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
@@ -56,4 +56,4 @@ INTERFACES     = editaccountsui.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)
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 7d7bd2a..598d12f 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -62,2 +62,3 @@
 #include "koprefsdialog.h"
+//#include <kprefswidget.h>
 
@@ -69,2 +70,3 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   setCaption( i18n("Settings - some need a restart (nr)"));
+  setupGlobalTab();
   setupMainTab();
@@ -92,2 +94,3 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
 
+#include "kpimglobalprefs.h"
 
@@ -96,3 +99,11 @@ 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() 
@@ -183,5 +194,6 @@ void KOPrefsDialog::usrReadConfig()
 {
-    qDebug("read ");
+ 
   mNameEdit->setText(KOPrefs::instance()->mName);
   mEmailEdit->setText(KOPrefs::instance()->mEmail);
+  kdelibcfg->readConfig();
 }
@@ -189,5 +201,5 @@ void KOPrefsDialog::usrWriteConfig()
 {
-    qDebug("write ");
     KOPrefs::instance()->mName = mNameEdit->text();
     KOPrefs::instance()->mEmail = mEmailEdit->text();
+  kdelibcfg->writeConfig();
  
diff --git a/kmicromail/koprefsdialog.h b/kmicromail/koprefsdialog.h
index 4b6bd4b..615574b 100644
--- a/kmicromail/koprefsdialog.h
+++ b/kmicromail/koprefsdialog.h
@@ -34,2 +34,3 @@
 #include <libkdepim/kdateedit.h>
+#include <kcmconfigs/kdepimconfigwidget.h>
 
@@ -58,2 +59,3 @@ protected:
     void setupMainTab();
+    void setupGlobalTab();
     void setupMailTab();
@@ -61,2 +63,3 @@ protected:
  private:
+    KDEPIMConfigWidget* kdelibcfg;
     QLineEdit *mNameEdit;
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 1c30faa..7dafcd8 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -69,2 +69,3 @@
 #include "koprefsdialog.h"
+#include "kpimglobalprefs.h"
 
@@ -80,2 +81,3 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
 
+  setupGlobalTab();
   setupMainTab();
@@ -99,3 +101,11 @@ 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()
@@ -1323,2 +1333,3 @@ void KOPrefsDialog::usrReadConfig()
 {
+  kdelibcfg->readConfig();
   mNameEdit->setText(KOPrefs::instance()->fullName());
@@ -1372,2 +1383,3 @@ void KOPrefsDialog::usrWriteConfig()
 
+  kdelibcfg->writeConfig();
     // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text();
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index 83dc1eb..e20969a 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -34,2 +34,3 @@
 #include <libkdepim/kdateedit.h>
+#include <kcmconfigs/kdepimconfigwidget.h>
 
@@ -81,2 +82,3 @@ class KOPrefsDialog : public KPrefsDialog
     void usrWriteConfig();
+    void setupGlobalTab();
 
@@ -101,2 +103,3 @@ class KOPrefsDialog : public KPrefsDialog
   private:
+    KDEPIMConfigWidget* kdelibcfg;
     KPrefsDialogWidBool *mEnableGroupScheduling;