summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-08-10 01:34:22 (UTC)
committer ulf69 <ulf69>2004-08-10 01:34:22 (UTC)
commitc9d570427f3d5bead7bee1301514a2d4b82836ea (patch) (side-by-side diff)
tree8d25f388217c591b7dac1db6c26d0777e6459352
parent4f05a9fcbb9e54184aef93883886aaf865104463 (diff)
downloadkdepimpi-c9d570427f3d5bead7bee1301514a2d4b82836ea.zip
kdepimpi-c9d570427f3d5bead7bee1301514a2d4b82836ea.tar.gz
kdepimpi-c9d570427f3d5bead7bee1301514a2d4b82836ea.tar.bz2
enhancements to configure external apps like email and phones through a
generalized interface
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp53
-rw-r--r--kaddressbook/kcmconfigs/kcmkabconfig.cpp20
-rw-r--r--kaddressbook/kcmconfigs/kcmkabconfig.h10
-rw-r--r--libkdepim/addresseeview.cpp31
-rw-r--r--libkdepim/kcmconfigs/kcmkdepimconfig.cpp24
-rw-r--r--libkdepim/kcmconfigs/kcmkdepimconfig.h10
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.cpp534
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.h68
-rw-r--r--libkdepim/kpimprefs.cpp11
-rw-r--r--libkdepim/kpimprefs.h19
-rw-r--r--libkdepim/libkdepim.pro4
-rw-r--r--libkdepim/libkdepimE.pro4
-rw-r--r--microkde/kdeui/kcmodule.cpp16
-rw-r--r--microkde/kdeui/kcmodule.h11
-rw-r--r--microkde/kutils/kcmultidialog.cpp13
-rw-r--r--microkde/kutils/kcmultidialog.h5
16 files changed, 580 insertions, 253 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 4303cab..fe4841a 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -90,4 +90,6 @@
#include "kcmconfigs/kcmkabconfig.h"
#include "kcmconfigs/kcmkdepimconfig.h"
+#include "kpimglobalprefs.h"
+#include "externalapphandler.h"
@@ -468,27 +470,5 @@ void KABCore::sendMail()
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);
}
@@ -551,4 +531,8 @@ void KABCore::mailVCard( const QStringList& uids )
}
}
+
+ bool result = ExternalAppHandler::instance()->mailAttachments(urls.join(", "));
+
+
/*US
kapp->invokeMailer( QString::null, QString::null, QString::null,
@@ -558,17 +542,4 @@ void KABCore::mailVCard( const QStringList& uids )
urls ); // attachments
*/
-#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
-
}
@@ -1198,9 +1169,11 @@ QString KABCore::getNameByPhone( const QString &phone )
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
@@ -40,11 +40,11 @@
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" );
}
}
-KCMKabConfig::KCMKabConfig( QWidget *parent, const char *name )
- : KCModule( parent, name )
+KCMKabConfig::KCMKabConfig( KABPrefs* prefs, QWidget *parent, const char *name )
+ : KCModule( prefs, parent, name )
{
//abort();
@@ -58,17 +58,17 @@ 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
@@ -28,5 +28,5 @@
class KABConfigWidget;
-class KPrefs;
+class KABPrefs;
class KCMKabConfig : public KCModule
@@ -35,9 +35,9 @@ 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();
private:
diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp
index 547441c..83aba48 100644
--- a/libkdepim/addresseeview.cpp
+++ b/libkdepim/addresseeview.cpp
@@ -38,6 +38,6 @@
#ifndef DESKTOP_VERSION
-#include <qtopia/qcopenvelope_qws.h>
-#include <qpe/qpeapplication.h>
+#include <qtopia/qcopenvelope_qws.h>
+#include <qpe/qpeapplication.h>
#endif
@@ -60,5 +60,5 @@ AddresseeView::AddresseeView( QWidget *parent, const char *name )
//US QStyleSheetItem *link = sheet->item( "a" );
//US link->setColor( KGlobalSettings::linkColor() );
-
+
}
void AddresseeView::setSource(const QString& n)
@@ -89,5 +89,5 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
}
if ( kphoneInstalled > 0 )
- kphoneAvail = true;
+ kphoneAvail = true;
#if 0
if ( kphoneAvail )
@@ -96,5 +96,5 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
qDebug("NOOOOOOOOOOOo KPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPone avail ");
#endif
-
+
#endif
mAddressee = addr;
@@ -145,5 +145,5 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
}
-
+
for ( ; emailIt != emails.end(); ++emailIt ) {
dynamicPart += QString(
@@ -182,5 +182,5 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
.arg( formattedAddress );
} else {
-
+
dynamicPart += QString(
"<tr><td align=\"right\"><b>%1</b></td>"
@@ -189,5 +189,5 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
//US .arg( (*addrIt).label().replace( '\n', "<br>" ) );
.arg( (*addrIt).label() /*replace( QRegExp("\n"), "<br>" )*/ );
-
+
}
}
@@ -209,7 +209,7 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
if ( true /*!mAddressee.role().isEmpty()*/ ) {
aRole = "<tr>"
- "<td align=\"left\">" + mAddressee.role() + "</td>"
+ "<td align=\"left\">" + mAddressee.role() + "</td>"
"</tr>";
- }
+ }
if ( true /*!mAddressee.organization().isEmpty()*/ ) {
aOrga = "<tr>"
@@ -269,5 +269,5 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
mText = "<table width=\"100%\">\n";
- //mText += "<tr bgcolor=\"#3679AD\"><td><h2>";
+ //mText += "<tr bgcolor=\"#3679AD\"><td><h2>";
#ifdef DESKTOP_VERSION
mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h1>";
@@ -275,5 +275,5 @@ mText = "<table width=\"100%\">\n";
mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h2>";
#endif
-
+
#ifdef DESKTOP_VERSION
mText += "<font color=\"#FFFFFF\"> <em>" + name+"</em></font></h1>";
@@ -288,5 +288,5 @@ mText = "<table width=\"100%\">\n";
"<td align=\"left\"><b>%2</b></td></tr>" )
.arg( i18n(" ") )
- .arg( name );
+ .arg( name );
*/
if ( ! mAddressee.role().isEmpty() )
@@ -303,9 +303,10 @@ mText = "<table width=\"100%\">\n";
mText += notes;
mText += "</table>";
-
+
}
// at last display it...
setText( mText );
+
}
@@ -322,5 +323,5 @@ void AddresseeView::addTag(const QString & tag,const QString & text)
QString tmpText=text;
QString tmpStr=str;
- if(number !=-1)
+ if(number !=-1)
{
if (number > 0) {
diff --git a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp
index 830d5d2..f26efe0 100644
--- a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp
+++ b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp
@@ -40,15 +40,17 @@ $Id$
#include "kcmkdepimconfig.h"
#include "kprefs.h"
-#include "kpimprefs.h"
+#include "kpimglobalprefs.h"
+
#ifndef _WIN32_
extern "C"
{
- KCModule *create_kabconfig( QWidget *parent, const char * ) {
- return new KCMKdePimConfig( parent, "kcmkdepimconfig" );
+ KCModule *create_kabconfig( KPimGlobalPrefs* prefs, QWidget *parent, const char * ) {
+ return new KCMKdePimConfig( prefs, parent, "kcmkdepimconfig" );
}
}
#endif
-KCMKdePimConfig::KCMKdePimConfig( QWidget *parent, const char *name )
- : KCModule( parent, name )
+
+KCMKdePimConfig::KCMKdePimConfig( KPimGlobalPrefs* prefs, QWidget *parent, const char *name )
+ : KCModule( prefs, parent, name )
{
//abort();
@@ -62,16 +64,16 @@ KCMKdePimConfig::KCMKdePimConfig( QWidget *parent, const char *name )
}
-void KCMKdePimConfig::load(KPrefs* prefs)
+void KCMKdePimConfig::load()
{
- mConfigWidget->restoreSettings((KPimPrefs*)prefs);
+ mConfigWidget->restoreSettings((KPimGlobalPrefs*)getPreferences());
}
-void KCMKdePimConfig::save(KPrefs* prefs)
+void KCMKdePimConfig::save()
{
- mConfigWidget->saveSettings((KPimPrefs*)prefs);
+ mConfigWidget->saveSettings((KPimGlobalPrefs*)getPreferences());
}
-void KCMKdePimConfig::defaults(KPrefs* prefs)
+void KCMKdePimConfig::defaults()
{
- mConfigWidget->defaults((KPimPrefs*)prefs);
+ mConfigWidget->defaults((KPimGlobalPrefs*)getPreferences());
}
diff --git a/libkdepim/kcmconfigs/kcmkdepimconfig.h b/libkdepim/kcmconfigs/kcmkdepimconfig.h
index 8cb74f4..fa96eda 100644
--- a/libkdepim/kcmconfigs/kcmkdepimconfig.h
+++ b/libkdepim/kcmconfigs/kcmkdepimconfig.h
@@ -35,5 +35,5 @@ $Id$
class KDEPIMConfigWidget;
-class KPrefs;
+class KPimGlobalPrefs;
class KCMKdePimConfig : public KCModule
@@ -42,9 +42,9 @@ class KCMKdePimConfig : public KCModule
public:
- KCMKdePimConfig( QWidget *parent = 0, const char *name = 0 );
+ KCMKdePimConfig( KPimGlobalPrefs* 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();
private:
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index 477267c..9964eeb 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -72,5 +72,5 @@ $Id$
*/
-#include "kpimprefs.h"
+#include "kpimglobalprefs.h"
#include "kdepimconfigwidget.h"
@@ -80,4 +80,11 @@ KDEPIMConfigWidget::KDEPIMConfigWidget( QWidget *parent, const char *name )
: QWidget( parent, name )
{
+ mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email"));
+ mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone"));
+ mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS"));
+ mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax"));
+ mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager"));
+
+
QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
KDialog::spacingHint() );
@@ -85,172 +92,408 @@ KDEPIMConfigWidget::KDEPIMConfigWidget( QWidget *parent, const char *name )
QTabWidget *tabWidget = new QTabWidget( this );
topLayout->addWidget( tabWidget );
-/*US
- // General page
- QWidget *generalPage = new QWidget( this );
- QVBoxLayout *layout = new QVBoxLayout( generalPage, KDialog::marginHintSmall(),
- KDialog::spacingHintSmall() );
- //general groupbox
- QGroupBox *groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage );
- QVBoxLayout *boxLayout = new QVBoxLayout( groupBox->layout() );
- boxLayout->setAlignment( Qt::AlignTop );
- boxLayout->setMargin(KDialog::marginHintSmall() );
- groupBox->layout()->setMargin(KDialog::marginHintSmall()) ;
- groupBox->layout()->setSpacing(KDialog::spacingHintSmall());
- boxLayout->setSpacing( KDialog::spacingHintSmall() );
- mViewsSingleClickBox = new QCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" );
- boxLayout->addWidget( mViewsSingleClickBox );
-
- mNameParsing = new QCheckBox( i18n( "Automatic name parsing for new addressees" ), groupBox, "mparse" );
- boxLayout->addWidget( mNameParsing );
-
- layout->addWidget( groupBox );
-
-
- //extensions groupbox
-
- QGroupBox *groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions" ), generalPage );
- QVBoxLayout *boxLayout = new QVBoxLayout( groupBox->layout() );
- boxLayout->setAlignment( Qt::AlignTop );
- boxLayout->setMargin(KDialog::marginHintSmall());
- boxLayout->setSpacing(KDialog::spacingHintSmall());
- groupBox->layout()->setMargin(1) ;
- groupBox->layout()->setSpacing(0);
- mExtensionView = new KListView( groupBox );
- mExtensionView->setAllColumnsShowFocus( true );
- mExtensionView->addColumn( i18n( "Name" ) );
- mExtensionView->addColumn( i18n( "Description" ) );
- mExtensionView->setMaximumHeight(80);
-
- boxLayout->addWidget( mExtensionView );
-
- mConfigureButton = new QPushButton( i18n( "Configure..." ), groupBox );
- mConfigureButton->setEnabled( false );
- boxLayout->addWidget( mConfigureButton );
-
- layout->addWidget( groupBox );
-
- connect( mNameParsing, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
- connect( mViewsSingleClickBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
- connect( mExtensionView, SIGNAL( selectionChanged( QListViewItem* ) ),
- SLOT( selectionChanged( QListViewItem* ) ) );
- connect( mExtensionView, SIGNAL( clicked( QListViewItem* ) ),
- SLOT( itemClicked( QListViewItem* ) ) );
- connect( mConfigureButton, SIGNAL( clicked() ),
- SLOT( configureExtension() ) );
-
- tabWidget->addTab( generalPage, i18n( "General" ) );
-
- // Addressee page
- mAddresseeWidget = new AddresseeWidget( this );
- tabWidget->addTab( mAddresseeWidget, i18n( "Contact" ) );
- connect( mAddresseeWidget, SIGNAL( modified() ), SLOT( modified() ) );
-*/
+
+
// mailclient page
- QWidget *mailclientPage = new QWidget( this );
- QVBoxLayout* layout = new QVBoxLayout( mailclientPage, KDialog::marginHintSmall(),
+ QWidget *externalAppsPage = new QWidget( this );
+ QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(),
KDialog::spacingHintSmall() );
- QGroupBox *groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), mailclientPage );
- QVBoxLayout* boxLayout = new QVBoxLayout( groupBox->layout() );
- boxLayout->setAlignment( Qt::AlignTop );
-// boxLayout->setMargin(KDialog::marginHintSmall() );
-// groupBox->layout()->setMargin(KDialog::marginHintSmall()) ;
-// groupBox->layout()->setSpacing(KDialog::spacingHintSmall());
-// boxLayout->setSpacing( KDialog::spacingHintSmall() );
+ mExternalApps = new QComboBox( externalAppsPage );
+
+ QMap<ExternalAppHandler::Types, QString>::Iterator it;
+ for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it )
+ mExternalApps->insertItem( it.data(), it.key() );
+
+ layout->addWidget( mExternalApps );
+
+ connect( mExternalApps, SIGNAL( activated( int ) ),
+ this, SLOT (externalapp_changed( int ) ) );
+
+
+
+
+ mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage );
+ QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" );
+
+
+ mClient = new QComboBox( mExternalAppGroupBox );
+ boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 );
+
+ connect( mClient, SIGNAL( activated( int ) ),
+ this, SLOT (client_changed( int ) ) );
+
+ QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox);
+ boxLayout->addWidget( lab, 1, 0 );
+ mChannel = new QLineEdit(mExternalAppGroupBox);
+ mChannel->setReadOnly(true);
+ boxLayout->addMultiCellWidget( mChannel, 2 , 2, 0, 1 );
+
+ lab = new QLabel( i18n("Message:"), mExternalAppGroupBox);
+ boxLayout->addWidget( lab, 3, 0 );
+ mMessage = new QLineEdit(mExternalAppGroupBox);
+ mMessage->setReadOnly(true);
+ boxLayout->addWidget( mMessage , 4, 0);
+
+ lab = new QLabel( i18n("Parameters:"), mExternalAppGroupBox);
+ boxLayout->addWidget( lab, 3, 1 );
+ mParameters = new QLineEdit(mExternalAppGroupBox);
+ mParameters->setReadOnly(true);
+ boxLayout->addWidget( mParameters, 4, 1 );
+
+ lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox);
+ boxLayout->addWidget( lab, 5, 0 );
+ mMessage2 = new QLineEdit(mExternalAppGroupBox);
+ mMessage2->setReadOnly(true);
+ boxLayout->addWidget( mMessage2 , 6, 0);
+
+ lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox);
+ boxLayout->addWidget( lab, 5, 1 );
+ mParameters2 = new QLineEdit(mExternalAppGroupBox);
+ mParameters2->setReadOnly(true);
+ boxLayout->addWidget( mParameters2, 6, 1 );
- mEmailClient = new QComboBox( groupBox );
- mEmailClient->insertItem( i18n("OM/Pi"), KPimPrefs::OMPI );
- mEmailClient->insertItem( i18n("Qtopia mail"), KPimPrefs::QTOPIA );
- mEmailClient->insertItem( i18n("Opie mail"), KPimPrefs::OPIE );
- mEmailClient->insertItem( i18n("Other"), KPimPrefs::OTHER );
- boxLayout->addWidget( mEmailClient );
+ lab = new QLabel( i18n("HINT: Delimiter=; Data=%1 "), mExternalAppGroupBox);
+ boxLayout->addMultiCellWidget( lab, 7, 7, 0, 1 );
- connect( mEmailClient, SIGNAL( activated( int ) ),
- this, SLOT (emailclient_changed( int ) ) );
- QLabel* lab = new QLabel( i18n("Channel:"), groupBox);
- boxLayout->addWidget( lab );
- mEmailChannel = new QLineEdit(groupBox);
- mEmailChannel->setReadOnly(true);
- boxLayout->addWidget( mEmailChannel );
+ connect( mChannel, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
+ connect( mMessage, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
+ connect( mParameters, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
+ connect( mMessage2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
+ connect( mParameters2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
- layout->addWidget( groupBox );
- tabWidget->addTab( mailclientPage, i18n( "Mail" ) );
+ layout->addWidget( mExternalAppGroupBox );
+ tabWidget->addTab( externalAppsPage, i18n( "External Apps." ) );
}
+void KDEPIMConfigWidget::externalapp_changed( int newApp )
+{
+ // first store the current data
+ saveEditFieldSettings();
+
+ // set mCurrentApp
+ mCurrentApp = (ExternalAppHandler::Types)newApp;
+
+ // set mCurrentClient
+ switch(mCurrentApp)
+ {
+ case(ExternalAppHandler::EMAIL):
+ mCurrentClient = mEmailClient;
+ break;
+ case(ExternalAppHandler::PHONE):
+ mCurrentClient = mPhoneClient;
+ break;
+ case(ExternalAppHandler::SMS):
+ mCurrentClient = mSMSClient;
+ break;
+ case(ExternalAppHandler::FAX):
+ mCurrentClient = mFaxClient;
+ break;
+ case(ExternalAppHandler::PAGER):
+ mCurrentClient = mPagerClient;
+ break;
+ default:
+ return;
+ }
+ // and at last update the widgets
+ updateClientWidgets();
+}
-void KDEPIMConfigWidget::emailclient_changed( int newClient )
+
+
+void KDEPIMConfigWidget::client_changed( int newClient )
{
- if (newClient == KPimPrefs::OTHER)
- mEmailChannel->setReadOnly(false);
- else
- mEmailChannel->setReadOnly(true);
+ if (newClient == mCurrentClient)
+ return;
- QString opiepath = QString::fromLatin1( getenv("OPIEDIR") );
- QString qtopiapath = QString::fromLatin1( getenv("QPEDIR") );
+ // first store the current data
+ saveEditFieldSettings();
- if (opiepath.isEmpty())
- opiepath = qtopiapath;
- QString text = mEmailChannel->text();
+ //then reset the clientvariable
+ mCurrentClient = newClient;
- if (newClient == KPimPrefs::OPIE)
+ // and at last update the widgets
+ updateClientWidgets();
+
+ modified();
+}
+
+void KDEPIMConfigWidget::saveEditFieldSettings()
+{
+
+ switch(mCurrentApp)
{
- if ( QFile::exists( opiepath + "/bin/opiemail" ))
- text = "QPE/Application/opiemail";
- else
- text = "FILENOTFOUND: " + opiepath + "/bin/opiemail";
+ case(ExternalAppHandler::EMAIL):
+ mEmailClient = mClient->currentItem();
+ break;
+ case(ExternalAppHandler::PHONE):
+ mPhoneClient= mClient->currentItem();
+ break;
+ case(ExternalAppHandler::SMS):
+ mSMSClient = mClient->currentItem();
+ break;
+ case(ExternalAppHandler::FAX):
+ mFaxClient = mClient->currentItem();
+ break;
+ case(ExternalAppHandler::PAGER):
+ mPagerClient = mClient->currentItem();
+ break;
+ default:
+ return;
}
- else if (newClient == KPimPrefs::QTOPIA)
- {
- if ( QFile::exists( qtopiapath + "/bin/qtmail" ))
- text = "QPE/Application/qtmail";
- else
- text = "FILENOTFOUND: " + qtopiapath + "/bin/qtmail";
+ //store the current data back to the apropriate membervariables if we had set it to "other"
+ if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC))
+ {
+ mEmailOtherChannel = mChannel->text();
+ mEmailOtherMessage = mMessage->text();
+ mEmailOtherMessageParameters = mParameters->text();
+ mEmailOtherMessage2 = mMessage2->text();
+ mEmailOtherMessageParameters2 = mParameters2->text();
+ }
+ else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC))
+ {
+ mPhoneOtherChannel = mChannel->text();
+ mPhoneOtherMessage = mMessage->text();
+ mPhoneOtherMessageParameters = mParameters->text();
+ }
+ else if ((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC))
+ {
+ mSMSOtherChannel = mChannel->text();
+ mSMSOtherMessage = mMessage->text();
+ mSMSOtherMessageParameters = mParameters->text();
+ }
+ else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC))
+ {
+ mFaxOtherChannel = mChannel->text();
+ mFaxOtherMessage = mMessage->text();
+ mFaxOtherMessageParameters = mParameters->text();
+ }
+ else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC))
+ {
+ mPagerOtherChannel = mChannel->text();
+ mPagerOtherMessage = mMessage->text();
+ mPagerOtherMessageParameters = mParameters->text();
}
- else if (newClient == KPimPrefs::OMPI)
+
+}
+
+void KDEPIMConfigWidget::updateClientWidgets()
+{
+ bool blocked = signalsBlocked();
+ blockSignals( true );
+
+ // at this point we assume, that mCurrentApp and mCurrentClient are set to the values that we want to display
+ QMap<ExternalAppHandler::Types, QString>::Iterator it = mExternalAppsMap.find ( mCurrentApp );
+ if (it == mExternalAppsMap.end())
+ return;
+
+ // update group box
+ mExternalAppGroupBox->setTitle(i18n( "Used %1 Client" ).arg(it.data()));
+
+ //update the entries in the client combobox
+ mClient->clear();
+
+ QList<DefaultAppItem> items = ExternalAppHandler::instance()->getAvailableDefaultItems(mCurrentApp);
+ DefaultAppItem* dai;
+ for ( dai=items.first(); dai != 0; dai=items.next() )
{
- if ( QFile::exists( qtopiapath + "/bin/ompi" ))
- text = "QPE/Application/ompi";
- else if ( QFile::exists( opiepath + "/bin/ompi" ))
- text = "QPE/Application/ompi";
- else
- text = "FILENOTFOUND: " + qtopiapath + "/bin/ompi";
+ mClient->insertItem( i18n(dai->_label), dai->_id );
+
+ if (dai->_id == mCurrentClient)
+ {
+ //restore the edit fields with the data of the local membervariables if we had set it to "other".
+ //Otherwise take the default data from externalapphandler.
+ mChannel->setText(dai->_channel);
+ mMessage->setText(dai->_message);
+ mParameters->setText(dai->_parameters);
+ mMessage2->setText(dai->_message2);
+ mParameters2->setText(dai->_parameters2);
+
+
+ if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC))
+ {
+ mChannel->setText(mEmailOtherChannel);
+ mMessage->setText(mEmailOtherMessage);
+ mParameters->setText(mEmailOtherMessageParameters);
+ mMessage2->setText(mEmailOtherMessage2);
+ mParameters2->setText(mEmailOtherMessageParameters2);
+ }
+ else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC))
+ {
+ mChannel->setText(mPhoneOtherChannel);
+ mMessage->setText(mPhoneOtherMessage);
+ mParameters->setText(mPhoneOtherMessageParameters);
+ }
+ else if ((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC))
+ {
+ mChannel->setText(mSMSOtherChannel);
+ mMessage->setText(mSMSOtherMessage);
+ mParameters->setText(mSMSOtherMessageParameters);
+ }
+ else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC))
+ {
+ mChannel->setText(mFaxOtherChannel);
+ mMessage->setText(mFaxOtherMessage);
+ mParameters->setText(mFaxOtherMessageParameters);
+ }
+ else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC))
+ {
+ mChannel->setText(mPagerOtherChannel);
+ mMessage->setText(mPagerOtherMessage);
+ mParameters->setText(mPagerOtherMessageParameters);
+ }
+ }
+
+ }
+ bool readonly;
+ bool enabled;
+ if ( ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC))
+ ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC))
+ ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC))
+ ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC))
+ ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC)))
+ {
+ readonly = false;
+ }
+ else
+ {
+ readonly = true;
+ }
+
+ if ( ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::NONE_EMC))
+ ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::NONE_PHC))
+ ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::NONE_SMC))
+ ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::NONE_FAC))
+ ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::NONE_PAC)))
+ {
+ enabled = false;
+ }
+ else
+ {
+ enabled = true;
+ }
+
+
+ mChannel->setReadOnly(readonly);
+ mMessage->setReadOnly(readonly);
+ mParameters->setReadOnly(readonly);
+ mMessage2->setReadOnly(readonly);
+ mParameters2->setReadOnly(readonly);
+
+ mChannel->setEnabled(enabled);
+ mMessage->setEnabled(enabled);
+ mParameters->setEnabled(enabled);
+ mMessage2->setEnabled(enabled);
+ mParameters2->setEnabled(enabled);
+
+
+
+ mClient->setCurrentItem(mCurrentClient);
+
+
+ // enable/disable the extra message/parameter field
+ if (mCurrentApp == ExternalAppHandler::EMAIL)
+ {
}
else
{
- //do nothing if we choosed other
+ mMessage2->setText( "" );
+ mParameters2->setText( "" );
}
- mEmailChannel->setText( text );
+ if (enabled == true) {
+ mMessage2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL);
+ mParameters2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL);
+ }
+ blockSignals( blocked );
+
}
-void KDEPIMConfigWidget::restoreSettings(KPimPrefs* prefs)
+
+
+void KDEPIMConfigWidget::restoreSettings(KPimGlobalPrefs* prefs)
{
bool blocked = signalsBlocked();
blockSignals( true );
- mEmailChannel->setText( prefs->mEmailChannel );
- mEmailClient->setCurrentItem(prefs->mEmailClient);
+ mEmailClient = prefs->mEmailClient;
+ mEmailOtherChannel = prefs->mEmailOtherChannel;
+ mEmailOtherMessage = prefs->mEmailOtherMessage;
+ mEmailOtherMessageParameters = prefs->mEmailOtherMessageParameters;
+ mEmailOtherMessage2 = prefs->mEmailOtherMessage2;
+ mEmailOtherMessageParameters2 = prefs->mEmailOtherMessageParameters2;
+
+ mPhoneClient = prefs->mPhoneClient;
+ mPhoneOtherChannel = prefs->mPhoneOtherChannel;
+ mPhoneOtherMessage = prefs->mPhoneOtherMessage;
+ mPhoneOtherMessageParameters = prefs->mPhoneOtherMessageParameters;
+
+ mFaxClient = prefs->mFaxClient;
+ mFaxOtherChannel = prefs->mFaxOtherChannel;
+ mFaxOtherMessage = prefs->mFaxOtherMessage;
+ mFaxOtherMessageParameters = prefs->mFaxOtherMessageParameters;
+
+ mSMSClient = prefs->mSMSClient;
+ mSMSOtherChannel = prefs->mSMSOtherChannel;
+ mSMSOtherMessage = prefs->mSMSOtherMessage;
+ mSMSOtherMessageParameters = prefs->mSMSOtherMessageParameters;
+
+ mPagerClient = prefs->mPagerClient;
+ mPagerOtherChannel = prefs->mPagerOtherChannel;
+ mPagerOtherMessage = prefs->mPagerOtherMessage;
+ mPagerOtherMessageParameters = prefs->mPagerOtherMessageParameters;
+
+ mCurrentApp = ExternalAppHandler::EMAIL;
+ mCurrentClient = mEmailClient;
+
+ updateClientWidgets();
blockSignals( blocked );
emit changed( false );
+
}
-void KDEPIMConfigWidget::saveSettings(KPimPrefs* prefs)
+void KDEPIMConfigWidget::saveSettings(KPimGlobalPrefs* prefs)
{
- prefs->mEmailClient = mEmailClient->currentItem();
- prefs->mEmailChannel = mEmailChannel->text();
+ saveEditFieldSettings();
+
+ prefs->mEmailClient = mEmailClient;
+ prefs->mEmailOtherChannel = mEmailOtherChannel;
+ prefs->mEmailOtherMessage = mEmailOtherMessage;
+ prefs->mEmailOtherMessageParameters = mEmailOtherMessageParameters;
+ prefs->mEmailOtherMessage2 = mEmailOtherMessage2;
+ prefs->mEmailOtherMessageParameters2 = mEmailOtherMessageParameters2;
+
+ prefs->mPhoneClient = mPhoneClient;
+ prefs->mPhoneOtherChannel = mPhoneOtherChannel;
+ prefs->mPhoneOtherMessage = mPhoneOtherMessage;
+ prefs->mPhoneOtherMessageParameters = mPhoneOtherMessageParameters;
+
+ prefs->mFaxClient = mFaxClient;
+ prefs->mFaxOtherChannel = mFaxOtherChannel;
+ prefs->mFaxOtherMessage = mFaxOtherMessage;
+ prefs->mFaxOtherMessageParameters = mFaxOtherMessageParameters;
+
+ prefs->mSMSClient = mSMSClient;
+ prefs->mSMSOtherChannel = mSMSOtherChannel;
+ prefs->mSMSOtherMessage = mSMSOtherMessage;
+ prefs->mSMSOtherMessageParameters = mSMSOtherMessageParameters;
+
+ prefs->mPagerClient = mPagerClient;
+ prefs->mPagerOtherChannel = mPagerOtherChannel;
+ prefs->mPagerOtherMessage = mPagerOtherMessage;
+ prefs->mPagerOtherMessageParameters = mPagerOtherMessageParameters;
prefs->writeConfig();
@@ -259,8 +502,44 @@ void KDEPIMConfigWidget::saveSettings(KPimPrefs* prefs)
}
-void KDEPIMConfigWidget::defaults(KPimPrefs* prefs)
+void KDEPIMConfigWidget::defaults(KPimGlobalPrefs* prefs)
{
- mEmailClient->setCurrentItem(KPimPrefs::OMPI);
- emailclient_changed( KPimPrefs::OMPI );
+
+ DefaultAppItem* dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::NONE_EMC);
+
+ mEmailClient = dai->_id;
+ mEmailOtherChannel = dai->_channel;
+ mEmailOtherMessage = dai->_message;
+ mEmailOtherMessageParameters = dai->_parameters;
+ mEmailOtherMessage2 = dai->_message2;
+ mEmailOtherMessageParameters2 = dai->_parameters2;
+
+
+ dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::PHONE, KPimGlobalPrefs::NONE_PHC);
+
+ mPhoneClient = dai->_id;
+ mPhoneOtherChannel = dai->_channel;
+ mPhoneOtherMessage = dai->_message;
+ mPhoneOtherMessageParameters = dai->_parameters;
+
+ dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::FAX, KPimGlobalPrefs::NONE_FAC);
+
+ mFaxClient = dai->_id;
+ mFaxOtherChannel = dai->_channel;
+ mFaxOtherMessage = dai->_message;
+ mFaxOtherMessageParameters = dai->_parameters;
+
+ dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::SMS, KPimGlobalPrefs::NONE_SMC);
+
+ mSMSClient = dai->_id;
+ mSMSOtherChannel = dai->_channel;
+ mSMSOtherMessage = dai->_message;
+ mSMSOtherMessageParameters = dai->_parameters;
+
+ dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::PAGER, KPimGlobalPrefs::NONE_PAC);
+
+ mPagerClient = dai->_id;
+ mPagerOtherChannel = dai->_channel;
+ mPagerOtherMessage = dai->_message;
+ mPagerOtherMessageParameters = dai->_parameters;
@@ -272,2 +551,7 @@ void KDEPIMConfigWidget::modified()
emit changed( true );
}
+
+void KDEPIMConfigWidget::textChanged( const QString& text )
+{
+ emit changed( true );
+}
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.h b/libkdepim/kcmconfigs/kdepimconfigwidget.h
index 109a847..6e02544 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.h
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.h
@@ -33,4 +33,8 @@ $Id$
#include <qwidget.h>
+#include <qmap.h>
+
+#include "externalapphandler.h"
+
/*
@@ -42,5 +46,6 @@ class KListView;
class QComboBox;
class QLineEdit;
-class KPimPrefs;
+class KPimGlobalPrefs;
+class QGroupBox;
class KDEPIMConfigWidget : public QWidget
@@ -51,13 +56,15 @@ class KDEPIMConfigWidget : public QWidget
KDEPIMConfigWidget( QWidget *parent, const char *name = 0 );
- void restoreSettings(KPimPrefs* prefs);
- void saveSettings(KPimPrefs* prefs);
- void defaults(KPimPrefs* prefs);
+ void restoreSettings(KPimGlobalPrefs* prefs);
+ void saveSettings(KPimGlobalPrefs* prefs);
+ void defaults(KPimGlobalPrefs* prefs);
signals:
void changed( bool );
+
public slots:
void modified();
+ void textChanged( const QString& text );
@@ -67,7 +74,11 @@ class KDEPIMConfigWidget : public QWidget
// void selectionChanged( QListViewItem* );
// void itemClicked( QListViewItem* );
- void emailclient_changed( int newClient );
+ void client_changed( int newClient );
+ void externalapp_changed( int newApp );
private:
+ void saveEditFieldSettings();
+ void updateClientWidgets();
+
// void restoreExtensionSettings();
// void saveExtensionSettings();
@@ -78,6 +89,49 @@ class KDEPIMConfigWidget : public QWidget
// QCheckBox *mViewsSingleClickBox;
// QPushButton *mConfigureButton;
- QComboBox* mEmailClient;
- QLineEdit* mEmailChannel;
+ QComboBox* mExternalApps;
+ QGroupBox* mExternalAppGroupBox;
+
+
+ QComboBox* mClient;
+ QLineEdit* mChannel;
+ QLineEdit* mMessage;
+ QLineEdit* mParameters;
+ QLineEdit* mMessage2;
+ QLineEdit* mParameters2;
+
+ ExternalAppHandler::Types mCurrentApp;
+ int mCurrentClient;
+
+
+ int mEmailClient;
+ QString mEmailOtherChannel;
+ QString mEmailOtherMessage;
+ QString mEmailOtherMessageParameters;
+ QString mEmailOtherMessage2;
+ QString mEmailOtherMessageParameters2;
+
+ int mPhoneClient;
+ QString mPhoneOtherChannel;
+ QString mPhoneOtherMessage;
+ QString mPhoneOtherMessageParameters;
+
+ int mFaxClient;
+ QString mFaxOtherChannel;
+ QString mFaxOtherMessage;
+ QString mFaxOtherMessageParameters;
+
+ int mSMSClient;
+ QString mSMSOtherChannel;
+ QString mSMSOtherMessage;
+ QString mSMSOtherMessageParameters;
+
+ int mPagerClient;
+ QString mPagerOtherChannel;
+ QString mPagerOtherMessage;
+ QString mPagerOtherMessageParameters;
+
+
+
+ QMap<ExternalAppHandler::Types, QString> mExternalAppsMap;
// AddresseeWidget *mAddresseeWidget;
diff --git a/libkdepim/kpimprefs.cpp b/libkdepim/kpimprefs.cpp
index 15531c7..140a286 100644
--- a/libkdepim/kpimprefs.cpp
+++ b/libkdepim/kpimprefs.cpp
@@ -22,4 +22,11 @@
*/
+/*
+Enhanced Version of the file for platform independent KDE tools.
+Copyright (c) 2004 Ulf Schenk
+
+$Id$
+*/
+
#include <kglobal.h>
#include <kconfig.h>
@@ -32,8 +39,4 @@ KPimPrefs::KPimPrefs( const QString &name ) :
KPrefs( name )
{
- KPrefs::setCurrentGroup( "ExternalApplications" );
- addItemInt( "EmailChannelType", &mEmailClient, OMPI );
- addItemString( "EmailChannelOther", &mEmailChannel, "" );
-
}
diff --git a/libkdepim/kpimprefs.h b/libkdepim/kpimprefs.h
index 5186315..9bd9466 100644
--- a/libkdepim/kpimprefs.h
+++ b/libkdepim/kpimprefs.h
@@ -21,4 +21,12 @@
without including the source code for Qt in the source distribution.
*/
+
+/*
+Enhanced Version of the file for platform independent KDE tools.
+Copyright (c) 2004 Ulf Schenk
+
+$Id$
+*/
+
#ifndef KPIMPREFS_H
#define KPIMPREFS_H
@@ -45,19 +53,8 @@ class KPimPrefs : public KPrefs
void usrWriteConfig();
- 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 902f049..e05e681 100644
--- a/libkdepim/libkdepim.pro
+++ b/libkdepim/libkdepim.pro
@@ -24,4 +24,5 @@ HEADERS = \
categoryselectdialog.h \
categoryselectdialog_base.h \
+ externalapphandler.h \
kdateedit.h \
kdatepicker.h \
@@ -29,4 +30,5 @@ HEADERS = \
kincidenceformatter.h \
kpimprefs.h \
+ kpimglobalprefs.h \
kprefsdialog.h \
addresseeview.h \
@@ -41,4 +43,5 @@ SOURCES = \
categoryselectdialog.cpp \
categoryselectdialog_base.cpp \
+ externalapphandler.cpp \
kdateedit.cpp \
kdatepicker.cpp \
@@ -46,4 +49,5 @@ SOURCES = \
kincidenceformatter.cpp \
kpimprefs.cpp \
+ kpimglobalprefs.cpp \
kprefsdialog.cpp \
addresseeview.cpp \
diff --git a/libkdepim/libkdepimE.pro b/libkdepim/libkdepimE.pro
index fc8abe1..b322bce 100644
--- a/libkdepim/libkdepimE.pro
+++ b/libkdepim/libkdepimE.pro
@@ -18,4 +18,5 @@ HEADERS = \
categoryselectdialog.h \
categoryselectdialog_base.h \
+ externalapphandler.h \
kdateedit.h \
kdatepicker.h \
@@ -23,4 +24,5 @@ HEADERS = \
kincidenceformatter.h \
kpimprefs.h \
+ kpimglobalprefs.h \
kprefsdialog.h \
addresseeview.h \
@@ -37,4 +39,5 @@ SOURCES = \
categoryselectdialog.cpp \
categoryselectdialog_base.cpp \
+ externalapphandler.cpp \
kdateedit.cpp \
kinputdialog.cpp \
@@ -42,4 +45,5 @@ SOURCES = \
kincidenceformatter.cpp \
kpimprefs.cpp \
+ kpimglobalprefs.cpp \
kprefsdialog.cpp \
addresseeview.cpp \
diff --git a/microkde/kdeui/kcmodule.cpp b/microkde/kdeui/kcmodule.cpp
index 915cd0f..f646db3 100644
--- a/microkde/kdeui/kcmodule.cpp
+++ b/microkde/kdeui/kcmodule.cpp
@@ -34,7 +34,8 @@ public:
bool _useRootOnlyMsg;
bool _hasOwnInstance;
+ KPrefs* _prefs;
};
-KCModule::KCModule(QWidget *parent, const char *name, const QStringList &)
+KCModule::KCModule(KPrefs* prefs, QWidget *parent, const char *name, const QStringList &)
: QWidget(parent, name), _btn(Help|Default|Apply)
{
@@ -42,5 +43,6 @@ KCModule::KCModule(QWidget *parent, const char *name, const QStringList &)
d = new KCModulePrivate;
d->_useRootOnlyMsg = true;
-/*US
+ d->_prefs = prefs;
+/*US
d->_instance = new KInstance(name);
if (name && strlen(name)) {
@@ -49,5 +51,5 @@ KCModule::KCModule(QWidget *parent, const char *name, const QStringList &)
} else
d->_instance = new KInstance("kcmunnamed");
-*/
+*/
d->_hasOwnInstance = true;
//US KGlobal::setActiveInstance(this->instance());
@@ -72,5 +74,5 @@ KCModule::~KCModule()
if (d->_hasOwnInstance)
delete d->_instance;
-*/
+*/
delete d;
}
@@ -95,4 +97,10 @@ bool KCModule::useRootOnlyMsg() const
return d->_useRootOnlyMsg;
}
+
+KPrefs* KCModule::getPreferences()
+{
+ return d->_prefs;
+}
+
/*US
KInstance *KCModule::instance() const
diff --git a/microkde/kdeui/kcmodule.h b/microkde/kdeui/kcmodule.h
index bc020bc..874958c 100644
--- a/microkde/kdeui/kcmodule.h
+++ b/microkde/kdeui/kcmodule.h
@@ -84,5 +84,5 @@ public:
* implementation.
*/
- KCModule(QWidget *parent=0, const char *name=0, const QStringList &args=QStringList() );
+ KCModule(KPrefs* prefs, QWidget *parent=0, const char *name=0, const QStringList &args=QStringList() );
//US KCModule(KInstance *instance, QWidget *parent=0, const QStringList &args=QStringList() );
@@ -107,5 +107,5 @@ public:
* so you probably want to call this method in the constructor.
*/
- virtual void load(KPrefs* prefs) {};
+ virtual void load() {};
/**
@@ -120,5 +120,5 @@ public:
* save is called when the user clicks "Apply" or "Ok".
*/
- virtual void save(KPrefs* prefs) {};
+ virtual void save() {};
/**
@@ -128,5 +128,5 @@ public:
* button. It should set the display to useful values.
*/
- virtual void defaults(KPrefs* prefs) {};
+ virtual void defaults() {};
/**
@@ -138,5 +138,5 @@ public:
* NOTE: The default behaviour is to call defaults().
*/
- virtual void sysdefaults(KPrefs* prefs) { defaults(prefs); };
+ virtual void sysdefaults() { defaults(); };
/**
@@ -194,4 +194,5 @@ public:
bool useRootOnlyMsg() const;
+ KPrefs* getPreferences();
//US KInstance *instance() const;
diff --git a/microkde/kutils/kcmultidialog.cpp b/microkde/kutils/kcmultidialog.cpp
index c2378fb..6c82e4f 100644
--- a/microkde/kutils/kcmultidialog.cpp
+++ b/microkde/kutils/kcmultidialog.cpp
@@ -35,11 +35,10 @@
#include "kcmultidialog.h"
-#include "kprefs.h"
//US #include "kcmultidialog.moc"
//US #include "kcmoduleloader.h"
-KCMultiDialog::KCMultiDialog(KPrefs* prefs, const QString& baseGroup, QWidget *parent, const char *name, bool modal)
+KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const char *name, bool modal)
: KDialogBase(IconList, i18n("Configure"), Default |Cancel | Apply | Ok, Ok,
- parent, name, modal, true), mPrefs(prefs), d(0L)
+ parent, name, modal, true), d(0L)
{
enableButton(Apply, false);
@@ -76,5 +75,5 @@ void KCMultiDialog::slotDefault()
if (pageIndex((QWidget *)(*it)->parent()) == curPageIndex)
{
- (*it)->defaults(mPrefs);
+ (*it)->defaults();
clientChanged(true);
return;
@@ -90,5 +89,5 @@ qDebug("KCMultiDialog::slotApply clicked");
QPtrListIterator<KCModule> it(modules);
for (; it.current(); ++it)
- (*it)->save(mPrefs);
+ (*it)->save();
clientChanged(false);
@@ -104,5 +103,5 @@ qDebug("KCMultiDialog::slotOk clicked");
QPtrListIterator<KCModule> it(modules);
for (; it.current(); ++it)
- (*it)->save(mPrefs);
+ (*it)->save();
accept();
@@ -163,5 +162,5 @@ void KCMultiDialog::addModule(KCModule* module ) //, const QString& modulename,
connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool)));
//US
- module->load(mPrefs);
+ module->load();
diff --git a/microkde/kutils/kcmultidialog.h b/microkde/kutils/kcmultidialog.h
index a42555f..1aa66b2 100644
--- a/microkde/kutils/kcmultidialog.h
+++ b/microkde/kutils/kcmultidialog.h
@@ -30,6 +30,4 @@
#include <kcmodule.h>
-class KPrefs;
-
/**
* A class that offers a @ref KDialogBase containing arbitrary KControl Modules
@@ -55,5 +53,5 @@ public:
* @param modal If you pass true here, the dialog will be modal
**/
- KCMultiDialog(KPrefs* prefs, const QString& baseGroup = QString::fromLatin1("settings"),
+ KCMultiDialog(const QString& baseGroup = QString::fromLatin1("settings"),
QWidget *parent=0, const char *name=0,
bool modal=false);
@@ -140,5 +138,4 @@ private:
//US
KJanusWidget* mMainWidget;
- KPrefs* mPrefs;
// For future use