global prefs integrated in kopi amd ompi

5 files changed, 36 insertions, 6 deletions

diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index 0d6cf86..75ba92f 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -51,14 +51,14 @@ INTERFACES     = editaccountsui.ui \
                statuswidgetui.ui \
                newmaildirui.ui \
                selectstoreui.ui \
                nntpgroupsui.ui
 
 
-INCLUDEPATH += . $(KDEPIMDIR)  $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include
-LIBS        += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan  -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokde -lmicroqtcompat -lmicrokabc -lmicrokcal -lmicrokdepim
+INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim  $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include
+LIBS        += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan  -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicroqtcompat  -lmicrokdepim
 LIBS += $(QTOPIALIB)
 #LIBS += -lqtopia 
 #next line for Zaurus only
 #LIBS +=  -luuid
 
 #
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 7d7bd2a..598d12f 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -57,19 +57,21 @@
 #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
@@ -87,17 +89,26 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   //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());
@@ -178,21 +189,22 @@ void KOPrefsDialog::setupFontsTab()
   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()
diff --git a/kmicromail/koprefsdialog.h b/kmicromail/koprefsdialog.h
index 4b6bd4b..615574b 100644
--- a/kmicromail/koprefsdialog.h
+++ b/kmicromail/koprefsdialog.h
@@ -29,12 +29,13 @@
 #include <qlistview.h>
 
 #include <kdialogbase.h>
 
 #include <libkdepim/kprefsdialog.h>
 #include <libkdepim/kdateedit.h>
+#include <kcmconfigs/kdepimconfigwidget.h>
 
 class KColorButton;
 class QSpinBox;
 class QSlider;
 class KURLRequester;
 class QComboBox;
@@ -53,15 +54,17 @@ class KOPrefsDialog : public KPrefsDialog
 
 protected:
     void usrReadConfig();
     void usrWriteConfig();
 
     void setupMainTab();
+    void setupGlobalTab();
     void setupMailTab();
     void setupFontsTab();
  private:
+    KDEPIMConfigWidget* kdelibcfg;
     QLineEdit *mNameEdit;
     QLineEdit *mEmailEdit;
     QLabel *mNameLabel;
     QLabel *mEmailLabel;
 #if 0
     /*
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 1c30faa..7dafcd8 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -64,23 +64,25 @@
 #define INITFILE       "/etc/default/init"
 #endif
 
 #include "koprefs.h"
 
 #include "koprefsdialog.h"
+#include "kpimglobalprefs.h"
 
 
 KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   KPrefsDialog(KOPrefs::instance(),parent,name,true)
 {
 
   setCaption( i18n("Preferences - some settings need a restart (nr)"));
   mCategoryDict.setAutoDelete(true);
 
   KGlobal::locale()->insertCatalogue("timezones");
 
+  setupGlobalTab();
   setupMainTab();
   setupLocaleTab();
   setupTimeZoneTab();
   setupTimeTab();
   setupLocaleDateTab();
   setupFontsTab();
@@ -94,13 +96,21 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
 }
 
 
 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::setupLocaleDateTab()
 {
 QFrame *topFrame = addPage(i18n("Date Format"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
    topLayout->setSpacing(spacingHint());
    topLayout->setMargin(marginHint());  
@@ -1318,12 +1328,13 @@ void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text,
     }
   }
 }
 
 void KOPrefsDialog::usrReadConfig()
 {
+  kdelibcfg->readConfig();
   mNameEdit->setText(KOPrefs::instance()->fullName());
   mEmailEdit->setText(KOPrefs::instance()->email());
 
   mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval);
   QDate current ( 2001, 1,1);
   mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1));
@@ -1367,12 +1378,13 @@ void KOPrefsDialog::usrReadConfig()
 }
 
 
 void KOPrefsDialog::usrWriteConfig()
 {
 
+  kdelibcfg->writeConfig();
     // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text();
     //KOPrefs::instance()->mRemoteUser =  mRemoteUser->text();
     //KOPrefs::instance()->mRemotePassWd = mRemotePassWd->text();
     //KOPrefs::instance()->mRemoteFile= mRemoteFile->text();
     //KOPrefs::instance()->mLocalTempFile =mLocalTempFile->text();
     KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text();
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index 83dc1eb..e20969a 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -29,12 +29,13 @@
 #include <qlistview.h>
 
 #include <kdialogbase.h>
 
 #include <libkdepim/kprefsdialog.h>
 #include <libkdepim/kdateedit.h>
+#include <kcmconfigs/kdepimconfigwidget.h>
 
 class KColorButton;
 class QSpinBox;
 class QSlider;
 class KURLRequester;
 class QComboBox;
@@ -76,12 +77,13 @@ class KOPrefsDialog : public KPrefsDialog
     void updateItem();
     void updateInput();
 
   protected:
     void usrReadConfig();
     void usrWriteConfig();
+    void setupGlobalTab();
 
     void setupMainTab();
     void setupTimeTab();
     void setupTimeZoneTab();
     void setupLocaleTab();
     void setupLocaleDateTab();
@@ -96,12 +98,13 @@ class KOPrefsDialog : public KPrefsDialog
     void setupSyncAlgTab();
 
     void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0);
 
 
   private:
+    KDEPIMConfigWidget* kdelibcfg;
     KPrefsDialogWidBool *mEnableGroupScheduling;
     KPrefsDialogWidBool *mEnableProjectView;
 
     QFrame *mPrinterTab;
 
     QLineEdit *nameEdit;