summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/addresseeview.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index 0564e85..90be928 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -243,73 +243,70 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
243 "<table>" 243 "<table>"
244 "<tr>" 244 "<tr>"
245 "<td rowspan=\"3\" align=\"right\" valign=\"top\">" 245 "<td rowspan=\"3\" align=\"right\" valign=\"top\">"
246 "%3" 246 "%3"
247 "</td>" 247 "</td>"
248 "<td align=\"left\"><font size=\"+2\"><b>%4</b></font></td>" // name 248 "<td align=\"left\"><font size=\"+2\"><b>%4</b></font></td>" // name
249 "</tr>" 249 "</tr>"
250 "%5" // role 250 "%5" // role
251 "%6" // organization 251 "%6" // organization
252 "<td colspan=\"2\">&nbsp;</td>" 252 "<td colspan=\"2\">&nbsp;</td>"
253 "%7" // dynamic part 253 "%7" // dynamic part
254 "%8" // notes 254 "%8" // notes
255 "</table>" 255 "</table>"
256 "</body>" 256 "</body>"
257 "</html>") 257 "</html>")
258//US 258//US
259 .arg( /*KGlobalSettings::textColor().name()*/ "black" ) 259 .arg( /*KGlobalSettings::textColor().name()*/ "black" )
260//US 260//US
261 .arg( /*KGlobalSettings::baseColor().name()*/ "white" ) 261 .arg( /*KGlobalSettings::baseColor().name()*/ "white" )
262 .arg( picString ) 262 .arg( picString )
263 .arg( name ) 263 .arg( name )
264 .arg( aRole ) 264 .arg( aRole )
265 .arg( aOrga ) 265 .arg( aOrga )
266 .arg( dynamicPart ) 266 .arg( dynamicPart )
267 .arg( notes ); 267 .arg( notes );
268 268
269 } else { // no picture! 269 } else { // no picture!
270 270
271mText = "<table width=\"100%\">\n"; 271mText = "<table width=\"100%\">\n";
272 //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; 272 //mText += "<tr bgcolor=\"#3679AD\"><td><h2>";
273#ifdef DESKTOP_VERSION 273#ifdef DESKTOP_VERSION
274 mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h1>"; 274 mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h1>";
275 mText += "<font color=\"#FFFFFF\">" + name +"</font></h1>";
275#else 276#else
276 mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h2>"; 277 mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h3>";
278 mText += "<font color=\"#FFFFFF\"> " + name +"</font></h3>";
277#endif 279#endif
278 280
279#ifdef DESKTOP_VERSION
280 mText += "<font color=\"#FFFFFF\"> <em>" + name+"</em></font></h1>";
281#else
282 mText += "<font color=\"#FFFFFF\"> <em>" + name +"</em></font></h2>";
283#endif
284 mText += "</td></tr>\n<tr bgcolor=\"#EAF8FA\"><td>"; 281 mText += "</td></tr>\n<tr bgcolor=\"#EAF8FA\"><td>";
285 282
286 mText += "<table><td colspan=\"2\">&nbsp;</td>"; 283 mText += "<table><td colspan=\"2\">&nbsp;</td>";
287 /* 284 /*
288 mText += QString("<tr><td align=\"right\"><b2>%1</b2></td>" 285 mText += QString("<tr><td align=\"right\"><b2>%1</b2></td>"
289 "<td align=\"left\"><b>%2</b></td></tr>" ) 286 "<td align=\"left\"><b>%2</b></td></tr>" )
290 .arg( i18n(" ") ) 287 .arg( i18n(" ") )
291 .arg( name ); 288 .arg( name );
292 */ 289 */
293 if ( ! mAddressee.role().isEmpty() ) 290 if ( ! mAddressee.role().isEmpty() )
294 mText += QString("<tr><td align=\"right\"><b>%1</b></td>" 291 mText += QString("<tr><td align=\"right\"><b>%1</b></td>"
295 "<td align=\"left\">%2</td></tr>" ) 292 "<td align=\"left\">%2</td></tr>" )
296 .arg( i18n(" ") ) 293 .arg( i18n(" ") )
297 .arg( mAddressee.role()); 294 .arg( mAddressee.role());
298 if ( ! mAddressee.organization().isEmpty() ) 295 if ( ! mAddressee.organization().isEmpty() )
299 mText += QString("<tr><td align=\"right\"><b>%1</b></td>" 296 mText += QString("<tr><td align=\"right\"><b>%1</b></td>"
300 "<td align=\"left\">%2</td></tr>" ) 297 "<td align=\"left\">%2</td></tr>" )
301 .arg( i18n(" ") ) 298 .arg( i18n(" ") )
302 .arg( mAddressee.organization()); 299 .arg( mAddressee.organization());
303 mText += dynamicPart; 300 mText += dynamicPart;
304 mText += notes; 301 mText += notes;
305 mText += "</table>"; 302 mText += "</table>";
306 303
307 } 304 }
308 305
309 // at last display it... 306 // at last display it...
310 setText( mText ); 307 setText( mText );
311 308
312} 309}
313 310
314QString AddresseeView::getPhoneNumbers( bool preferred ) 311QString AddresseeView::getPhoneNumbers( bool preferred )
315{ 312{