Diffstat (limited to 'korganizer/koviewmanager.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/koviewmanager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index a74c5fe..dcb51dc 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -119,13 +119,13 @@ void KOViewManager::showDateView( int view, QDate date) | |||
119 | mCurrentAgendaView = 7 ; | 119 | mCurrentAgendaView = 7 ; |
120 | mMainView->dateNavigator()->selectDates( date, 7 ); | 120 | mMainView->dateNavigator()->selectDates( date, 7 ); |
121 | } else if (view == 5 ) { | 121 | } else if (view == 5 ) { |
122 | mCurrentAgendaView = 14 ; | 122 | mCurrentAgendaView = 14 ; |
123 | mMainView->dateNavigator()->selectDates( date, 14); | 123 | mMainView->dateNavigator()->selectDates( date, 14); |
124 | } else if (view == 6 ) { | 124 | } else if (view == 6 ) { |
125 | mMainView->dateNavigator()->selectDates( date, 7 ); | 125 | //mMainView->dateNavigator()->selectDates( date, 7 ); |
126 | showMonthView(); | 126 | showMonthView(); |
127 | } else if (view == 7 ) { | 127 | } else if (view == 7 ) { |
128 | mMainView->dateNavigator()->selectDate( date ); | 128 | mMainView->dateNavigator()->selectDate( date ); |
129 | showJournalView(); | 129 | showJournalView(); |
130 | } else if (view == 8 ) { | 130 | } else if (view == 8 ) { |
131 | globalFlagBlockAgenda = 1; | 131 | globalFlagBlockAgenda = 1; |
@@ -220,12 +220,13 @@ void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView ) | |||
220 | { | 220 | { |
221 | mCurrentAgendaView = 0; | 221 | mCurrentAgendaView = 0; |
222 | int wid = mMainView->width() ; | 222 | int wid = mMainView->width() ; |
223 | int hei = mMainView->height(); | 223 | int hei = mMainView->height(); |
224 | if ( mCurrentView == mMonthView ) { | 224 | if ( mCurrentView == mMonthView ) { |
225 | if ( true /* !KOPrefs::instance()->mMonthViewWeek*/ ) { | 225 | if ( true /* !KOPrefs::instance()->mMonthViewWeek*/ ) { |
226 | mMonthView->setIgnoreResizeEvent( 2 ); | ||
226 | mMainView->navigatorBar()->show(); | 227 | mMainView->navigatorBar()->show(); |
227 | hei -= mMainView->navigatorBar()->sizeHint().height(); | 228 | hei -= mMainView->navigatorBar()->sizeHint().height(); |
228 | } | 229 | } |
229 | //mMainView->navigatorBar()->hide(); | 230 | //mMainView->navigatorBar()->hide(); |
230 | } else { | 231 | } else { |
231 | mMainView->navigatorBar()->hide(); | 232 | mMainView->navigatorBar()->hide(); |
@@ -488,13 +489,13 @@ void KOViewManager::showNextXView() | |||
488 | } | 489 | } |
489 | bool KOViewManager::showsNextDays() | 490 | bool KOViewManager::showsNextDays() |
490 | { | 491 | { |
491 | return mFlagShowNextxDays; | 492 | return mFlagShowNextxDays; |
492 | } | 493 | } |
493 | void KOViewManager::showMonthView() | 494 | void KOViewManager::showMonthView() |
494 | { | 495 | { |
495 | if (!mMonthView) { | 496 | if (!mMonthView) { |
496 | mMonthView = new KOMonthView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::MonthView"); | 497 | mMonthView = new KOMonthView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::MonthView"); |
497 | 498 | ||
498 | addView(mMonthView); | 499 | addView(mMonthView); |
499 | // mMonthView->show(); | 500 | // mMonthView->show(); |
500 | // SIGNALS/SLOTS FOR MONTH VIEW | 501 | // SIGNALS/SLOTS FOR MONTH VIEW |