| -rw-r--r-- | korganizer/mainwindow.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
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 ) { @@ -976,4 +984,6 @@ void MainWindow::initActions() action->addTo( iconToolBar ); } + icon = loadPixmap( pathString + "today" ); + configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130); if (p-> mShowIconToday) today_action->addTo( iconToolBar ); |