2 files changed, 24 insertions, 22 deletions

diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index b5de4a1..e80b3fc 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -204,5 +204,5 @@ void KOViewManager::showNextView()
 
-    if (mCurrentView == mAgendaView && mFlagShowNextxDays)  goto LIST;
+    if (mCurrentView == mAgendaView && mFlagShowNextxDays)  goto JOURNAL;
 
-    if (mCurrentView == mListView ) goto DAY_1;
+    if  (mCurrentView == mJournalView )  goto DAY_1;
     
@@ -216,5 +216,8 @@ void KOViewManager::showNextView()
  
-    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;
 
@@ -223,5 +226,5 @@ void KOViewManager::showNextView()
  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:
@@ -236,8 +239,6 @@ void KOViewManager::showNextView()
     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 ;}
-
-
 
@@ -246,7 +247,7 @@ void KOViewManager::showNextView()
     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 ;}
@@ -259,5 +260,5 @@ void KOViewManager::showNextView()
 
-    if ( KOPrefs::instance()->mShowIconTodoview ) {  showTodoView() ;return ;}
+    if ( KOPrefs::instance()->mShowIconList )  { showListView() ;return ;}
 
-    if ( KOPrefs::instance()->mShowIconJournal )  { showJournalView() ;return ;}
+    if ( KOPrefs::instance()->mShowIconTodoview ) {  showTodoView() ;return ;}
 
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index b947cac..24055af 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1011,4 +1011,4 @@ void MainWindow::initActions()
         xdays_action->addTo( iconToolBar  );
-    if (p-> mShowIconList)
-        showlist_action->addTo( iconToolBar  );
+    if (p-> mShowIconJournal)
+        viewjournal_action->addTo( iconToolBar  );
     if (p-> mShowIconDay1)
@@ -1022,7 +1022,8 @@ void MainWindow::initActions()
     if (p-> mShowIconMonth)
-        month_action->addTo( iconToolBar  );
+        month_action->addTo( iconToolBar  ); 
+    if (p-> mShowIconList)
+        showlist_action->addTo( iconToolBar  );
     if (p-> mShowIconTodoview)
-        todoview_action->addTo( iconToolBar  );
-    if (p-> mShowIconJournal)
-        viewjournal_action->addTo( iconToolBar  );
+        todoview_action->addTo( iconToolBar  );   
+   
     icon = loadPixmap( pathString + "2leftarrowB" );