enhancements to configure external apps like email and phones through a

generalized interface

3 files changed, 28 insertions, 55 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 4303cab..fe4841a 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -91,2 +91,4 @@
 #include "kcmconfigs/kcmkdepimconfig.h"
+#include "kpimglobalprefs.h"
+#include "externalapphandler.h"
 
@@ -469,25 +471,3 @@ void KABCore::sendMail( const QString& email )
 {
-//US original kde implementation : kapp->invokeMailer( email, "" );
-
-/*US original qtopia implementation
-    PimContact c = abList->currentEntry();
-    QString name = c.fileAs();
-    QString email = c.defaultEmail();
-#ifndef QT_NO_COP
-    QCopEnvelope e(Service::channel("Email"), "writeMail(QString,QString)");
-    e << name << email;
-#else
-*/
-
-
-#ifndef QT_NO_COP
-    QCString channel = KABPrefs::instance()->mEmailChannel.latin1();
-    qDebug("Using QCopEnvelope e(\"" + channel + "\", \"writeMail(QMap(QString,QString))\")");
-
-    QCopEnvelope e(channel, "writeMail(QString,QString)");
-    //US we need no names in the To field. The emailadresses are enough
-    e << "" << email;
-#else
-    KMessageBox::sorry( this, i18n( "This version does not support sending emails." ) );
-#endif
+  bool result = ExternalAppHandler::instance()->mailToContacts(email);
 }
@@ -552,2 +532,6 @@ void KABCore::mailVCard( const QStringList& uids )
   }
+
+  bool result = ExternalAppHandler::instance()->mailAttachments(urls.join(", "));
+
+
 /*US
@@ -559,15 +543,2 @@ void KABCore::mailVCard( const QStringList& uids )
 */
-#ifndef QT_NO_COP
-    QCString channel = KABPrefs::instance()->mEmailChannel.latin1();
-    qDebug("Using QCopEnvelope e(\"" + channel + "\", \"writeMail(QMap(QString,QString))\")");
-
-    QMap<QString, QString> parameterMap;
-    parameterMap.insert("ATTACHMENT<n>", urls.join(", "));
-
-    QCopEnvelope e(channel, "writeMail(QMap(QString,QString))");
-    e << parameterMap;
-#else
-    KMessageBox::sorry( this, i18n( "This version does not support sending emails." ) );
-#endif
-
 
@@ -1199,7 +1170,9 @@ void KABCore::openConfigDialog()
 {
-        KABPrefs* prefs = KABPrefs::instance();
-    KCMultiDialog*  ConfigureDialog = new KCMultiDialog( prefs, "PIM", this ,"kabconfigdialog", true );
-    KCMKabConfig* kabcfg = new KCMKabConfig( ConfigureDialog->getNewVBoxPage(i18n( "Addressbook")) , "KCMKabConfig" );
+        KABPrefs* kab_prefs = KABPrefs::instance();
+        KPimGlobalPrefs* kpim_prefs = KPimGlobalPrefs::instance();
+
+    KCMultiDialog*  ConfigureDialog = new KCMultiDialog( "PIM", this ,"kabconfigdialog", true );
+    KCMKabConfig* kabcfg = new KCMKabConfig( kab_prefs, ConfigureDialog->getNewVBoxPage(i18n( "Addressbook")) , "KCMKabConfig" );
     ConfigureDialog->addModule(kabcfg );
-    KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( ConfigureDialog->getNewVBoxPage(i18n( "Pim")) , "KCMKdeLibConfig" );
+    KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( kpim_prefs, ConfigureDialog->getNewVBoxPage(i18n( "Global")) , "KCMKdeLibConfig" );
     ConfigureDialog->addModule(kdelibcfg );
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index 26398f8..b460a81 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -41,4 +41,4 @@ extern "C"
 {
-  KCModule *create_kabconfig( QWidget *parent, const char * ) {
-    return new KCMKabConfig( parent, "kcmkabconfig" );
+  KCModule *create_kabconfig( KABPrefs* prefs, QWidget *parent, const char * ) {
+    return new KCMKabConfig( prefs, parent, "kcmkabconfig" );
   }
@@ -46,4 +46,4 @@ extern "C"
 
-KCMKabConfig::KCMKabConfig( QWidget *parent, const char *name )
-  : KCModule( parent, name )
+KCMKabConfig::KCMKabConfig( KABPrefs* prefs, QWidget *parent, const char *name )
+  : KCModule( prefs, parent, name )
 {
@@ -59,15 +59,15 @@ KCMKabConfig::KCMKabConfig( QWidget *parent, const char *name )
 
-void KCMKabConfig::load(KPrefs* prefs)
+void KCMKabConfig::load()
 {
-  mConfigWidget->restoreSettings((KABPrefs*)prefs);
+  mConfigWidget->restoreSettings((KABPrefs*)getPreferences());
 }
 
-void KCMKabConfig::save(KPrefs* prefs)
+void KCMKabConfig::save()
 {
-  mConfigWidget->saveSettings((KABPrefs*)prefs);
+  mConfigWidget->saveSettings((KABPrefs*)getPreferences());
 }
 
-void KCMKabConfig::defaults(KPrefs* prefs)
+void KCMKabConfig::defaults()
 {
-  mConfigWidget->defaults((KABPrefs*)prefs);
+  mConfigWidget->defaults((KABPrefs*)getPreferences());
 }
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.h b/kaddressbook/kcmconfigs/kcmkabconfig.h
index b4858c1..1cb6ad3 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.h
@@ -29,3 +29,3 @@
 class KABConfigWidget;
-class KPrefs;
+class KABPrefs;
 
@@ -36,7 +36,7 @@ class KCMKabConfig : public KCModule
   public:
-    KCMKabConfig( QWidget *parent = 0, const char *name = 0 );
+    KCMKabConfig( KABPrefs* prefs, QWidget *parent = 0, const char *name = 0 );
 
-    virtual void load(KPrefs* prefs);
-    virtual void save(KPrefs* prefs);
-    virtual void defaults(KPrefs* prefs);
+    virtual void load();
+    virtual void save();
+    virtual void defaults();