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
@@ -18,32 +18,36 @@
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <kglobal.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 
 #include "kpimprefs.h"
 
 KPimPrefs::KPimPrefs( const QString &name ) :
   KPrefs( name )
 {
+  KPrefs::setCurrentGroup( "ExternalApplications" );
+  addItemInt( "EmailChannelType", &mEmailClient, OMPI );
+  addItemString( "EmailChannelOther", &mEmailChannel, "" );
+
 }
 
 KPimPrefs::~KPimPrefs()
 {
 }
 
 void KPimPrefs::usrSetDefaults()
 {
   setCategoryDefaults();
 }
 
 void KPimPrefs::usrReadConfig()
 {
   kdDebug(5300) << "KPimPrefs::usrReadConfig()" << endl;
 
   config()->setGroup("General");
diff --git a/libkdepim/kpimprefs.h b/libkdepim/kpimprefs.h
index 05a564c..5186315 100644
--- a/libkdepim/kpimprefs.h
+++ b/libkdepim/kpimprefs.h
@@ -17,37 +17,51 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef KPIMPREFS_H
 #define KPIMPREFS_H
 
 #include <qstringlist.h>
 
 #include "kprefs.h"
 
 class KPimPrefs : public KPrefs
 {
   public:
+
     KPimPrefs( const QString &name = QString::null );
 
     virtual ~KPimPrefs();
 
     /** Set preferences to default values */
     void usrSetDefaults();
-  
+
     /** Read preferences from config file */
     void usrReadConfig();
 
     /** Write preferences to config file */
     void usrWriteConfig();
 
+    enum EMailClients {
+      OMPI = 0,
+      QTOPIA = 1,
+      OPIE = 2,
+      OTHER = 3
+    };
+
+
   public:
     QStringList mCustomCategories;
-  
+
+    int mEmailClient;
+    QString mEmailChannel;
+
+
+
   protected:
     virtual void setCategoryDefaults() = 0;
 };
 
 #endif
diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro
index a2fae0b..902f049 100644
--- a/libkdepim/libkdepim.pro
+++ b/libkdepim/libkdepim.pro
@@ -1,53 +1,55 @@
         TEMPLATE= lib
         CONFIG  = qt warn_on
 DEFINES +=KORG_NOKABC
 TARGET = microkdepim
-INCLUDEPATH += ../microkde ../libkabcwrap ../microkde/kdecore . ..
+INCLUDEPATH += ../microkde ../libkabcwrap ../microkde/kdecore ../microkde/kdeui . ..
 DESTDIR=../bin
 
 DEFINES +=  DESKTOP_VERSION
 include( ../variables.pri )
 unix : {
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 }
 INTERFACES = \
 
 HEADERS = \
  categoryeditdialog.h \
  categoryeditdialog_base.h \
  categoryselectdialog.h \
  categoryselectdialog_base.h \
  kdateedit.h \
  kdatepicker.h \
  kinputdialog.h \
  kincidenceformatter.h \
  kpimprefs.h \
- kprefs.h \
  kprefsdialog.h \
  addresseeview.h \
  ksyncprofile.h \
- ksyncprefsdialog.h 
+ ksyncprefsdialog.h \
+ kcmconfigs/kcmkdepimconfig.h \
+ kcmconfigs/kdepimconfigwidget.h
 
 SOURCES = \
  categoryeditdialog.cpp \
  categoryeditdialog_base.cpp \
  categoryselectdialog.cpp \
  categoryselectdialog_base.cpp \
  kdateedit.cpp \
  kdatepicker.cpp \
  kinputdialog.cpp \
  kincidenceformatter.cpp \
  kpimprefs.cpp \
- kprefs.cpp \
  kprefsdialog.cpp \
  addresseeview.cpp \
  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
@@ -1,46 +1,49 @@
         TEMPLATE= lib
         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 += . ..
 LIBS += -lmicrokde 
 LIBS += -L$(QPEDIR)/lib
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/lib
 
 
 INTERFACES = \
 
 HEADERS = \
  categoryeditdialog.h \
  categoryeditdialog_base.h \
  categoryselectdialog.h \
  categoryselectdialog_base.h \
  kdateedit.h \
  kdatepicker.h \
  kinputdialog.h \
  kincidenceformatter.h \
  kpimprefs.h \
- kprefs.h \
  kprefsdialog.h \
  addresseeview.h \
  ksyncprofile.h \
- ksyncprefsdialog.h 
+ ksyncprefsdialog.h \
+ kcmconfigs/kcmkdepimconfig.h \
+ kcmconfigs/kdepimconfigwidget.h
+ 
 
 
 SOURCES = \
  categoryeditdialog.cpp \
  categoryeditdialog_base.cpp \
  categoryselectdialog.cpp \
  categoryselectdialog_base.cpp \
  kdateedit.cpp \
  kinputdialog.cpp \
  kdatepicker.cpp \
  kincidenceformatter.cpp \
  kpimprefs.cpp \
- kprefs.cpp \
  kprefsdialog.cpp \
  addresseeview.cpp \
  ksyncprofile.cpp \
- ksyncprefsdialog.cpp
+ ksyncprefsdialog.cpp \
+ kcmconfigs/kcmkdepimconfig.cpp \
+ kcmconfigs/kdepimconfigwidget.cpp