fixes

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
@@ -31,25 +31,25 @@
 
 #include "koeventpopupmenu.h"
 #include "koprefs.h"
 
 KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
 {
     mCurrentIncidence = 0;
     mHasAdditionalItems = false;
 
   
     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..."),
                                       this,SLOT(popupClone())));
     mEditOnlyItems.append(insertItem (i18n("&Move..."),
                                       this,SLOT(popupMove())));
 #ifndef DESKTOP_VERSION
     mEditOnlyItems.append(insertItem (i18n("&Beam..."),
                                       this,SLOT(popupBeam())));
 #endif
     mEditOnlyItems.append(insertItem (i18n("&Toggle Cancel"),
                                       this,SLOT(popupCancel())));
     isDisabled = false;  
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index cdcbbf0..ea037a9 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -338,25 +338,25 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
                                   SLOT(saveToFile()));
     exportPO->insertItem( i18n("As vCal (vcs) file..."),this,
                                   SLOT(saveToFileVCS()));
     exportPO->insertItem( i18n("Journal/Details..."),this,
                                   SLOT(saveDescriptionToFile()));
     // mPopupMenu->insertSeparator();
     // mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
     //                            i18n("Add Categ. to selected..."),this,
     //                            SLOT(addCat()),true);
     //mPopupMenu->insertSeparator();
 #ifndef DESKTOP_VERSION
     selPopup->insertSeparator();
-    selPopup->insertItem( i18n("Beam via IR"),this,
+    selPopup->insertItem( i18n("Beam via IR..."),this,
                           SLOT(beamSelected()));
 #if 0
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Beam via IR"),this,
                                   SLOT(beamSelected()),true);
 #endif
 #endif
     /*
       mPopupMenu = new QPopupMenu;
       mPopupMenu->insertItem(i18n("Edit Event"), this,
       SLOT (editEvent()));
       mPopupMenu->insertItem(SmallIcon("delete"), i18n("Delete Event"), this,
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index f68f032..7a5f3e5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -666,45 +666,47 @@ void MainWindow::initActions()
             pathString += "icons16/";
             pixWid = 18; pixHei = 16;
         }
     } else {
         pathString += "iconsmini/";
         pixWid = 18; pixHei = 16;
     }
     if ( KOPrefs::instance()->mShowFullMenu ) {
         QMenuBar *menuBar1;
         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  );
 #else
         menuBar1->insertItem( i18n("Sync"), syncMenu );
         menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu  );
 #endif
         //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu );
         menuBar1->insertItem( i18n("Filter"),selectFilterMenu  );
         menuBar1->insertItem( i18n("Help"), helpMenu );
     } else {
         QPEMenuBar *menuBar1;
         menuBar1 = new QPEMenuBar( iconToolBar );
         QPopupMenu *menuBar = new QPopupMenu( this );
         icon = loadPixmap( pathString + "z_menu" );
         menuBar1->insertItem( icon.pixmap(), menuBar);
         //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 );
         menuBar->insertItem( i18n("Filter"),selectFilterMenu  );
         menuBar->insertItem( i18n("Help"), helpMenu );
         //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
         menuBar1->setMaximumSize( menuBar1->sizeHint( ));
     }
     connect ( selectFilterMenu, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
     connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) );
 
    
@@ -773,38 +775,38 @@ void MainWindow::initActions()
 
     icon = loadPixmap( pathString + "search" );
     QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
     search_action->addTo( actionMenu );
     connect( search_action, SIGNAL( activated() ),
              mView->dialogManager(), SLOT( showSearchDialog() ) );
 
     actionMenu->insertSeparator();
     
    
 
     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 );
     configureToolBarMenu->insertSeparator();
     configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 );
     configureToolBarMenu->insertSeparator();
     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() ),
              mView, SLOT( showIncidence() ) );
 
     mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
     mEditAction->addTo( mCurrentItemMenu  );
     connect( mEditAction, SIGNAL( activated() ),
              mView, SLOT( editIncidence() ) );
 
     mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
     mDeleteAction->addTo(  mCurrentItemMenu );
@@ -1713,37 +1715,32 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
         mNewSubTodoAction->setEnabled( true );
     } else {
         mShowAction->setText( i18n("Show...") );
         mShowAction->setText( i18n("Edit...") );
         mShowAction->setText( i18n("Delete...") );
 
         mNewSubTodoAction->setEnabled( false );
     }
 }
 
 void MainWindow::enableIncidenceActions( bool enabled )
 {
-
-#ifndef DESKTOP_VERSION
-    mCurrentItemMenu->setEnabled( enabled );
-#else
     mShowAction->setEnabled( enabled );
     mEditAction->setEnabled( enabled );
     mDeleteAction->setEnabled( enabled );
 
     mCloneAction->setEnabled( enabled );
     mMoveAction->setEnabled( enabled );
     mBeamAction->setEnabled( enabled );
     mCancelAction->setEnabled( enabled );
-#endif
 }
 
 void MainWindow::importOL()
 { 
 #ifdef _OL_IMPORT_
       mView->clearAllViews();
       KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this );
       id->exec();
       delete id;
       mView->calendar()->checkAlarmForIncidence( 0, true );
       mView->updateView();
 #endif