1 files changed, 22 insertions, 6 deletions

diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index c927b37..aa30c52 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -43,122 +43,138 @@
 #include <kapplication.h>
 
 KODialogManager::KODialogManager( CalendarView *mainView ) :
   QObject(), mMainView( mainView )
 {
   mOutgoingDialog = 0;
   mIncomingDialog = 0;
   mOptionsDialog = 0;
   mSearchDialog = 0;
   mArchiveDialog = 0;
   mFilterEditDialog = 0;
   mPluginDialog = 0;
 
   // mCategoryEditDialog = new KPIM::CategoryEditDialog(KOPrefs::instance(),mMainView);
   //KOGlobals::fitDialogToScreen( mCategoryEditDialog );
 }
 
 KODialogManager::~KODialogManager()
 {
   delete mOutgoingDialog;
   delete mIncomingDialog;
   delete mOptionsDialog;
   delete mSearchDialog;
 #ifndef KORG_NOARCHIVE
   delete mArchiveDialog;
 #endif
   delete mFilterEditDialog;
 #ifndef KORG_NOPLUGINS
   delete mPluginDialog;
 #endif
 }
 
 OutgoingDialog *KODialogManager::outgoingDialog()
 {
   createOutgoingDialog();
   return mOutgoingDialog;
 }
 
 void KODialogManager::createOutgoingDialog()
 {
   if (!mOutgoingDialog) {
     mOutgoingDialog = new OutgoingDialog(mMainView->calendar(),mMainView);
     if (mIncomingDialog) mIncomingDialog->setOutgoingDialog(mOutgoingDialog);
     connect(mOutgoingDialog,SIGNAL(numMessagesChanged(int)),
             mMainView,SIGNAL(numOutgoingChanged(int)));
   }
 }
 
+void KODialogManager::showGlobalOptionsDialog( bool showSync )
+{
+ if (!mOptionsDialog) {
+    mOptionsDialog = new KOPrefsDialog(0);
+    connect(mOptionsDialog,SIGNAL(configChanged()),
+            mMainView,SLOT(updateConfig()));
+  }
+  mOptionsDialog->readConfig();
+#ifndef DESKTOP_VERSION  
+  mOptionsDialog->showMaximized();
+#else
+  mOptionsDialog->show();
+#endif
+  if ( showSync )
+      mOptionsDialog->showSyncPage();
+  mOptionsDialog->exec();
+  delete mOptionsDialog;
+  mOptionsDialog = 0;
+}
 void KODialogManager::showOptionsDialog( bool showSync )
 {
    
   if (!mOptionsDialog) {
     mOptionsDialog = new KOPrefsDialog(mMainView);
-    //mOptionsDialog->readConfig();
     connect(mOptionsDialog,SIGNAL(configChanged()),
             mMainView,SLOT(updateConfig()));
-    //connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()),
-    //      mOptionsDialog,SLOT(updateCategories()));
-    
   }
   mOptionsDialog->readConfig();
 #ifndef DESKTOP_VERSION  
   mOptionsDialog->showMaximized();
 #else
   mOptionsDialog->show();
 #endif
   if ( showSync )
       mOptionsDialog->showSyncPage();
   mOptionsDialog->exec();
-  
+  delete mOptionsDialog;
+  mOptionsDialog = 0;
 }
 void KODialogManager::showSyncOptions()
 {
-    showOptionsDialog( true );
+    showGlobalOptionsDialog( true );
 
 }
 void KODialogManager::showOutgoingDialog()
 {
   createOutgoingDialog();
   mOutgoingDialog->show();
   mOutgoingDialog->raise();
 }
 
 IncomingDialog *KODialogManager::incomingDialog()
 {
   createOutgoingDialog();
   if (!mIncomingDialog) {
     mIncomingDialog = new IncomingDialog(mMainView->calendar(),mOutgoingDialog,mMainView);
     connect(mIncomingDialog,SIGNAL(numMessagesChanged(int)),
             mMainView,SIGNAL(numIncomingChanged(int)));
     connect(mIncomingDialog,SIGNAL(calendarUpdated()),
             mMainView,SLOT(updateView()));
   }
   return mIncomingDialog;
 }
 
 void KODialogManager::createIncomingDialog()
 {
   createOutgoingDialog();
   if (!mIncomingDialog) {
     mIncomingDialog = new IncomingDialog(mMainView->calendar(),mOutgoingDialog,mMainView);
     connect(mIncomingDialog,SIGNAL(numMessagesChanged(int)),
             mMainView,SIGNAL(numIncomingChanged(int)));
     connect(mIncomingDialog,SIGNAL(calendarUpdated()),
             mMainView,SLOT(updateView()));
   }
 }
 
 void KODialogManager::showIncomingDialog()
 {
   createIncomingDialog();
   mIncomingDialog->show();
   mIncomingDialog->raise();
 }
 /*
 void KODialogManager::showCategoryEditDialog()
 {
   mCategoryEditDialog->show();
 }
 */
 void KODialogManager::hideSearchDialog()
 {