summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/kaddressbook/germantranslation.txt6
-rw-r--r--kabc/addresseeview.cpp31
2 files changed, 20 insertions, 17 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index 473aa0e..515161f 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -761,33 +761,33 @@
761{ "Backup enabled","Backup angeschaltet" }, 761{ "Backup enabled","Backup angeschaltet" },
762{ "Use standard backup dir","Standard Backupverzeichnis" }, 762{ "Use standard backup dir","Standard Backupverzeichnis" },
763{ "Number of Backups:","Anzahl der Backups" }, 763{ "Number of Backups:","Anzahl der Backups" },
764{ "Make backup every ","Mache ein Backup alle " }, 764{ "Make backup every ","Mache ein Backup alle " },
765{ " days"," Tage" }, 765{ " days"," Tage" },
766{ "Creating backup ... please wait ...","Erzeuge Backup ... bitte warten ..." }, 766{ "Creating backup ... please wait ...","Erzeuge Backup ... bitte warten ..." },
767{ "Backup Failed!","Backup Problem!" }, 767{ "Backup Failed!","Backup Problem!" },
768{ "Try again now","Versuche jetzt nochmal" }, 768{ "Try again now","Versuche jetzt nochmal" },
769{ "Try again later","Versuche später nochmal" }, 769{ "Try again later","Versuche später nochmal" },
770{ "Try again tomorrow","Versuche morgen nochmal" }, 770{ "Try again tomorrow","Versuche morgen nochmal" },
771{ "Disable backup","Schalte Backup ab" }, 771{ "Disable backup","Schalte Backup ab" },
772{ "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, 772{ "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" },
773{ "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, 773{ "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" },
774{ "Choose action","Wähle Aktion" }, 774{ "Choose action","Wähle Aktion" },
775{ "&Configure KA/Pi...","Konfiguriere KA/Pi..." }, 775{ "&Configure KA/Pi...","Konfiguriere KA/Pi..." },
776{ "Global Settings...","Globale Einstellungen..." }, 776{ "Global Settings...","Globale Einstellungen..." },
777{ "Spouse","Ehegatte" }, 777{ "Spouse","Ehegatte" },
778{ "Notes","Notizen" }, 778{ "Notes","Notizen" },
779{ "Messanger","Messanger" }, 779{ "Messanger","Messanger" },
780{ "Assistant","Assistent" }, 780{ "Assistant","Assistent" },
781{ "Manager","Manager" }, 781{ "Manager","Manager" },
782{ "Secrecy","Sichtbar" }, 782{ "Secrecy","Sichtbar" },
783{ "male","männlich" }, 783{ "male","männlich" },
784{ "female","weiblich" }, 784{ "female","weiblich" },
785{ "","" }, 785{ "Hide!","Verbergen!" },
786{ "","" }, 786{ "Show!","Anzeigen!" },
787{ "","" }, 787{ "Details","Details" },
788{ "","" }, 788{ "","" },
789{ "","" }, 789{ "","" },
790{ "","" }, 790{ "","" },
791{ "","" }, 791{ "","" },
792{ "","" }, 792{ "","" },
793{ "","" }, \ No newline at end of file 793{ "","" }, \ No newline at end of file
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index 202a718..7c70ab1 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -208,60 +208,70 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
208 208
209 dynamicPart += QString( 209 dynamicPart += QString(
210 "<tr><td align=\"right\"><b>%1</b></td>" 210 "<tr><td align=\"right\"><b>%1</b></td>"
211 "<td align=\"left\">%2</td></tr>" ) 211 "<td align=\"left\">%2</td></tr>" )
212 .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) 212 .arg( KABC::Address::typeLabel( (*addrIt).type() ) )
213 .arg( formattedAddress ); 213 .arg( formattedAddress );
214 } else { 214 } else {
215 215
216 dynamicPart += QString( 216 dynamicPart += QString(
217 "<tr><td align=\"right\"><b>%1</b></td>" 217 "<tr><td align=\"right\"><b>%1</b></td>"
218 "<td align=\"left\">%2</td></tr>" ) 218 "<td align=\"left\">%2</td></tr>" )
219 .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) 219 .arg( KABC::Address::typeLabel( (*addrIt).type() ) )
220//US .arg( (*addrIt).label().replace( '\n', "<br>" ) ); 220//US .arg( (*addrIt).label().replace( '\n', "<br>" ) );
221 .arg( (*addrIt).label() /*replace( QRegExp("\n"), "<br>" )*/ ); 221 .arg( (*addrIt).label() /*replace( QRegExp("\n"), "<br>" )*/ );
222 222
223 } 223 }
224 } 224 }
225 225
226 226
227 QString notes; 227 QString notes;
228 if ( sFullDetailsMode ) { 228 if ( sFullDetailsMode ) {
229 notes = QString( 229 notes = QString(
230 "<tr><td align=\"right\"><b>%1</b></td>" 230 "<tr><td align=\"right\"><b>%1</b></td>"
231 "<td align=\"left\"><a href=\"notAllDetails\">%4</a></td></tr>" ) 231 "<td align=\"left\"><a href=\"notAllDetails\">%4</a></td></tr>" )
232 .arg( i18n("Details:") ) 232 .arg( i18n("Details") )
233 .arg( i18n("Click here to hide!") ); 233 .arg( i18n("Hide!") );
234 234
235 QString tempX = mAddressee.secrecy().asString(); 235 QString tempX = mAddressee.custom( "KADDRESSBOOK", "X-Gender" );
236 if ( !tempX.isEmpty() ) {
237 notes += QString(
238 "<tr><td align=\"right\"><b>%1</b></td>"
239 "<td align=\"left\">%2</td></tr>" )
240 .arg( i18n( "" ) )
241 .arg( i18n(tempX) );
242 }
243
244
245 tempX = mAddressee.secrecy().asString();
236 246
237 notes += QString( 247 notes += QString(
238 "<tr><td align=\"right\"><b>%1</b></td>" 248 "<tr><td align=\"right\"><b>%1</b></td>"
239 "<td align=\"left\">%2</td></tr>" ) 249 "<td align=\"left\">%2</td></tr>" )
240 .arg( "" ) 250 .arg( "" )
241 .arg( tempX ); 251 .arg( tempX );
242 252
243 253
244 tempX = mAddressee.categories().join(" - "); 254 tempX = mAddressee.categories().join(" - ");
245 if ( !tempX.isEmpty() ) { 255 if ( !tempX.isEmpty() ) {
246 notes += QString( 256 notes += QString(
247 "<tr><td align=\"right\"><b>%1</b></td>" 257 "<tr><td align=\"right\"><b>%1</b></td>"
248 "<td align=\"left\">%2</td></tr>" ) 258 "<td align=\"left\">%2</td></tr>" )
249 .arg( i18n( "Category" ) ) 259 .arg( i18n( "Category" ) )
250 .arg( tempX ); 260 .arg( tempX );
251 } 261 }
252 tempX = mAddressee.custom( "KADDRESSBOOK", "X-Profession" ); 262 tempX = mAddressee.custom( "KADDRESSBOOK", "X-Profession" );
253 if ( !tempX.isEmpty() ) { 263 if ( !tempX.isEmpty() ) {
254 notes += QString( 264 notes += QString(
255 "<tr><td align=\"right\"><b>%1</b></td>" 265 "<tr><td align=\"right\"><b>%1</b></td>"
256 "<td align=\"left\">%2</td></tr>" ) 266 "<td align=\"left\">%2</td></tr>" )
257 .arg( i18n( "Profession" ) ) 267 .arg( i18n( "Profession" ) )
258 .arg( tempX ); 268 .arg( tempX );
259 } 269 }
260 tempX = mAddressee.custom( "KADDRESSBOOK", "X-Office" ); 270 tempX = mAddressee.custom( "KADDRESSBOOK", "X-Office" );
261 if ( !tempX.isEmpty() ) { 271 if ( !tempX.isEmpty() ) {
262 notes += QString( 272 notes += QString(
263 "<tr><td align=\"right\"><b>%1</b></td>" 273 "<tr><td align=\"right\"><b>%1</b></td>"
264 "<td align=\"left\">%2</td></tr>" ) 274 "<td align=\"left\">%2</td></tr>" )
265 .arg( i18n( "Office" ) ) 275 .arg( i18n( "Office" ) )
266 .arg( tempX ); 276 .arg( tempX );
267 } 277 }
@@ -292,99 +302,92 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
292 } 302 }
293 if ( !mAddressee.url().url().isEmpty() ) { 303 if ( !mAddressee.url().url().isEmpty() ) {
294 notes += QString( 304 notes += QString(
295 "<tr><td align=\"right\"><b>%1</b></td>" 305 "<tr><td align=\"right\"><b>%1</b></td>"
296 "<td align=\"left\">%2</td></tr>" ) 306 "<td align=\"left\">%2</td></tr>" )
297 .arg( i18n( "Homepage" ) ) 307 .arg( i18n( "Homepage" ) )
298 .arg( mAddressee.url().url() ); 308 .arg( mAddressee.url().url() );
299 } 309 }
300 tempX = mAddressee.nickName(); 310 tempX = mAddressee.nickName();
301 if ( !tempX.isEmpty() ) { 311 if ( !tempX.isEmpty() ) {
302 notes += QString( 312 notes += QString(
303 "<tr><td align=\"right\"><b>%1</b></td>" 313 "<tr><td align=\"right\"><b>%1</b></td>"
304 "<td align=\"left\">%2</td></tr>" ) 314 "<td align=\"left\">%2</td></tr>" )
305 .arg( i18n( "Nickname" ) ) 315 .arg( i18n( "Nickname" ) )
306 .arg( tempX ); 316 .arg( tempX );
307 } 317 }
308 tempX = mAddressee.custom( "KADDRESSBOOK", "X-IMAddress" ); 318 tempX = mAddressee.custom( "KADDRESSBOOK", "X-IMAddress" );
309 if ( !tempX.isEmpty() ) { 319 if ( !tempX.isEmpty() ) {
310 notes += QString( 320 notes += QString(
311 "<tr><td align=\"right\"><b>%1</b></td>" 321 "<tr><td align=\"right\"><b>%1</b></td>"
312 "<td align=\"left\">%2</td></tr>" ) 322 "<td align=\"left\">%2</td></tr>" )
313 .arg( i18n( "Messanger" ) ) 323 .arg( i18n( "Messanger" ) )
314 .arg( tempX ); 324 .arg( tempX );
315 } 325 }
316 tempX = mAddressee.custom( "KADDRESSBOOK", "X-Gender" ); 326
317 if ( !tempX.isEmpty() ) {
318 notes += QString(
319 "<tr><td align=\"right\"><b>%1</b></td>"
320 "<td align=\"left\">%2</td></tr>" )
321 .arg( i18n( "Gender" ) )
322 .arg( i18n(tempX) );
323 }
324 tempX = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" ); 327 tempX = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" );
325 if ( !tempX.isEmpty() ) { 328 if ( !tempX.isEmpty() ) {
326 QDate dt = KGlobal::locale()->readDate( tempX, "%Y-%m-%d"); 329 QDate dt = KGlobal::locale()->readDate( tempX, "%Y-%m-%d");
327 tempX = KGlobal::locale()->formatDate(dt, true); 330 tempX = KGlobal::locale()->formatDate(dt, true);
328 notes += QString( 331 notes += QString(
329 "<tr><td align=\"right\"><b>%1</b></td>" 332 "<tr><td align=\"right\"><b>%1</b></td>"
330 "<td align=\"left\">%2</td></tr>" ) 333 "<td align=\"left\">%2</td></tr>" )
331 .arg( i18n( "Anniversary" ) ) 334 .arg( i18n( "Anniversary" ) )
332 .arg( tempX ); 335 .arg( tempX );
333 } 336 }
334 tempX = mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ); 337 tempX = mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" );
335 if ( !tempX.isEmpty() ) { 338 if ( !tempX.isEmpty() ) {
336 notes += QString( 339 notes += QString(
337 "<tr><td align=\"right\"><b>%1</b></td>" 340 "<tr><td align=\"right\"><b>%1</b></td>"
338 "<td align=\"left\">%2</td></tr>" ) 341 "<td align=\"left\">%2</td></tr>" )
339 .arg( i18n( "Spouse" ) ) 342 .arg( i18n( "Spouse" ) )
340 .arg( tempX ); 343 .arg( tempX );
341 } 344 }
342 tempX = mAddressee.custom( "KADDRESSBOOK", "X-Children" ); 345 tempX = mAddressee.custom( "KADDRESSBOOK", "X-Children" );
343 if ( !tempX.isEmpty() ) { 346 if ( !tempX.isEmpty() ) {
344 notes += QString( 347 notes += QString(
345 "<tr><td align=\"right\"><b>%1</b></td>" 348 "<tr><td align=\"right\"><b>%1</b></td>"
346 "<td align=\"left\">%2</td></tr>" ) 349 "<td align=\"left\">%2</td></tr>" )
347 .arg( i18n( "Children" ) ) 350 .arg( i18n( "Children" ) )
348 .arg( tempX ); 351 .arg( tempX );
349 } 352 }
350 353
351 if ( !mAddressee.note().isEmpty() ) { 354 if ( !mAddressee.note().isEmpty() ) {
352 notes += QString( 355 notes += QString(
353 "<tr>" 356 "<tr>"
354 "<td align=\"right\" valign=\"top\"><b>%1</b></td>" // note label 357 "<td align=\"right\" valign=\"top\"><b>%1</b></td>" // note label
355 "<td align=\"left\">%2</td>" // note 358 "<td align=\"left\">%2</td>" // note
356 "</tr>" ).arg( i18n( "Notes" ) ) 359 "</tr>" ).arg( i18n( "Notes" ) )
357 //US .arg( mAddressee.note().replace( '\n', "<br>" ) ); 360 //US .arg( mAddressee.note().replace( '\n', "<br>" ) );
358 .arg( mAddressee.note().replace( QRegExp("\n"), "<br>" ) ); 361 .arg( mAddressee.note().replace( QRegExp("\n"), "<br>" ) );
359 //qDebug("AddresseeView::setAddressee has to be verified."); 362 //qDebug("AddresseeView::setAddressee has to be verified.");
360 } 363 }
361 } else { 364 } else {
362 notes = QString( 365 notes = QString(
363 "<tr><td align=\"right\"><b>%1</b></td>" 366 "<tr><td align=\"right\"><b>%1</b></td>"
364 "<td align=\"left\"><a href=\"allDetails\">%4</a></td></tr>" ) 367 "<td align=\"left\"><a href=\"allDetails\">%4</a></td></tr>" )
365 .arg( i18n("Details:") ) 368 .arg( i18n("Details") )
366 .arg( i18n("Click here to show!") ); 369 .arg( i18n("Show!") );
367 370
368 371
369 } 372 }
370 373
371 QString aRole = ""; 374 QString aRole = "";
372 QString aOrga = ""; 375 QString aOrga = "";
373 if ( true /*!mAddressee.role().isEmpty()*/ ) { 376 if ( true /*!mAddressee.role().isEmpty()*/ ) {
374 aRole = "<tr>" 377 aRole = "<tr>"
375 "<td align=\"left\">" + mAddressee.role() + "</td>" 378 "<td align=\"left\">" + mAddressee.role() + "</td>"
376 "</tr>"; 379 "</tr>";
377 } 380 }
378 if ( true /*!mAddressee.organization().isEmpty()*/ ) { 381 if ( true /*!mAddressee.organization().isEmpty()*/ ) {
379 aOrga = "<tr>" 382 aOrga = "<tr>"
380 "<td align=\"left\">" + mAddressee.organization() + "</td>" 383 "<td align=\"left\">" + mAddressee.organization() + "</td>"
381 "</tr>"; 384 "</tr>";
382 } 385 }
383 mText = ""; 386 mText = "";
384 QString picString = ""; 387 QString picString = "";
385 KABC::Picture picture = mAddressee.photo(); 388 KABC::Picture picture = mAddressee.photo();
386 bool picAvailintern = false; 389 bool picAvailintern = false;
387 bool picAvailUrl = false; 390 bool picAvailUrl = false;
388 if (! picture.undefined() ) { 391 if (! picture.undefined() ) {
389 picAvailintern = (picture.isIntern() && !picture.data().isNull()); 392 picAvailintern = (picture.isIntern() && !picture.data().isNull());
390 picAvailUrl = !picture.isIntern() && QFile::exists(picture.url() ); 393 picAvailUrl = !picture.isIntern() && QFile::exists(picture.url() );