summaryrefslogtreecommitdiffabout
path: root/korganizer/koviewmanager.cpp
Side-by-side diff
Diffstat (limited to 'korganizer/koviewmanager.cpp') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koviewmanager.cpp27
1 files changed, 14 insertions, 13 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index b5de4a1..e80b3fc 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -202,9 +202,9 @@ void KOViewManager::showNextView()
{
if (mCurrentView == mWhatsNextView) goto NEXT_X;
- if (mCurrentView == mAgendaView && mFlagShowNextxDays) goto LIST;
+ if (mCurrentView == mAgendaView && mFlagShowNextxDays) goto JOURNAL;
- if (mCurrentView == mListView ) goto DAY_1;
+ if (mCurrentView == mJournalView ) goto DAY_1;
if (mCurrentView == mAgendaView && mCurrentAgendaView == 1 ) goto DAY_5;
@@ -214,16 +214,19 @@ void KOViewManager::showNextView()
if (mCurrentView == mMonthView && KOPrefs::instance()->mMonthViewWeek) goto MONTH;
- if (mCurrentView == mMonthView ) goto TODO;
+ if (mCurrentView == mMonthView ) goto LIST;
+
+ if (mCurrentView == mListView ) goto TODO;
+
+ // if (mCurrentView == mTodoView ) goto LIST;
- if (mCurrentView == mTodoView ) goto JOURNAL;
NEXT:
if ( KOPrefs::instance()->mShowIconNext ) { showWhatsNextView();return ;}
NEXT_X:
if ( KOPrefs::instance()->mShowIconNextDays ) { showNextXView() ;return ;}
- LIST:
- if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;}
+ JOURNAL:
+ if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;}
DAY_1:
if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;}
DAY_5:
@@ -234,18 +237,16 @@ void KOViewManager::showNextView()
if ( KOPrefs::instance()->mShowIconDay6 ) { showMonthViewWeek();return ;}
MONTH:
if ( KOPrefs::instance()->mShowIconMonth ) { showMonthView();return ;}
+ LIST:
+ if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;}
TODO:
if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;}
- JOURNAL:
- if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;}
-
-
if ( KOPrefs::instance()->mShowIconNext ) { showWhatsNextView();return ;}
if ( KOPrefs::instance()->mShowIconNextDays ) { showNextXView() ;return ;}
- if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;}
+ if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;}
if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;}
@@ -257,9 +258,9 @@ void KOViewManager::showNextView()
if ( KOPrefs::instance()->mShowIconMonth ) { showMonthView();return ;}
- if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;}
+ if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;}
- if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;}
+ if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;}