fix

2 files changed, 20 insertions, 7 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 21f5b2f..6c4cb7b 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,13 +1,16 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.0.0 ************
 
+Stable release 2.0.0!
+
 KO/Pi:
 Fixed problem in edit dialog recreation at startup.
 Made "toggle view*" menu items enabled context sensitive.
 Changed agenda size menu to items 1-10.
 Made it possible to change agenda size quickly by pressing mouse on timelabels in agenda view and move mouse up/down.
+Usebility enhancements in the KO/Pi menus.
 OM/Pi:
 Added three info lines to display subject, from and to of selected mails.
 
 ********** VERSION 1.9.20 ************
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 950d2ec..3feb4ab 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -522,10 +522,15 @@ void MainWindow::initActions()
         menuBar1 = menuBar();
         menuBar1->insertItem( i18n("File"), importMenu );
         menuBar1->insertItem( i18n("View"), viewMenu );
         menuBar1->insertItem( i18n("Actions"), actionMenu );
+#ifdef DESKTOP_VERSION
         menuBar1->insertItem( i18n("Synchronize"), syncMenu );
         menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
+#else
+        menuBar1->insertItem( i18n("Sync"), syncMenu );
+        menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu  );
+#endif
         //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu );
         menuBar1->insertItem( i18n("Filter"),selectFilterMenu  );
         menuBar1->insertItem( i18n("Help"), helpMenu );
     } else {
@@ -595,8 +600,16 @@ void MainWindow::initActions()
     QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
     nt_action->addTo( actionMenu );
     connect( nt_action, SIGNAL( activated() ),
              mView, SLOT( newTodo() ) );
+
+    icon = loadPixmap( pathString + "today" );
+    QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
+    today_action->addTo( viewMenu );
+    connect( today_action, SIGNAL( activated() ),
+             mView, SLOT( goToday() ) );
+    viewMenu->insertSeparator();
+
     icon = loadPixmap( pathString + "navi" );
     action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
@@ -757,14 +770,9 @@ void MainWindow::initActions()
     search_action->addTo( actionMenu );
     connect( search_action, SIGNAL( activated() ),
              mView->dialogManager(), SLOT( showSearchDialog() ) );
 
-    icon = loadPixmap( pathString + "today" );
-    configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130);
-    QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
-    today_action->addTo( actionMenu );
-    connect( today_action, SIGNAL( activated() ),
-             mView, SLOT( goToday() ) );
+    
 
     if ( KOPrefs::instance()->mShowFullMenu ) {
         actionMenu->insertSeparator();
         actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );
@@ -973,9 +981,11 @@ void MainWindow::initActions()
         action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this );
         connect( action, SIGNAL( activated() ),
                  mView, SLOT( goPrevious() ) );
         action->addTo( iconToolBar  );
-    }
+    } 
+    icon = loadPixmap( pathString + "today" );
+    configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130);
     if (p-> mShowIconToday)
         today_action->addTo( iconToolBar  );
     icon = loadPixmap( pathString + "1rightarrowB" );
     configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220);