1 files changed, 7 insertions, 10 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index f68f032..7a5f3e5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -675,7 +675,8 @@ void MainWindow::initActions()
         menuBar1 = menuBar();
         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 );
         menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
@@ -695,7 +696,8 @@ void MainWindow::initActions()
         //menuBar1->insertItem( i18n("ME"), menuBar);
         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  );
         menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu );
@@ -782,10 +784,10 @@ 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 );
     configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
@@ -795,7 +797,7 @@ void MainWindow::initActions()
     configureToolBarMenu->insertItem(i18n("Week Number"), 400);
     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  );
     connect( mShowAction, SIGNAL( activated() ),
@@ -1722,10 +1724,6 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
 
 void MainWindow::enableIncidenceActions( bool enabled )
 {
-
-#ifndef DESKTOP_VERSION
-    mCurrentItemMenu->setEnabled( enabled );
-#else
     mShowAction->setEnabled( enabled );
     mEditAction->setEnabled( enabled );
     mDeleteAction->setEnabled( enabled );
@@ -1734,7 +1732,6 @@ void MainWindow::enableIncidenceActions( bool enabled )
     mMoveAction->setEnabled( enabled );
     mBeamAction->setEnabled( enabled );
     mCancelAction->setEnabled( enabled );
-#endif
 }
 
 void MainWindow::importOL()