-rw-r--r-- | bin/kdepim/WhatsNew.txt | 3 | ||||
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 2 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 11 | ||||
-rw-r--r-- | korganizer/kowhatsnextview.cpp | 13 |
4 files changed, 24 insertions, 5 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 6c4cb7b..4c00770 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -5,16 +5,19 @@ Info about the changes in new versions of KDE-Pim/Pi | |||
5 | Stable release 2.0.0! | 5 | Stable release 2.0.0! |
6 | 6 | ||
7 | KO/Pi: | 7 | KO/Pi: |
8 | Fixed problem in edit dialog recreation at startup. | 8 | Fixed problem in edit dialog recreation at startup. |
9 | Made "toggle view*" menu items enabled context sensitive. | 9 | Made "toggle view*" menu items enabled context sensitive. |
10 | Changed agenda size menu to items 1-10. | 10 | Changed agenda size menu to items 1-10. |
11 | Made it possible to change agenda size quickly by pressing mouse on timelabels in agenda view and move mouse up/down. | 11 | Made it possible to change agenda size quickly by pressing mouse on timelabels in agenda view and move mouse up/down. |
12 | Usebility enhancements in the KO/Pi menus. | 12 | Usebility enhancements in the KO/Pi menus. |
13 | Birthday import now adds year to summary. | ||
14 | What's Next view shows age in years for birthday. | ||
15 | |||
13 | OM/Pi: | 16 | OM/Pi: |
14 | Added three info lines to display subject, from and to of selected mails. | 17 | Added three info lines to display subject, from and to of selected mails. |
15 | 18 | ||
16 | ********** VERSION 1.9.20 ************ | 19 | ********** VERSION 1.9.20 ************ |
17 | 20 | ||
18 | KO/Pi: | 21 | KO/Pi: |
19 | Added for the "dislplay one day" agenda mode | 22 | Added for the "dislplay one day" agenda mode |
20 | info in the caption and in the day lables: | 23 | info in the caption and in the day lables: |
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index e55d17e..dce95cd 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -1188,16 +1188,16 @@ | |||
1188 | { "confidential","vertraulich" }, | 1188 | { "confidential","vertraulich" }, |
1189 | { "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Unter-Todos.\nAlle erledigten Unter-Todos\nwerden auch gelöscht!" }, | 1189 | { "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Unter-Todos.\nAlle erledigten Unter-Todos\nwerden auch gelöscht!" }, |
1190 | { "Yesterday","Gestern" }, | 1190 | { "Yesterday","Gestern" }, |
1191 | { "Day after tomorrow","Übermorgen" }, | 1191 | { "Day after tomorrow","Übermorgen" }, |
1192 | { "Tomorrow","Morgen" }, | 1192 | { "Tomorrow","Morgen" }, |
1193 | { "Day before yesterday","Vorgestern" }, | 1193 | { "Day before yesterday","Vorgestern" }, |
1194 | { "Size %1","Größe %1" }, | 1194 | { "Size %1","Größe %1" }, |
1195 | { "New Agendasize: %1","Neue Agendagröße: %1" }, | 1195 | { "New Agendasize: %1","Neue Agendagröße: %1" }, |
1196 | { "","" }, | 1196 | { " (%1 y.)"," (%1 J.)" }, |
1197 | { "","" }, | 1197 | { "","" }, |
1198 | { "","" }, | 1198 | { "","" }, |
1199 | { "","" }, | 1199 | { "","" }, |
1200 | { "","" }, | 1200 | { "","" }, |
1201 | { "","" }, | 1201 | { "","" }, |
1202 | { "","" }, | 1202 | { "","" }, |
1203 | { "","" }, | 1203 | { "","" }, |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 1d5a57e..257a4dd 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1518,21 +1518,24 @@ void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthd | |||
1518 | bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a, bool birthday) | 1518 | bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a, bool birthday) |
1519 | { | 1519 | { |
1520 | //qDebug("addAnni "); | 1520 | //qDebug("addAnni "); |
1521 | Event * ev = new Event(); | 1521 | Event * ev = new Event(); |
1522 | if ( a ) { | 1522 | if ( a ) { |
1523 | ev->addAttendee( a ); | 1523 | ev->addAttendee( a ); |
1524 | } | 1524 | } |
1525 | QString kind; | 1525 | QString kind; |
1526 | if ( birthday ) | 1526 | if ( birthday ) { |
1527 | kind = i18n( "Birthday" ); | 1527 | kind = i18n( "Birthday" ); |
1528 | else | 1528 | ev->setSummary( name + " (" + QString::number(date.year()) +")"); |
1529 | } | ||
1530 | else { | ||
1529 | kind = i18n( "Anniversary" ); | 1531 | kind = i18n( "Anniversary" ); |
1530 | ev->setSummary( name + " - " + kind ); | 1532 | ev->setSummary( name + " (" + QString::number(date.year()) +") " + kind ); |
1533 | } | ||
1531 | ev->setOrganizer(a->email()); | 1534 | ev->setOrganizer(a->email()); |
1532 | ev->setCategories( kind ); | 1535 | ev->setCategories( kind ); |
1533 | ev->setDtStart( QDateTime(date) ); | 1536 | ev->setDtStart( QDateTime(date) ); |
1534 | ev->setDtEnd( QDateTime(date) ); | 1537 | ev->setDtEnd( QDateTime(date) ); |
1535 | ev->setFloats( true ); | 1538 | ev->setFloats( true ); |
1536 | Recurrence * rec = ev->recurrence(); | 1539 | Recurrence * rec = ev->recurrence(); |
1537 | rec->setYearly(Recurrence::rYearlyMonth,1,-1); | 1540 | rec->setYearly(Recurrence::rYearlyMonth,1,-1); |
1538 | rec->addYearlyNum( date.month() ); | 1541 | rec->addYearlyNum( date.month() ); |
@@ -2506,31 +2509,33 @@ void CalendarView::showDatePicker( ) | |||
2506 | void CalendarView::showEventEditor() | 2509 | void CalendarView::showEventEditor() |
2507 | { | 2510 | { |
2508 | #ifdef DESKTOP_VERSION | 2511 | #ifdef DESKTOP_VERSION |
2509 | mEventEditor->show(); | 2512 | mEventEditor->show(); |
2510 | #else | 2513 | #else |
2511 | if ( mEventEditor->width() < QApplication::desktop()->width() -60 || mEventEditor->width() > QApplication::desktop()->width() ) { | 2514 | if ( mEventEditor->width() < QApplication::desktop()->width() -60 || mEventEditor->width() > QApplication::desktop()->width() ) { |
2512 | topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") ); | 2515 | topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") ); |
2513 | qDebug("KO: CalendarView: recreate mEventEditor %d %d", mEventEditor->width(), QApplication::desktop()->width() ); | 2516 | qDebug("KO: CalendarView: recreate mEventEditor %d %d", mEventEditor->width(), QApplication::desktop()->width() ); |
2517 | qApp->processEvents(); | ||
2514 | delete mEventEditor; | 2518 | delete mEventEditor; |
2515 | mEventEditor = mDialogManager->getEventEditor(); | 2519 | mEventEditor = mDialogManager->getEventEditor(); |
2516 | topLevelWidget()->setCaption( i18n("") ); | 2520 | topLevelWidget()->setCaption( i18n("") ); |
2517 | } | 2521 | } |
2518 | mEventEditor->showMaximized(); | 2522 | mEventEditor->showMaximized(); |
2519 | #endif | 2523 | #endif |
2520 | } | 2524 | } |
2521 | void CalendarView::showTodoEditor() | 2525 | void CalendarView::showTodoEditor() |
2522 | { | 2526 | { |
2523 | #ifdef DESKTOP_VERSION | 2527 | #ifdef DESKTOP_VERSION |
2524 | mTodoEditor->show(); | 2528 | mTodoEditor->show(); |
2525 | #else | 2529 | #else |
2526 | if ( mTodoEditor->width() < QApplication::desktop()->width() -60|| mTodoEditor->width() > QApplication::desktop()->width() ) { | 2530 | if ( mTodoEditor->width() < QApplication::desktop()->width() -60|| mTodoEditor->width() > QApplication::desktop()->width() ) { |
2527 | topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") ); | 2531 | topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") ); |
2528 | qDebug("KO: CalendarView: recreate mTodoEditor %d %d ", mTodoEditor->width() ,QApplication::desktop()->width() ); | 2532 | qDebug("KO: CalendarView: recreate mTodoEditor %d %d ", mTodoEditor->width() ,QApplication::desktop()->width() ); |
2533 | qApp->processEvents(); | ||
2529 | delete mTodoEditor; | 2534 | delete mTodoEditor; |
2530 | mTodoEditor = mDialogManager->getTodoEditor(); | 2535 | mTodoEditor = mDialogManager->getTodoEditor(); |
2531 | topLevelWidget()->setCaption( i18n("") ); | 2536 | topLevelWidget()->setCaption( i18n("") ); |
2532 | } | 2537 | } |
2533 | mTodoEditor->showMaximized(); | 2538 | mTodoEditor->showMaximized(); |
2534 | #endif | 2539 | #endif |
2535 | } | 2540 | } |
2536 | 2541 | ||
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 7166a01..4111c5d 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp | |||
@@ -595,16 +595,24 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a | |||
595 | tempText += "<a "; | 595 | tempText += "<a "; |
596 | if (ev->type()=="Event") tempText += "href=\"event:"; | 596 | if (ev->type()=="Event") tempText += "href=\"event:"; |
597 | if (ev->type()=="Todo") tempText += "href=\"todo:"; | 597 | if (ev->type()=="Todo") tempText += "href=\"todo:"; |
598 | tempText += ev->uid() + "\">"; | 598 | tempText += ev->uid() + "\">"; |
599 | if ( ev->summary().length() > 0 ) | 599 | if ( ev->summary().length() > 0 ) |
600 | tempText += ev->summary(); | 600 | tempText += ev->summary(); |
601 | else | 601 | else |
602 | tempText += i18n("-no summary-"); | 602 | tempText += i18n("-no summary-"); |
603 | if ( ev->categories().contains( i18n("Birthday") ) || ev->categories().contains( i18n("Anniversary") ) ) { | ||
604 | noc = ev->getNextOccurence( cdt, &ok ); | ||
605 | if ( ok ) { | ||
606 | int years = noc.date().year() - ev->dtStart().date().year(); | ||
607 | tempText += i18n(" (%1 y.)"). arg( years ); | ||
608 | } | ||
609 | } | ||
610 | |||
603 | tempText += "</a>"; | 611 | tempText += "</a>"; |
604 | if ( KOPrefs::instance()->mWNViewShowLocation ) | 612 | if ( KOPrefs::instance()->mWNViewShowLocation ) |
605 | if ( !ev->location().isEmpty() ) | 613 | if ( !ev->location().isEmpty() ) |
606 | tempText += " ("+ev->location() +")"; | 614 | tempText += " ("+ev->location() +")"; |
607 | if ( ev->relatedTo() && KOPrefs::instance()->mWNViewShowsParents) | 615 | if ( ev->relatedTo() && KOPrefs::instance()->mWNViewShowsParents) |
608 | tempText += " ["+ev->relatedTo()->summary() +"]"; | 616 | tempText += " ["+ev->relatedTo()->summary() +"]"; |
609 | tempText += "</td></tr>\n"; | 617 | tempText += "</td></tr>\n"; |
610 | mText += tempText; | 618 | mText += tempText; |
@@ -650,17 +658,20 @@ bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub ) | |||
650 | // mText += "r"; | 658 | // mText += "r"; |
651 | // needClose =true; | 659 | // needClose =true; |
652 | // } | 660 | // } |
653 | if ( needClose ) | 661 | if ( needClose ) |
654 | mText += "] "; | 662 | mText += "] "; |
655 | if ( ev->cancelled() ) | 663 | if ( ev->cancelled() ) |
656 | mText += "</font>"; | 664 | mText += "</font>"; |
657 | mText += "<a href=\"todo:" + ev->uid() + "\">"; | 665 | mText += "<a href=\"todo:" + ev->uid() + "\">"; |
658 | mText += ev->summary(); | 666 | if ( ev->summary().length() > 0 ) |
667 | mText += ev->summary(); | ||
668 | else | ||
669 | mText += i18n("-no summary-"); | ||
659 | mText += "</a>"; | 670 | mText += "</a>"; |
660 | if ( ((Todo*)ev)->hasDueDate () ) { | 671 | if ( ((Todo*)ev)->hasDueDate () ) { |
661 | QString year = ""; | 672 | QString year = ""; |
662 | int ye = ((Todo*)ev)->dtDue().date().year(); | 673 | int ye = ((Todo*)ev)->dtDue().date().year(); |
663 | if ( QDateTime::currentDateTime().date().year() != ye ) | 674 | if ( QDateTime::currentDateTime().date().year() != ye ) |
664 | year = QString::number( ye ); | 675 | year = QString::number( ye ); |
665 | QString dfs = KGlobal::locale()->dateFormatShort(); | 676 | QString dfs = KGlobal::locale()->dateFormatShort(); |
666 | KGlobal::locale()->setDateFormatShort("%d.%b"); | 677 | KGlobal::locale()->setDateFormatShort("%d.%b"); |