summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt3
-rw-r--r--korganizer/mainwindow.cpp24
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
4 4
5Stable release 2.0.0!
6
5KO/Pi: 7KO/Pi:
@@ -9,2 +11,3 @@ Changed agenda size menu to items 1-10.
9Made it possible to change agenda size quickly by pressing mouse on timelabels in agenda view and move mouse up/down. 11Made it possible to change agenda size quickly by pressing mouse on timelabels in agenda view and move mouse up/down.
12Usebility enhancements in the KO/Pi menus.
10OM/Pi: 13OM/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()
525 menuBar1->insertItem( i18n("Actions"), actionMenu ); 525 menuBar1->insertItem( i18n("Actions"), actionMenu );
526#ifdef DESKTOP_VERSION
526 menuBar1->insertItem( i18n("Synchronize"), syncMenu ); 527 menuBar1->insertItem( i18n("Synchronize"), syncMenu );
527 menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); 528 menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu );
529#else
530 menuBar1->insertItem( i18n("Sync"), syncMenu );
531 menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu );
532#endif
528 //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu ); 533 //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu );
@@ -598,2 +603,10 @@ void MainWindow::initActions()
598 mView, SLOT( newTodo() ) ); 603 mView, SLOT( newTodo() ) );
604
605 icon = loadPixmap( pathString + "today" );
606 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
607 today_action->addTo( viewMenu );
608 connect( today_action, SIGNAL( activated() ),
609 mView, SLOT( goToday() ) );
610 viewMenu->insertSeparator();
611
599 icon = loadPixmap( pathString + "navi" ); 612 icon = loadPixmap( pathString + "navi" );
@@ -760,8 +773,3 @@ void MainWindow::initActions()
760 773
761 icon = loadPixmap( pathString + "today" ); 774
762 configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130);
763 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
764 today_action->addTo( actionMenu );
765 connect( today_action, SIGNAL( activated() ),
766 mView, SLOT( goToday() ) );
767 775
@@ -976,3 +984,5 @@ void MainWindow::initActions()
976 action->addTo( iconToolBar ); 984 action->addTo( iconToolBar );
977 } 985 }
986 icon = loadPixmap( pathString + "today" );
987 configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130);
978 if (p-> mShowIconToday) 988 if (p-> mShowIconToday)