summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koeditorgeneralevent.cpp8
-rw-r--r--korganizer/komonthview.cpp2
-rw-r--r--korganizer/kotodoviewitem.cpp10
-rw-r--r--korganizer/kowhatsnextview.cpp6
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
@@ -397,15 +397,15 @@ 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;
}
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
@@ -553,7 +553,7 @@ void MonthViewCell::insertTodo(Todo *todo)
text += " ";
}
}
- text += i18n("Td: %1").arg(todo->summary());
+ text += i18n("T: %1").arg(todo->summary());
MonthViewItem *item = new MonthViewItem( todo, mDate, text );
//item->setPalette( mStandardPalette );
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 44db209..0e847c2 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -271,7 +271,7 @@ bool KOTodoViewItem::isAlternate()
if (lv && lv->alternateBackground().isValid())
{
KOTodoViewItem *above = 0;
- above = dynamic_cast<KOTodoViewItem *>(itemAbove());
+ above = static_cast<KOTodoViewItem *>(itemAbove());
m_known = above ? above->m_known : true;
if (m_known)
{
@@ -283,21 +283,21 @@ bool KOTodoViewItem::isAlternate()
bool previous = true;
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());
}
while(item)
{
item->m_odd = previous = !previous;
item->m_known = true;
- item = dynamic_cast<KOTodoViewItem *>(item->nextSibling());
+ item = static_cast<KOTodoViewItem *>(item->nextSibling());
}
}
return m_odd;
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 10665f4..391b3bb 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -615,7 +615,11 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
if ( bDay ) {
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 );
}
}