-rw-r--r-- | bin/kdepim/WhatsNew.txt | 3 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 24 |
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 @@ -4,2 +4,4 @@ Info about the changes in new versions of KDE-Pim/Pi +Stable release 2.0.0! + KO/Pi: @@ -9,2 +11,3 @@ 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: diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 950d2ec..3feb4ab 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -525,4 +525,9 @@ void MainWindow::initActions() 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 ); @@ -598,2 +603,10 @@ void MainWindow::initActions() 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" ); @@ -760,8 +773,3 @@ void MainWindow::initActions() - 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() ) ); + @@ -976,3 +984,5 @@ void MainWindow::initActions() action->addTo( iconToolBar ); - } + } + icon = loadPixmap( pathString + "today" ); + configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130); if (p-> mShowIconToday) |