| -rw-r--r-- | korganizer/koeventpopupmenu.cpp | 2 | ||||
| -rw-r--r-- | korganizer/kolistview.cpp | 2 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 17 |
3 files changed, 9 insertions, 12 deletions
diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp index 41d331a..0b0fe8e 100644 --- a/korganizer/koeventpopupmenu.cpp +++ b/korganizer/koeventpopupmenu.cpp @@ -42,3 +42,3 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu() mEditOnlyItems.append(insertItem (i18n("&Edit..."),this,SLOT(popupEdit()))); - mEditOnlyItems.append(insertItem (i18n("&Delete"), + mEditOnlyItems.append(insertItem (i18n("&Delete..."), this,SLOT(popupDelete()))); diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index cdcbbf0..ea037a9 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -349,3 +349,3 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, selPopup->insertSeparator(); - selPopup->insertItem( i18n("Beam via IR"),this, + selPopup->insertItem( i18n("Beam via IR..."),this, SLOT(beamSelected())); diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index f68f032..7a5f3e5 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -677,3 +677,4 @@ void MainWindow::initActions() menuBar1->insertItem( i18n("View"), viewMenu ); - menuBar1->insertItem( i18n("Actions"), actionMenu ); + menuBar1->insertItem( i18n("Edit"), mCurrentItemMenu ); + menuBar1->insertItem( i18n("Action"), actionMenu ); #ifdef DESKTOP_VERSION @@ -697,3 +698,4 @@ void MainWindow::initActions() menuBar->insertItem( i18n("View"), viewMenu ); - menuBar->insertItem( i18n("Actions"), actionMenu ); + menuBar->insertItem( i18n("Edit"), mCurrentItemMenu ); + menuBar->insertItem( i18n("Action"), actionMenu ); menuBar->insertItem( i18n("Synchronize"), syncMenu ); @@ -784,6 +786,6 @@ void MainWindow::initActions() action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); - action->addTo( actionMenu ); + action->addTo( mCurrentItemMenu ); connect( action, SIGNAL( activated() ), mView, SLOT( undo_delete() ) ); - + mCurrentItemMenu->insertSeparator(); icon = loadPixmap( pathString + "newevent" ); @@ -797,3 +799,3 @@ void MainWindow::initActions() - actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); + //actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); @@ -1724,6 +1726,2 @@ void MainWindow::enableIncidenceActions( bool enabled ) { - -#ifndef DESKTOP_VERSION - mCurrentItemMenu->setEnabled( enabled ); -#else mShowAction->setEnabled( enabled ); @@ -1736,3 +1734,2 @@ void MainWindow::enableIncidenceActions( bool enabled ) mCancelAction->setEnabled( enabled ); -#endif } |