author | ulf69 <ulf69> | 2004-09-16 17:25:06 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-09-16 17:25:06 (UTC) |
commit | b6bfa63deb15a2600d46a8c68c231f068da1444a (patch) (unidiff) | |
tree | 271c22bdf98d05d1c0acbd56e5c570f56baa9b5d | |
parent | c32d7e58ca69196426eee3217140227aca634f52 (diff) | |
download | kdepimpi-b6bfa63deb15a2600d46a8c68c231f068da1444a.zip kdepimpi-b6bfa63deb15a2600d46a8c68c231f068da1444a.tar.gz kdepimpi-b6bfa63deb15a2600d46a8c68c231f068da1444a.tar.bz2 |
added sip support to external applications and display sip numbers as hyperlink
-rw-r--r-- | libkdepim/addresseeview.cpp | 6 | ||||
-rw-r--r-- | libkdepim/externalapphandler.cpp | 81 | ||||
-rw-r--r-- | libkdepim/externalapphandler.h | 8 |
3 files changed, 93 insertions, 2 deletions
diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp index 5c69010..b4717d7 100644 --- a/libkdepim/addresseeview.cpp +++ b/libkdepim/addresseeview.cpp | |||
@@ -72,26 +72,29 @@ void AddresseeView::setSource(const QString& n) | |||
72 | else if ( n.left( 7 ) == "phoneto" ) | 72 | else if ( n.left( 7 ) == "phoneto" ) |
73 | ExternalAppHandler::instance()->callByPhone( n.mid(8) ); | 73 | ExternalAppHandler::instance()->callByPhone( n.mid(8) ); |
74 | else if ( n.left( 5 ) == "faxto" ) | 74 | else if ( n.left( 5 ) == "faxto" ) |
75 | ExternalAppHandler::instance()->callByFax( n.mid(6) ); | 75 | ExternalAppHandler::instance()->callByFax( n.mid(6) ); |
76 | else if ( n.left( 5 ) == "smsto" ) | 76 | else if ( n.left( 5 ) == "smsto" ) |
77 | ExternalAppHandler::instance()->callBySMS( n.mid(6) ); | 77 | ExternalAppHandler::instance()->callBySMS( n.mid(6) ); |
78 | else if ( n.left( 7 ) == "pagerto" ) | 78 | else if ( n.left( 7 ) == "pagerto" ) |
79 | ExternalAppHandler::instance()->callByPager( n.mid(8) ); | 79 | ExternalAppHandler::instance()->callByPager( n.mid(8) ); |
80 | else if ( n.left( 5 ) == "sipto" ) | ||
81 | ExternalAppHandler::instance()->callBySIP( n.mid(6) ); | ||
80 | 82 | ||
81 | } | 83 | } |
82 | void AddresseeView::setAddressee( const KABC::Addressee& addr ) | 84 | void AddresseeView::setAddressee( const KABC::Addressee& addr ) |
83 | { | 85 | { |
84 | ExternalAppHandler* eah = ExternalAppHandler::instance(); | 86 | ExternalAppHandler* eah = ExternalAppHandler::instance(); |
85 | bool kemailAvail = eah->isEmailAppAvailable(); | 87 | bool kemailAvail = eah->isEmailAppAvailable(); |
86 | bool kphoneAvail = eah->isPhoneAppAvailable(); | 88 | bool kphoneAvail = eah->isPhoneAppAvailable(); |
87 | bool kfaxAvail = eah->isFaxAppAvailable(); | 89 | bool kfaxAvail = eah->isFaxAppAvailable(); |
88 | bool ksmsAvail = eah->isSMSAppAvailable(); | 90 | bool ksmsAvail = eah->isSMSAppAvailable(); |
89 | bool kpagerAvail = eah->isPagerAppAvailable(); | 91 | bool kpagerAvail = eah->isPagerAppAvailable(); |
92 | bool ksipAvail = eah->isSIPAppAvailable(); | ||
90 | 93 | ||
91 | 94 | ||
92 | mAddressee = addr; | 95 | mAddressee = addr; |
93 | // clear view | 96 | // clear view |
94 | setText( QString::null ); | 97 | setText( QString::null ); |
95 | 98 | ||
96 | if ( mAddressee.isEmpty() ) | 99 | if ( mAddressee.isEmpty() ) |
97 | return; | 100 | return; |
@@ -154,16 +157,19 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) | |||
154 | 157 | ||
155 | extension = QString::null; | 158 | extension = QString::null; |
156 | if ((phonetype & KABC::PhoneNumber::Fax) == KABC::PhoneNumber::Fax) { | 159 | if ((phonetype & KABC::PhoneNumber::Fax) == KABC::PhoneNumber::Fax) { |
157 | if (kfaxAvail) extension = "faxto:"; | 160 | if (kfaxAvail) extension = "faxto:"; |
158 | } | 161 | } |
159 | else if ((phonetype & KABC::PhoneNumber::Pager) == KABC::PhoneNumber::Pager) { | 162 | else if ((phonetype & KABC::PhoneNumber::Pager) == KABC::PhoneNumber::Pager) { |
160 | if (kpagerAvail) extension = "pagerto:"; | 163 | if (kpagerAvail) extension = "pagerto:"; |
161 | } | 164 | } |
165 | else if ((phonetype & KABC::PhoneNumber::Sip) == KABC::PhoneNumber::Sip) { | ||
166 | if (ksipAvail) extension = "sipto:"; | ||
167 | } | ||
162 | else if (kphoneAvail) { | 168 | else if (kphoneAvail) { |
163 | extension = "phoneto:"; | 169 | extension = "phoneto:"; |
164 | } | 170 | } |
165 | else | 171 | else |
166 | extension = QString::null; | 172 | extension = QString::null; |
167 | 173 | ||
168 | if ( !extension.isEmpty() ) { | 174 | if ( !extension.isEmpty() ) { |
169 | dynamicPart += QString( | 175 | dynamicPart += QString( |
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index 5ba32b6..fa56ee9 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp | |||
@@ -350,17 +350,17 @@ void ExternalAppHandler::loadConfig() | |||
350 | { | 350 | { |
351 | 351 | ||
352 | mDefaultItems.clear(); | 352 | mDefaultItems.clear(); |
353 | mEmailAppAvailable = UNDEFINED; | 353 | mEmailAppAvailable = UNDEFINED; |
354 | mPhoneAppAvailable = UNDEFINED; | 354 | mPhoneAppAvailable = UNDEFINED; |
355 | mFaxAppAvailable = UNDEFINED; | 355 | mFaxAppAvailable = UNDEFINED; |
356 | mSMSAppAvailable = UNDEFINED; | 356 | mSMSAppAvailable = UNDEFINED; |
357 | mPagerAppAvailable = UNDEFINED; | 357 | mPagerAppAvailable = UNDEFINED; |
358 | 358 | mSIPAppAvailable = UNDEFINED; | |
359 | 359 | ||
360 | QString opiepath = QString::fromLatin1( getenv("OPIEDIR") ); | 360 | QString opiepath = QString::fromLatin1( getenv("OPIEDIR") ); |
361 | QString qtopiapath = QString::fromLatin1( getenv("QPEDIR") ); | 361 | QString qtopiapath = QString::fromLatin1( getenv("QPEDIR") ); |
362 | 362 | ||
363 | if (opiepath.isEmpty()) | 363 | if (opiepath.isEmpty()) |
364 | opiepath = qtopiapath; | 364 | opiepath = qtopiapath; |
365 | 365 | ||
366 | //mailclients | 366 | //mailclients |
@@ -399,16 +399,20 @@ void ExternalAppHandler::loadConfig() | |||
399 | //smsclients | 399 | //smsclients |
400 | addDefaultAppItem(ExternalAppHandler::SMS, KPimGlobalPrefs::NONE_SMC, "No sms client installed", undefined, undefined, undefined, undefined, undefined); | 400 | addDefaultAppItem(ExternalAppHandler::SMS, KPimGlobalPrefs::NONE_SMC, "No sms client installed", undefined, undefined, undefined, undefined, undefined); |
401 | addDefaultAppItem(ExternalAppHandler::SMS, KPimGlobalPrefs::OTHER_SMC, "Other sms client", undefined, undefined, undefined, undefined, undefined); | 401 | addDefaultAppItem(ExternalAppHandler::SMS, KPimGlobalPrefs::OTHER_SMC, "Other sms client", undefined, undefined, undefined, undefined, undefined); |
402 | 402 | ||
403 | //pagerclients | 403 | //pagerclients |
404 | addDefaultAppItem(ExternalAppHandler::PAGER, KPimGlobalPrefs::NONE_PAC, "No pager client installed", undefined, undefined, undefined, undefined, undefined); | 404 | addDefaultAppItem(ExternalAppHandler::PAGER, KPimGlobalPrefs::NONE_PAC, "No pager client installed", undefined, undefined, undefined, undefined, undefined); |
405 | addDefaultAppItem(ExternalAppHandler::PAGER, KPimGlobalPrefs::OTHER_PAC, "Other pager client", undefined, undefined, undefined, undefined, undefined); | 405 | addDefaultAppItem(ExternalAppHandler::PAGER, KPimGlobalPrefs::OTHER_PAC, "Other pager client", undefined, undefined, undefined, undefined, undefined); |
406 | 406 | ||
407 | //sipclients | ||
408 | addDefaultAppItem(ExternalAppHandler::SIP, KPimGlobalPrefs::NONE_SIC, "No sip client installed", undefined, undefined, undefined, undefined, undefined); | ||
409 | addDefaultAppItem(ExternalAppHandler::SIP, KPimGlobalPrefs::OTHER_SIC, "Other sip client", undefined, undefined, undefined, undefined, undefined); | ||
410 | |||
407 | } | 411 | } |
408 | 412 | ||
409 | ExternalAppHandler *ExternalAppHandler::instance() | 413 | ExternalAppHandler *ExternalAppHandler::instance() |
410 | { | 414 | { |
411 | if ( !sInstance ) { | 415 | if ( !sInstance ) { |
412 | sInstance = staticDeleter.setObject( new ExternalAppHandler() ); | 416 | sInstance = staticDeleter.setObject( new ExternalAppHandler() ); |
413 | sInstance->loadConfig(); | 417 | sInstance->loadConfig(); |
414 | } | 418 | } |
@@ -537,16 +541,35 @@ bool ExternalAppHandler::isPagerAppAvailable() | |||
537 | } | 541 | } |
538 | 542 | ||
539 | return (mPagerAppAvailable == AVAILABLE); | 543 | return (mPagerAppAvailable == AVAILABLE); |
540 | #else //DESKTOP_VERSION | 544 | #else //DESKTOP_VERSION |
541 | return false; | 545 | return false; |
542 | #endif //DESKTOP_VERSION | 546 | #endif //DESKTOP_VERSION |
543 | } | 547 | } |
544 | 548 | ||
549 | |||
550 | bool ExternalAppHandler::isSIPAppAvailable() | ||
551 | { | ||
552 | #ifndef DESKTOP_VERSION | ||
553 | if (mSIPAppAvailable == UNDEFINED) | ||
554 | { | ||
555 | int client = KPimGlobalPrefs::instance()->mSipClient; | ||
556 | if (client == KPimGlobalPrefs::NONE_SIC) | ||
557 | mSIPAppAvailable = UNAVAILABLE; | ||
558 | else | ||
559 | mSIPAppAvailable = AVAILABLE; | ||
560 | } | ||
561 | |||
562 | return (mSIPAppAvailable == AVAILABLE); | ||
563 | #else //DESKTOP_VERSION | ||
564 | return false; | ||
565 | #endif //DESKTOP_VERSION | ||
566 | } | ||
567 | |||
545 | /************************************************************************** | 568 | /************************************************************************** |
546 | * | 569 | * |
547 | **************************************************************************/ | 570 | **************************************************************************/ |
548 | 571 | ||
549 | 572 | ||
550 | //calls the emailapplication with a number of attachments that need to be send (Seperated by Comma) | 573 | //calls the emailapplication with a number of attachments that need to be send (Seperated by Comma) |
551 | bool ExternalAppHandler::mailToMultipleContacts( const QString& emails, const QString& urls ) | 574 | bool ExternalAppHandler::mailToMultipleContacts( const QString& emails, const QString& urls ) |
552 | { | 575 | { |
@@ -896,16 +919,72 @@ bool ExternalAppHandler::callByFax( const QString& faxnumber ) | |||
896 | 919 | ||
897 | return true; | 920 | return true; |
898 | } | 921 | } |
899 | 922 | ||
900 | /************************************************************************** | 923 | /************************************************************************** |
901 | * | 924 | * |
902 | **************************************************************************/ | 925 | **************************************************************************/ |
903 | 926 | ||
927 | //calls the sipapplication with the number | ||
928 | bool ExternalAppHandler::callBySIP( const QString& sipnumber ) | ||
929 | { | ||
930 | #ifndef DESKTOP_VERSION | ||
931 | QString channel; | ||
932 | QString message; | ||
933 | QString parameters; | ||
934 | |||
935 | |||
936 | int client = KPimGlobalPrefs::instance()->mSipClient; | ||
937 | if (client == KPimGlobalPrefs::OTHER_SIC) | ||
938 | { | ||
939 | channel = KPimGlobalPrefs::instance()->mSipOtherChannel; | ||
940 | message = KPimGlobalPrefs::instance()->mSipOtherMessage; | ||
941 | parameters = KPimGlobalPrefs::instance()->mSipOtherMessageParameters; | ||
942 | } | ||
943 | else | ||
944 | { | ||
945 | DefaultAppItem* dai = ExternalAppHandler::getDefaultItem(SIP, client); | ||
946 | if (!dai) | ||
947 | { | ||
948 | qDebug("could not find configured sip application."); | ||
949 | return false; | ||
950 | } | ||
951 | channel = dai->_channel; | ||
952 | message = dai->_message; | ||
953 | parameters = dai->_parameters; | ||
954 | } | ||
955 | |||
956 | |||
957 | //first check if one of the sip apps need the emails right in the message. | ||
958 | message = translateMessage(message, sipnumber, ""); | ||
959 | |||
960 | |||
961 | qDebug("Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message.latin1()); | ||
962 | qDebug("passing sipnumber(%s) as parameter in the form %s to QCopEnvelope", sipnumber.latin1(), parameters.latin1()); | ||
963 | |||
964 | QCopEnvelope e(channel.latin1(), message.latin1()); | ||
965 | //US we need no names in the To field. The emailadresses are enough | ||
966 | |||
967 | passParameters(&e, parameters, sipnumber, ""); | ||
968 | |||
969 | |||
970 | #else | ||
971 | KMessageBox::sorry( 0, i18n( "This version does not support sip." ) ); | ||
972 | #endif | ||
973 | |||
974 | |||
975 | return true; | ||
976 | } | ||
977 | |||
978 | |||
979 | /************************************************************************** | ||
980 | * | ||
981 | **************************************************************************/ | ||
982 | |||
904 | 983 | ||
905 | QString& ExternalAppHandler::translateMessage(QString& message, const QString& param1, const QString& param2 ) const | 984 | QString& ExternalAppHandler::translateMessage(QString& message, const QString& param1, const QString& param2 ) const |
906 | { | 985 | { |
907 | message = message.replace( QRegExp("%1"), param1 ); | 986 | message = message.replace( QRegExp("%1"), param1 ); |
908 | return message.replace( QRegExp("%2"), param2 ); | 987 | return message.replace( QRegExp("%2"), param2 ); |
909 | } | 988 | } |
910 | 989 | ||
911 | /************************************************************************** | 990 | /************************************************************************** |
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h index 1b04b2b..cfe577b 100644 --- a/libkdepim/externalapphandler.h +++ b/libkdepim/externalapphandler.h | |||
@@ -152,17 +152,18 @@ class ExternalAppHandler : public QObject | |||
152 | 152 | ||
153 | static ExternalAppHandler *instance(); | 153 | static ExternalAppHandler *instance(); |
154 | 154 | ||
155 | enum Types { | 155 | enum Types { |
156 | EMAIL = 0, | 156 | EMAIL = 0, |
157 | PHONE = 1, | 157 | PHONE = 1, |
158 | SMS = 2, | 158 | SMS = 2, |
159 | FAX = 3, | 159 | FAX = 3, |
160 | PAGER = 4 | 160 | PAGER = 4, |
161 | SIP = 5 | ||
161 | }; | 162 | }; |
162 | 163 | ||
163 | enum Availability { | 164 | enum Availability { |
164 | UNDEFINED = -1, | 165 | UNDEFINED = -1, |
165 | UNAVAILABLE = 0, | 166 | UNAVAILABLE = 0, |
166 | AVAILABLE = 1 | 167 | AVAILABLE = 1 |
167 | }; | 168 | }; |
168 | 169 | ||
@@ -185,21 +186,25 @@ class ExternalAppHandler : public QObject | |||
185 | bool callBySMS( const QString& phonenumber ); | 186 | bool callBySMS( const QString& phonenumber ); |
186 | 187 | ||
187 | //calls the pagerapplication with the number | 188 | //calls the pagerapplication with the number |
188 | bool callByPager( const QString& pagernumber ); | 189 | bool callByPager( const QString& pagernumber ); |
189 | 190 | ||
190 | //calls the faxapplication with the number | 191 | //calls the faxapplication with the number |
191 | bool callByFax( const QString& faxnumber ); | 192 | bool callByFax( const QString& faxnumber ); |
192 | 193 | ||
194 | //calls the sipapplication with the number | ||
195 | bool callBySIP( const QString& sipnumber ); | ||
196 | |||
193 | bool isEmailAppAvailable(); | 197 | bool isEmailAppAvailable(); |
194 | bool isSMSAppAvailable(); | 198 | bool isSMSAppAvailable(); |
195 | bool isPhoneAppAvailable(); | 199 | bool isPhoneAppAvailable(); |
196 | bool isFaxAppAvailable(); | 200 | bool isFaxAppAvailable(); |
197 | bool isPagerAppAvailable(); | 201 | bool isPagerAppAvailable(); |
202 | bool isSIPAppAvailable(); | ||
198 | 203 | ||
199 | 204 | ||
200 | //Call this method on the source when you want to select names from the addressbook by using QCop | 205 | //Call this method on the source when you want to select names from the addressbook by using QCop |
201 | bool requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid); | 206 | bool requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid); |
202 | //Call this method on the target when you want to return the name/email map to the source (client). | 207 | //Call this method on the target when you want to return the name/email map to the source (client). |
203 | bool returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& name, const QStringList& email, const QStringList& uid); | 208 | bool returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& name, const QStringList& email, const QStringList& uid); |
204 | 209 | ||
205 | bool requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email); | 210 | bool requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email); |
@@ -236,16 +241,17 @@ class ExternalAppHandler : public QObject | |||
236 | ExternalAppHandler(); | 241 | ExternalAppHandler(); |
237 | QList<DefaultAppItem> mDefaultItems; | 242 | QList<DefaultAppItem> mDefaultItems; |
238 | 243 | ||
239 | Availability mEmailAppAvailable; | 244 | Availability mEmailAppAvailable; |
240 | Availability mPhoneAppAvailable; | 245 | Availability mPhoneAppAvailable; |
241 | Availability mFaxAppAvailable; | 246 | Availability mFaxAppAvailable; |
242 | Availability mSMSAppAvailable; | 247 | Availability mSMSAppAvailable; |
243 | Availability mPagerAppAvailable; | 248 | Availability mPagerAppAvailable; |
249 | Availability mSIPAppAvailable; | ||
244 | 250 | ||
245 | QCopListTransferItem* mNameEmailUidListFromKAPITransfer; | 251 | QCopListTransferItem* mNameEmailUidListFromKAPITransfer; |
246 | QCopListTransferItem* mFindByEmailFromKAPITransfer; | 252 | QCopListTransferItem* mFindByEmailFromKAPITransfer; |
247 | QCopTransferItem* mDisplayDetails; | 253 | QCopTransferItem* mDisplayDetails; |
248 | 254 | ||
249 | 255 | ||
250 | void addDefaultAppItem(Types type, int id, const QString& label, const QString& channel, const QString& message, const QString& parameters, const QString& message2, const QString& parameters2); | 256 | void addDefaultAppItem(Types type, int id, const QString& label, const QString& channel, const QString& message, const QString& parameters, const QString& message2, const QString& parameters2); |
251 | 257 | ||