summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-01-27 10:51:32 (UTC)
committer zautrix <zautrix>2005-01-27 10:51:32 (UTC)
commit9ff00e650e32d6f348a2333c9cf21da9c9a137ff (patch) (side-by-side diff)
treeefabd55edbaf0be0129c54b3fcd156c028085530 /korganizer
parent1501a5d8a25e3474fb450d7e0b272feb14821d1c (diff)
downloadkdepimpi-9ff00e650e32d6f348a2333c9cf21da9c9a137ff.zip
kdepimpi-9ff00e650e32d6f348a2333c9cf21da9c9a137ff.tar.gz
kdepimpi-9ff00e650e32d6f348a2333c9cf21da9c9a137ff.tar.bz2
fix
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp24
1 files changed, 17 insertions, 7 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 950d2ec..3feb4ab 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -523,8 +523,13 @@ void MainWindow::initActions()
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 );
@@ -596,6 +601,14 @@ void MainWindow::initActions()
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 );
@@ -758,12 +771,7 @@ void MainWindow::initActions()
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();
@@ -974,7 +982,9 @@ void MainWindow::initActions()
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" );