summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt1
-rw-r--r--korganizer/koeventviewer.cpp14
-rw-r--r--korganizer/koeventviewerdialog.cpp3
3 files changed, 18 insertions, 0 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index da33d12..ccebf58 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -7,6 +7,7 @@ Fixed that tooltips were not updated after moving an item in agenda view.
Fixed a bug in sorting start date for recurring events in list view.
Changed the left button in todo viewer from "Agenda" to "Set completed".
This makes it possible to change a todo in the What's Next View quickly to the completed state without leaving the What's Next View.
+Added more info in the todo viewer: Startdate, parent/sub todos.
KA/Pi:
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 1fcc977..cee0466 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -360,6 +360,9 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
mText.append(event->location()+"<br>");
mMailSubject += i18n(" at ") + event->location();
}
+ if (event->hasStartDate()) {
+ mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer)));
+ }
if (event->hasDueDate()) {
mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer)));
mMailSubject += i18n(" - " )+event->dtDueStr( true );
@@ -381,7 +384,18 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
formatReadOnly(event);
formatAttendees(event);
+ if ( event->relatedTo() ) {
+ addTag("b",i18n("Parent todo: "));
+ mText.append(event->relatedTo()->summary()+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>");
+ }
+ QPtrList<Incidence> Relations = event->relations();
+ Incidence *to;
+ if ( Relations.first() )
+ addTag("b",i18n("Sub todos:<br>"));
+ for (to=Relations.first();to;to=Relations.next()) {
+ mText.append( to->summary()+" [" +QString::number(to->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%]<br>");
+ }
setText(mText);
}
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index 772fd95..3979ed2 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -121,6 +121,9 @@ void KOEventViewerDialog::setEvent(Event *event)
mEventViewer->setEvent(event);
mIncidence = event;
findButton( Close )->setFocus();
+ if ( !mSyncMode ) {
+ findButton( User1 )->setText( i18n("Agenda"));
+ }
}
void KOEventViewerDialog::setIncidence(Incidence *in )
{