summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koeventpopupmenu.cpp2
-rw-r--r--korganizer/kolistview.cpp2
-rw-r--r--korganizer/mainwindow.cpp17
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
@@ -41,5 +41,5 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
mSingleOnlyItems.append( insertItem (i18n("&Show"),this,SLOT(popupShow())));
mEditOnlyItems.append(insertItem (i18n("&Edit..."),this,SLOT(popupEdit())));
- mEditOnlyItems.append(insertItem (i18n("&Delete"),
+ mEditOnlyItems.append(insertItem (i18n("&Delete..."),
this,SLOT(popupDelete())));
mEditOnlyItems.append(insertItem (i18n("&Clone..."),
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index cdcbbf0..ea037a9 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -348,5 +348,5 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
#ifndef DESKTOP_VERSION
selPopup->insertSeparator();
- selPopup->insertItem( i18n("Beam via IR"),this,
+ selPopup->insertItem( i18n("Beam via IR..."),this,
SLOT(beamSelected()));
#if 0
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index f68f032..7a5f3e5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -676,5 +676,6 @@ void MainWindow::initActions()
menuBar1->insertItem( i18n("File"), importMenu );
menuBar1->insertItem( i18n("View"), viewMenu );
- menuBar1->insertItem( i18n("Actions"), actionMenu );
+ menuBar1->insertItem( i18n("Edit"), mCurrentItemMenu );
+ menuBar1->insertItem( i18n("Action"), actionMenu );
#ifdef DESKTOP_VERSION
menuBar1->insertItem( i18n("Synchronize"), syncMenu );
@@ -696,5 +697,6 @@ void MainWindow::initActions()
menuBar->insertItem( i18n("File"), importMenu );
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 );
menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu );
@@ -783,8 +785,8 @@ 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" );
configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
@@ -796,5 +798,5 @@ void MainWindow::initActions()
configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
- actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu);
+ //actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu);
mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
mShowAction->addTo( mCurrentItemMenu );
@@ -1723,8 +1725,4 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
void MainWindow::enableIncidenceActions( bool enabled )
{
-
-#ifndef DESKTOP_VERSION
- mCurrentItemMenu->setEnabled( enabled );
-#else
mShowAction->setEnabled( enabled );
mEditAction->setEnabled( enabled );
@@ -1735,5 +1733,4 @@ void MainWindow::enableIncidenceActions( bool enabled )
mBeamAction->setEnabled( enabled );
mCancelAction->setEnabled( enabled );
-#endif
}