-rw-r--r-- | libkdepim/addresseeview.cpp | 51 |
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 | |||
@@ -35,15 +35,16 @@ | |||
35 | 35 | ||
36 | #include "addresseeview.h" | 36 | #include "addresseeview.h" |
37 | 37 | ||
38 | 38 | ||
39 | #ifndef DESKTOP_VERSION | 39 | #ifndef DESKTOP_VERSION |
40 | #include <qtopia/qcopenvelope_qws.h> | 40 | #include <qtopia/qcopenvelope_qws.h> |
41 | #include <qpe/qpeapplication.h> | ||
41 | #endif | 42 | #endif |
42 | 43 | ||
43 | 44 | int kphoneInstalled = 0; | |
44 | 45 | ||
45 | using namespace KPIM; | 46 | using namespace KPIM; |
46 | 47 | ||
47 | AddresseeView::AddresseeView( QWidget *parent, const char *name ) | 48 | AddresseeView::AddresseeView( QWidget *parent, const char *name ) |
48 | //US : KTextBrowser( parent, name ) | 49 | //US : KTextBrowser( parent, name ) |
49 | : QTextBrowser( parent, name ) | 50 | : QTextBrowser( parent, name ) |
@@ -59,23 +60,43 @@ AddresseeView::AddresseeView( QWidget *parent, const char *name ) | |||
59 | //US QStyleSheetItem *link = sheet->item( "a" ); | 60 | //US QStyleSheetItem *link = sheet->item( "a" ); |
60 | //US link->setColor( KGlobalSettings::linkColor() ); | 61 | //US link->setColor( KGlobalSettings::linkColor() ); |
61 | 62 | ||
62 | } | 63 | } |
63 | void AddresseeView::setSource(const QString& n) | 64 | 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 |
70 | 77 | ||
71 | } | 78 | } |
72 | void AddresseeView::setAddressee( const KABC::Addressee& addr ) | 79 | 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 |
77 | setText( QString::null ); | 98 | setText( QString::null ); |
78 | 99 | ||
79 | if ( mAddressee.isEmpty() ) | 100 | if ( mAddressee.isEmpty() ) |
80 | return; | 101 | return; |
81 | 102 | ||
@@ -99,17 +120,27 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) | |||
99 | ++emailIt; | 120 | ++emailIt; |
100 | } | 121 | } |
101 | 122 | ||
102 | KABC::PhoneNumber::List phones = mAddressee.phoneNumbers(); | 123 | KABC::PhoneNumber::List phones = mAddressee.phoneNumbers(); |
103 | KABC::PhoneNumber::List::ConstIterator phoneIt; | 124 | KABC::PhoneNumber::List::ConstIterator phoneIt; |
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 | } |
111 | 142 | ||
112 | 143 | ||
113 | for ( ; emailIt != emails.end(); ++emailIt ) { | 144 | for ( ; emailIt != emails.end(); ++emailIt ) { |
114 | dynamicPart += QString( | 145 | dynamicPart += QString( |
115 | "<tr><td align=\"right\"><b>%1</b></td>" | 146 | "<tr><td align=\"right\"><b>%1</b></td>" |