summaryrefslogtreecommitdiffabout
Side-by-side diff
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
@@ -3,4 +3,6 @@ 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.
@@ -8,4 +10,5 @@ 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.
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 950d2ec..3feb4ab 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -524,6 +524,11 @@ void MainWindow::initActions()
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 );
@@ -597,4 +602,12 @@ void MainWindow::initActions()
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 );
@@ -759,10 +772,5 @@ void MainWindow::initActions()
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 ) {
@@ -975,5 +983,7 @@ void MainWindow::initActions()
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 );