| -rw-r--r-- | libkdepim/addresseeview.cpp | 119 |
1 files changed, 80 insertions, 39 deletions
diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp index 83aba48..8fecaf8 100644 --- a/libkdepim/addresseeview.cpp +++ b/libkdepim/addresseeview.cpp @@ -35,2 +35,3 @@ +#include "externalapphandler.h" #include "addresseeview.h" @@ -38,8 +39,8 @@ -#ifndef DESKTOP_VERSION -#include <qtopia/qcopenvelope_qws.h> -#include <qpe/qpeapplication.h> -#endif +//US #ifndef DESKTOP_VERSION +//US #include <qtopia/qcopenvelope_qws.h> +//US #include <qpe/qpeapplication.h> +//US #endif -static int kphoneInstalled = 0; +//US static int kphoneInstalled = 0; @@ -63,2 +64,3 @@ AddresseeView::AddresseeView( QWidget *parent, const char *name ) } + void AddresseeView::setSource(const QString& n) @@ -66,12 +68,13 @@ void AddresseeView::setSource(const QString& n) qDebug("********AddresseeView::setSource %s", n.latin1()); -#ifndef DESKTOP_VERSION - if ( n.left( 6 ) == "mailto" ) { - QCopEnvelope e("QPE/Application/ompi", "newMail(QString)"); - e << n.mid(7); - } - if ( n.left( 7 ) == "phoneto" ) { - QString mess = "-ring:" + n.mid(8); - QCopEnvelope e("QPE/Application/kppi", mess.latin1()); - } -#endif + + if ( n.left( 6 ) == "mailto" ) + ExternalAppHandler::instance()->mailToContacts( n.mid(7) ); + else if ( n.left( 7 ) == "phoneto" ) + ExternalAppHandler::instance()->callByPhone( n.mid(8) ); + else if ( n.left( 5 ) == "faxto" ) + ExternalAppHandler::instance()->callByFax( n.mid(6) ); + else if ( n.left( 5 ) == "smsto" ) + ExternalAppHandler::instance()->callBySMS( n.mid(6) ); + else if ( n.left( 7 ) == "pagerto" ) + ExternalAppHandler::instance()->callByPager( n.mid(8) ); @@ -80,21 +83,10 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) { - bool kphoneAvail = false; + ExternalAppHandler* eah = ExternalAppHandler::instance(); + bool kemailAvail = eah->isEmailAppAvailable(); + bool kphoneAvail = eah->isPhoneAppAvailable(); + bool kfaxAvail = eah->isFaxAppAvailable(); + bool ksmsAvail = eah->isSMSAppAvailable(); + bool kpagerAvail = eah->isPagerAppAvailable(); -#ifndef DESKTOP_VERSION - if ( ! kphoneInstalled ) { - if ( QFile::exists( QPEApplication::qpeDir() + "/bin/kppi" ) ) - kphoneInstalled = 1; - else - kphoneInstalled = -1; - } - if ( kphoneInstalled > 0 ) - kphoneAvail = true; -#if 0 - if ( kphoneAvail ) - qDebug("KPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPone avail "); - else - qDebug("NOOOOOOOOOOOo KPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPone avail "); -#endif -#endif mAddressee = addr; @@ -116,2 +108,3 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) if ( emailIt != emails.end() ) { + if ( kemailAvail ) { dynamicPart += QString( @@ -124,2 +117,10 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) ++emailIt; + } else { + dynamicPart += QString( + "<tr><td align=\"right\"><b>%1</b></td>" + "<td align=\"left\">%2</td></tr>" ) + .arg( type ) + .arg( *emailIt ); + ++emailIt; + } } @@ -128,10 +129,41 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) KABC::PhoneNumber::List::ConstIterator phoneIt; + QString extension; + int phonetype; + QString sms; for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) { - if ( kphoneAvail ) { + phonetype = (*phoneIt).type(); + if (ksmsAvail && + ( + ((phonetype & KABC::PhoneNumber::Car) == KABC::PhoneNumber::Car) || + ((phonetype & KABC::PhoneNumber::Cell) == KABC::PhoneNumber::Cell) + ) + ) + { + sms = QString("<a href=\"smsto:%1 \">(sms)</a>" ) + .arg( (*phoneIt).number() ); + + } + else + sms = ""; + + extension = QString::null; + if ((phonetype & KABC::PhoneNumber::Fax) == KABC::PhoneNumber::Fax) + if (kfaxAvail) extension = "faxto:"; + else if ((phonetype & KABC::PhoneNumber::Pager) == KABC::PhoneNumber::Pager) + if (kpagerAvail) extension = "pagerto:"; + else if (kphoneAvail) + extension = "phoneto:"; + else + extension = QString::null; + + + if ( !extension.isEmpty() ) { dynamicPart += QString( "<tr><td align=\"right\"><b>%1</b></td>" - "<td align=\"left\"><a href=\"phoneto:%2 \">%3</a></td></tr>" ) - .arg( KABC::PhoneNumber::typeLabel( (*phoneIt).type() ) ) + "<td align=\"left\"><a href=\"%2%3 \">%4</a> %5</td></tr>" ) + .arg( KABC::PhoneNumber::typeLabel( phonetype ) ) + .arg( extension ) .arg( (*phoneIt).number() ) - .arg( (*phoneIt).number() ); + .arg( (*phoneIt).number() ) + .arg( sms ); @@ -140,5 +172,6 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) "<tr><td align=\"right\"><b>%1</b></td>" - "<td align=\"left\">%2</td></tr>" ) - .arg( KABC::PhoneNumber::typeLabel( (*phoneIt).type() ) ) - .arg( (*phoneIt).number() ); + "<td align=\"left\">%2 %3</td></tr>" ) + .arg( KABC::PhoneNumber::typeLabel( phonetype ) ) + .arg( (*phoneIt).number() ) + .arg( sms ); } @@ -148,2 +181,3 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) for ( ; emailIt != emails.end(); ++emailIt ) { + if ( kemailAvail ) { dynamicPart += QString( @@ -155,2 +189,9 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) .arg( *emailIt ); + } else { + dynamicPart += QString( + "<tr><td align=\"right\"><b>%1</b></td>" + "<td align=\"left\">%2</td></tr>" ) + .arg( type ) + .arg( *emailIt ); + } } |