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
-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 | |||
@@ -544,32 +544,33 @@ if (!mMonthView) { | |||
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 | { |