author | ulf69 <ulf69> | 2004-10-07 01:04:18 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-10-07 01:04:18 (UTC) |
commit | 0406c1ac252f2fa631f7a486e73b0a97d09874f9 (patch) (unidiff) | |
tree | 72de99490603b5913a39a101ef571ba74acd6798 | |
parent | 0afcfa29ace7bc5e42a11fae44301e1e8230a376 (diff) | |
download | kdepimpi-0406c1ac252f2fa631f7a486e73b0a97d09874f9.zip kdepimpi-0406c1ac252f2fa631f7a486e73b0a97d09874f9.tar.gz kdepimpi-0406c1ac252f2fa631f7a486e73b0a97d09874f9.tar.bz2 |
added functionality for Birthdaylookup from kopi via qCop
-rw-r--r-- | libkdepim/externalapphandler.cpp | 68 | ||||
-rw-r--r-- | libkdepim/externalapphandler.h | 32 |
2 files changed, 86 insertions, 14 deletions
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index 99aee86..07bdff2 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp | |||
@@ -235,139 +235,169 @@ bool QCopMapTransferItem::appMessage( const QCString& cmsg, const QByteArray& da | |||
235 | QString uid; | 235 | QString uid; |
236 | 236 | ||
237 | stream >> uid >> adrMap; | 237 | stream >> uid >> adrMap; |
238 | 238 | ||
239 | emit receivedMessageFromTarget(uid, adrMap); | 239 | emit receivedMessageFromTarget(uid, adrMap); |
240 | 240 | ||
241 | 241 | ||
242 | return true; | 242 | return true; |
243 | } | 243 | } |
244 | } | 244 | } |
245 | 245 | ||
246 | return false; | 246 | return false; |
247 | } | 247 | } |
248 | 248 | ||
249 | 249 | ||
250 | /********************************************************************************* | 250 | /********************************************************************************* |
251 | * | 251 | * |
252 | ********************************************************************************/ | 252 | ********************************************************************************/ |
253 | 253 | ||
254 | 254 | ||
255 | QCopListTransferItem::QCopListTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage) | 255 | QCopListTransferItem::QCopListTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage) |
256 | : QCopTransferItem(usedSourceParameters, sourceMessage, targetChannel,targetMessage) | 256 | : QCopTransferItem(usedSourceParameters, sourceMessage, targetChannel,targetMessage) |
257 | { | 257 | { |
258 | //targetMessage returns later two parameters: uid, and three lists | 258 | //targetMessage returns later two parameters: uid, and three lists |
259 | _targetMessageParameters = "(QString,QStringList,QStringList,QStringList)"; | 259 | _targetMessageParameters = "(QString,QStringList,QStringList,QStringList,QStringList,QStringList,QStringList)"; |
260 | } | 260 | } |
261 | 261 | ||
262 | /*********************************************************************************/ | 262 | /*********************************************************************************/ |
263 | bool QCopListTransferItem::sendMessageToSource(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3) | 263 | bool QCopListTransferItem::sendMessageToSource(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4, const QStringList& list5, const QStringList& list6) |
264 | { | 264 | { |
265 | #ifndef DESKTOP_VERSION | 265 | #ifndef DESKTOP_VERSION |
266 | //targetMessage passes two parameters: uid, map | 266 | //targetMessage passes two parameters: uid, map |
267 | QString targetMessage = _targetMessage + _targetMessageParameters; | 267 | QString targetMessage = _targetMessage + _targetMessageParameters; |
268 | 268 | ||
269 | qDebug("3Using QCopEnvelope e(\"%s\",\"%s\")", _sourceChannel.latin1(), targetMessage.latin1()); | 269 | qDebug("3Using QCopEnvelope e(\"%s\",\"%s\")", _sourceChannel.latin1(), targetMessage.latin1()); |
270 | qDebug("passing uid(%s) and list1, list2, list3 as parameter to QCopEnvelope", uid.latin1()); | 270 | qDebug("passing uid(%s) and list1, list2, list3, list4, list5, list6 as parameter to QCopEnvelope", uid.latin1()); |
271 | |||
272 | |||
273 | for ( int i = 0; i < list3.count(); i++) | ||
274 | qDebug("listentry list3: %s",list3[i].latin1()); | ||
271 | 275 | ||
272 | QCopEnvelope e(_sourceChannel.latin1(), targetMessage.latin1()); | 276 | QCopEnvelope e(_sourceChannel.latin1(), targetMessage.latin1()); |
273 | //US we need no names in the To field. The emailadresses are enough | 277 | //US we need no names in the To field. The emailadresses are enough |
274 | 278 | ||
275 | e << uid << list1 << list2 << list3; | 279 | e << uid << list1 << list2 << list3 << list4 << list5 << list6; |
276 | 280 | ||
277 | qApp->processEvents(); | 281 | qApp->processEvents(); |
278 | 282 | ||
279 | return true; | 283 | return true; |
280 | 284 | ||
281 | #else | 285 | #else |
282 | KMessageBox::sorry( 0, i18n( "This version does not support QCop." ) ); | 286 | KMessageBox::sorry( 0, i18n( "This version does not support QCop." ) ); |
283 | return false; | 287 | return false; |
284 | #endif | 288 | #endif |
285 | 289 | ||
286 | } | 290 | } |
287 | 291 | ||
288 | 292 | ||
289 | /*********************************************************************************/ | 293 | /*********************************************************************************/ |
290 | bool QCopListTransferItem::appMessage( const QCString& cmsg, const QByteArray& data ) | 294 | bool QCopListTransferItem::appMessage( const QCString& cmsg, const QByteArray& data ) |
291 | { | 295 | { |
292 | bool res = QCopTransferItem::appMessage( cmsg, data ); | 296 | bool res = QCopTransferItem::appMessage( cmsg, data ); |
293 | qDebug("1QCopListTransferItem- QCOP message received: %s ", cmsg.data() ); | 297 | qDebug("1QCopListTransferItem- QCOP message received: %s ", cmsg.data() ); |
294 | 298 | ||
295 | if (res == false) | 299 | if (res == false) |
296 | { | 300 | { |
297 | QDataStream stream( data, IO_ReadOnly ); | 301 | QDataStream stream( data, IO_ReadOnly ); |
298 | 302 | ||
299 | qDebug("2QCopListTransferItem- QCOP message received: %s ", cmsg.data() ); | 303 | qDebug("2QCopListTransferItem- QCOP message received: %s ", cmsg.data() ); |
300 | 304 | ||
301 | //we are in the source and get an answer from the target | 305 | //we are in the source and get an answer from the target |
302 | if ((_targetMessage + _targetMessageParameters) == cmsg.data()) | 306 | if ((_targetMessage + _targetMessageParameters) == cmsg.data()) |
303 | { | 307 | { |
304 | QStringList list1; | 308 | QStringList list1; |
305 | QStringList list2; | 309 | QStringList list2; |
306 | QStringList list3; | 310 | QStringList list3; |
311 | QStringList list4; | ||
312 | QStringList list5; | ||
313 | QStringList list6; | ||
307 | QString uid; | 314 | QString uid; |
308 | 315 | ||
309 | stream >> uid >> list1 >> list2 >> list3; | 316 | qDebug("3QCopListTransferItem- QCOP message received: %s ", cmsg.data() ); |
310 | emit receivedMessageFromTarget(uid, list1, list2, list3); | 317 | |
318 | stream >> uid >> list1 >> list2 >> list3 >> list4 >> list5 >> list6; | ||
319 | emit receivedMessageFromTarget(uid, list1, list2, list3, list4, list5, list6); | ||
311 | 320 | ||
312 | 321 | ||
313 | return true; | 322 | return true; |
314 | } | 323 | } |
315 | } | 324 | } |
316 | 325 | ||
317 | return false; | 326 | return false; |
318 | } | 327 | } |
319 | 328 | ||
320 | 329 | ||
321 | 330 | ||
322 | /********************************************************************************* | 331 | /********************************************************************************* |
323 | * | 332 | * |
324 | ********************************************************************************/ | 333 | ********************************************************************************/ |
325 | 334 | ||
326 | 335 | ||
327 | ExternalAppHandler *ExternalAppHandler::sInstance = 0; | 336 | ExternalAppHandler *ExternalAppHandler::sInstance = 0; |
328 | static KStaticDeleter<ExternalAppHandler> staticDeleter; | 337 | static KStaticDeleter<ExternalAppHandler> staticDeleter; |
329 | 338 | ||
330 | ExternalAppHandler::ExternalAppHandler() | 339 | ExternalAppHandler::ExternalAppHandler() |
331 | { | 340 | { |
332 | mDefaultItems.setAutoDelete(true); | 341 | mDefaultItems.setAutoDelete(true); |
333 | 342 | ||
334 | mNameEmailUidListFromKAPITransfer = new QCopListTransferItem(0, "requestNameEmailUIDListFromKAPI", "QPE/Application/kapi", "receiveNameEmailUIDList"); | 343 | mNameEmailUidListFromKAPITransfer = new QCopListTransferItem(0, "requestNameEmailUIDListFromKAPI", "QPE/Application/kapi", "receiveNameEmailUIDList"); |
335 | connect(mNameEmailUidListFromKAPITransfer, SIGNAL (receivedMessageFromSource(const QString&, const QString&)), this, SIGNAL (requestForNameEmailUidList(const QString&, const QString&))); | 344 | connect(mNameEmailUidListFromKAPITransfer, SIGNAL (receivedMessageFromSource(const QString&, const QString&)), this, SIGNAL (requestForNameEmailUidList(const QString&, const QString&))); |
336 | connect(mNameEmailUidListFromKAPITransfer, SIGNAL (receivedMessageFromTarget(const QString&, const QStringList&, const QStringList&, const QStringList&)), this, SIGNAL (receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&))); | 345 | connect(mNameEmailUidListFromKAPITransfer, SIGNAL (receivedMessageFromTarget(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), this, SLOT (receivedNameEmailUidList_Slot(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&))); |
337 | 346 | ||
338 | //US mFindByEmailFromKAPITransfer = new QCopListTransferItem(1, "requestFindByEmailFromKAPI", "QPE/Application/kapi", "receiveFindByEmailNameEmailUIDList"); | 347 | //US mFindByEmailFromKAPITransfer = new QCopListTransferItem(1, "requestFindByEmailFromKAPI", "QPE/Application/kapi", "receiveFindByEmailNameEmailUIDList"); |
339 | //US connect(mFindByEmailFromKAPITransfer, SIGNAL (receivedMessageFromSource(const QString&, const QString&, const QString&)), this, SIGNAL (requestForFindByEmail(const QString&, const QString&, const QString&))); | 348 | //US connect(mFindByEmailFromKAPITransfer, SIGNAL (receivedMessageFromSource(const QString&, const QString&, const QString&)), this, SIGNAL (requestForFindByEmail(const QString&, const QString&, const QString&))); |
340 | //US connect(mFindByEmailFromKAPITransfer, SIGNAL (receivedMessageFromTarget(const QString&, const QStringList&, const QStringList&, const QStringList&)), this, SIGNAL (receivedFindByEmailEvent(const QString&, const QStringList&, const QStringList&, const QStringList&))); | 349 | //US connect(mFindByEmailFromKAPITransfer, SIGNAL (receivedMessageFromTarget(const QString&, const QStringList&, const QStringList&, const QStringList&)), this, SIGNAL (receivedFindByEmailEvent(const QString&, const QStringList&, const QStringList&, const QStringList&))); |
341 | 350 | ||
342 | mDisplayDetails = new QCopListTransferItem(3, "requestDisplayDetailsFromKAPI", "QPE/Application/kapi", ""); | 351 | mDisplayDetails = new QCopListTransferItem(3, "requestDisplayDetailsFromKAPI", "QPE/Application/kapi", ""); |
343 | connect(mDisplayDetails, SIGNAL (receivedMessageFromSource(const QString&, const QString&, const QString&, const QString&, const QString&)), this, SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&))); | 352 | connect(mDisplayDetails, SIGNAL (receivedMessageFromSource(const QString&, const QString&, const QString&, const QString&, const QString&)), this, SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&))); |
353 | |||
354 | |||
355 | |||
356 | mBirthdayListFromKAPITransfer = new QCopListTransferItem(0, "requestBirthdayListFromKAPI", "QPE/Application/kapi", "receiveBirthdayList"); | ||
357 | connect(mBirthdayListFromKAPITransfer, SIGNAL (receivedMessageFromSource(const QString&, const QString&)), this, SIGNAL (requestForBirthdayList(const QString&, const QString&))); | ||
358 | connect(mBirthdayListFromKAPITransfer, SIGNAL (receivedMessageFromTarget(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), this, SIGNAL (receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&))); | ||
359 | |||
360 | |||
344 | } | 361 | } |
345 | 362 | ||
346 | ExternalAppHandler::~ExternalAppHandler() | 363 | ExternalAppHandler::~ExternalAppHandler() |
347 | { | 364 | { |
348 | } | 365 | } |
349 | 366 | ||
367 | void ExternalAppHandler::receivedNameEmailUidList_Slot(const QString& uid, | ||
368 | const QStringList& nameList, | ||
369 | const QStringList& emailList, | ||
370 | const QStringList& uidList, | ||
371 | const QStringList&, | ||
372 | const QStringList&, | ||
373 | const QStringList& ) | ||
374 | { | ||
375 | // this method is a conevnient way to reduce the number of parameters I have to pass | ||
376 | emit receivedNameEmailUidListEvent(uid, nameList, emailList, uidList); | ||
377 | } | ||
378 | |||
379 | |||
350 | void ExternalAppHandler::loadConfig() | 380 | void ExternalAppHandler::loadConfig() |
351 | { | 381 | { |
352 | 382 | ||
353 | mDefaultItems.clear(); | 383 | mDefaultItems.clear(); |
354 | mEmailAppAvailable = UNDEFINED; | 384 | mEmailAppAvailable = UNDEFINED; |
355 | mPhoneAppAvailable = UNDEFINED; | 385 | mPhoneAppAvailable = UNDEFINED; |
356 | mFaxAppAvailable = UNDEFINED; | 386 | mFaxAppAvailable = UNDEFINED; |
357 | mSMSAppAvailable = UNDEFINED; | 387 | mSMSAppAvailable = UNDEFINED; |
358 | mPagerAppAvailable = UNDEFINED; | 388 | mPagerAppAvailable = UNDEFINED; |
359 | mSIPAppAvailable = UNDEFINED; | 389 | mSIPAppAvailable = UNDEFINED; |
360 | 390 | ||
361 | QString opiepath = QString::fromLatin1( getenv("OPIEDIR") ); | 391 | QString opiepath = QString::fromLatin1( getenv("OPIEDIR") ); |
362 | QString qtopiapath = QString::fromLatin1( getenv("QPEDIR") ); | 392 | QString qtopiapath = QString::fromLatin1( getenv("QPEDIR") ); |
363 | 393 | ||
364 | if (opiepath.isEmpty()) | 394 | if (opiepath.isEmpty()) |
365 | opiepath = qtopiapath; | 395 | opiepath = qtopiapath; |
366 | 396 | ||
367 | //mailclients | 397 | //mailclients |
368 | QString mailmsg1 = "writeMail(QString,QString)"; | 398 | QString mailmsg1 = "writeMail(QString,QString)"; |
369 | QString mailmsg2 = "writeMail(QMap(QString,QString))"; | 399 | QString mailmsg2 = "writeMail(QMap(QString,QString))"; |
370 | 400 | ||
371 | QString undefined = ""; | 401 | QString undefined = ""; |
372 | 402 | ||
373 | addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::NONE_EMC, "No email client installed", undefined, undefined, undefined, undefined, undefined); | 403 | addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::NONE_EMC, "No email client installed", undefined, undefined, undefined, undefined, undefined); |
@@ -1028,67 +1058,85 @@ void ExternalAppHandler::passParameters(QCopEnvelope* e, const QString& paramete | |||
1028 | else | 1058 | else |
1029 | { | 1059 | { |
1030 | // qDebug("pass parameter << %s", key.latin1()); | 1060 | // qDebug("pass parameter << %s", key.latin1()); |
1031 | (*e) << key; | 1061 | (*e) << key; |
1032 | } | 1062 | } |
1033 | } | 1063 | } |
1034 | 1064 | ||
1035 | if (useValMap == true) | 1065 | if (useValMap == true) |
1036 | (*e) << valmap; | 1066 | (*e) << valmap; |
1037 | 1067 | ||
1038 | #endif | 1068 | #endif |
1039 | 1069 | ||
1040 | } | 1070 | } |
1041 | 1071 | ||
1042 | 1072 | ||
1043 | 1073 | ||
1044 | /************************************************************************** | 1074 | /************************************************************************** |
1045 | * | 1075 | * |
1046 | **************************************************************************/ | 1076 | **************************************************************************/ |
1047 | 1077 | ||
1048 | void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data ) | 1078 | void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data ) |
1049 | { | 1079 | { |
1050 | bool res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); | 1080 | bool res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); |
1051 | if (!res) | 1081 | if (!res) |
1082 | res = mBirthdayListFromKAPITransfer->appMessage( cmsg, data ); | ||
1083 | |||
1084 | if (!res) | ||
1052 | res = mDisplayDetails->appMessage( cmsg, data ); | 1085 | res = mDisplayDetails->appMessage( cmsg, data ); |
1053 | 1086 | ||
1054 | // if (!res) | 1087 | // if (!res) |
1055 | // res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); | 1088 | // res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); |
1056 | } | 1089 | } |
1057 | 1090 | ||
1058 | 1091 | ||
1059 | 1092 | ||
1060 | bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid) | 1093 | bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid) |
1061 | { | 1094 | { |
1062 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); | 1095 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); |
1063 | return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(sessionuid); | 1096 | return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(sessionuid); |
1064 | } | 1097 | } |
1065 | 1098 | ||
1066 | bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) | 1099 | bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) |
1067 | { | 1100 | { |
1068 | 1101 | QStringList list4, list5, list6; | |
1102 | |||
1069 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); | 1103 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); |
1070 | return mNameEmailUidListFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3); | 1104 | return mNameEmailUidListFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6); |
1071 | } | 1105 | } |
1072 | 1106 | ||
1073 | bool ExternalAppHandler::requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email) | 1107 | bool ExternalAppHandler::requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email) |
1074 | { | 1108 | { |
1075 | mFindByEmailFromKAPITransfer->setSourceChannel(sourceChannel); | 1109 | mFindByEmailFromKAPITransfer->setSourceChannel(sourceChannel); |
1076 | return mFindByEmailFromKAPITransfer->sendMessageToTarget(sessionuid, email); | 1110 | return mFindByEmailFromKAPITransfer->sendMessageToTarget(sessionuid, email); |
1077 | } | 1111 | } |
1078 | 1112 | ||
1079 | bool ExternalAppHandler::returnFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) | 1113 | bool ExternalAppHandler::returnFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) |
1080 | { | 1114 | { |
1115 | QStringList list4, list5, list6; | ||
1116 | |||
1081 | mFindByEmailFromKAPITransfer->setSourceChannel(sourceChannel); | 1117 | mFindByEmailFromKAPITransfer->setSourceChannel(sourceChannel); |
1082 | return mFindByEmailFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3); | 1118 | return mFindByEmailFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6); |
1083 | } | 1119 | } |
1084 | 1120 | ||
1085 | bool ExternalAppHandler::requestDetailsFromKAPI(const QString& name, const QString& email, const QString& uid) | 1121 | bool ExternalAppHandler::requestDetailsFromKAPI(const QString& name, const QString& email, const QString& uid) |
1086 | { | 1122 | { |
1087 | mDisplayDetails->setSourceChannel(""); | 1123 | mDisplayDetails->setSourceChannel(""); |
1088 | return mDisplayDetails->sendMessageToTarget("", name, email, uid); | 1124 | return mDisplayDetails->sendMessageToTarget("", name, email, uid); |
1089 | } | 1125 | } |
1090 | 1126 | ||
1127 | bool ExternalAppHandler::requestBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid) | ||
1128 | { | ||
1129 | mBirthdayListFromKAPITransfer->setSourceChannel(sourceChannel); | ||
1130 | return mBirthdayListFromKAPITransfer->sendMessageToTarget(sessionuid); | ||
1131 | } | ||
1132 | |||
1133 | bool ExternalAppHandler::returnBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4, const QStringList& list5, const QStringList& list6) | ||
1134 | { | ||
1135 | mBirthdayListFromKAPITransfer->setSourceChannel(sourceChannel); | ||
1136 | return mBirthdayListFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6); | ||
1137 | } | ||
1138 | |||
1091 | 1139 | ||
1092 | 1140 | ||
1093 | 1141 | ||
1094 | 1142 | ||
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h index cfe577b..4c6f1ea 100644 --- a/libkdepim/externalapphandler.h +++ b/libkdepim/externalapphandler.h | |||
@@ -38,99 +38,98 @@ $Id$ | |||
38 | class QCopEnvelope; | 38 | class QCopEnvelope; |
39 | 39 | ||
40 | 40 | ||
41 | class ExternalAppHandler; | 41 | class ExternalAppHandler; |
42 | class QCopTransferItem : public QObject | 42 | class QCopTransferItem : public QObject |
43 | { | 43 | { |
44 | Q_OBJECT | 44 | Q_OBJECT |
45 | public: | 45 | public: |
46 | QCopTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage); | 46 | QCopTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage); |
47 | QCopTransferItem(); | 47 | QCopTransferItem(); |
48 | 48 | ||
49 | bool sendMessageToTarget(const QString& uid, const QString& param1 = QString::null, const QString& param2 = QString::null, const QString& param3 = QString::null); | 49 | bool sendMessageToTarget(const QString& uid, const QString& param1 = QString::null, const QString& param2 = QString::null, const QString& param3 = QString::null); |
50 | 50 | ||
51 | void setSourceChannel(const QString& sourceChannel); | 51 | void setSourceChannel(const QString& sourceChannel); |
52 | 52 | ||
53 | virtual bool appMessage( const QCString& msg, const QByteArray& data ); | 53 | virtual bool appMessage( const QCString& msg, const QByteArray& data ); |
54 | 54 | ||
55 | 55 | ||
56 | signals: | 56 | signals: |
57 | void receivedMessageFromSource(const QString& sourceChannel, const QString& uid); | 57 | void receivedMessageFromSource(const QString& sourceChannel, const QString& uid); |
58 | void receivedMessageFromSource(const QString& sourceChannel, const QString& uid, const QString& param1); | 58 | void receivedMessageFromSource(const QString& sourceChannel, const QString& uid, const QString& param1); |
59 | void receivedMessageFromSource(const QString& sourceChannel, const QString& uid, const QString& param1, const QString& param2); | 59 | void receivedMessageFromSource(const QString& sourceChannel, const QString& uid, const QString& param1, const QString& param2); |
60 | void receivedMessageFromSource(const QString& sourceChannel, const QString& uid, const QString& param1, const QString& param2, const QString& param3); | 60 | void receivedMessageFromSource(const QString& sourceChannel, const QString& uid, const QString& param1, const QString& param2, const QString& param3); |
61 | 61 | ||
62 | |||
63 | public: | 62 | public: |
64 | int _usedSourceParameters; | 63 | int _usedSourceParameters; |
65 | QString _sourceChannel; | 64 | QString _sourceChannel; |
66 | QString _sourceMessage; | 65 | QString _sourceMessage; |
67 | QString _sourceMessageParameters; | 66 | QString _sourceMessageParameters; |
68 | QString _targetChannel; | 67 | QString _targetChannel; |
69 | QString _targetMessage; | 68 | QString _targetMessage; |
70 | QString _targetMessageParameters; | 69 | QString _targetMessageParameters; |
71 | 70 | ||
72 | }; | 71 | }; |
73 | 72 | ||
74 | /********************************************************************************* | 73 | /********************************************************************************* |
75 | * | 74 | * |
76 | ********************************************************************************/ | 75 | ********************************************************************************/ |
77 | 76 | ||
78 | class QCopMapTransferItem : public QCopTransferItem | 77 | class QCopMapTransferItem : public QCopTransferItem |
79 | { | 78 | { |
80 | Q_OBJECT | 79 | Q_OBJECT |
81 | public: | 80 | public: |
82 | QCopMapTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage); | 81 | QCopMapTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage); |
83 | 82 | ||
84 | bool sendMessageToSource(const QString& uid, const QMap<QString,QString>& nameEmailMap); | 83 | bool sendMessageToSource(const QString& uid, const QMap<QString,QString>& nameEmailMap); |
85 | 84 | ||
86 | 85 | ||
87 | virtual bool appMessage( const QCString& msg, const QByteArray& data ); | 86 | virtual bool appMessage( const QCString& msg, const QByteArray& data ); |
88 | 87 | ||
89 | 88 | ||
90 | signals: | 89 | signals: |
91 | void receivedMessageFromTarget(const QString& uid, const QMap<QString,QString>& nameEmailMap); | 90 | void receivedMessageFromTarget(const QString& uid, const QMap<QString,QString>& nameEmailMap); |
92 | 91 | ||
93 | }; | 92 | }; |
94 | 93 | ||
95 | /********************************************************************************* | 94 | /********************************************************************************* |
96 | * | 95 | * |
97 | ********************************************************************************/ | 96 | ********************************************************************************/ |
98 | 97 | ||
99 | class QCopListTransferItem : public QCopTransferItem | 98 | class QCopListTransferItem : public QCopTransferItem |
100 | { | 99 | { |
101 | Q_OBJECT | 100 | Q_OBJECT |
102 | public: | 101 | public: |
103 | QCopListTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage); | 102 | QCopListTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage); |
104 | 103 | ||
105 | bool sendMessageToSource(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3); | 104 | bool sendMessageToSource(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4, const QStringList& list5, const QStringList& list6); |
106 | 105 | ||
107 | 106 | ||
108 | virtual bool appMessage( const QCString& msg, const QByteArray& data ); | 107 | virtual bool appMessage( const QCString& msg, const QByteArray& data ); |
109 | 108 | ||
110 | 109 | ||
111 | signals: | 110 | signals: |
112 | void receivedMessageFromTarget(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3); | 111 | void receivedMessageFromTarget(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4 , const QStringList& list5, const QStringList& list6); |
113 | 112 | ||
114 | }; | 113 | }; |
115 | 114 | ||
116 | /********************************************************************************* | 115 | /********************************************************************************* |
117 | * | 116 | * |
118 | ********************************************************************************/ | 117 | ********************************************************************************/ |
119 | 118 | ||
120 | 119 | ||
121 | class DefaultAppItem | 120 | class DefaultAppItem |
122 | { | 121 | { |
123 | public: | 122 | public: |
124 | DefaultAppItem(int type, int id, const QString& label, const QString& channel, const QString& message, const QString& parameters, const QString& message2, const QString& parameters2) | 123 | DefaultAppItem(int type, int id, const QString& label, const QString& channel, const QString& message, const QString& parameters, const QString& message2, const QString& parameters2) |
125 | : _type(type), _id(id), _label(label), _channel(channel), _message(message), _parameters(parameters), _message2(message2), _parameters2(parameters2) | 124 | : _type(type), _id(id), _label(label), _channel(channel), _message(message), _parameters(parameters), _message2(message2), _parameters2(parameters2) |
126 | {} | 125 | {} |
127 | 126 | ||
128 | DefaultAppItem() | 127 | DefaultAppItem() |
129 | { } | 128 | { } |
130 | 129 | ||
131 | public: | 130 | public: |
132 | int _type; | 131 | int _type; |
133 | int _id; | 132 | int _id; |
134 | QString _label; | 133 | QString _label; |
135 | QString _channel; | 134 | QString _channel; |
136 | QString _message; | 135 | QString _message; |
@@ -186,82 +185,107 @@ class ExternalAppHandler : public QObject | |||
186 | bool callBySMS( const QString& phonenumber ); | 185 | bool callBySMS( const QString& phonenumber ); |
187 | 186 | ||
188 | //calls the pagerapplication with the number | 187 | //calls the pagerapplication with the number |
189 | bool callByPager( const QString& pagernumber ); | 188 | bool callByPager( const QString& pagernumber ); |
190 | 189 | ||
191 | //calls the faxapplication with the number | 190 | //calls the faxapplication with the number |
192 | bool callByFax( const QString& faxnumber ); | 191 | bool callByFax( const QString& faxnumber ); |
193 | 192 | ||
194 | //calls the sipapplication with the number | 193 | //calls the sipapplication with the number |
195 | bool callBySIP( const QString& sipnumber ); | 194 | bool callBySIP( const QString& sipnumber ); |
196 | 195 | ||
197 | bool isEmailAppAvailable(); | 196 | bool isEmailAppAvailable(); |
198 | bool isSMSAppAvailable(); | 197 | bool isSMSAppAvailable(); |
199 | bool isPhoneAppAvailable(); | 198 | bool isPhoneAppAvailable(); |
200 | bool isFaxAppAvailable(); | 199 | bool isFaxAppAvailable(); |
201 | bool isPagerAppAvailable(); | 200 | bool isPagerAppAvailable(); |
202 | bool isSIPAppAvailable(); | 201 | bool isSIPAppAvailable(); |
203 | 202 | ||
204 | 203 | ||
205 | //Call this method on the source when you want to select names from the addressbook by using QCop | 204 | //Call this method on the source when you want to select names from the addressbook by using QCop |
206 | bool requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid); | 205 | bool requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid); |
207 | //Call this method on the target when you want to return the name/email map to the source (client). | 206 | //Call this method on the target when you want to return the name/email map to the source (client). |
208 | bool returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& name, const QStringList& email, const QStringList& uid); | 207 | bool returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& name, const QStringList& email, const QStringList& uid); |
209 | 208 | ||
209 | |||
210 | |||
210 | bool requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email); | 211 | bool requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email); |
211 | bool returnFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& name, const QStringList& email, const QStringList& uid); | 212 | bool returnFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& name, const QStringList& email, const QStringList& uid); |
212 | 213 | ||
213 | bool requestDetailsFromKAPI(const QString& name, const QString& email, const QString& uid); | 214 | bool requestDetailsFromKAPI(const QString& name, const QString& email, const QString& uid); |
214 | 215 | ||
215 | 216 | ||
217 | |||
218 | bool requestBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid); | ||
219 | bool returnBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid, | ||
220 | const QStringList& birthdayList, const QStringList& anniversaryList, | ||
221 | const QStringList& realNameList, const QStringList& emailList, | ||
222 | const QStringList& assembledNameList, const QStringList& uidList); | ||
223 | |||
224 | |||
216 | //loadConfig clears the cache and checks again if the applications are available or not | 225 | //loadConfig clears the cache and checks again if the applications are available or not |
217 | void loadConfig(); | 226 | void loadConfig(); |
218 | 227 | ||
219 | QList<DefaultAppItem> getAvailableDefaultItems(Types); | 228 | QList<DefaultAppItem> getAvailableDefaultItems(Types); |
220 | DefaultAppItem* getDefaultItem(Types, int); | 229 | DefaultAppItem* getDefaultItem(Types, int); |
221 | 230 | ||
222 | public slots: | 231 | public slots: |
223 | void appMessage( const QCString& msg, const QByteArray& data ); | 232 | void appMessage( const QCString& msg, const QByteArray& data ); |
224 | 233 | ||
225 | 234 | ||
226 | signals: | 235 | signals: |
227 | // Emmitted when the target app receives a request from the source app | 236 | // Emmitted when the target app receives a request from the source app |
228 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& uid); | 237 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& uid); |
229 | 238 | ||
230 | // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi | 239 | // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi |
231 | // The first parameter is a uniqueid. It can be used to identify the event | 240 | // The first parameter is a uniqueid. It can be used to identify the event |
232 | void receivedNameEmailUidListEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList); | 241 | void receivedNameEmailUidListEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList); |
233 | 242 | ||
234 | void requestFindByEmail(const QString& sourceChannel, const QString& uid, const QString& email); | 243 | void requestFindByEmail(const QString& sourceChannel, const QString& uid, const QString& email); |
235 | void receivedFindBbyEmailEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList); | 244 | void receivedFindByEmailEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList); |
236 | 245 | ||
237 | void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); | 246 | void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); |
238 | 247 | ||
239 | 248 | ||
249 | // Emmitted when the target app receives a request from the source app | ||
250 | void requestForBirthdayList(const QString& sourceChannel, const QString& uid); | ||
251 | |||
252 | // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi | ||
253 | // The first parameter is a uniqueid. It can be used to identify the event | ||
254 | void receivedBirthdayListEvent(const QString& uid, const QStringList& birthdayList, | ||
255 | const QStringList& anniversaryList, const QStringList& realNameList, | ||
256 | const QStringList& emailList, const QStringList& assembledNameList, | ||
257 | const QStringList& uidList); | ||
258 | |||
259 | |||
240 | private: | 260 | private: |
241 | ExternalAppHandler(); | 261 | ExternalAppHandler(); |
242 | QList<DefaultAppItem> mDefaultItems; | 262 | QList<DefaultAppItem> mDefaultItems; |
243 | 263 | ||
244 | Availability mEmailAppAvailable; | 264 | Availability mEmailAppAvailable; |
245 | Availability mPhoneAppAvailable; | 265 | Availability mPhoneAppAvailable; |
246 | Availability mFaxAppAvailable; | 266 | Availability mFaxAppAvailable; |
247 | Availability mSMSAppAvailable; | 267 | Availability mSMSAppAvailable; |
248 | Availability mPagerAppAvailable; | 268 | Availability mPagerAppAvailable; |
249 | Availability mSIPAppAvailable; | 269 | Availability mSIPAppAvailable; |
250 | 270 | ||
251 | QCopListTransferItem* mNameEmailUidListFromKAPITransfer; | 271 | QCopListTransferItem* mNameEmailUidListFromKAPITransfer; |
252 | QCopListTransferItem* mFindByEmailFromKAPITransfer; | 272 | QCopListTransferItem* mFindByEmailFromKAPITransfer; |
253 | QCopTransferItem* mDisplayDetails; | 273 | QCopTransferItem* mDisplayDetails; |
274 | QCopListTransferItem* mBirthdayListFromKAPITransfer; | ||
254 | 275 | ||
255 | 276 | ||
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); | 277 | void addDefaultAppItem(Types type, int id, const QString& label, const QString& channel, const QString& message, const QString& parameters, const QString& message2, const QString& parameters2); |
257 | 278 | ||
258 | QString& translateMessage(QString& message, const QString& param1, const QString& param2) const; | 279 | QString& translateMessage(QString& message, const QString& param1, const QString& param2) const; |
259 | void passParameters(QCopEnvelope* e, const QString& parameters, const QString& param1, const QString& param2) const; | 280 | void passParameters(QCopEnvelope* e, const QString& parameters, const QString& param1, const QString& param2) const; |
260 | 281 | ||
261 | 282 | ||
262 | static ExternalAppHandler *sInstance; | 283 | static ExternalAppHandler *sInstance; |
263 | 284 | ||
285 | private slots: | ||
286 | void receivedNameEmailUidList_Slot(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList, const QStringList&, const QStringList&, const QStringList& ); | ||
287 | |||
264 | }; | 288 | }; |
265 | 289 | ||
266 | 290 | ||
267 | #endif | 291 | #endif |