author | ulf69 <ulf69> | 2004-09-16 17:23:08 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-09-16 17:23:08 (UTC) |
commit | c32d7e58ca69196426eee3217140227aca634f52 (patch) (side-by-side diff) | |
tree | 3cc420da278d1035bb45c23d7c70562369f96b7b | |
parent | 02e7ae4983679a787834277176a031286a8310c2 (diff) | |
download | kdepimpi-c32d7e58ca69196426eee3217140227aca634f52.zip kdepimpi-c32d7e58ca69196426eee3217140227aca634f52.tar.gz kdepimpi-c32d7e58ca69196426eee3217140227aca634f52.tar.bz2 |
added sip support to external apps
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 44 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.h | 5 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.cpp | 7 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.h | 10 |
4 files changed, 63 insertions, 3 deletions
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 4f4cc6a..703aeb1 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp @@ -84,6 +84,7 @@ KDEPIMConfigWidget::KDEPIMConfigWidget( QWidget *parent, const char *name ) mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS")); mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax")); mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager")); + mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP")); QVBoxLayout *topLayout = new QVBoxLayout( this, 0, @@ -199,6 +200,9 @@ void KDEPIMConfigWidget::externalapp_changed( int newApp ) case(ExternalAppHandler::PAGER): mCurrentClient = mPagerClient; break; + case(ExternalAppHandler::SIP): + mCurrentClient = mSipClient; + break; default: return; } @@ -247,6 +251,9 @@ void KDEPIMConfigWidget::saveEditFieldSettings() case(ExternalAppHandler::PAGER): mPagerClient = mClient->currentItem(); break; + case(ExternalAppHandler::SIP): + mSipClient = mClient->currentItem(); + break; default: return; } @@ -284,6 +291,12 @@ void KDEPIMConfigWidget::saveEditFieldSettings() mPagerOtherMessage = mMessage->text(); mPagerOtherMessageParameters = mParameters->text(); } + else if ((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC)) + { + mSipOtherChannel = mChannel->text(); + mSipOtherMessage = mMessage->text(); + mSipOtherMessageParameters = mParameters->text(); + } } @@ -353,6 +366,12 @@ void KDEPIMConfigWidget::updateClientWidgets() mMessage->setText(mPagerOtherMessage); mParameters->setText(mPagerOtherMessageParameters); } + else if ((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC)) + { + mChannel->setText(mSipOtherChannel); + mMessage->setText(mSipOtherMessage); + mParameters->setText(mSipOtherMessageParameters); + } } } @@ -363,7 +382,8 @@ void KDEPIMConfigWidget::updateClientWidgets() ||((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))) + ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC)) + ||((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC))) { readonly = false; } @@ -376,7 +396,8 @@ void KDEPIMConfigWidget::updateClientWidgets() ||((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))) + ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::NONE_PAC)) + ||((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::NONE_SIC))) { enabled = false; } @@ -458,6 +479,11 @@ void KDEPIMConfigWidget::restoreSettings(KPimGlobalPrefs* prefs) mPagerOtherMessage = prefs->mPagerOtherMessage; mPagerOtherMessageParameters = prefs->mPagerOtherMessageParameters; + mSipClient = prefs->mPagerClient; + mSipOtherChannel = prefs->mSipOtherChannel; + mSipOtherMessage = prefs->mSipOtherMessage; + mSipOtherMessageParameters = prefs->mSipOtherMessageParameters; + mCurrentApp = ExternalAppHandler::EMAIL; mCurrentClient = mEmailClient; @@ -500,6 +526,12 @@ void KDEPIMConfigWidget::saveSettings(KPimGlobalPrefs* prefs) prefs->mPagerOtherMessage = mPagerOtherMessage; prefs->mPagerOtherMessageParameters = mPagerOtherMessageParameters; + + prefs->mSipClient = mSipClient; + prefs->mSipOtherChannel = mSipOtherChannel; + prefs->mSipOtherMessage = mSipOtherMessage; + prefs->mSipOtherMessageParameters = mSipOtherMessageParameters; + prefs->writeConfig(); //release the cache that other views can access the changed values instantanious @@ -550,6 +582,14 @@ void KDEPIMConfigWidget::defaults(KPimGlobalPrefs* prefs) mPagerOtherMessageParameters = dai->_parameters; + dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::SIP, KPimGlobalPrefs::NONE_SIC); + + mSipClient = dai->_id; + mSipOtherChannel = dai->_channel; + mSipOtherMessage = dai->_message; + mSipOtherMessageParameters = dai->_parameters; + + emit changed( true ); } diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.h b/libkdepim/kcmconfigs/kdepimconfigwidget.h index 6e02544..e3cfd81 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.h +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.h @@ -130,6 +130,11 @@ class KDEPIMConfigWidget : public QWidget QString mPagerOtherMessage; QString mPagerOtherMessageParameters; + int mSipClient; + QString mSipOtherChannel; + QString mSipOtherMessage; + QString mSipOtherMessageParameters; + QMap<ExternalAppHandler::Types, QString> mExternalAppsMap; diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp index 7f683a8..eb8f1de 100644 --- a/libkdepim/kpimglobalprefs.cpp +++ b/libkdepim/kpimglobalprefs.cpp @@ -41,7 +41,7 @@ static KStaticDeleter<KPimGlobalPrefs> staticDeleter; KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) - : KPrefs("kkdepimrc") + : KPrefs("microkdeglobalrc") { KPrefs::setCurrentGroup( "ExternalApplications" ); @@ -72,6 +72,11 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) addItemString( "PagerChannelMessage", &mPagerOtherMessage, "" ); addItemString( "PagerChannelParameters", &mPagerOtherMessageParameters, "" ); + addItemInt( "SIPChannelType", &mSipClient, NONE_SIC ); + addItemString( "SIPChannel", &mSipOtherChannel, "" ); + addItemString( "SIPChannelMessage", &mSipOtherMessage, "" ); + addItemString( "SIPChannelParameters", &mSipOtherMessageParameters, "" ); + } KPimGlobalPrefs::~KPimGlobalPrefs() diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h index 80b2c4f..8bd543d 100644 --- a/libkdepim/kpimglobalprefs.h +++ b/libkdepim/kpimglobalprefs.h @@ -72,6 +72,11 @@ class KPimGlobalPrefs : public KPrefs OTHER_PAC = 1 }; + enum SIPClients { + NONE_SIC = 0, + OTHER_SIC = 1 + }; + private: KPimGlobalPrefs( const QString &name = QString::null ); @@ -106,6 +111,11 @@ class KPimGlobalPrefs : public KPrefs QString mPagerOtherMessage; QString mPagerOtherMessageParameters; + int mSipClient; + QString mSipOtherChannel; + QString mSipOtherMessage; + QString mSipOtherMessageParameters; + }; |