added support for mailit opie mailer,

now we check for applications in QTDIR, QPEDIR and OPIEDIR

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
@@ -287,279 +287,292 @@ bool QCopListTransferItem::sendMessageToSource(const QString& uid, const QString
 
   QCopEnvelope e(_sourceChannel.latin1(), targetMessage.latin1());
     //US we need no names in the To field. The emailadresses are enough
 
   e << uid << list1 << list2 << list3 << list4 << list5 << list6;
 
   qApp->processEvents();
 
   return true;
 
 #else
   KMessageBox::sorry( 0, i18n( "This version does not support QCop." ) );
   return false;
 #endif
 
 }
 
 
 /*********************************************************************************/
 bool QCopListTransferItem::appMessage( const QCString& cmsg, const QByteArray& data )
 {
   bool res = QCopTransferItem::appMessage( cmsg, data );
 #ifdef DEBUG_EXT_APP_HANDLER
     qDebug("1QCopListTransferItem- QCOP message received: %s ", cmsg.data()  );
 #endif
 
   if (res == false)
   {
     QDataStream stream( data, IO_ReadOnly );
 
 #ifdef DEBUG_EXT_APP_HANDLER
     qDebug("2QCopListTransferItem- QCOP message received: %s ", cmsg.data()  );
 #endif
 
     //we are in the source and get an answer from the target
     if ((_targetMessage + _targetMessageParameters) == cmsg.data())
     {
       QStringList list1;
       QStringList list2;
       QStringList list3;
       QStringList list4;
       QStringList list5;
       QStringList list6;
       QString uid;
 
 #ifdef DEBUG_EXT_APP_HANDLER
       qDebug("3QCopListTransferItem- QCOP message received: %s ", cmsg.data()  );
 #endif
 
       stream >> uid >> list1 >> list2 >> list3 >> list4 >> list5 >> list6;
       emit receivedMessageFromTarget(uid, list1, list2, list3, list4, list5, list6);
 
 
       return true;
     }
   }
 
   return false;
 }
 
 
 
 /*********************************************************************************
  *
  ********************************************************************************/
 
 
 ExternalAppHandler *ExternalAppHandler::sInstance = 0;
 static KStaticDeleter<ExternalAppHandler> staticDeleter;
 
 ExternalAppHandler::ExternalAppHandler()
 {
   mDefaultItems.setAutoDelete(true);
 
   mNameEmailUidListFromKAPITransfer = new QCopListTransferItem(0, "requestNameEmailUIDListFromKAPI", "QPE/Application/kapi", "receiveNameEmailUIDList");
   connect(mNameEmailUidListFromKAPITransfer, SIGNAL (receivedMessageFromSource(const QString&, const QString&)), this, SIGNAL (requestForNameEmailUidList(const QString&, const QString&)));
   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&)));
 
 //US  mFindByEmailFromKAPITransfer = new QCopListTransferItem(1, "requestFindByEmailFromKAPI", "QPE/Application/kapi", "receiveFindByEmailNameEmailUIDList");
 //US  connect(mFindByEmailFromKAPITransfer, SIGNAL (receivedMessageFromSource(const QString&, const QString&, const QString&)), this, SIGNAL (requestForFindByEmail(const QString&, const QString&, const QString&)));
 //US  connect(mFindByEmailFromKAPITransfer, SIGNAL (receivedMessageFromTarget(const QString&, const QStringList&, const QStringList&, const QStringList&)), this, SIGNAL (receivedFindByEmailEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)));
 
   mDisplayDetails = new QCopListTransferItem(3, "requestDisplayDetailsFromKAPI", "QPE/Application/kapi", "");
   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&)));
 
 
 
   mBirthdayListFromKAPITransfer = new QCopListTransferItem(0, "requestBirthdayListFromKAPI", "QPE/Application/kapi", "receiveBirthdayList");
   connect(mBirthdayListFromKAPITransfer, SIGNAL (receivedMessageFromSource(const QString&, const QString&)), this, SIGNAL (requestForBirthdayList(const QString&, const QString&)));
   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&)));
 
 
 }
 
 ExternalAppHandler::~ExternalAppHandler()
 { 
     delete mNameEmailUidListFromKAPITransfer;
     //delete mFindByEmailFromKAPITransfer;
     delete mDisplayDetails;
     delete mBirthdayListFromKAPITransfer;
 }
 
 void ExternalAppHandler::receivedNameEmailUidList_Slot(const QString& uid,
                                                        const QStringList& nameList,
                                                        const QStringList& emailList,
                                                        const QStringList& uidList,
                                                        const QStringList&,
                                                        const QStringList&,
                                                        const QStringList& )
 {
   // this method is a conevnient way to reduce the number of parameters I have to pass 
   emit receivedNameEmailUidListEvent(uid, nameList, emailList, uidList);
 }
 
 
 void ExternalAppHandler::loadConfig()
 {
 
   mDefaultItems.clear();
   mEmailAppAvailable = UNDEFINED;
   mPhoneAppAvailable = UNDEFINED;
   mFaxAppAvailable = UNDEFINED;
   mSMSAppAvailable = UNDEFINED;
   mPagerAppAvailable = UNDEFINED;
   mSIPAppAvailable = UNDEFINED;
 
   QString opiepath = QString::fromLatin1( getenv("OPIEDIR") );
   QString qtopiapath = QString::fromLatin1( getenv("QPEDIR") );
+  QString qtpath = QString::fromLatin1( getenv("QTDIR") );
 
+  //if qtopiapath is not set, fallback to qt
+  if (qtopiapath.isEmpty())
+    qtopiapath = qtpath;
+
+  //if opiepath is not set, fallback to qtopia
   if (opiepath.isEmpty())
     opiepath = qtopiapath;
 
+
+
   //mailclients
   QString mailmsg1 = "writeMail(QString,QString)";
   QString mailmsg2 = "writeMail(QMap(QString,QString))";
 
   QString undefined = "";
 
   addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::NONE_EMC,   "No email client installed",       undefined,                undefined,        undefined, undefined, undefined);
   addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OTHER_EMC,  "Userdefined email client",       undefined,                undefined,        undefined, undefined, undefined);
 
   if (( QFile::exists( qtopiapath + "/bin/ompi" )) ||
-     ( QFile::exists( opiepath + "/bin/ompi" )))
+     ( QFile::exists( opiepath + "/bin/ompi" )) ||
+     ( QFile::exists( qtpath + "/bin/ompi" )))
     addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OMPI_EMC,   "OM/Pi email client",   "QPE/Application/ompi",    mailmsg1, "%1;%2",        mailmsg2,   "TO=%1;ATTACHMENT=%2");
 
-  if ( QFile::exists( qtopiapath + "/bin/qtmail" ))
+  if (( QFile::exists( qtopiapath + "/bin/qtmail" )) ||
+      ( QFile::exists( qtpath + "/bin/qtmail" )))
     addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::QTOPIA_EMC, "Qtopia email client", "QPE/Application/qtmail",   mailmsg1, "%1;%2",       mailmsg2,    "TO=%1;ATTACHMENT=%2");
 
   if ( QFile::exists( opiepath + "/bin/opiemail" ))
     addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OPIE_EMC,   "Opie email client",   "QPE/Application/opiemail", mailmsg1, "%1;%2",       mailmsg2,    "TO=%1;ATTACHMENT=%2");
 
+  if ( QFile::exists( opiepath + "/bin/mailit" ))
+    addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OPIE_MAILIT_EMC,   "Opie mailit email client",   "QPE/Application/mailit", mailmsg1, "%1;%2",       mailmsg2,    "TO=%1;ATTACHMENT=%2");
+
 
 
   //phoneclients
 
   addDefaultAppItem(ExternalAppHandler::PHONE, KPimGlobalPrefs::NONE_PHC,  "No phone client installed",       undefined,            undefined, undefined, undefined, undefined);
   addDefaultAppItem(ExternalAppHandler::PHONE, KPimGlobalPrefs::OTHER_PHC,  "Other phone client",       undefined,            undefined, undefined, undefined, undefined);
   if (( QFile::exists( qtopiapath + "/bin/kppi" )) ||
      ( QFile::exists( opiepath + "/bin/kppi" )))
     addDefaultAppItem(ExternalAppHandler::PHONE, KPimGlobalPrefs::KPPI_PHC,   "KP/Pi phone client",       "QPE/Application/kppi", "-ring:%1", "", undefined, undefined);
 
   //faxclients
   addDefaultAppItem(ExternalAppHandler::FAX,   KPimGlobalPrefs::NONE_FAC,  "No fax client installed",       undefined,            undefined, undefined, undefined, undefined);
   addDefaultAppItem(ExternalAppHandler::FAX,   KPimGlobalPrefs::OTHER_FAC,  "Other fax client",       undefined,            undefined, undefined, undefined, undefined);
 
   //smsclients
   addDefaultAppItem(ExternalAppHandler::SMS,   KPimGlobalPrefs::NONE_SMC,  "No sms client installed",       undefined,            undefined, undefined, undefined, undefined);
   addDefaultAppItem(ExternalAppHandler::SMS,   KPimGlobalPrefs::OTHER_SMC,  "Other sms client",       undefined,            undefined, undefined, undefined, undefined);
 
   //pagerclients
   addDefaultAppItem(ExternalAppHandler::PAGER, KPimGlobalPrefs::NONE_PAC,  "No pager client installed",       undefined,            undefined, undefined, undefined, undefined);
   addDefaultAppItem(ExternalAppHandler::PAGER, KPimGlobalPrefs::OTHER_PAC,  "Other pager client",       undefined,            undefined, undefined, undefined, undefined);
 
   //sipclients
   addDefaultAppItem(ExternalAppHandler::SIP, KPimGlobalPrefs::NONE_SIC,  "No SIP client installed",       undefined,            undefined, undefined, undefined, undefined);
   addDefaultAppItem(ExternalAppHandler::SIP, KPimGlobalPrefs::OTHER_SIC,  "Other SIP client",       undefined,            undefined, undefined, undefined, undefined);
   if (( QFile::exists( qtopiapath + "/bin/kppi" )) ||
       ( QFile::exists( opiepath + "/bin/kppi" )))
       addDefaultAppItem(ExternalAppHandler::SIP, KPimGlobalPrefs::KPPI_SIC,   "KP/Pi SIP client",       "QPE/Application/kppi", "-ring:%1", "", undefined, undefined);
 
 }
 
 ExternalAppHandler *ExternalAppHandler::instance()
 {
   if ( !sInstance ) {
     sInstance = staticDeleter.setObject( new ExternalAppHandler() );
     sInstance->loadConfig();
   }
 
   return sInstance;
 }
 
 void ExternalAppHandler::addDefaultAppItem(Types type, int id, const QString& label,  const QString& channel, const QString& message, const QString& parameter, const QString& message2, const QString& parameter2)
 {
   DefaultAppItem* dai = new DefaultAppItem(type, id, label,  channel, message, parameter, message2, parameter2);
   // qDebug("%d %d %s %s ",   type,  id,  label.latin1(), channel.latin1() );
   mDefaultItems.append(dai);
 }
 
 
 QList<DefaultAppItem> ExternalAppHandler::getAvailableDefaultItems(Types type)
 {
   QList<DefaultAppItem> list;
 
   DefaultAppItem* dai;
 
   for ( dai=mDefaultItems.first(); dai != 0; dai=mDefaultItems.next() )
   {
     if (dai->_type == type)
       list.append(dai);
   }
 
   return list;
 }
 
 DefaultAppItem* ExternalAppHandler::getDefaultItem(Types type, int clientid)
 {
   DefaultAppItem* dai;
 
   for ( dai=mDefaultItems.first(); dai != 0; dai=mDefaultItems.next() )
   {
     if (dai->_type == type && dai->_id == clientid)
       return dai;
   }
 
   return 0;
 }
 
 bool ExternalAppHandler::isEmailAppAvailable()
 {
 #ifndef DESKTOP_VERSION
   if (mEmailAppAvailable == UNDEFINED)
   {
     int client = KPimGlobalPrefs::instance()->mEmailClient;
     if (client == KPimGlobalPrefs::NONE_EMC)
       mEmailAppAvailable = UNAVAILABLE;
     else
       mEmailAppAvailable = AVAILABLE;
   }
   return (mEmailAppAvailable == AVAILABLE);
 
 #else //DESKTOP_VERSION
   return false;
 #endif //DESKTOP_VERSION
 }
 
 bool ExternalAppHandler::isSMSAppAvailable()
 {
 #ifndef DESKTOP_VERSION
   if (mSMSAppAvailable == UNDEFINED)
   {
     int client = KPimGlobalPrefs::instance()->mSMSClient;
     if (client == KPimGlobalPrefs::NONE_SMC)
       mSMSAppAvailable = UNAVAILABLE;
     else
       mSMSAppAvailable = AVAILABLE;
   }
 
   return (mSMSAppAvailable == AVAILABLE);
 #else //DESKTOP_VERSION
   return false;
 #endif //DESKTOP_VERSION
 }
 
 bool ExternalAppHandler::isPhoneAppAvailable()
 {
 #ifndef DESKTOP_VERSION
   if (mPhoneAppAvailable == UNDEFINED)
   {
     int client = KPimGlobalPrefs::instance()->mPhoneClient;
     if (client == KPimGlobalPrefs::NONE_PHC)
       mPhoneAppAvailable = UNAVAILABLE;
     else
       mPhoneAppAvailable = AVAILABLE;
   }
 
   return (mPhoneAppAvailable == AVAILABLE);
 #else //DESKTOP_VERSION
   return false;
diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h
index 11c534a..5e27e85 100644
--- a/libkdepim/kpimglobalprefs.h
+++ b/libkdepim/kpimglobalprefs.h
@@ -1,142 +1,143 @@
 /*
     This file is part of libkdepim.
     Copyright (c) 2004 Ulf Schenk
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KPIMGLOBALPREFS_H
 #define KPIMGLOBALPREFS_H
 
 #include "kprefs.h"
 #include <qdict.h>
 
 class KPimGlobalPrefs : public KPrefs
 {
   public:
 
     void setGlobalConfig();
     static KPimGlobalPrefs *instance();
 
 
     virtual ~KPimGlobalPrefs();
 
 
     enum EMailClients {
       NONE_EMC = 0,
       OTHER_EMC = 1,
       OMPI_EMC = 2,
       QTOPIA_EMC = 3,
-      OPIE_EMC = 4
+      OPIE_EMC = 4,
+      OPIE_MAILIT_EMC = 5
     };
 
     enum PhoneClients {
       NONE_PHC = 0,
       OTHER_PHC = 1,
       KPPI_PHC = 2
     };
 
     enum FaxClients {
       NONE_FAC = 0,
       OTHER_FAC = 1
     };
 
     enum SMSClients {
       NONE_SMC = 0,
       OTHER_SMC = 1
     };
 
     enum PagerClients {
       NONE_PAC = 0,
       OTHER_PAC = 1
     };
 
     enum SIPClients {
       NONE_SIC = 0,
       OTHER_SIC = 1,
       KPPI_SIC = 2
     };
 
   private:
     KPimGlobalPrefs( const QString &name = QString::null );
 
    static KPimGlobalPrefs *sInstance;
     QDict<QString> *mLocaleDict;
 
 
   public:
     //US I copied the following "locale" settings from KOPrefs 
     int mPreferredDate;
     QString mUserDateFormatLong;
     QString mUserDateFormatShort;
     int mPreferredLanguage;
     int mPreferredTime;
     bool mWeekStartsOnSunday;
     QString mTimeZoneId;
     bool mUseDaylightsaving;
     int mDaylightsavingStart;
     int mDaylightsavingEnd;
     bool mTimeZoneAdd30min;
 
     int mEmailClient;
     QString mEmailOtherChannel;
     QString mEmailOtherMessage;
     QString mEmailOtherMessageParameters;
     QString mEmailOtherMessage2;
     QString mEmailOtherMessageParameters2;
 
     int mPhoneClient;
     QString mPhoneOtherChannel;
     QString mPhoneOtherMessage;
     QString mPhoneOtherMessageParameters;
 
     int mFaxClient;
     QString mFaxOtherChannel;
     QString mFaxOtherMessage;
     QString mFaxOtherMessageParameters;
 
     int mSMSClient;
     QString mSMSOtherChannel;
     QString mSMSOtherMessage;
     QString mSMSOtherMessageParameters;
 
     int mPagerClient;
     QString mPagerOtherChannel;
     QString mPagerOtherMessage;
     QString mPagerOtherMessageParameters;
 
     int mSipClient;
     QString mSipOtherChannel;
     QString mSipOtherMessage;
     QString mSipOtherMessageParameters;
 
     QString mEx2PhoneDevice;
     QString mEx2PhoneConnection;
     QString mEx2PhoneModel;
 
 };
 
 #endif