7 files changed, 52 insertions, 2 deletions

diff --git a/libkcal/alarm.cpp b/libkcal/alarm.cpp
index 79e0464..3157214 100644
--- a/libkcal/alarm.cpp
+++ b/libkcal/alarm.cpp
@@ -345,17 +345,17 @@ int Alarm::offset()
             return mParent->dtStart().secsTo( mAlarmTime ) ;
     }
     else
         {
             return mOffset.asSeconds();
         }
     
 }
-QString Alarm::offsetText() 
+QString Alarm::offsetText()
 {
     int min = -offset()/60;
     int hours = min /60;
     min = min % 60;
     int days = hours /24;
     hours = hours % 24;
     QString message;
     //qDebug("%d %d %d ", days, hours, min  );
diff --git a/libkcal/event.cpp b/libkcal/event.cpp
index 0766fd9..fdf5657 100644
--- a/libkcal/event.cpp
+++ b/libkcal/event.cpp
@@ -409,8 +409,16 @@ QDateTime Event::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_
              * offset = off;
              return alarmStart;
          }
      }
      *ok = false;
      return QDateTime ();
 
 }
+
+QString Event::durationText()
+{
+    int sec = mDtStart.secsTo( mDtEnd );
+    if ( doesFloat() )
+        sec += 86400;
+    return durationText4Time( sec );
+}
diff --git a/libkcal/event.h b/libkcal/event.h
index 2da9770..6a58618 100644
--- a/libkcal/event.h
+++ b/libkcal/event.h
@@ -71,16 +71,17 @@ class Event : public Incidence
     /** get the event's time transparency level. */
     Transparency transparency() const;
 
     void setDuration(int seconds);
 
     bool contains ( Event*);
 
     bool isOverlapping (  Event*,  QDateTime*, QDateTime* );
+    QString durationText();
 
   private:
     bool accept(Visitor &v) { return v.visit(this); }
 
     QDateTime mDtEnd;
     bool mHasEndDate;
     Transparency mTransparency;
 };
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 4643a3a..201f593 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -95,17 +95,46 @@ Incidence::~Incidence()
   for (ev=Relations.first();ev;ev=Relations.next()) {
     if (ev->relatedTo() == this) ev->setRelatedTo(0);
   } 
   if (relatedTo()) relatedTo()->removeRelation(this);
   if ( mRecurrence ) 
       delete mRecurrence; 
  
 }
+QString Incidence::durationText()
+{
+    return "---";
+}
+QString Incidence::durationText4Time( int offset )
+{
+    int min = offset/60;
+    int hours = min /60;
+    min = min % 60;
+    int days = hours /24;
+    hours = hours % 24;
+
+    if ( doesFloat() || ( min == 0 && hours == 0 )  ) {
+        if ( days == 1 )
+            return "1" + i18n(" day");
+        else
+            return QString::number( days )+   i18n(" days");
 
+    }
+    QString message = QString::number ( hours ) +":";
+    if ( min < 10 ) message += "0";
+    message += QString::number ( min );
+    if ( days > 0 ) { 
+        if ( days == 1 )
+            message =  "1" + i18n(" day") + " "+message;
+        else
+            message =  QString::number( days )+   i18n(" days") + " "+message;
+    }
+    return message; 
+}
 bool Incidence::isHoliday() const
 {
     return mHoliday;
 }
 bool Incidence::isBirthday() const
 {
 
     return mBirthday ;
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index 8519f01..88df217 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -276,17 +276,18 @@ class Incidence : public IncidenceBase
     QDateTime dtStart() const;
     bool isHoliday() const;
     bool isBirthday() const;
     bool isAnniversary() const;
     QDateTime lastModifiedSub();
     QString recurrenceText() const;
     void setLastModifiedSubInvalid();
     
-
+    virtual QString durationText();
+    QString durationText4Time( int secs );
     Recurrence *mRecurrence;
 protected:
     QPtrList<Alarm> mAlarms;
     QPtrList<Incidence> mRelations;
     QDateTime mRecurrenceID;
     bool mHasRecurrenceID;
   private:
     void checkCategories();
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index 7bf756a..e4508a0 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -609,8 +609,18 @@ void Todo::checkSetCompletedFalse()
         QDateTime dt = QDateTime::currentDateTime();
         if ( dt > mDtStart && dt > mRecurrenceID ) {
             qDebug("start: %s --due: %s --recID: %s ",mDtStart.toString().latin1(), dtDue().toString().latin1(),mRecurrenceID.toString().latin1() );
             setCompleted( false );
             qDebug("Todo::checkSetCompletedFalse ");
         }
     }
 }
+QString Todo::durationText()
+{
+    if ( mHasDueDate && hasStartDate() ) {
+        int sec = dtStart().secsTo( dtDue() );
+        if ( doesFloat() )
+            sec += 86400;
+        return durationText4Time( sec );
+    }
+    return "---";
+}
diff --git a/libkcal/todo.h b/libkcal/todo.h
index 425dfad..7feb32e 100644
--- a/libkcal/todo.h
+++ b/libkcal/todo.h
@@ -125,16 +125,17 @@ namespace KCal {
     void stopRunning();
     int runTime();
     QDateTime runStart () const { return mRunStart;}
     void saveRunningInfo( QString comment, QDateTime start, QDateTime end );
     public slots:
     void saveRunningInfoToFile( QString st );
     void saveRunningInfoToFile( );
     void saveParents();
+    QString durationText();
   private:
     bool mRunning;
     QTimer * mRunSaveTimer;
     QDateTime mRunStart;
     QDateTime mRunEnd;
     bool accept(Visitor &v) { return v.visit(this); }
 
     QDateTime mDtDue;                     // due date of todo