summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-02-17 21:45:30 (UTC)
committer zautrix <zautrix>2005-02-17 21:45:30 (UTC)
commitb1e885da3b0a083121f940485d9c0eea53ff5139 (patch) (unidiff)
treee999d042e45cd1410cc327a3c347bbefa5896289
parent8e8d2bd0c31eb272a7f26756252ff4930d0602bc (diff)
downloadkdepimpi-b1e885da3b0a083121f940485d9c0eea53ff5139.zip
kdepimpi-b1e885da3b0a083121f940485d9c0eea53ff5139.tar.gz
kdepimpi-b1e885da3b0a083121f940485d9c0eea53ff5139.tar.bz2
fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt3
-rw-r--r--korganizer/koeventviewer.cpp12
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,34 +1,37 @@
1Info about the changes in new versions of KDE-Pim/Pi 1Info about the changes in new versions of KDE-Pim/Pi
2 2
3********** VERSION 2.0.8 ************ 3********** VERSION 2.0.8 ************
4 4
5Fixed a problem in dependency info in the ipk files for the Zaurus. 5Fixed a problem in dependency info in the ipk files for the Zaurus.
6 6
7Added 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. 7Added 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
9Added a "go today" button to the datepicker. 9Added a "go today" button to the datepicker.
10 10
11Added "created" and "last modified" to event/todo viewer (and What'sThis viewer)
12and made it configureable to show these values.
13
11 14
12********** VERSION 2.0.7 ************ 15********** VERSION 2.0.7 ************
13 16
14Added global application font settings 17Added 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
17Fixed a problem in OM/Pi when trying to login to some IMAP servers 20Fixed 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
20Added recurring todos to KO/Pi. 23Added recurring todos to KO/Pi.
21 24
22 25
23********** VERSION 2.0.6 ************ 26********** VERSION 2.0.6 ************
24 27
25Some bugfixes in the pi-sync mode. 28Some bugfixes in the pi-sync mode.
26Added German translation for pi-sync mode. 29Added German translation for pi-sync mode.
27 30
28KO/Pi: 31KO/Pi:
29Made the todolist using alternate background. 32Made the todolist using alternate background.
30 33
31Other minor fixes in KO/Pi. 34Other minor fixes in KO/Pi.
32 35
33 36
34********** VERSION 2.0.5 ************ 37********** VERSION 2.0.5 ************
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index d87938a..417d89c 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -435,49 +435,59 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
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
463void KOEventViewer::formatCategories(Incidence *event) 473void 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}
474void KOEventViewer::formatAttendees(Incidence *event) 484void 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>");