-rw-r--r-- | desktop/rpm/kdepim_rpm | 2 | ||||
-rw-r--r-- | korganizer/koagendaitem.cpp | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm index 9dd9034..9093b40 100644 --- a/desktop/rpm/kdepim_rpm +++ b/desktop/rpm/kdepim_rpm | |||
@@ -1,27 +1,27 @@ | |||
1 | Summary: A collection of PIM programs | 1 | Summary: A collection of PIM programs |
2 | Name: KDE-Pim-Pi | 2 | Name: KDE-Pim-Pi |
3 | Version: 1.9.20 | 3 | Version: 2.0.1 |
4 | Release: SuSE_9.2 | 4 | Release: SuSE_9.2 |
5 | Copyright:GPL | 5 | Copyright:GPL |
6 | Group: Productivity/Pim | 6 | Group: Productivity/Pim |
7 | Source:http://sourceforge.net/projects/kdepimpi/ | 7 | Source:http://sourceforge.net/projects/kdepimpi/ |
8 | URL:http://sourceforge.net/projects/kdepimpi/ | 8 | URL:http://sourceforge.net/projects/kdepimpi/ |
9 | Packager: zautrix | 9 | Packager: zautrix |
10 | 10 | ||
11 | %description | 11 | %description |
12 | This package contains the platform-independent PIM programs from | 12 | This package contains the platform-independent PIM programs from |
13 | www.pi-sync.net, compiled for SuSE 9.2: | 13 | www.pi-sync.net, compiled for SuSE 9.2: |
14 | KTimeTacker/Pi | 14 | KTimeTacker/Pi |
15 | KPhone/Pi | 15 | KPhone/Pi |
16 | KAddressbook/Pi | 16 | KAddressbook/Pi |
17 | KOrganizer/Pi | 17 | KOrganizer/Pi |
18 | PasswordManager/Pi | 18 | PasswordManager/Pi |
19 | KOPieMail/Pi | 19 | KOPieMail/Pi |
20 | 20 | ||
21 | These applications do not need anything from the KDE-desktop | 21 | These applications do not need anything from the KDE-desktop |
22 | at all to run on Linux. However, there is a dependency from | 22 | at all to run on Linux. However, there is a dependency from |
23 | two KDE libs, because a small command line program is included | 23 | two KDE libs, because a small command line program is included |
24 | to make it possible to sync with the KDE-desktop applications. | 24 | to make it possible to sync with the KDE-desktop applications. |
25 | 25 | ||
26 | These applications are independent from the KDE-desktop | 26 | These applications are independent from the KDE-desktop |
27 | environment. That means, nothing of your existing | 27 | environment. That means, nothing of your existing |
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index a05c60e..5f9ed92 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp | |||
@@ -497,55 +497,57 @@ void KOAgendaItem::computeText() | |||
497 | 497 | ||
498 | if ( !mIncidence->location().isEmpty() ) { | 498 | if ( !mIncidence->location().isEmpty() ) { |
499 | if ( mAllDay ) | 499 | if ( mAllDay ) |
500 | mDisplayedText += " ("; | 500 | mDisplayedText += " ("; |
501 | else | 501 | else |
502 | mDisplayedText += "\n("; | 502 | mDisplayedText += "\n("; |
503 | mDisplayedText += mIncidence->location() +")"; | 503 | mDisplayedText += mIncidence->location() +")"; |
504 | } | 504 | } |
505 | 505 | ||
506 | QString tipText = mIncidence->summary(); | 506 | QString tipText = mIncidence->summary(); |
507 | QWhatsThis::add(this,KIncidenceFormatter::instance()->getFormattedText( mIncidence )); | 507 | QWhatsThis::add(this,KIncidenceFormatter::instance()->getFormattedText( mIncidence )); |
508 | if ( !mIncidence->doesFloat() ) { | 508 | if ( !mIncidence->doesFloat() ) { |
509 | if ( mIncidence->type() == "Event" ) { | 509 | if ( mIncidence->type() == "Event" ) { |
510 | if ( (static_cast<Event*>(mIncidence))->isMultiDay() ) { | 510 | if ( (static_cast<Event*>(mIncidence))->isMultiDay() ) { |
511 | tipText += "\n"+i18n("From: ")+mIncidence->dtStartStr(); | 511 | tipText += "\n"+i18n("From: ")+mIncidence->dtStartStr(); |
512 | tipText += "\n"+i18n("To: ")+(static_cast<Event*>(mIncidence))->dtEndStr(); | 512 | tipText += "\n"+i18n("To: ")+(static_cast<Event*>(mIncidence))->dtEndStr(); |
513 | } | 513 | } |
514 | else { | 514 | else { |
515 | tipText += "\n"+i18n("Time: ")+mIncidence->dtStartTimeStr(); | 515 | tipText += "\n"+i18n("Time: ")+mIncidence->dtStartTimeStr(); |
516 | tipText += " - "+(static_cast<Event*>(mIncidence))->dtEndTimeStr(); | 516 | tipText += " - "+(static_cast<Event*>(mIncidence))->dtEndTimeStr(); |
517 | } | 517 | } |
518 | } | 518 | } |
519 | else if ( mIncidence->type() == "Todo" ) { | 519 | else if ( mIncidence->type() == "Todo" ) { |
520 | if (mIncidence->hasStartDate()) | 520 | if (mIncidence->hasStartDate()) |
521 | tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartStr(); | 521 | tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartStr(); |
522 | tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueStr(); | 522 | if (((Todo*)mIncidence)->hasDueDate()) |
523 | tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueStr(); | ||
523 | } | 524 | } |
524 | } else if ( mIncidence->type() == "Todo" ) { | 525 | } else if ( mIncidence->type() == "Todo" ) { |
525 | if (mIncidence->hasStartDate()) | 526 | if (mIncidence->hasStartDate()) |
526 | tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartDateStr(); | 527 | tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartDateStr(); |
527 | tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueDateStr(); | 528 | if (((Todo*)mIncidence)->hasDueDate()) |
529 | tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueDateStr(); | ||
528 | } | 530 | } |
529 | 531 | ||
530 | if (!mIncidence->location().isEmpty()) { | 532 | if (!mIncidence->location().isEmpty()) { |
531 | tipText += "\n"+i18n("Location: ")+mIncidence->location(); | 533 | tipText += "\n"+i18n("Location: ")+mIncidence->location(); |
532 | } | 534 | } |
533 | QToolTip::add(this,tipText,toolTipGroup(),""); | 535 | QToolTip::add(this,tipText,toolTipGroup(),""); |
534 | 536 | ||
535 | } | 537 | } |
536 | void KOAgendaItem::updateItem() | 538 | void KOAgendaItem::updateItem() |
537 | { | 539 | { |
538 | computeText(); | 540 | computeText(); |
539 | 541 | ||
540 | //qDebug("KOAgendaItem:: updateItem() %s %d %d ",incidence()->summary().latin1(), x(), y()); | 542 | //qDebug("KOAgendaItem:: updateItem() %s %d %d ",incidence()->summary().latin1(), x(), y()); |
541 | paintMe( mSelected ); | 543 | paintMe( mSelected ); |
542 | repaint( false); | 544 | repaint( false); |
543 | } | 545 | } |
544 | 546 | ||
545 | void KOAgendaItem::resizeEvent ( QResizeEvent *ev ) | 547 | void KOAgendaItem::resizeEvent ( QResizeEvent *ev ) |
546 | { | 548 | { |
547 | //qDebug("KOAgendaItem::resizeEvent %s ", mIncidence->summary().latin1()); | 549 | //qDebug("KOAgendaItem::resizeEvent %s ", mIncidence->summary().latin1()); |
548 | paintMe( mSelected ); | 550 | paintMe( mSelected ); |
549 | repaint( false ); | 551 | repaint( false ); |
550 | } | 552 | } |
551 | 553 | ||