author | ulf69 <ulf69> | 2004-11-07 01:13:59 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-11-07 01:13:59 (UTC) |
commit | c3168210fffc83fbab58f44ce456fd241d44716d (patch) (unidiff) | |
tree | c93de33dd16e9b0f1e0752d6006aa75bd003fccf /libkdepim | |
parent | 023e0e82dd8bf6421d12492a2dd25534fc43ad31 (diff) | |
download | kdepimpi-c3168210fffc83fbab58f44ce456fd241d44716d.zip kdepimpi-c3168210fffc83fbab58f44ce456fd241d44716d.tar.gz kdepimpi-c3168210fffc83fbab58f44ce456fd241d44716d.tar.bz2 |
added support for mailit opie mailer,
now we check for applications in QTDIR, QPEDIR and OPIEDIR
-rw-r--r-- | libkdepim/externalapphandler.cpp | 17 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.h | 3 |
2 files changed, 17 insertions, 3 deletions
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index 9f12152..3079141 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp | |||
@@ -412,10 +412,18 @@ void ExternalAppHandler::loadConfig() | |||
412 | 412 | ||
413 | QString opiepath = QString::fromLatin1( getenv("OPIEDIR") ); | 413 | QString opiepath = QString::fromLatin1( getenv("OPIEDIR") ); |
414 | QString qtopiapath = QString::fromLatin1( getenv("QPEDIR") ); | 414 | QString qtopiapath = QString::fromLatin1( getenv("QPEDIR") ); |
415 | QString qtpath = QString::fromLatin1( getenv("QTDIR") ); | ||
415 | 416 | ||
417 | //if qtopiapath is not set, fallback to qt | ||
418 | if (qtopiapath.isEmpty()) | ||
419 | qtopiapath = qtpath; | ||
420 | |||
421 | //if opiepath is not set, fallback to qtopia | ||
416 | if (opiepath.isEmpty()) | 422 | if (opiepath.isEmpty()) |
417 | opiepath = qtopiapath; | 423 | opiepath = qtopiapath; |
418 | 424 | ||
425 | |||
426 | |||
419 | //mailclients | 427 | //mailclients |
420 | QString mailmsg1 = "writeMail(QString,QString)"; | 428 | QString mailmsg1 = "writeMail(QString,QString)"; |
421 | QString mailmsg2 = "writeMail(QMap(QString,QString))"; | 429 | QString mailmsg2 = "writeMail(QMap(QString,QString))"; |
@@ -426,15 +434,20 @@ void ExternalAppHandler::loadConfig() | |||
426 | addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OTHER_EMC, "Userdefined email client", undefined, undefined, undefined, undefined, undefined); | 434 | addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OTHER_EMC, "Userdefined email client", undefined, undefined, undefined, undefined, undefined); |
427 | 435 | ||
428 | if (( QFile::exists( qtopiapath + "/bin/ompi" )) || | 436 | if (( QFile::exists( qtopiapath + "/bin/ompi" )) || |
429 | ( QFile::exists( opiepath + "/bin/ompi" ))) | 437 | ( QFile::exists( opiepath + "/bin/ompi" )) || |
438 | ( QFile::exists( qtpath + "/bin/ompi" ))) | ||
430 | addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OMPI_EMC, "OM/Pi email client", "QPE/Application/ompi", mailmsg1, "%1;%2", mailmsg2, "TO=%1;ATTACHMENT=%2"); | 439 | addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OMPI_EMC, "OM/Pi email client", "QPE/Application/ompi", mailmsg1, "%1;%2", mailmsg2, "TO=%1;ATTACHMENT=%2"); |
431 | 440 | ||
432 | if ( QFile::exists( qtopiapath + "/bin/qtmail" )) | 441 | if (( QFile::exists( qtopiapath + "/bin/qtmail" )) || |
442 | ( QFile::exists( qtpath + "/bin/qtmail" ))) | ||
433 | addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::QTOPIA_EMC, "Qtopia email client", "QPE/Application/qtmail", mailmsg1, "%1;%2", mailmsg2, "TO=%1;ATTACHMENT=%2"); | 443 | addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::QTOPIA_EMC, "Qtopia email client", "QPE/Application/qtmail", mailmsg1, "%1;%2", mailmsg2, "TO=%1;ATTACHMENT=%2"); |
434 | 444 | ||
435 | if ( QFile::exists( opiepath + "/bin/opiemail" )) | 445 | if ( QFile::exists( opiepath + "/bin/opiemail" )) |
436 | addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OPIE_EMC, "Opie email client", "QPE/Application/opiemail", mailmsg1, "%1;%2", mailmsg2, "TO=%1;ATTACHMENT=%2"); | 446 | addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OPIE_EMC, "Opie email client", "QPE/Application/opiemail", mailmsg1, "%1;%2", mailmsg2, "TO=%1;ATTACHMENT=%2"); |
437 | 447 | ||
448 | if ( QFile::exists( opiepath + "/bin/mailit" )) | ||
449 | addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OPIE_MAILIT_EMC, "Opie mailit email client", "QPE/Application/mailit", mailmsg1, "%1;%2", mailmsg2, "TO=%1;ATTACHMENT=%2"); | ||
450 | |||
438 | 451 | ||
439 | 452 | ||
440 | //phoneclients | 453 | //phoneclients |
diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h index 11c534a..5e27e85 100644 --- a/libkdepim/kpimglobalprefs.h +++ b/libkdepim/kpimglobalprefs.h | |||
@@ -50,7 +50,8 @@ class KPimGlobalPrefs : public KPrefs | |||
50 | OTHER_EMC = 1, | 50 | OTHER_EMC = 1, |
51 | OMPI_EMC = 2, | 51 | OMPI_EMC = 2, |
52 | QTOPIA_EMC = 3, | 52 | QTOPIA_EMC = 3, |
53 | OPIE_EMC = 4 | 53 | OPIE_EMC = 4, |
54 | OPIE_MAILIT_EMC = 5 | ||
54 | }; | 55 | }; |
55 | 56 | ||
56 | enum PhoneClients { | 57 | enum PhoneClients { |