author | zautrix <zautrix> | 2005-02-20 11:14:04 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-20 11:14:04 (UTC) |
commit | bb74ffa01010ca364e101e05a6b3e090ae363a0e (patch) (unidiff) | |
tree | 573f3b5244f064996c9cb4c73cc0ad04816bda9b /korganizer/koviewmanager.cpp | |
parent | ce9aa88149547443452a2077f5c3832fbea34f63 (diff) | |
download | kdepimpi-bb74ffa01010ca364e101e05a6b3e090ae363a0e.zip kdepimpi-bb74ffa01010ca364e101e05a6b3e090ae363a0e.tar.gz kdepimpi-bb74ffa01010ca364e101e05a6b3e090ae363a0e.tar.bz2 |
minor month-weekview fixes
Diffstat (limited to 'korganizer/koviewmanager.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/koviewmanager.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index ac67b58..a9f5a41 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -528,64 +528,65 @@ if (!mMonthView) { | |||
528 | connect( mMonthView, SIGNAL( showDaySignal( QDate ) ), | 528 | connect( mMonthView, SIGNAL( showDaySignal( QDate ) ), |
529 | mMainView, SLOT ( showDay( QDate ) ) ); | 529 | mMainView, SLOT ( showDay( QDate ) ) ); |
530 | connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig())); | 530 | connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig())); |
531 | connect( mMonthView, SIGNAL(nextMonth() ), | 531 | connect( mMonthView, SIGNAL(nextMonth() ), |
532 | mMonthView->navigatorBar(), SIGNAL(goNextMonth() ) ); | 532 | mMonthView->navigatorBar(), SIGNAL(goNextMonth() ) ); |
533 | connect( mMonthView, SIGNAL(prevMonth() ), | 533 | connect( mMonthView, SIGNAL(prevMonth() ), |
534 | mMonthView->navigatorBar(), SIGNAL(goPrevMonth() ) ); | 534 | mMonthView->navigatorBar(), SIGNAL(goPrevMonth() ) ); |
535 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevYear() ), | 535 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevYear() ), |
536 | mMainView->dateNavigator(), SLOT( selectPreviousYear() ) ); | 536 | mMainView->dateNavigator(), SLOT( selectPreviousYear() ) ); |
537 | connect( mMonthView->navigatorBar(), SIGNAL( goNextYear() ), | 537 | connect( mMonthView->navigatorBar(), SIGNAL( goNextYear() ), |
538 | mMainView->dateNavigator(), SLOT( selectNextYear() ) ); | 538 | mMainView->dateNavigator(), SLOT( selectNextYear() ) ); |
539 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevMonth() ), | 539 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevMonth() ), |
540 | mMainView->dateNavigator(), SLOT( selectPreviousMonth() ) ); | 540 | mMainView->dateNavigator(), SLOT( selectPreviousMonth() ) ); |
541 | connect( mMonthView->navigatorBar(), SIGNAL( goNextMonth() ), | 541 | connect( mMonthView->navigatorBar(), SIGNAL( goNextMonth() ), |
542 | mMainView->dateNavigator(), SLOT( selectNextMonth() ) ); | 542 | mMainView->dateNavigator(), SLOT( selectNextMonth() ) ); |
543 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevWeek() ), | 543 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevWeek() ), |
544 | mMainView->dateNavigator(), SLOT( selectPreviousWeek() ) ); | 544 | mMainView->dateNavigator(), SLOT( selectPreviousWeek() ) ); |
545 | connect( mMonthView->navigatorBar(), SIGNAL( goNextWeek() ), | 545 | connect( mMonthView->navigatorBar(), SIGNAL( goNextWeek() ), |
546 | mMainView->dateNavigator(), SLOT( selectNextWeek() ) ); | 546 | mMainView->dateNavigator(), SLOT( selectNextWeek() ) ); |
547 | 547 | ||
548 | connect( mMainView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), | 548 | connect( mMainView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), |
549 | mMonthView->navigatorBar(), SLOT( selectDates( const KCal::DateList & ) ) ); | 549 | mMonthView->navigatorBar(), SLOT( selectDates( const KCal::DateList & ) ) ); |
550 | 550 | ||
551 | 551 | ||
552 | connect( mMonthView->navigatorBar(), SIGNAL( monthSelected ( int ) ), | 552 | connect( mMonthView->navigatorBar(), SIGNAL( monthSelected ( int ) ), |
553 | mMainView->dateNavigator(), SLOT( slotMonthSelect( int ) ) ); | 553 | mMainView->dateNavigator(), SLOT( slotMonthSelect( int ) ) ); |
554 | 554 | ||
555 | } | 555 | } |
556 | } | 556 | } |
557 | void KOViewManager::showMonthViewWeek() | 557 | void KOViewManager::showMonthViewWeek() |
558 | { | 558 | { |
559 | createMonthView(); | 559 | createMonthView(); |
560 | globalFlagBlockAgenda = 1; | ||
560 | bool full = true; | 561 | bool full = true; |
561 | if ( mCurrentView == mMonthView) | 562 | if ( mCurrentView == mMonthView) |
562 | full = mMainView->leftFrame()->isVisible(); | 563 | full = mMainView->leftFrame()->isVisible(); |
563 | if ( !KOPrefs::instance()->mMonthViewWeek ) { | 564 | if ( !KOPrefs::instance()->mMonthViewWeek ) { |
564 | mMonthView->switchView(); | 565 | mMonthView->switchView(); |
565 | if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() ) | 566 | if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() ) |
566 | full = false; | 567 | full = false; |
567 | else | 568 | else |
568 | full = true; | 569 | full = true; |
569 | } | 570 | } |
570 | mMainView->dateNavigator()->selectWeek(); | 571 | mMainView->dateNavigator()->selectWeek(); |
571 | showView(mMonthView, full ); | 572 | showView(mMonthView, full ); |
572 | } | 573 | } |
573 | 574 | ||
574 | void KOViewManager::showMonthView() | 575 | void KOViewManager::showMonthView() |
575 | { | 576 | { |
576 | 577 | ||
577 | createMonthView(); | 578 | createMonthView(); |
578 | globalFlagBlockAgenda = 1; | 579 | globalFlagBlockAgenda = 1; |
579 | //mFlagShowNextxDays = false; | 580 | //mFlagShowNextxDays = false; |
580 | bool full = true; | 581 | bool full = true; |
581 | if ( mCurrentView == mMonthView) | 582 | if ( mCurrentView == mMonthView) |
582 | full = mMainView->leftFrame()->isVisible(); | 583 | full = mMainView->leftFrame()->isVisible(); |
583 | // if(mMonthView == mCurrentView) return; | 584 | // if(mMonthView == mCurrentView) return; |
584 | if ( KOPrefs::instance()->mMonthViewWeek ) { | 585 | if ( KOPrefs::instance()->mMonthViewWeek ) { |
585 | mMonthView->switchView(); | 586 | mMonthView->switchView(); |
586 | if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() ) | 587 | if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() ) |
587 | full = false; | 588 | full = false; |
588 | else | 589 | else |
589 | full = true; | 590 | full = true; |
590 | } | 591 | } |
591 | mMainView->dateNavigator()->selectMonth(); | 592 | mMainView->dateNavigator()->selectMonth(); |