better todo info

3 files changed, 19 insertions, 1 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
@@ -1,21 +1,22 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 1.9.17 ************
 
 KO/Pi:
 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:
 All fields search does now actually search all the (possible) fields, 
 not only those listed in the contact list.
 Made is possible to inline a picture in a vcard on the Z.
 This was only possible on the desktop, now is it possible on the Z as well.
 Fixed of missing save settings after filter configuration.
 Made saving of addressbook much faster.
 Fixed extension widget layout problem.
 Fixed saving of default formatted name settings.
 Fixed formatted name handling in edit dialog.
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 1fcc977..cee0466 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -351,46 +351,60 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
         mText +="<font color=\"#B00000\">";
         addTag("i",i18n("This todo has been cancelled!"));
         mText.append("<br>");
         mText += "</font>";
         mMailSubject += i18n("(cancelled)");
     }
    
     if (!event->location().isEmpty()) {
         addTag("b",i18n("Location: "));
         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 );
     }
     addTag("b",i18n("Access: "));
     mText.append(event->secrecyStr()+"<br>");
     if (!event->description().isEmpty()) {
         addTag("p",i18n("<b>Details: </b>"));
         addTag("p",event->description());
     }
 
     formatCategories(event);
 
     mText.append(i18n("<p><b>Priority:</b> %2</p>")
                  .arg(QString::number(event->priority())));
 
     mText.append(i18n("<p><i>%1 % completed</i></p>")
                  .arg(event->percentComplete()));
 
     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);
 }
 
 void KOEventViewer::formatCategories(Incidence *event)
 {
     if (!event->categoriesStr().isEmpty()) {
         if (event->categories().count() == 1) {
             addTag("h3",i18n("Category"));
         } else {
             addTag("h3",i18n("Categories"));
         }
         addTag("p",event->categoriesStr());
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index 772fd95..3979ed2 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -112,24 +112,27 @@ int KOEventViewerDialog::executeS( bool local )
 }
 
 void KOEventViewerDialog::updateConfig()
 {
   mEventViewer->setFont( KOPrefs::instance()->mEventViewFont );
 
 }
 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 )
 {
     if ( in->type() == "Event" )
         setEvent( (Event*) in );
     else if ( in->type() =="Todo" )
         setTodo( (Todo*) in );
     else if ( in->type() =="Journal" )
         setJournal( (Journal*) in );
 }
 void KOEventViewerDialog::addIncidence(Incidence *in)
 {