1 files changed, 17 insertions, 16 deletions

diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index b5de4a1..e80b3fc 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -173,122 +173,123 @@ void KOViewManager::showDateView( int view, QDate date)
 void KOViewManager::writeSettings(KConfig *config)
 {
      config->setGroup("General");
 
     QString view;
     if (mCurrentView == mWhatsNextView) view = "WhatsNext";
     else if (mCurrentView == mMonthView) view = "Month";
     else if (mCurrentView == mListView) view = "List";
     else if (mCurrentView == mJournalView) view = "Journal";
     else if (mCurrentView == mTimeSpanView) view = "TimeSpan";
     else if (mCurrentView == mTodoView) view = "Todo";
     else view = "Agenda";
 
     config->writeEntry("Current View",view);
 
     if (mAgendaView) {
         mAgendaView->writeSettings(config);
     }
     if (mTimeSpanView) {
         mTimeSpanView->writeSettings(config);
     }
     if (mListView) {
         mListView->writeSettings(config);
     }
     if (mTodoView) {
         mTodoView->saveLayout(config,"Todo View");
     }
 }
 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;
 
     if (mCurrentView == mAgendaView && mCurrentAgendaView == 5 )  goto DAY_7;
     
     if  (mCurrentView == mAgendaView )  goto DAY_6;
 
     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 ;}
+    if ( KOPrefs::instance()->mShowIconNextDays )  { showNextXView() ;return ;} 
+ JOURNAL:
+    if ( KOPrefs::instance()->mShowIconJournal )  { showJournalView() ;return ;}
  DAY_1:
     if ( KOPrefs::instance()->mShowIconDay1 )  { showDayView() ;return ;}
  DAY_5:
     if ( KOPrefs::instance()->mShowIconDay5 )  { showWorkWeekView() ;return ;}
  DAY_7:
     if ( KOPrefs::instance()->mShowIconDay7 )   { showWeekView();return ;}
  DAY_6:
     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()->mShowIconDay1 )  { showDayView() ;return ;}
+    if ( KOPrefs::instance()->mShowIconJournal )  { showJournalView() ;return ;}
 
+    if ( KOPrefs::instance()->mShowIconDay1 )  { showDayView() ;return ;}
+    
     if ( KOPrefs::instance()->mShowIconDay5 )  { showWorkWeekView() ;return ;}
 
     if ( KOPrefs::instance()->mShowIconDay7 )   { showWeekView();return ;}
 
     if ( KOPrefs::instance()->mShowIconDay6 )   { showMonthViewWeek();return ;}
 
     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 ;}
 
 
 
 }
 void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
 {
  
     //mFlagShowNextxDays = false;
     //if(view == mCurrentView) return;  
     if ( view == 0 ) {
         view = mCurrentView;
         if ( view == 0 )
             return;
     }
     bool callupdate = !(view == mCurrentView);
     bool full = fullScreen;
     if(view == mCurrentView && view != mWhatsNextView ) {
         if ( mCurrentAgendaView < 0 )
             return;
         if ( view != mMonthView )
             full = mMainView->leftFrame()->isVisible();
     } else {
         if ( view == mMonthView && mMonthView)
             ;//mMonthView->skipResize = true ; 
         mCurrentView = view;
         // bool full = fullScreen;
         bool isFull = !mMainView->leftFrame()->isVisible();
         if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen )
             full = true;
         if ( !isFull && KOPrefs::instance()->mViewChangeHoldNonFullscreen )
             full = false;
     }