summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-07-24 21:25:24 (UTC)
committer zautrix <zautrix>2004-07-24 21:25:24 (UTC)
commitf0d0803312ea5607d9ba85454d39787ab626b86e (patch) (unidiff)
tree7c14022c53015a604bc2482751a978b67c9bad09
parentf27f513f6f4a464a05f5edaf3e0f74578b99af88 (diff)
downloadkdepimpi-f0d0803312ea5607d9ba85454d39787ab626b86e.zip
kdepimpi-f0d0803312ea5607d9ba85454d39787ab626b86e.tar.gz
kdepimpi-f0d0803312ea5607d9ba85454d39787ab626b86e.tar.bz2
Added connection to kphone, if kphone is available
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/addresseeview.cpp51
1 files changed, 41 insertions, 10 deletions
diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp
index 71c7817..e9dc1e9 100644
--- a/libkdepim/addresseeview.cpp
+++ b/libkdepim/addresseeview.cpp
@@ -40,5 +40,6 @@
40#include <qtopia/qcopenvelope_qws.h> 40#include <qtopia/qcopenvelope_qws.h>
41#include <qpe/qpeapplication.h>
41#endif 42#endif
42 43
43 44int kphoneInstalled = 0;
44 45
@@ -64,6 +65,12 @@ void AddresseeView::setSource(const QString& n)
64{ 65{
65 //qDebug("********AddresseeView::setSource %s", n.mid(7).latin1()); 66 qDebug("********AddresseeView::setSource %s", n.latin1());
66#ifndef DESKTOP_VERSION 67#ifndef DESKTOP_VERSION
67 QCopEnvelope e("QPE/Application/kmpi", "newMail(QString)"); 68 if ( n.left( 6 ) == "mailto" ) {
68 e << n.mid(7); 69 QCopEnvelope e("QPE/Application/kmpi", "newMail(QString)");
70 e << n.mid(7);
71 }
72 if ( n.left( 7 ) == "phoneto" ) {
73 QString mess = "-ring:" + n.mid(8);
74 QCopEnvelope e("QPE/Application/kppi", mess.latin1());
75 }
69#endif 76#endif
@@ -73,4 +80,18 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
73{ 80{
74 mAddressee = addr; 81 bool kphoneAvail = false;
75 82
83#ifndef DESKTOP_VERSION
84 if ( ! kphoneInstalled ) {
85 if ( QFile::exists( QPEApplication::qpeDir() + "/bin/kppi" ) )
86 kphoneInstalled = 1;
87 else
88 kphoneInstalled = -1;
89 } else {
90 if ( kphoneInstalled > 0 )
91 kphoneAvail = true;
92 }
93 //if ( kphoneAvail )
94 // qDebug("KPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPone avail ");
95#endif
96 mAddressee = addr;
76 // clear view 97 // clear view
@@ -104,7 +125,17 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
104 for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) { 125 for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) {
105 dynamicPart += QString( 126 if ( kphoneAvail ) {
106 "<tr><td align=\"right\"><b>%1</b></td>" 127 dynamicPart += QString(
107 "<td align=\"left\">%2</td></tr>" ) 128 "<tr><td align=\"right\"><b>%1</b></td>"
108 .arg( KABC::PhoneNumber::typeLabel( (*phoneIt).type() ) ) 129 "<td align=\"left\"><a href=\"phoneto:%2 \">%3</a></td></tr>" )
109 .arg( (*phoneIt).number() ); 130 .arg( KABC::PhoneNumber::typeLabel( (*phoneIt).type() ) )
131 .arg( (*phoneIt).number() )
132 .arg( (*phoneIt).number() );
133
134 } else {
135 dynamicPart += QString(
136 "<tr><td align=\"right\"><b>%1</b></td>"
137 "<td align=\"left\">%2</td></tr>" )
138 .arg( KABC::PhoneNumber::typeLabel( (*phoneIt).type() ) )
139 .arg( (*phoneIt).number() );
140 }
110 } 141 }