moved pim related parameters into kpimprefs. (email, phone parameters)

4 files changed, 35 insertions, 12 deletions

diff --git a/libkdepim/kpimprefs.cpp b/libkdepim/kpimprefs.cpp
index ce4c540..15531c7 100644
--- a/libkdepim/kpimprefs.cpp
+++ b/libkdepim/kpimprefs.cpp
@@ -33,2 +33,6 @@ KPimPrefs::KPimPrefs( const QString &name ) :
 {
+  KPrefs::setCurrentGroup( "ExternalApplications" );
+  addItemInt( "EmailChannelType", &mEmailClient, OMPI );
+  addItemString( "EmailChannelOther", &mEmailChannel, "" );
+
 }
diff --git a/libkdepim/kpimprefs.h b/libkdepim/kpimprefs.h
index 05a564c..5186315 100644
--- a/libkdepim/kpimprefs.h
+++ b/libkdepim/kpimprefs.h
@@ -32,2 +32,3 @@ class KPimPrefs : public KPrefs
   public:
+
     KPimPrefs( const QString &name = QString::null );
@@ -38,3 +39,3 @@ class KPimPrefs : public KPrefs
     void usrSetDefaults();
-  
+
     /** Read preferences from config file */
@@ -45,5 +46,18 @@ class KPimPrefs : public KPrefs
 
+    enum EMailClients {
+      OMPI = 0,
+      QTOPIA = 1,
+      OPIE = 2,
+      OTHER = 3
+    };
+
+
   public:
     QStringList mCustomCategories;
-  
+
+    int mEmailClient;
+    QString mEmailChannel;
+
+
+
   protected:
diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro
index a2fae0b..902f049 100644
--- a/libkdepim/libkdepim.pro
+++ b/libkdepim/libkdepim.pro
@@ -4,3 +4,3 @@ DEFINES +=KORG_NOKABC
 TARGET = microkdepim
-INCLUDEPATH += ../microkde ../libkabcwrap ../microkde/kdecore . ..
+INCLUDEPATH += ../microkde ../libkabcwrap ../microkde/kdecore ../microkde/kdeui . ..
 DESTDIR=../bin
@@ -30,3 +30,2 @@ HEADERS = \
  kpimprefs.h \
- kprefs.h \
  kprefsdialog.h \
@@ -34,3 +33,5 @@ HEADERS = \
  ksyncprofile.h \
- ksyncprefsdialog.h 
+ ksyncprefsdialog.h \
+ kcmconfigs/kcmkdepimconfig.h \
+ kcmconfigs/kdepimconfigwidget.h
 
@@ -46,3 +47,2 @@ SOURCES = \
  kpimprefs.cpp \
- kprefs.cpp \
  kprefsdialog.cpp \
@@ -50,3 +50,5 @@ SOURCES = \
  ksyncprofile.cpp \
- ksyncprefsdialog.cpp
+ ksyncprefsdialog.cpp \
+ kcmconfigs/kcmkdepimconfig.cpp \
+ kcmconfigs/kdepimconfigwidget.cpp
 
diff --git a/libkdepim/libkdepimE.pro b/libkdepim/libkdepimE.pro
index 36a789d..fc8abe1 100644
--- a/libkdepim/libkdepimE.pro
+++ b/libkdepim/libkdepimE.pro
@@ -3,3 +3,3 @@ CONFIG		+= qt warn_on
 TARGET = microkdepim
-INCLUDEPATH += ../microkde ../qtcompat ../libkabcwrap ../microkde/kdecore $(QPEDIR)/include
+INCLUDEPATH += ../microkde ../qtcompat ../libkabcwrap ../microkde/kdecore ../microkde/kdeui $(QPEDIR)/include
 INCLUDEPATH += . ..
@@ -24,3 +24,2 @@ HEADERS = \
  kpimprefs.h \
- kprefs.h \
  kprefsdialog.h \
@@ -28,3 +27,6 @@ HEADERS = \
  ksyncprofile.h \
- ksyncprefsdialog.h 
+ ksyncprefsdialog.h \
+ kcmconfigs/kcmkdepimconfig.h \
+ kcmconfigs/kdepimconfigwidget.h
+ 
 
@@ -41,3 +43,2 @@ SOURCES = \
  kpimprefs.cpp \
- kprefs.cpp \
  kprefsdialog.cpp \
@@ -45,2 +46,4 @@ SOURCES = \
  ksyncprofile.cpp \
- ksyncprefsdialog.cpp
+ ksyncprefsdialog.cpp \
+ kcmconfigs/kcmkdepimconfig.cpp \
+ kcmconfigs/kdepimconfigwidget.cpp