6 files changed, 54 insertions, 23 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 7c7466b..4794414 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2522,4 +2522,3 @@ void CalendarView::edit_paste()
 }
-
-void CalendarView::edit_options()
+void CalendarView::edit_global_options()
 {
@@ -2528,3 +2527,3 @@ void CalendarView::edit_options()
     emit saveStopTimer();
-    mDialogManager->showOptionsDialog();
+    mDialogManager->showGlobalOptionsDialog();
     if ( tz != KPimGlobalPrefs::instance()->mTimeZoneId) {
@@ -2542,3 +2541,6 @@ void CalendarView::edit_options()
         qDebug("KO: No tz change ");
-
+}
+void CalendarView::edit_options()
+{
+    mDialogManager->showOptionsDialog();
 }
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 4600090..1215a99 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -351,2 +351,3 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     void edit_options();
+    void edit_global_options();
     /**
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index c927b37..aa30c52 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -90,2 +90,21 @@ void KODialogManager::createOutgoingDialog()
 
+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 )
@@ -95,8 +114,4 @@ void KODialogManager::showOptionsDialog( bool showSync )
     mOptionsDialog = new KOPrefsDialog(mMainView);
-    //mOptionsDialog->readConfig();
     connect(mOptionsDialog,SIGNAL(configChanged()),
             mMainView,SLOT(updateConfig()));
-    //connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()),
-    //      mOptionsDialog,SLOT(updateCategories()));
-    
   }
@@ -111,3 +126,4 @@ void KODialogManager::showOptionsDialog( bool showSync )
   mOptionsDialog->exec();
-  
+  delete mOptionsDialog;
+  mOptionsDialog = 0;
 }
@@ -115,3 +131,3 @@ void KODialogManager::showSyncOptions()
 {
-    showOptionsDialog( true );
+    showGlobalOptionsDialog( true );
 
diff --git a/korganizer/kodialogmanager.h b/korganizer/kodialogmanager.h
index a6cc621..b68ddc2 100644
--- a/korganizer/kodialogmanager.h
+++ b/korganizer/kodialogmanager.h
@@ -73,2 +73,3 @@ class KODialogManager : public QObject
     void showOptionsDialog( bool showSync = false);
+    void showGlobalOptionsDialog(bool showSync = false);
     void showSyncOptions();
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index c9477e3..4b5b66a 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -88,4 +88,6 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
 #endif
-
+  kdelibcfg = 0;
+  if ( !parent ) 
   setupGlobalTab();
+  else {
   setupMainTab();
@@ -103,3 +105,3 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   //setupGroupAutomationTab();
-
+  }
 
@@ -113,6 +115,6 @@ void KOPrefsDialog::setupGlobalTab()
 {
-   QFrame *topFrame = addPage(i18n("Global"),0,0);
-   kdelibcfg = new KDEPIMConfigWidget(  KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" );
-   QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
-   topLayout->addWidget( kdelibcfg );
+    //QFrame *topFrame = addPage(i18n("Global"),0,0);
+   kdelibcfg = new KDEPIMConfigWidget(  KPimGlobalPrefs::instance(), this, "KCMKdeLibConfig" );
+   setMainWidget( kdelibcfg );
+   setCaption( i18n("KDE-Pim Global Settings"));
 
@@ -242,3 +244,3 @@ void KOPrefsDialog::showSyncPage()
 {
-    showPage ( 0 ) ;
+    // showPage ( 0 ) ;
     kdelibcfg->showTimeZoneTab() ;
@@ -1460,3 +1462,5 @@ void KOPrefsDialog::usrReadConfig()
 {
-  kdelibcfg->readConfig();
+    if ( kdelibcfg )
+        kdelibcfg->readConfig();
+    else {
   mNameEdit->setText(KOPrefs::instance()->fullName());
@@ -1504,2 +1508,3 @@ void KOPrefsDialog::usrReadConfig()
   mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval );
+    }
 }
@@ -1509,4 +1514,5 @@ void KOPrefsDialog::usrWriteConfig()
 {
-
-  kdelibcfg->writeConfig();
+    if ( kdelibcfg )
+        kdelibcfg->writeConfig();
+    else {
     // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text();
@@ -1568,3 +1574,3 @@ void KOPrefsDialog::usrWriteConfig()
   KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->value() ;
-    
+    }
 }
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 25e76ee..2c04852 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -726,6 +726,11 @@ void MainWindow::initActions()
     icon = loadPixmap( pathString + "configure" );
-    action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this );
+    action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ),
-             mView, SLOT( edit_options() ) );
+             mView, SLOT( edit_options() ) );  
+    icon = loadPixmap( pathString + "configure" );
+    action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
+    action->addTo( actionMenu );
+    connect( action, SIGNAL( activated() ),
+             mView, SLOT( edit_global_options() ) );
     actionMenu->insertSeparator();