menu cleanup

1 files changed, 45 insertions, 42 deletions

diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index 41a4dc1..1af9dad 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -168,51 +168,54 @@ void KODialogManager::hideSearchDialog()
 void KODialogManager::showSearchDialog()
 {
-  if (!mSearchDialog) {
-      mSearchDialog = new SearchDialog(mMainView->calendar(),mMainView); 
-      KOListView * lview = mSearchDialog->listview();
-
-      connect(lview, SIGNAL(showIncidenceSignal(Incidence *)),
-              mMainView, SLOT(showIncidence(Incidence *)));
-      connect(lview, SIGNAL(editIncidenceSignal(Incidence *)),
-              mMainView, SLOT(editIncidence(Incidence *)));
-      connect(lview, SIGNAL(deleteIncidenceSignal(Incidence *)),
-              mMainView, SLOT(deleteIncidence(Incidence *)));
-      connect(lview, SIGNAL(cloneIncidenceSignal(Incidence *)),
-              mMainView, SLOT(cloneIncidence(Incidence *)));
-      connect(lview, SIGNAL(beamIncidenceSignal(Incidence *)),
-              mMainView, SLOT(beamIncidence(Incidence *)));
-      connect(lview, SIGNAL(moveIncidenceSignal(Incidence *)),
-              mMainView, SLOT(moveIncidence(Incidence *)));
-      connect(lview, SIGNAL(beamIncidenceList(QPtrList<Incidence> )),
-              mMainView, SLOT(beamIncidenceList(QPtrList<Incidence> )));
-
-       connect(mMainView, SIGNAL(configChanged()), mSearchDialog, SLOT(updateConfig()));
-       connect(mMainView, SIGNAL(updateSearchDialog()), mSearchDialog, SLOT(updateList()));
-      //  connect( lview, SIGNAL( incidenceSelected( Incidence * ) ),
-      //       mMainView, SLOT( processMainViewSelection( Incidence * ) ) );  
+    if (!mSearchDialog) {
+        mSearchDialog = new SearchDialog(mMainView->calendar(),mMainView); 
+        KOListView * lview = mSearchDialog->listview();
+
+        connect(lview, SIGNAL(showIncidenceSignal(Incidence *)),
+                mMainView, SLOT(showIncidence(Incidence *)));
+        connect(lview, SIGNAL(editIncidenceSignal(Incidence *)),
+                mMainView, SLOT(editIncidence(Incidence *)));
+        connect(lview, SIGNAL(deleteIncidenceSignal(Incidence *)),
+                mMainView, SLOT(deleteIncidence(Incidence *)));
+        connect(lview, SIGNAL(cloneIncidenceSignal(Incidence *)),
+                mMainView, SLOT(cloneIncidence(Incidence *)));
+        connect(lview, SIGNAL(beamIncidenceSignal(Incidence *)),
+                mMainView, SLOT(beamIncidence(Incidence *)));
+        connect(lview, SIGNAL(moveIncidenceSignal(Incidence *)),
+                mMainView, SLOT(moveIncidence(Incidence *)));
+        connect(lview, SIGNAL(beamIncidenceList(QPtrList<Incidence> )),
+                mMainView, SLOT(beamIncidenceList(QPtrList<Incidence> )));
+
+        connect(mMainView, SIGNAL(configChanged()), mSearchDialog, SLOT(updateConfig()));
+        connect(mMainView, SIGNAL(updateSearchDialog()), mSearchDialog, SLOT(updateList()));
+        //  connect( lview, SIGNAL( incidenceSelected( Incidence * ) ),
+        //       mMainView, SLOT( processMainViewSelection( Incidence * ) ) );  
 #ifndef DESKTOP_VERSION    
-       mSearchDialog->setMaximumSize( QApplication::desktop()->size());
-    //mSearchDialog->setGeometry( 40,40, 400, 300);
-    mSearchDialog->showMaximized();
+        mSearchDialog->setMaximumSize( QApplication::desktop()->size());
+        mSearchDialog->showMaximized();
 #else
-    KConfig *config = KOGlobals::config();
-    config->setGroup("WidgetLayout");
-    QStringList list;
-    list = config->readListEntry("SearchLayout");
-    int x,y,w,h;
-    if ( ! list.isEmpty() ) {
-        x = list[0].toInt();
-        y = list[1].toInt();
-        w = list[2].toInt();
-        h = list[3].toInt();
-        mSearchDialog->setGeometry(x,y,w,h);
+        KConfig *config = KOGlobals::config();
+        config->setGroup("WidgetLayout");
+        QStringList list;
+        list = config->readListEntry("SearchLayout");
+        int x,y,w,h;
+        if ( ! list.isEmpty() ) {
+            x = list[0].toInt();
+            y = list[1].toInt();
+            w = list[2].toInt();
+            h = list[3].toInt();
+            mSearchDialog->setGeometry(x,y,w,h);
        
-    }
+        }
 
 #endif
-  }
-  // make sure the widget is on top again
-  mSearchDialog->show();
-  mSearchDialog->raise();
+    }
+    // make sure the widget is on top again 
+#ifdef DESKTOP_VERSION    
+    mSearchDialog->show();
+#else
+    mSearchDialog->showMaximized();
+#endif
+    mSearchDialog->raise();
 }