-rw-r--r-- | libkdepim/addresseeview.cpp | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp index 547441c..83aba48 100644 --- a/libkdepim/addresseeview.cpp +++ b/libkdepim/addresseeview.cpp | |||
@@ -38,6 +38,6 @@ | |||
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 | #include <qpe/qpeapplication.h> |
42 | #endif | 42 | #endif |
43 | 43 | ||
@@ -60,5 +60,5 @@ AddresseeView::AddresseeView( QWidget *parent, const char *name ) | |||
60 | //US QStyleSheetItem *link = sheet->item( "a" ); | 60 | //US QStyleSheetItem *link = sheet->item( "a" ); |
61 | //US link->setColor( KGlobalSettings::linkColor() ); | 61 | //US link->setColor( KGlobalSettings::linkColor() ); |
62 | 62 | ||
63 | } | 63 | } |
64 | void AddresseeView::setSource(const QString& n) | 64 | void AddresseeView::setSource(const QString& n) |
@@ -89,5 +89,5 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) | |||
89 | } | 89 | } |
90 | if ( kphoneInstalled > 0 ) | 90 | if ( kphoneInstalled > 0 ) |
91 | kphoneAvail = true; | 91 | kphoneAvail = true; |
92 | #if 0 | 92 | #if 0 |
93 | if ( kphoneAvail ) | 93 | if ( kphoneAvail ) |
@@ -96,5 +96,5 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) | |||
96 | qDebug("NOOOOOOOOOOOo KPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPone avail "); | 96 | qDebug("NOOOOOOOOOOOo KPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPone avail "); |
97 | #endif | 97 | #endif |
98 | 98 | ||
99 | #endif | 99 | #endif |
100 | mAddressee = addr; | 100 | mAddressee = addr; |
@@ -145,5 +145,5 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) | |||
145 | } | 145 | } |
146 | 146 | ||
147 | 147 | ||
148 | for ( ; emailIt != emails.end(); ++emailIt ) { | 148 | for ( ; emailIt != emails.end(); ++emailIt ) { |
149 | dynamicPart += QString( | 149 | dynamicPart += QString( |
@@ -182,5 +182,5 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) | |||
182 | .arg( formattedAddress ); | 182 | .arg( formattedAddress ); |
183 | } else { | 183 | } else { |
184 | 184 | ||
185 | dynamicPart += QString( | 185 | dynamicPart += QString( |
186 | "<tr><td align=\"right\"><b>%1</b></td>" | 186 | "<tr><td align=\"right\"><b>%1</b></td>" |
@@ -189,5 +189,5 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) | |||
189 | //US .arg( (*addrIt).label().replace( '\n', "<br>" ) ); | 189 | //US .arg( (*addrIt).label().replace( '\n', "<br>" ) ); |
190 | .arg( (*addrIt).label() /*replace( QRegExp("\n"), "<br>" )*/ ); | 190 | .arg( (*addrIt).label() /*replace( QRegExp("\n"), "<br>" )*/ ); |
191 | 191 | ||
192 | } | 192 | } |
193 | } | 193 | } |
@@ -209,7 +209,7 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) | |||
209 | if ( true /*!mAddressee.role().isEmpty()*/ ) { | 209 | if ( true /*!mAddressee.role().isEmpty()*/ ) { |
210 | aRole = "<tr>" | 210 | aRole = "<tr>" |
211 | "<td align=\"left\">" + mAddressee.role() + "</td>" | 211 | "<td align=\"left\">" + mAddressee.role() + "</td>" |
212 | "</tr>"; | 212 | "</tr>"; |
213 | } | 213 | } |
214 | if ( true /*!mAddressee.organization().isEmpty()*/ ) { | 214 | if ( true /*!mAddressee.organization().isEmpty()*/ ) { |
215 | aOrga = "<tr>" | 215 | aOrga = "<tr>" |
@@ -269,5 +269,5 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) | |||
269 | 269 | ||
270 | mText = "<table width=\"100%\">\n"; | 270 | mText = "<table width=\"100%\">\n"; |
271 | //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; | 271 | //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; |
272 | #ifdef DESKTOP_VERSION | 272 | #ifdef DESKTOP_VERSION |
273 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h1>"; | 273 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h1>"; |
@@ -275,5 +275,5 @@ mText = "<table width=\"100%\">\n"; | |||
275 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h2>"; | 275 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h2>"; |
276 | #endif | 276 | #endif |
277 | 277 | ||
278 | #ifdef DESKTOP_VERSION | 278 | #ifdef DESKTOP_VERSION |
279 | mText += "<font color=\"#FFFFFF\"> <em>" + name+"</em></font></h1>"; | 279 | mText += "<font color=\"#FFFFFF\"> <em>" + name+"</em></font></h1>"; |
@@ -288,5 +288,5 @@ mText = "<table width=\"100%\">\n"; | |||
288 | "<td align=\"left\"><b>%2</b></td></tr>" ) | 288 | "<td align=\"left\"><b>%2</b></td></tr>" ) |
289 | .arg( i18n(" ") ) | 289 | .arg( i18n(" ") ) |
290 | .arg( name ); | 290 | .arg( name ); |
291 | */ | 291 | */ |
292 | if ( ! mAddressee.role().isEmpty() ) | 292 | if ( ! mAddressee.role().isEmpty() ) |
@@ -303,9 +303,10 @@ mText = "<table width=\"100%\">\n"; | |||
303 | mText += notes; | 303 | mText += notes; |
304 | mText += "</table>"; | 304 | mText += "</table>"; |
305 | 305 | ||
306 | } | 306 | } |
307 | 307 | ||
308 | // at last display it... | 308 | // at last display it... |
309 | setText( mText ); | 309 | setText( mText ); |
310 | |||
310 | } | 311 | } |
311 | 312 | ||
@@ -322,5 +323,5 @@ void AddresseeView::addTag(const QString & tag,const QString & text) | |||
322 | QString tmpText=text; | 323 | QString tmpText=text; |
323 | QString tmpStr=str; | 324 | QString tmpStr=str; |
324 | if(number !=-1) | 325 | if(number !=-1) |
325 | { | 326 | { |
326 | if (number > 0) { | 327 | if (number > 0) { |