bugs

2 files changed, 19 insertions, 4 deletions

diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp
index 2c45f21..c52f2b3 100644
--- a/libkcal/kincidenceformatter.cpp
+++ b/libkcal/kincidenceformatter.cpp
@@ -180,15 +180,21 @@ void KIncidenceFormatter::setTodo(Todo *event )
     }
     if (event->hasDueDate()) {
         mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(shortDate)));
     }
     mText.append(i18n("<p><b>Priority:</b> %2</p>")
                  .arg(QString::number(event->priority())));
-
+  
+    if ( event->percentComplete() == 100 && event->hasCompletedDate() ) {
+    mText.append(i18n("<p><i>Completed on %1</i></p>")
+                 .arg( event->completedStr() ));
+    } else {
     mText.append(i18n("<p><i>%1 % completed</i></p>")
                  .arg(event->percentComplete()));
+    }
+    
      addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() );
     formatCategories(event);
     if (!event->description().isEmpty()) {
         addTag("p",i18n("<b>Details: </b>"));
         addTag("p",event->description());
     }
@@ -243,12 +249,13 @@ void KIncidenceFormatter::addTag(const QString & tag,const QString & text)
 
 void KIncidenceFormatter::formatAttendees(Incidence *event)
 {
  QPtrList<Attendee> attendees = event->attendees();
     if (attendees.count()) {
         QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small);
+        QString NOiconPath = KGlobal::iconLoader()->iconPath("nomailappt",KIcon::Small);
         addTag("h3",i18n("Organizer"));
         mText.append("<ul><li>");
 #if 0
         //ndef KORG_NOKABC
        
         KABC::AddressBook *add_book = KABC::StdAddressBook::self();
@@ -303,14 +310,17 @@ void KIncidenceFormatter::formatAttendees(Incidence *event)
             else mText += a->email();
             mText += "</a>\n";
 #endif
 
             if (!a->email().isEmpty()) {
                 if (iconPath) {
-                    mText += "<a href=\"mailto:" + a->name() +" "+ "<" + a->email() + ">" + "\">";
-                    mText += "<IMG src=\"" + iconPath + "\">";
+                    mText += "<a href=\"mailto:" + a->name() +" "+ "<" + a->email() + ">" + "\">"; 
+                    if ( a->RSVP() )
+                        mText += "<IMG src=\"" + iconPath + "\">";
+                    else
+                        mText += "<IMG src=\"" + NOiconPath + "\">";
                     mText += "</a>\n";
                 }
             }
             if (a->status() != Attendee::NeedsAction )
                 mText +="[" + a->statusStr() + "] ";
             if (a->role() == Attendee::Chair )
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index 3d2de61..7362bdf 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -285,13 +285,16 @@ bool Todo::isCompleted() const
   else return false;
 }
 
 void Todo::setCompleted(bool completed)
 {
   if (completed) mPercentComplete = 100;
-  else mPercentComplete = 0;
+  else {
+      mPercentComplete = 0;
+      mHasCompletedDate = false;
+  }
   updated();
 }
 
 QDateTime Todo::completed() const
 {
   return mCompleted;
@@ -320,12 +323,14 @@ int Todo::percentComplete() const
   return mPercentComplete;
 }
 
 void Todo::setPercentComplete(int v)
 {
   mPercentComplete = v;
+  if ( v != 100 )
+      mHasCompletedDate = false;
   updated();
 }
 QDateTime Todo::getNextAlarmDateTime( bool * ok, int * offset ) const
 {
     if ( isCompleted() || ! hasDueDate() || cancelled() ) {
          *ok = false;