summaryrefslogtreecommitdiffabout
path: root/libkdepim/kcmconfigs
authorulf69 <ulf69>2004-09-16 17:23:08 (UTC)
committer ulf69 <ulf69>2004-09-16 17:23:08 (UTC)
commitc32d7e58ca69196426eee3217140227aca634f52 (patch) (unidiff)
tree3cc420da278d1035bb45c23d7c70562369f96b7b /libkdepim/kcmconfigs
parent02e7ae4983679a787834277176a031286a8310c2 (diff)
downloadkdepimpi-c32d7e58ca69196426eee3217140227aca634f52.zip
kdepimpi-c32d7e58ca69196426eee3217140227aca634f52.tar.gz
kdepimpi-c32d7e58ca69196426eee3217140227aca634f52.tar.bz2
added sip support to external apps
Diffstat (limited to 'libkdepim/kcmconfigs') (more/less context) (show whitespace changes)
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.cpp44
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.h5
2 files changed, 47 insertions, 2 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 )
84 mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS")); 84 mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS"));
85 mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax")); 85 mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax"));
86 mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager")); 86 mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager"));
87 mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP"));
87 88
88 89
89 QVBoxLayout *topLayout = new QVBoxLayout( this, 0, 90 QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
@@ -199,6 +200,9 @@ void KDEPIMConfigWidget::externalapp_changed( int newApp )
199 case(ExternalAppHandler::PAGER): 200 case(ExternalAppHandler::PAGER):
200 mCurrentClient = mPagerClient; 201 mCurrentClient = mPagerClient;
201 break; 202 break;
203 case(ExternalAppHandler::SIP):
204 mCurrentClient = mSipClient;
205 break;
202 default: 206 default:
203 return; 207 return;
204 } 208 }
@@ -247,6 +251,9 @@ void KDEPIMConfigWidget::saveEditFieldSettings()
247 case(ExternalAppHandler::PAGER): 251 case(ExternalAppHandler::PAGER):
248 mPagerClient = mClient->currentItem(); 252 mPagerClient = mClient->currentItem();
249 break; 253 break;
254 case(ExternalAppHandler::SIP):
255 mSipClient = mClient->currentItem();
256 break;
250 default: 257 default:
251 return; 258 return;
252 } 259 }
@@ -284,6 +291,12 @@ void KDEPIMConfigWidget::saveEditFieldSettings()
284 mPagerOtherMessage = mMessage->text(); 291 mPagerOtherMessage = mMessage->text();
285 mPagerOtherMessageParameters = mParameters->text(); 292 mPagerOtherMessageParameters = mParameters->text();
286 } 293 }
294 else if ((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC))
295 {
296 mSipOtherChannel = mChannel->text();
297 mSipOtherMessage = mMessage->text();
298 mSipOtherMessageParameters = mParameters->text();
299 }
287 300
288 301
289} 302}
@@ -353,6 +366,12 @@ void KDEPIMConfigWidget::updateClientWidgets()
353 mMessage->setText(mPagerOtherMessage); 366 mMessage->setText(mPagerOtherMessage);
354 mParameters->setText(mPagerOtherMessageParameters); 367 mParameters->setText(mPagerOtherMessageParameters);
355 } 368 }
369 else if ((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC))
370 {
371 mChannel->setText(mSipOtherChannel);
372 mMessage->setText(mSipOtherMessage);
373 mParameters->setText(mSipOtherMessageParameters);
374 }
356 } 375 }
357 376
358 } 377 }
@@ -363,7 +382,8 @@ void KDEPIMConfigWidget::updateClientWidgets()
363 ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC)) 382 ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC))
364 ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC)) 383 ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC))
365 ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC)) 384 ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC))
366 ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC))) 385 ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC))
386 ||((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC)))
367 { 387 {
368 readonly = false; 388 readonly = false;
369 } 389 }
@@ -376,7 +396,8 @@ void KDEPIMConfigWidget::updateClientWidgets()
376 ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::NONE_PHC)) 396 ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::NONE_PHC))
377 ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::NONE_SMC)) 397 ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::NONE_SMC))
378 ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::NONE_FAC)) 398 ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::NONE_FAC))
379 ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::NONE_PAC))) 399 ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::NONE_PAC))
400 ||((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::NONE_SIC)))
380 { 401 {
381 enabled = false; 402 enabled = false;
382 } 403 }
@@ -458,6 +479,11 @@ void KDEPIMConfigWidget::restoreSettings(KPimGlobalPrefs* prefs)
458 mPagerOtherMessage = prefs->mPagerOtherMessage; 479 mPagerOtherMessage = prefs->mPagerOtherMessage;
459 mPagerOtherMessageParameters = prefs->mPagerOtherMessageParameters; 480 mPagerOtherMessageParameters = prefs->mPagerOtherMessageParameters;
460 481
482 mSipClient = prefs->mPagerClient;
483 mSipOtherChannel = prefs->mSipOtherChannel;
484 mSipOtherMessage = prefs->mSipOtherMessage;
485 mSipOtherMessageParameters = prefs->mSipOtherMessageParameters;
486
461 mCurrentApp = ExternalAppHandler::EMAIL; 487 mCurrentApp = ExternalAppHandler::EMAIL;
462 mCurrentClient = mEmailClient; 488 mCurrentClient = mEmailClient;
463 489
@@ -500,6 +526,12 @@ void KDEPIMConfigWidget::saveSettings(KPimGlobalPrefs* prefs)
500 prefs->mPagerOtherMessage = mPagerOtherMessage; 526 prefs->mPagerOtherMessage = mPagerOtherMessage;
501 prefs->mPagerOtherMessageParameters = mPagerOtherMessageParameters; 527 prefs->mPagerOtherMessageParameters = mPagerOtherMessageParameters;
502 528
529
530 prefs->mSipClient = mSipClient;
531 prefs->mSipOtherChannel = mSipOtherChannel;
532 prefs->mSipOtherMessage = mSipOtherMessage;
533 prefs->mSipOtherMessageParameters = mSipOtherMessageParameters;
534
503 prefs->writeConfig(); 535 prefs->writeConfig();
504 536
505 //release the cache that other views can access the changed values instantanious 537 //release the cache that other views can access the changed values instantanious
@@ -550,6 +582,14 @@ void KDEPIMConfigWidget::defaults(KPimGlobalPrefs* prefs)
550 mPagerOtherMessageParameters = dai->_parameters; 582 mPagerOtherMessageParameters = dai->_parameters;
551 583
552 584
585 dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::SIP, KPimGlobalPrefs::NONE_SIC);
586
587 mSipClient = dai->_id;
588 mSipOtherChannel = dai->_channel;
589 mSipOtherMessage = dai->_message;
590 mSipOtherMessageParameters = dai->_parameters;
591
592
553 emit changed( true ); 593 emit changed( true );
554} 594}
555 595
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
130 QString mPagerOtherMessage; 130 QString mPagerOtherMessage;
131 QString mPagerOtherMessageParameters; 131 QString mPagerOtherMessageParameters;
132 132
133 int mSipClient;
134 QString mSipOtherChannel;
135 QString mSipOtherMessage;
136 QString mSipOtherMessageParameters;
137
133 138
134 139
135 QMap<ExternalAppHandler::Types, QString> mExternalAppsMap; 140 QMap<ExternalAppHandler::Types, QString> mExternalAppsMap;