summaryrefslogtreecommitdiffabout
path: root/korganizer/koviewmanager.cpp
Side-by-side diff
Diffstat (limited to 'korganizer/koviewmanager.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koviewmanager.cpp16
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
@@ -224,9 +224,11 @@ void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView )
mCurrentAgendaView = 0;
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 {
mMainView->navigatorBar()->hide();
@@ -527,13 +529,17 @@ void KOViewManager::showMonthView()
mMainView->navigatorBar(), SIGNAL(goNextMonth() ) );
connect( mMonthView, SIGNAL(prevMonth() ),
mMainView->navigatorBar(), SIGNAL(goPrevMonth() ) );
- mMonthView->updateConfig();
+ connect( mMonthView, SIGNAL( showNavigator(bool) ),
+ mMainView, SLOT ( showNavigatorBar(bool) ) );
}
globalFlagBlockAgenda = 1;
//mFlagShowNextxDays = false;
// if(mMonthView == mCurrentView) return;
- mMainView->dateNavigator()->selectMonth();
+ if ( KOPrefs::instance()->mMonthViewWeek )
+ mMainView->dateNavigator()->selectWeek();
+ else
+ mMainView->dateNavigator()->selectMonth();
showView(mMonthView, true );