author | zautrix <zautrix> | 2005-02-17 21:45:30 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-17 21:45:30 (UTC) |
commit | b1e885da3b0a083121f940485d9c0eea53ff5139 (patch) (unidiff) | |
tree | e999d042e45cd1410cc327a3c347bbefa5896289 | |
parent | 8e8d2bd0c31eb272a7f26756252ff4930d0602bc (diff) | |
download | kdepimpi-b1e885da3b0a083121f940485d9c0eea53ff5139.zip kdepimpi-b1e885da3b0a083121f940485d9c0eea53ff5139.tar.gz kdepimpi-b1e885da3b0a083121f940485d9c0eea53ff5139.tar.bz2 |
fix
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 3 | ||||
-rw-r--r-- | korganizer/koeventviewer.cpp | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 62c8447..06aa5f6 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,106 +1,109 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.0.8 ************ | 3 | ********** VERSION 2.0.8 ************ |
4 | 4 | ||
5 | Fixed a problem in dependency info in the ipk files for the Zaurus. | 5 | Fixed a problem in dependency info in the ipk files for the Zaurus. |
6 | 6 | ||
7 | Added icon for the stealth new week view and made navigation more user friendly in monthview by adding a prev/next week button to the navigator bar. | 7 | Added icon for the stealth new week view and made navigation more user friendly in monthview by adding a prev/next week button to the navigator bar. |
8 | 8 | ||
9 | Added a "go today" button to the datepicker. | 9 | Added a "go today" button to the datepicker. |
10 | 10 | ||
11 | Added "created" and "last modified" to event/todo viewer (and What'sThis viewer) | ||
12 | and made it configureable to show these values. | ||
13 | |||
11 | 14 | ||
12 | ********** VERSION 2.0.7 ************ | 15 | ********** VERSION 2.0.7 ************ |
13 | 16 | ||
14 | Added global application font settings | 17 | Added global application font settings |
15 | (for all KDE-Pim/Pi apps) to the general settings. | 18 | (for all KDE-Pim/Pi apps) to the general settings. |
16 | 19 | ||
17 | Fixed a problem in OM/Pi when trying to login to some IMAP servers | 20 | Fixed a problem in OM/Pi when trying to login to some IMAP servers |
18 | (like the IMAP server of Apple: mail.mac.com ) | 21 | (like the IMAP server of Apple: mail.mac.com ) |
19 | 22 | ||
20 | Added recurring todos to KO/Pi. | 23 | Added recurring todos to KO/Pi. |
21 | 24 | ||
22 | 25 | ||
23 | ********** VERSION 2.0.6 ************ | 26 | ********** VERSION 2.0.6 ************ |
24 | 27 | ||
25 | Some bugfixes in the pi-sync mode. | 28 | Some bugfixes in the pi-sync mode. |
26 | Added German translation for pi-sync mode. | 29 | Added German translation for pi-sync mode. |
27 | 30 | ||
28 | KO/Pi: | 31 | KO/Pi: |
29 | Made the todolist using alternate background. | 32 | Made the todolist using alternate background. |
30 | 33 | ||
31 | Other minor fixes in KO/Pi. | 34 | Other minor fixes in KO/Pi. |
32 | 35 | ||
33 | 36 | ||
34 | ********** VERSION 2.0.5 ************ | 37 | ********** VERSION 2.0.5 ************ |
35 | 38 | ||
36 | Bugfixes in KO/Pi. | 39 | Bugfixes in KO/Pi. |
37 | 40 | ||
38 | ********** VERSION 2.0.4 ************ | 41 | ********** VERSION 2.0.4 ************ |
39 | 42 | ||
40 | KO/Pi: | 43 | KO/Pi: |
41 | Fixed problem loading translations for summary/location edit boxes in event/todo editor. | 44 | Fixed problem loading translations for summary/location edit boxes in event/todo editor. |
42 | 45 | ||
43 | Added a general "select week number" to the toolbar. | 46 | Added a general "select week number" to the toolbar. |
44 | 47 | ||
45 | Fixed some small problem of the new features introduced in version 2.0.3. | 48 | Fixed some small problem of the new features introduced in version 2.0.3. |
46 | 49 | ||
47 | Made it possible to specify one specific category as category color, | 50 | Made it possible to specify one specific category as category color, |
48 | if more than one categories are selected. | 51 | if more than one categories are selected. |
49 | 52 | ||
50 | Fixed a bug in saving colors for categories with non-ascii characters. | 53 | Fixed a bug in saving colors for categories with non-ascii characters. |
51 | (Like, e.g. German Umlauts). | 54 | (Like, e.g. German Umlauts). |
52 | Propably you have to set your colors again for those categories. | 55 | Propably you have to set your colors again for those categories. |
53 | 56 | ||
54 | 57 | ||
55 | ********** VERSION 2.0.3 ************ | 58 | ********** VERSION 2.0.3 ************ |
56 | 59 | ||
57 | KO/Pi: | 60 | KO/Pi: |
58 | Added feature for changing alarm settings for many items at once: | 61 | Added feature for changing alarm settings for many items at once: |
59 | Open list view (or search dialog), select the desired items and choose in | 62 | Open list view (or search dialog), select the desired items and choose in |
60 | the popup menu: Set alarm for selected... | 63 | the popup menu: Set alarm for selected... |
61 | 64 | ||
62 | Added to the event/todo viewer the option to send an email to | 65 | Added to the event/todo viewer the option to send an email to |
63 | all attendees or all selected (with RSVP) attendees. | 66 | all attendees or all selected (with RSVP) attendees. |
64 | 67 | ||
65 | Made the week-month mode changing in month view faster. | 68 | Made the week-month mode changing in month view faster. |
66 | 69 | ||
67 | Made month view better useable with keyboard. | 70 | Made month view better useable with keyboard. |
68 | Now TAB key jumps to next cell with an event/todo. | 71 | Now TAB key jumps to next cell with an event/todo. |
69 | Scroll in cell with coursor keys, scroll in time (next week) with | 72 | Scroll in cell with coursor keys, scroll in time (next week) with |
70 | Shift/Control + coursorkeys. | 73 | Shift/Control + coursorkeys. |
71 | 74 | ||
72 | Fixed bug that the todo view flat mode was reset after first view update. | 75 | Fixed bug that the todo view flat mode was reset after first view update. |
73 | 76 | ||
74 | If a todo is displayed closed in the todo view, | 77 | If a todo is displayed closed in the todo view, |
75 | it is now displayed in overdue/due today color depending on the subtodos overdue/due today properties. | 78 | it is now displayed in overdue/due today color depending on the subtodos overdue/due today properties. |
76 | 79 | ||
77 | Added info about the numbers of years to the caption (title) information about a birthday event. | 80 | Added info about the numbers of years to the caption (title) information about a birthday event. |
78 | 81 | ||
79 | Made completion date in todo editor editable. | 82 | Made completion date in todo editor editable. |
80 | 83 | ||
81 | Added possibility to save/load templates for journals. | 84 | Added possibility to save/load templates for journals. |
82 | (Which is just a simple "save text to file" or "insert text from file". | 85 | (Which is just a simple "save text to file" or "insert text from file". |
83 | 86 | ||
84 | ********** VERSION 2.0.2 ************ | 87 | ********** VERSION 2.0.2 ************ |
85 | 88 | ||
86 | KO/Pi: | 89 | KO/Pi: |
87 | Fixed the layout problem of the day label buttons | 90 | Fixed the layout problem of the day label buttons |
88 | of the agenda view introduced in version 2.0.1. | 91 | of the agenda view introduced in version 2.0.1. |
89 | 92 | ||
90 | Added WhatsThis support for the todo view and the list view. | 93 | Added WhatsThis support for the todo view and the list view. |
91 | 94 | ||
92 | Added a quite useful feature to the montview. | 95 | Added a quite useful feature to the montview. |
93 | Just click on the week numbers on the left. | 96 | Just click on the week numbers on the left. |
94 | And in the top right corner of month view/agenda view | 97 | And in the top right corner of month view/agenda view |
95 | there is now a "week number quick selector". | 98 | there is now a "week number quick selector". |
96 | (Click on the black triangle). | 99 | (Click on the black triangle). |
97 | 100 | ||
98 | Made the quite difficult timezone change in KO/Pi easy. | 101 | Made the quite difficult timezone change in KO/Pi easy. |
99 | 102 | ||
100 | OM/Pi: | 103 | OM/Pi: |
101 | Fixed too small icons on desktop. | 104 | Fixed too small icons on desktop. |
102 | Fixed non visible icons in mainwindow on Z with fastload enabled. | 105 | Fixed non visible icons in mainwindow on Z with fastload enabled. |
103 | Added signature file setting to smtp account config. | 106 | Added signature file setting to smtp account config. |
104 | And the signature can be edited and saved in the edit mail dialog. | 107 | And the signature can be edited and saved in the edit mail dialog. |
105 | That does mean: | 108 | That does mean: |
106 | Simply edit the signature for the selected smtp account in the | 109 | Simply edit the signature for the selected smtp account in the |
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index d87938a..417d89c 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -363,193 +363,203 @@ void KOEventViewer::appendEvent(Event *event, int mode ) | |||
363 | 363 | ||
364 | } | 364 | } |
365 | setText(mText); | 365 | setText(mText); |
366 | //QWhatsThis::add(this,mText); | 366 | //QWhatsThis::add(this,mText); |
367 | 367 | ||
368 | } | 368 | } |
369 | 369 | ||
370 | void KOEventViewer::appendTodo(Todo *event, int mode ) | 370 | void KOEventViewer::appendTodo(Todo *event, int mode ) |
371 | { | 371 | { |
372 | mMailSubject = ""; | 372 | mMailSubject = ""; |
373 | mCurrentIncidence = event; | 373 | mCurrentIncidence = event; |
374 | topLevelWidget()->setCaption(i18n("Todo Viewer")); | 374 | topLevelWidget()->setCaption(i18n("Todo Viewer")); |
375 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; | 375 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; |
376 | if (mode == 0 ) | 376 | if (mode == 0 ) |
377 | addTag("h2",event->summary()); | 377 | addTag("h2",event->summary()); |
378 | else { | 378 | else { |
379 | if ( mColorMode == 1 ) { | 379 | if ( mColorMode == 1 ) { |
380 | mText +="<font color=\"#00A000\">"; | 380 | mText +="<font color=\"#00A000\">"; |
381 | } | 381 | } |
382 | if ( mColorMode == 2 ) { | 382 | if ( mColorMode == 2 ) { |
383 | mText +="<font color=\"#B00000\">"; | 383 | mText +="<font color=\"#B00000\">"; |
384 | } | 384 | } |
385 | if ( mode == 1 ) { | 385 | if ( mode == 1 ) { |
386 | addTag("h2",i18n( "Local: " ) +event->summary()); | 386 | addTag("h2",i18n( "Local: " ) +event->summary()); |
387 | } else { | 387 | } else { |
388 | addTag("h2",i18n( "Remote: " ) +event->summary()); | 388 | addTag("h2",i18n( "Remote: " ) +event->summary()); |
389 | } | 389 | } |
390 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); | 390 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); |
391 | if ( mColorMode ) | 391 | if ( mColorMode ) |
392 | mText += "</font>"; | 392 | mText += "</font>"; |
393 | } | 393 | } |
394 | mMailSubject += i18n( "Todo " )+ event->summary(); | 394 | mMailSubject += i18n( "Todo " )+ event->summary(); |
395 | 395 | ||
396 | if ( event->percentComplete() == 100 && event->hasCompletedDate() ) { | 396 | if ( event->percentComplete() == 100 && event->hasCompletedDate() ) { |
397 | mText +="<font color=\"#B00000\">"; | 397 | mText +="<font color=\"#B00000\">"; |
398 | addTag("i", i18n("<p><i>Completed on %1</i></p>").arg( event->completedStr(KOPrefs::instance()->mShortDateInViewer) ) ); | 398 | addTag("i", i18n("<p><i>Completed on %1</i></p>").arg( event->completedStr(KOPrefs::instance()->mShortDateInViewer) ) ); |
399 | mText += "</font>"; | 399 | mText += "</font>"; |
400 | } else { | 400 | } else { |
401 | mText.append(i18n("<p><i>%1 % completed</i></p>") | 401 | mText.append(i18n("<p><i>%1 % completed</i></p>") |
402 | .arg(event->percentComplete())); | 402 | .arg(event->percentComplete())); |
403 | } | 403 | } |
404 | 404 | ||
405 | if (event->cancelled ()) { | 405 | if (event->cancelled ()) { |
406 | mText +="<font color=\"#B00000\">"; | 406 | mText +="<font color=\"#B00000\">"; |
407 | addTag("i",i18n("This todo has been cancelled!")); | 407 | addTag("i",i18n("This todo has been cancelled!")); |
408 | mText.append("<br>"); | 408 | mText.append("<br>"); |
409 | mText += "</font>"; | 409 | mText += "</font>"; |
410 | mMailSubject += i18n("(cancelled)"); | 410 | mMailSubject += i18n("(cancelled)"); |
411 | } | 411 | } |
412 | 412 | ||
413 | if (!event->location().isEmpty()) { | 413 | if (!event->location().isEmpty()) { |
414 | addTag("b",i18n("Location: ")); | 414 | addTag("b",i18n("Location: ")); |
415 | mText.append(event->location()+"<br>"); | 415 | mText.append(event->location()+"<br>"); |
416 | mMailSubject += i18n(" at ") + event->location(); | 416 | mMailSubject += i18n(" at ") + event->location(); |
417 | } | 417 | } |
418 | 418 | ||
419 | if (event->recurrence()->doesRecur()) { | 419 | if (event->recurrence()->doesRecur()) { |
420 | 420 | ||
421 | QString recurText = event->recurrence()->recurrenceText(); | 421 | QString recurText = event->recurrence()->recurrenceText(); |
422 | addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>"); | 422 | addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>"); |
423 | 423 | ||
424 | } | 424 | } |
425 | if (event->hasStartDate()) { | 425 | if (event->hasStartDate()) { |
426 | mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer))); | 426 | mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer))); |
427 | } | 427 | } |
428 | if (event->hasDueDate()) { | 428 | if (event->hasDueDate()) { |
429 | mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer))); | 429 | mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer))); |
430 | mMailSubject += i18n(" - " )+event->dtDueStr( true ); | 430 | mMailSubject += i18n(" - " )+event->dtDueStr( true ); |
431 | } | 431 | } |
432 | addTag("b",i18n("Access: ")); | 432 | addTag("b",i18n("Access: ")); |
433 | mText.append(event->secrecyStr()+"<br>"); | 433 | mText.append(event->secrecyStr()+"<br>"); |
434 | if ( KOPrefs::instance()->mEVshowDetails ) { | 434 | if ( KOPrefs::instance()->mEVshowDetails ) { |
435 | if (!event->description().isEmpty()) { | 435 | if (!event->description().isEmpty()) { |
436 | addTag("p",i18n("<b>Details: </b>")); | 436 | addTag("p",i18n("<b>Details: </b>")); |
437 | addTag("p",event->description()); | 437 | addTag("p",event->description()); |
438 | } | 438 | } |
439 | } | 439 | } |
440 | 440 | ||
441 | formatCategories(event); | 441 | formatCategories(event); |
442 | 442 | ||
443 | mText.append(i18n("<p><b>Priority:</b> %2</p>") | 443 | mText.append(i18n("<p><b>Priority:</b> %2</p>") |
444 | .arg(QString::number(event->priority()))); | 444 | .arg(QString::number(event->priority()))); |
445 | 445 | ||
446 | formatReadOnly(event); | 446 | formatReadOnly(event); |
447 | formatAttendees(event); | 447 | formatAttendees(event); |
448 | if ( event->relatedTo() ) { | 448 | if ( event->relatedTo() ) { |
449 | addTag("b",i18n("Parent todo:<br>")); | 449 | addTag("b",i18n("Parent todo:<br>")); |
450 | mText.append(event->relatedTo()->summary()+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>"); | 450 | mText.append(event->relatedTo()->summary()+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>"); |
451 | } | 451 | } |
452 | QPtrList<Incidence> Relations = event->relations(); | 452 | QPtrList<Incidence> Relations = event->relations(); |
453 | Incidence *to; | 453 | Incidence *to; |
454 | if ( Relations.first() ) | 454 | if ( Relations.first() ) |
455 | addTag("b",i18n("Sub todos:<br>")); | 455 | addTag("b",i18n("Sub todos:<br>")); |
456 | for (to=Relations.first();to;to=Relations.next()) { | 456 | for (to=Relations.first();to;to=Relations.next()) { |
457 | mText.append( to->summary()+" [" +QString::number(to->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%]<br>"); | 457 | mText.append( to->summary()+" [" +QString::number(to->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%]<br>"); |
458 | 458 | ||
459 | } | 459 | } |
460 | if ( KOPrefs::instance()->mEVshowCreated ) { | ||
461 | addTag("p",i18n("<b>Created: ") +" </b>"); | ||
462 | addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate )); | ||
463 | |||
464 | } | ||
465 | if ( KOPrefs::instance()->mEVshowChanged ) { | ||
466 | addTag("p",i18n("<b>Last modified: ") +" </b>"); | ||
467 | addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate )); | ||
468 | |||
469 | } | ||
460 | setText(mText); | 470 | setText(mText); |
461 | } | 471 | } |
462 | 472 | ||
463 | void KOEventViewer::formatCategories(Incidence *event) | 473 | void KOEventViewer::formatCategories(Incidence *event) |
464 | { | 474 | { |
465 | if (!event->categoriesStr().isEmpty()) { | 475 | if (!event->categoriesStr().isEmpty()) { |
466 | if (event->categories().count() == 1) { | 476 | if (event->categories().count() == 1) { |
467 | addTag("h3",i18n("Category")); | 477 | addTag("h3",i18n("Category")); |
468 | } else { | 478 | } else { |
469 | addTag("h3",i18n("Categories")); | 479 | addTag("h3",i18n("Categories")); |
470 | } | 480 | } |
471 | addTag("p",event->categoriesStr()); | 481 | addTag("p",event->categoriesStr()); |
472 | } | 482 | } |
473 | } | 483 | } |
474 | void KOEventViewer::formatAttendees(Incidence *event) | 484 | void KOEventViewer::formatAttendees(Incidence *event) |
475 | { | 485 | { |
476 | QPtrList<Attendee> attendees = event->attendees(); | 486 | QPtrList<Attendee> attendees = event->attendees(); |
477 | if (attendees.count()) { | 487 | if (attendees.count()) { |
478 | 488 | ||
479 | 489 | ||
480 | QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small); | 490 | QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small); |
481 | QString NOiconPath = KGlobal::iconLoader()->iconPath("nomailappt",KIcon::Small); | 491 | QString NOiconPath = KGlobal::iconLoader()->iconPath("nomailappt",KIcon::Small); |
482 | addTag("h3",i18n("Organizer")); | 492 | addTag("h3",i18n("Organizer")); |
483 | mText.append("<ul><li>"); | 493 | mText.append("<ul><li>"); |
484 | #ifndef KORG_NOKABC | 494 | #ifndef KORG_NOKABC |
485 | 495 | ||
486 | #ifdef DESKTOP_VERSION | 496 | #ifdef DESKTOP_VERSION |
487 | KABC::AddressBook *add_book = KABC::StdAddressBook::self(); | 497 | KABC::AddressBook *add_book = KABC::StdAddressBook::self(); |
488 | KABC::Addressee::List addressList; | 498 | KABC::Addressee::List addressList; |
489 | addressList = add_book->findByEmail(event->organizer()); | 499 | addressList = add_book->findByEmail(event->organizer()); |
490 | KABC::Addressee o = addressList.first(); | 500 | KABC::Addressee o = addressList.first(); |
491 | if (!o.isEmpty() && addressList.size()<2) { | 501 | if (!o.isEmpty() && addressList.size()<2) { |
492 | mText += "<a href=\"uid:" + o.uid() + "\">"; | 502 | mText += "<a href=\"uid:" + o.uid() + "\">"; |
493 | mText += o.formattedName(); | 503 | mText += o.formattedName(); |
494 | mText += "</a>\n"; | 504 | mText += "</a>\n"; |
495 | } else { | 505 | } else { |
496 | mText.append(event->organizer()); | 506 | mText.append(event->organizer()); |
497 | } | 507 | } |
498 | #else //DESKTOP_VERSION | 508 | #else //DESKTOP_VERSION |
499 | mText += "<a href=\"uid:organizer\">"; | 509 | mText += "<a href=\"uid:organizer\">"; |
500 | mText += event->organizer(); | 510 | mText += event->organizer(); |
501 | mText += "</a>\n"; | 511 | mText += "</a>\n"; |
502 | #endif //DESKTOP_VERSION | 512 | #endif //DESKTOP_VERSION |
503 | 513 | ||
504 | 514 | ||
505 | #else | 515 | #else |
506 | mText.append(event->organizer()); | 516 | mText.append(event->organizer()); |
507 | #endif | 517 | #endif |
508 | 518 | ||
509 | if (iconPath) { | 519 | if (iconPath) { |
510 | mText += " <a href=\"mailto:" + event->organizer() + "\">"; | 520 | mText += " <a href=\"mailto:" + event->organizer() + "\">"; |
511 | mText += "<IMG src=\"" + iconPath + "\">"; | 521 | mText += "<IMG src=\"" + iconPath + "\">"; |
512 | mText += "</a>\n"; | 522 | mText += "</a>\n"; |
513 | } | 523 | } |
514 | mText.append("</li></ul>"); | 524 | mText.append("</li></ul>"); |
515 | 525 | ||
516 | addTag("h3",i18n("Attendees")); | 526 | addTag("h3",i18n("Attendees")); |
517 | Attendee *a; | 527 | Attendee *a; |
518 | mText.append("<ul>"); | 528 | mText.append("<ul>"); |
519 | int a_count = 0; | 529 | int a_count = 0; |
520 | int a_count_nr = 0; | 530 | int a_count_nr = 0; |
521 | 531 | ||
522 | for(a=attendees.first();a;a=attendees.next()) { | 532 | for(a=attendees.first();a;a=attendees.next()) { |
523 | #ifndef KORG_NOKABC | 533 | #ifndef KORG_NOKABC |
524 | #ifdef DESKTOP_VERSION | 534 | #ifdef DESKTOP_VERSION |
525 | if (a->name().isEmpty()) { | 535 | if (a->name().isEmpty()) { |
526 | addressList = add_book->findByEmail(a->email()); | 536 | addressList = add_book->findByEmail(a->email()); |
527 | KABC::Addressee o = addressList.first(); | 537 | KABC::Addressee o = addressList.first(); |
528 | if (!o.isEmpty() && addressList.size()<2) { | 538 | if (!o.isEmpty() && addressList.size()<2) { |
529 | mText += "<a href=\"uid:" + o.uid() + "\">"; | 539 | mText += "<a href=\"uid:" + o.uid() + "\">"; |
530 | mText += o.formattedName(); | 540 | mText += o.formattedName(); |
531 | mText += "</a>\n"; | 541 | mText += "</a>\n"; |
532 | } else { | 542 | } else { |
533 | mText += "<li>"; | 543 | mText += "<li>"; |
534 | mText.append(a->email()); | 544 | mText.append(a->email()); |
535 | mText += "\n"; | 545 | mText += "\n"; |
536 | } | 546 | } |
537 | } else { | 547 | } else { |
538 | mText += "<li><a href=\"uid:" + a->uid() + "\">"; | 548 | mText += "<li><a href=\"uid:" + a->uid() + "\">"; |
539 | if (!a->name().isEmpty()) mText += a->name(); | 549 | if (!a->name().isEmpty()) mText += a->name(); |
540 | else mText += a->email(); | 550 | else mText += a->email(); |
541 | mText += "</a>\n"; | 551 | mText += "</a>\n"; |
542 | } | 552 | } |
543 | #else //DESKTOP_VERSION | 553 | #else //DESKTOP_VERSION |
544 | mText += "<li><a href=\"uid:" + a->uid() + "\">"; | 554 | mText += "<li><a href=\"uid:" + a->uid() + "\">"; |
545 | if (!a->name().isEmpty()) mText += a->name(); | 555 | if (!a->name().isEmpty()) mText += a->name(); |
546 | else mText += a->email(); | 556 | else mText += a->email(); |
547 | mText += "</a>\n"; | 557 | mText += "</a>\n"; |
548 | #endif //DESKTOP_VERSION | 558 | #endif //DESKTOP_VERSION |
549 | #else | 559 | #else |
550 | //qDebug("nokabc "); | 560 | //qDebug("nokabc "); |
551 | mText += "<li><a href=\"uid:" + a->uid() + "\">"; | 561 | mText += "<li><a href=\"uid:" + a->uid() + "\">"; |
552 | if (!a->name().isEmpty()) mText += a->name(); | 562 | if (!a->name().isEmpty()) mText += a->name(); |
553 | else mText += a->email(); | 563 | else mText += a->email(); |
554 | mText += "</a>\n"; | 564 | mText += "</a>\n"; |
555 | #endif | 565 | #endif |