From 1ec37e1988d32ed65fa1afa001eff8fc105fbbbc Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Sat, 26 Mar 2005 23:47:43 +0000
Subject: fix

---
(limited to 'korganizer')

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 24055af..95b836c 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -686,12 +686,29 @@ void MainWindow::initActions()
              mView, SLOT( showDatePicker() ) );
     action->addTo( iconToolBar  );
     viewMenu->insertSeparator();
-    icon = loadPixmap( pathString + "list" );
-    configureToolBarMenu->insertItem(icon, i18n("List View"), 30 );
-    QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this );
-    showlist_action->addTo( viewMenu );
-    connect( showlist_action, SIGNAL( activated() ),
-             mView->viewManager(), SLOT( showListView() ) );
+
+
+    icon = loadPixmap( pathString + "whatsnext" );
+    configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 );
+    QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
+    whatsnext_action->addTo( viewMenu );
+    connect( whatsnext_action, SIGNAL( activated() ),
+             mView->viewManager(), SLOT( showWhatsNextView() ) );
+
+    icon = loadPixmap( pathString + "xdays" );
+    configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 );
+    QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this );
+    xdays_action->addTo( viewMenu );
+    connect( xdays_action, SIGNAL( activated() ),
+             mView->viewManager(), SLOT( showNextXView() ) );
+   
+
+    icon = loadPixmap( pathString + "journal" );
+    configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 );
+    QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this );
+    viewjournal_action->addTo( viewMenu );
+    connect( viewjournal_action, SIGNAL( activated() ),
+             mView->viewManager(), SLOT( showJournalView() ) );
 
 
     icon = loadPixmap( pathString + "day" );
@@ -730,6 +747,13 @@ void MainWindow::initActions()
     connect( month_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showMonthView() ) );
 
+     icon = loadPixmap( pathString + "list" );
+    configureToolBarMenu->insertItem(icon, i18n("List View"), 30 );
+    QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this );
+    showlist_action->addTo( viewMenu );
+    connect( showlist_action, SIGNAL( activated() ),
+             mView->viewManager(), SLOT( showListView() ) );
+
     icon = loadPixmap( pathString + "todo" );
     configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 );
     QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
@@ -737,26 +761,7 @@ void MainWindow::initActions()
     connect( todoview_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showTodoView() ) );
 
-    icon = loadPixmap( pathString + "journal" );
-    configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 );
-    QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this );
-    viewjournal_action->addTo( viewMenu );
-    connect( viewjournal_action, SIGNAL( activated() ),
-             mView->viewManager(), SLOT( showJournalView() ) );
-
-    icon = loadPixmap( pathString + "xdays" );
-    configureToolBarMenu->insertItem(icon, i18n("Next days"), 100,4 );
-    QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this );
-    xdays_action->addTo( viewMenu );
-    connect( xdays_action, SIGNAL( activated() ),
-             mView->viewManager(), SLOT( showNextXView() ) );
 
-    icon = loadPixmap( pathString + "whatsnext" );
-    configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110, 4 );
-    QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
-    whatsnext_action->addTo( viewMenu );
-    connect( whatsnext_action, SIGNAL( activated() ),
-             mView->viewManager(), SLOT( showWhatsNextView() ) );
 
 #if 0
     action = new QAction( "view_timespan", "Time Span", 0, this );
@@ -815,7 +820,7 @@ void MainWindow::initActions()
 
     icon = loadPixmap( pathString + "search" );
     QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
-    configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 4);
+    configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5);
     search_action->addTo( actionMenu );
     connect( search_action, SIGNAL( activated() ),
              mView->dialogManager(), SLOT( showSearchDialog() ) );
@@ -1027,7 +1032,7 @@ void MainWindow::initActions()
         todoview_action->addTo( iconToolBar  );   
    
     icon = loadPixmap( pathString + "2leftarrowB" );
-    configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200, 14);
+    configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200);
     if (p-> mShowIconBackFast) {
         action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this );
         connect( action, SIGNAL( activated() ),
@@ -1035,7 +1040,7 @@ void MainWindow::initActions()
         action->addTo( iconToolBar  );
     }
     icon = loadPixmap( pathString + "1leftarrowB" );
-    configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210,15);
+    configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210);
     if (p-> mShowIconBack) {
         action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this );
         connect( action, SIGNAL( activated() ),
@@ -1064,7 +1069,7 @@ void MainWindow::initActions()
     }
 
 
-    configureToolBarMenu->insertItem(i18n("What's This?"), 300);
+    configureToolBarMenu->insertItem(i18n("What's This?"), 300, 6);
 
     if (p-> mShowIconNewEvent)
         configureToolBarMenu->setItemChecked( 10, true );
--
cgit v0.9.0.2