| -rw-r--r-- | korganizer/koeditorgeneralevent.cpp | 8 | ||||
| -rw-r--r-- | korganizer/komonthview.cpp | 2 | ||||
| -rw-r--r-- | korganizer/kotodoviewitem.cpp | 10 | ||||
| -rw-r--r-- | korganizer/kowhatsnextview.cpp | 6 |
4 files changed, 15 insertions, 11 deletions
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index adc733b..2a49528 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp @@ -398,6 +398,6 @@ bool KOEditorGeneralEvent::validateInput() if (!mStartDateEdit->inputIsValid()) { KMessageBox::sorry( 0, - i18n("Please specify a valid start date, for example '%1'.") - .arg( KGlobal::locale()->formatDate( QDate::currentDate() ) ) ); + i18n("Please specify a valid start date,\nfor example '%1'.") + .arg( KGlobal::locale()->formatDate( QDate::currentDate(), true ) ) ); return false; } @@ -405,6 +405,6 @@ bool KOEditorGeneralEvent::validateInput() if (!mEndDateEdit->inputIsValid()) { KMessageBox::sorry( 0, - i18n("Please specify a valid end date, for example '%1'.") - .arg( KGlobal::locale()->formatDate( QDate::currentDate() ) ) ); + i18n("Please specify a valid end date,\nfor example '%1'.") + .arg( KGlobal::locale()->formatDate( QDate::currentDate(), true ) ) ); return false; } diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index da81586..f595d35 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -554,5 +554,5 @@ void MonthViewCell::insertTodo(Todo *todo) } } - text += i18n("Td: %1").arg(todo->summary()); + text += i18n("T: %1").arg(todo->summary()); MonthViewItem *item = new MonthViewItem( todo, mDate, text ); diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index 44db209..0e847c2 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp @@ -272,5 +272,5 @@ bool KOTodoViewItem::isAlternate() { KOTodoViewItem *above = 0; - above = dynamic_cast<KOTodoViewItem *>(itemAbove()); + above = static_cast<KOTodoViewItem *>(itemAbove()); m_known = above ? above->m_known : true; if (m_known) @@ -284,12 +284,12 @@ bool KOTodoViewItem::isAlternate() if (QListViewItem::parent()) { - item = dynamic_cast<KOTodoViewItem *>(QListViewItem::parent()); + item = static_cast<KOTodoViewItem *>(QListViewItem::parent()); if (item) previous = item->m_odd; - item = dynamic_cast<KOTodoViewItem *>(QListViewItem::parent()->firstChild()); + item = static_cast<KOTodoViewItem *>(QListViewItem::parent()->firstChild()); } else { - item = dynamic_cast<KOTodoViewItem *>(lv->firstChild()); + item = static_cast<KOTodoViewItem *>(lv->firstChild()); } @@ -298,5 +298,5 @@ bool KOTodoViewItem::isAlternate() item->m_odd = previous = !previous; item->m_known = true; - item = dynamic_cast<KOTodoViewItem *>(item->nextSibling()); + item = static_cast<KOTodoViewItem *>(item->nextSibling()); } } diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 10665f4..391b3bb 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -616,5 +616,9 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a noc = ev->getNextOccurence( cdt.addDays(-1), &ok ); if ( ok ) { - int years = noc.date().year() - ev->dtStart().date().year(); + int years = 0; + if ( ev->type() =="Todo" ) { + years = noc.date().year() -((Todo*)ev)->dtDue().date().year(); + } else + years = noc.date().year() - ev->dtStart().date().year(); tempText += i18n(" (%1 y.)"). arg( years ); } |