1 files changed, 17 insertions, 11 deletions

diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index c9477e3..4b5b66a 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -85,10 +85,12 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
 #ifndef DESKTOP_VERSION
   if ( QApplication::desktop()->height() == 480  )
       hideButtons();
 #endif
-
+  kdelibcfg = 0;
+  if ( !parent ) 
   setupGlobalTab();
+  else {
   setupMainTab();
   // setupLocaleTab();
   //setupTimeZoneTab();
   setupTimeTab();
@@ -100,9 +102,9 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   //setupSyncAlgTab();
   //setupPrinterTab();
   //setupGroupSchedulingTab();
   //setupGroupAutomationTab();
-
+  }
 
 }
 
 
@@ -110,12 +112,12 @@ KOPrefsDialog::~KOPrefsDialog()
 {
 }
 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"));
 
 
 } 
 void KOPrefsDialog::setupLocaleDateTab()
@@ -239,9 +241,9 @@ void  KOPrefsDialog::setupLocaleTab()
 #endif
 }
 void KOPrefsDialog::showSyncPage()
 {
-    showPage ( 0 ) ;
+    // showPage ( 0 ) ;
     kdelibcfg->showTimeZoneTab() ;
 
 }
 void KOPrefsDialog::setupSyncAlgTab()
@@ -1457,9 +1459,11 @@ void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text,
 }
 
 void KOPrefsDialog::usrReadConfig()
 {
-  kdelibcfg->readConfig();
+    if ( kdelibcfg )
+        kdelibcfg->readConfig();
+    else {
   mNameEdit->setText(KOPrefs::instance()->fullName());
   mEmailEdit->setText(KOPrefs::instance()->email());
 
   mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval);
@@ -1501,15 +1505,17 @@ void KOPrefsDialog::usrReadConfig()
   mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps );
   mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime );
   mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount );
   mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval );
+    }
 }
 
 
 void KOPrefsDialog::usrWriteConfig()
 {
-
-  kdelibcfg->writeConfig();
+    if ( kdelibcfg )
+        kdelibcfg->writeConfig();
+    else {
     // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text();
     //KOPrefs::instance()->mRemoteUser =  mRemoteUser->text();
     //KOPrefs::instance()->mRemotePassWd = mRemotePassWd->text();
     //KOPrefs::instance()->mRemoteFile= mRemoteFile->text();
@@ -1565,9 +1571,9 @@ void KOPrefsDialog::usrWriteConfig()
   KOPrefs::instance()->mAlarmPlayBeeps  = mAlarmPlayBeeps->value();
   KOPrefs::instance()->mAlarmSuspendTime = mAlarmSuspendTime->value() ;
   KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ;
   KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->value() ;
-    
+    }
 }
 
 void KOPrefsDialog::updateCategories()
 {