Diffstat (limited to 'korganizer/koviewmanager.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | korganizer/koviewmanager.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 7e126d9..6afd203 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -225,7 +225,9 @@ void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView ) int wid = mMainView->width() ; int hei = mMainView->height(); - if ( mCurrentView == mMonthView ) { - mMainView->navigatorBar()->show(); - hei -= mMainView->navigatorBar()->sizeHint().height(); + if ( mCurrentView == mMonthView ) { + if ( !KOPrefs::instance()->mMonthViewWeek ) { + mMainView->navigatorBar()->show(); + hei -= mMainView->navigatorBar()->sizeHint().height(); + } //mMainView->navigatorBar()->hide(); } else { @@ -528,5 +530,6 @@ void KOViewManager::showMonthView() connect( mMonthView, SIGNAL(prevMonth() ), mMainView->navigatorBar(), SIGNAL(goPrevMonth() ) ); - mMonthView->updateConfig(); + connect( mMonthView, SIGNAL( showNavigator(bool) ), + mMainView, SLOT ( showNavigatorBar(bool) ) ); } @@ -534,5 +537,8 @@ void KOViewManager::showMonthView() //mFlagShowNextxDays = false; // if(mMonthView == mCurrentView) return; - mMainView->dateNavigator()->selectMonth(); + if ( KOPrefs::instance()->mMonthViewWeek ) + mMainView->dateNavigator()->selectWeek(); + else + mMainView->dateNavigator()->selectMonth(); showView(mMonthView, true ); |