-rw-r--r-- | korganizer/koviewmanager.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index c442d0b..406e741 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -228,13 +228,5 @@ void KOViewManager::showNextView() NEXT_X: if ( KOPrefs::instance()->mShowIconNextDays ) { - globalFlagBlockAgenda = 1; - if ( mCurrentAgendaView != 3 ) - mCurrentAgendaView = -1; - showAgendaView(KOPrefs::instance()->mFullViewMonth); - globalFlagBlockAgenda = 2; - mMainView->dateNavigator()->selectDates( baseCycleDate , - KOPrefs::instance()->mNextXDays ); - mFlagShowNextxDays = true; - mCurrentAgendaView = 3 ; + showNextXView(); goto ENTE ; } @@ -408,5 +400,5 @@ void KOViewManager::showWhatsNextView() showView(mWhatsNextView, true ); //mWhatsNextView->updateView(); - + KOPrefs::instance()->mCurrentDisplayedView = VIEW_WN_VIEW; } @@ -454,4 +446,5 @@ void KOViewManager::showListView() showView(mListView, KOPrefs::instance()->mFullViewTodo); //mFlagShowNextxDays = temp; + KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW; } @@ -519,5 +512,5 @@ void KOViewManager::showAgendaView( bool fullScreen ) showView( mAgendaView, full); - + KOPrefs::instance()->mCurrentDisplayedView = VIEW_A_VIEW; } @@ -593,4 +586,5 @@ void KOViewManager::showNextXView() mFlagShowNextxDays = true; mCurrentAgendaView = 3 ; + KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW; } bool KOViewManager::showsNextDays() @@ -677,4 +671,5 @@ void KOViewManager::showMonthViewWeek() showView(mMonthView, full ); mMonthView->setKeyBFocus(); + KOPrefs::instance()->mCurrentDisplayedView = VIEW_ML_VIEW ; } @@ -707,4 +702,5 @@ void KOViewManager::showMonthView() showView(mMonthView, full ); mMonthView->setKeyBFocus(); + KOPrefs::instance()->mCurrentDisplayedView = VIEW_M_VIEW ; } @@ -762,4 +758,5 @@ void KOViewManager::showTodoView() globalFlagBlockAgenda = 1; showView( mTodoView, true ); + KOPrefs::instance()->mCurrentDisplayedView = VIEW_T_VIEW ; } @@ -779,4 +776,5 @@ void KOViewManager::showJournalView() showView(mJournalView); mMainView->dateNavigator()->selectDates( 1 ); + KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW ; } |