global prefs integrated in kopi amd ompi

1 files changed, 14 insertions, 2 deletions

diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 7d7bd2a..598d12f 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -47,67 +47,78 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kfontdialog.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include <kcolordialog.h>
 #include <kiconloader.h>
 #include <kemailsettings.h>
 #include <kstandarddirs.h>
 
 #include <klineedit.h>
 
 
 #include "koprefs.h"
 
 #include "koprefsdialog.h"
+//#include <kprefswidget.h>
 
 
 KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   KPrefsDialog(KOPrefs::instance(),parent,name,true)
 {
 
   setCaption( i18n("Settings - some need a restart (nr)"));
+  setupGlobalTab();
   setupMainTab();
   setupMailTab();;
   setupFontsTab();
   readConfig();
 
 #if 0
 
   setupMainTab();
   setupLocaleTab();
   setupTimeZoneTab();
   setupTimeTab();
   setupLocaleDateTab();
   setupFontsTab();
   setupColorsTab();
   setupViewsTab();
   //setupSyncTab();
   //setupSyncAlgTab();
   //setupPrinterTab();
   //setupGroupSchedulingTab();
   //setupGroupAutomationTab();
 #endif
 }
 
+#include "kpimglobalprefs.h"
 
 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 );
+
   
+} 
 void KOPrefsDialog::setupMainTab() 
 {
     QFrame *topFrame = addPage(i18n("General"),0,0);
 
   QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
 
 
   mNameEdit = new QLineEdit(topFrame);
   mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame);
   topLayout->addWidget(mNameLabel,0,0);
   topLayout->addWidget(mNameEdit,0,1);
 
   mEmailEdit = new QLineEdit(topFrame);
   mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame);
@@ -168,41 +179,42 @@ void KOPrefsDialog::setupFontsTab()
   ++i;
 
   KPrefsDialogWidFont *timeBarFont =
       addWidFont(i18n("Hello"),i18n("Read mail:"),
                  &(KOPrefs::instance()->mReadFont),topFrame);
   topLayout->addWidget(timeBarFont->label(),i,0);
   topLayout->addWidget(timeBarFont->preview(),i,1);
   topLayout->addWidget(timeBarFont->button(),i,2);
   ++i;
 
   topLayout->setColStretch(1,1);
   topLayout->setRowStretch(4,1);
 
 }
 void KOPrefsDialog::usrReadConfig()
 {
-    qDebug("read ");
+ 
   mNameEdit->setText(KOPrefs::instance()->mName);
   mEmailEdit->setText(KOPrefs::instance()->mEmail);
+  kdelibcfg->readConfig();
 }
 void KOPrefsDialog::usrWriteConfig()
 {
-    qDebug("write ");
     KOPrefs::instance()->mName = mNameEdit->text();
     KOPrefs::instance()->mEmail = mEmailEdit->text();
+  kdelibcfg->writeConfig();
  
     
 }
 
 #if 0
 void KOPrefsDialog::setupLocaleDateTab()
 {
 QFrame *topFrame = addPage(i18n("Date Format"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
    topLayout->setSpacing(spacingHint());
    topLayout->setMargin(marginHint());  
    int iii = 0;
 
    
    KPrefsWidRadios *syncPrefsGroup =
        addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame);