-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() | |||
42 | mEditOnlyItems.append(insertItem (i18n("&Edit..."),this,SLOT(popupEdit()))); | 42 | mEditOnlyItems.append(insertItem (i18n("&Edit..."),this,SLOT(popupEdit()))); |
43 | mEditOnlyItems.append(insertItem (i18n("&Delete"), | 43 | mEditOnlyItems.append(insertItem (i18n("&Delete..."), |
44 | this,SLOT(popupDelete()))); | 44 | 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, | |||
349 | selPopup->insertSeparator(); | 349 | selPopup->insertSeparator(); |
350 | selPopup->insertItem( i18n("Beam via IR"),this, | 350 | selPopup->insertItem( i18n("Beam via IR..."),this, |
351 | SLOT(beamSelected())); | 351 | 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() | |||
677 | menuBar1->insertItem( i18n("View"), viewMenu ); | 677 | menuBar1->insertItem( i18n("View"), viewMenu ); |
678 | menuBar1->insertItem( i18n("Actions"), actionMenu ); | 678 | menuBar1->insertItem( i18n("Edit"), mCurrentItemMenu ); |
679 | menuBar1->insertItem( i18n("Action"), actionMenu ); | ||
679 | #ifdef DESKTOP_VERSION | 680 | #ifdef DESKTOP_VERSION |
@@ -697,3 +698,4 @@ void MainWindow::initActions() | |||
697 | menuBar->insertItem( i18n("View"), viewMenu ); | 698 | menuBar->insertItem( i18n("View"), viewMenu ); |
698 | menuBar->insertItem( i18n("Actions"), actionMenu ); | 699 | menuBar->insertItem( i18n("Edit"), mCurrentItemMenu ); |
700 | menuBar->insertItem( i18n("Action"), actionMenu ); | ||
699 | menuBar->insertItem( i18n("Synchronize"), syncMenu ); | 701 | menuBar->insertItem( i18n("Synchronize"), syncMenu ); |
@@ -784,6 +786,6 @@ void MainWindow::initActions() | |||
784 | action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); | 786 | action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); |
785 | action->addTo( actionMenu ); | 787 | action->addTo( mCurrentItemMenu ); |
786 | connect( action, SIGNAL( activated() ), | 788 | connect( action, SIGNAL( activated() ), |
787 | mView, SLOT( undo_delete() ) ); | 789 | mView, SLOT( undo_delete() ) ); |
788 | 790 | mCurrentItemMenu->insertSeparator(); | |
789 | icon = loadPixmap( pathString + "newevent" ); | 791 | icon = loadPixmap( pathString + "newevent" ); |
@@ -797,3 +799,3 @@ void MainWindow::initActions() | |||
797 | 799 | ||
798 | actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); | 800 | //actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); |
799 | mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); | 801 | mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); |
@@ -1724,6 +1726,2 @@ void MainWindow::enableIncidenceActions( bool enabled ) | |||
1724 | { | 1726 | { |
1725 | |||
1726 | #ifndef DESKTOP_VERSION | ||
1727 | mCurrentItemMenu->setEnabled( enabled ); | ||
1728 | #else | ||
1729 | mShowAction->setEnabled( enabled ); | 1727 | mShowAction->setEnabled( enabled ); |
@@ -1736,3 +1734,2 @@ void MainWindow::enableIncidenceActions( bool enabled ) | |||
1736 | mCancelAction->setEnabled( enabled ); | 1734 | mCancelAction->setEnabled( enabled ); |
1737 | #endif | ||
1738 | } | 1735 | } |