menu cleanup

2 files changed, 37 insertions, 27 deletions

diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index 41a4dc1..1af9dad 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -192,7 +192,6 @@ void KODialogManager::showSearchDialog()
       //       mMainView, SLOT( processMainViewSelection( Incidence * ) ) );  
 #ifndef DESKTOP_VERSION    
        mSearchDialog->setMaximumSize( QApplication::desktop()->size());
-    //mSearchDialog->setGeometry( 40,40, 400, 300);
     mSearchDialog->showMaximized();
 #else
     KConfig *config = KOGlobals::config();
@@ -212,7 +211,11 @@ void KODialogManager::showSearchDialog()
 #endif
   }
   // make sure the widget is on top again
+#ifdef DESKTOP_VERSION    
   mSearchDialog->show();
+#else
+    mSearchDialog->showMaximized();
+#endif
   mSearchDialog->raise();
 }
 
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 019f41f..4f71788 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -513,13 +513,15 @@ void MainWindow::initActions()
     QPopupMenu *viewMenu = new QPopupMenu( this );
     QPopupMenu *actionMenu = new QPopupMenu( this );
     QPopupMenu *importMenu = new QPopupMenu( this );
+    QPopupMenu *importMenu_X = new QPopupMenu( this );
+    QPopupMenu *exportMenu_X = new QPopupMenu( this );
+    QPopupMenu *beamMenu_X = new QPopupMenu( this );
     selectFilterMenu = new QPopupMenu( this );
     selectFilterMenu->setCheckable( true );
     syncMenu = new QPopupMenu( this );
     configureAgendaMenu = new QPopupMenu( this );
     configureToolBarMenu = new QPopupMenu( this );
     QPopupMenu *helpMenu = new QPopupMenu( this );
-
     QIconSet icon;
     int pixWid = 22, pixHei = 22;
     QString pathString = "";
@@ -825,34 +827,34 @@ void MainWindow::initActions()
     // actionMenu->insertSeparator();
     action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
                           this );
-    action->addTo( importMenu );
+    action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( importIcal() ) );
     action = new QAction( "import_quick", i18n("Import last file"), 0,
                           this );
-    action->addTo( importMenu );
+    action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) );
-    importMenu->insertSeparator();
+    importMenu_X->insertSeparator();
     action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
                           this );
-    action->addTo( importMenu );
+    action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( importBday() ) );
     //#ifndef DESKTOP_VERSION
-    importMenu->insertSeparator();
+    importMenu_X->insertSeparator();
     action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
                           this );
-    action->addTo( importMenu );
+    action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) );
     //#else
 #ifdef _OL_IMPORT_
-    importMenu->insertSeparator();
+    importMenu_X->insertSeparator();
     action = new QAction( "import_ol", i18n("Import from OL"), 0,
                           this );
-    action->addTo( importMenu );
+    action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( importOL() ) );
 #endif
     //#endif
 
-    importMenu->insertSeparator();
+    //importMenu->insertSeparator();
     action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0,
                           this );
     action->addTo( importMenu );
@@ -862,11 +864,13 @@ void MainWindow::initActions()
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) );
-
     importMenu->insertSeparator();
+    importMenu->insertItem( i18n("Import"), importMenu_X );
+    //importMenu->insertSeparator();
     action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0,
                           this );
-    action->addTo( importMenu );    connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) );
+    action->addTo( exportMenu_X );    
+    connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) );
 
 
     //LR
@@ -874,49 +878,52 @@ void MainWindow::initActions()
     ex2phone->insertItem(i18n("Complete calendar..."), 1 );
     ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
     connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) );
-    importMenu->insertItem( i18n("Export to phone"), ex2phone );
+    exportMenu_X->insertItem( i18n("Export to phone"), ex2phone );
 
-    importMenu->insertSeparator();
-    action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
-                          this );
-    action->addTo( importMenu );
-    connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
+    importMenu->insertItem( i18n("Export"), exportMenu_X );
 #ifndef DESKTOP_VERSION
-    importMenu->insertSeparator();
+    //importMenu->insertSeparator();
     brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0,
                           this );
-    brAction->addTo( importMenu ); 
+    brAction->addTo( beamMenu_X ); 
     brAction->setToggleAction (true ) ;
     connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) );
 
     action = new QAction( "beam all", i18n("Beam complete calendar..."), 0,
                           this );
-    action->addTo( importMenu );
+    action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) );
 
     action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0,
                           this );
-    action->addTo( importMenu );
+    action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) );
+    importMenu->insertItem( i18n("Beam"), beamMenu_X );
 #else
- importMenu->insertSeparator();
+    //importMenu->insertSeparator();
  icon = loadPixmap( pathString + "print" );
     action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this );
-    action->addTo( importMenu );
+    action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ),
              this, SLOT( printCal() ) );
 
     icon = loadPixmap( pathString + "print" );
     action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
-    action->addTo( importMenu );
+    action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ),
              this, SLOT( printSel() ) );  
     action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this );
-    action->addTo( importMenu );
+    action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ),
              mView->viewManager(), SIGNAL( printWNV() ) );
+    importMenu->insertItem( i18n("Print"), beamMenu_X );
 #endif
     importMenu->insertSeparator();
+    action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
+                          this );
+    action->addTo( importMenu );
+    connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
+    importMenu->insertSeparator();
     action = new QAction( "beam all", i18n("Save"), 0,
                           this );
     action->addTo( importMenu );