another fixx

7 files changed, 69 insertions, 20 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 14dcdac..9ba4f3e 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,52 +1,54 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.0.3 ************
 
 KO/Pi:
 Added feature for changing alarm settings for many items at once:
 Open list view (or search dialog), select the desired items and choose in
 the popup menu: Set alarm for selected...
 
 Added to the event/todo viewer the option to send an email to 
 all attendees or all selected (with RSVP) attendees. 
 
 Made the week-month mode changing in month view faster.
 
 Made month view better useable with keyboard.
 Now TAB key jumps to next cell with an event/todo.
 Scroll in cell with coursor keys, scroll in time (next week) with
 Shift/Control + coursorkeys.
 
-Fixeg bug that the todo view flat mode was reset after first view update.
+Fixed bug that the todo view flat mode was reset after first view update.
+
+If a todo is displayed closed in the todo view, it is now displayed in overdue/due today color depending on the subtodos overdue/due today properties.
 
 ********** VERSION 2.0.2 ************
 
 KO/Pi:
 Fixed the layout problem of the day label buttons 
 of the agenda view introduced in version 2.0.1.
 
 Added WhatsThis support for the todo view and the list view.
 
 Added a quite useful feature to the montview.
 Just click on the week numbers on the left.
 And in the top right corner of month view/agenda view 
 there is now a "week number quick selector".
 (Click on the black triangle).
 
 Made the quite difficult timezone change in KO/Pi easy.
 
 OM/Pi:
 Fixed too small icons on desktop.
 Fixed non visible icons in mainwindow on Z with fastload enabled.
 Added signature file setting to smtp account config.
 And the signature can be edited and saved in the edit mail dialog.
 That does mean:
 Simply edit the signature for the selected smtp account in the
 edit new mail dialog and press the "save signature" button there.
 Then the signature is saved to the file specified in the smtp account settings.
 If there is no file specified, it is saved automatically to the file
 kdepim/apps/kopiemail/<accountname>.sig.
 
 
 
 ********** VERSION 2.0.1 ************
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 31c5659..cb519b2 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -1173,65 +1173,65 @@ void KOMonthView::updateView()
     QDateTime dt;
     bool ok;
     QDate endDate =  mStartDate.addDays( timeSpan );
     for( event = events.first(); event; event = events.next() ) { // for event
         if ( event->doesRecur() ) {
             bool last;
             QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last );
             QDateTime incidenceEnd;
             int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date()  );
             bool invalid = false;
             while( true ) {
                     if ( incidenceStart.isValid() ) {
                         incidenceEnd = incidenceStart.addDays( eventlen );
                         int st =   incidenceStart.date().daysTo( endDate );
                         if ( st >= 0 ) { // start before timeend
                             int end = mStartDate.daysTo( incidenceEnd.date() );
                             if ( end >= 0 ) { // end after timestart --- got one!
                                 //normalize
                                 st =  timeSpan - st;
                                 if ( st < 0 ) st = 0;
                                 if ( end > timeSpan ) end = timeSpan;
                                 int iii;
                                 //qDebug("found %s %d %d ",event->summary().latin1(), st, end );
                                 for ( iii = st;iii<= end;++iii) 
                                     (*cells)[iii]->insertEvent( event );
                             }
                         }
                     } else {
                         if ( invalid )
                             break;
                         invalid = true;
                         //qDebug("invalid %s", event->summary().latin1());
-                        incidenceStart = QDateTime( mStartDate );
+                        incidenceStart = QDateTime( mStartDate ).addSecs( -2 );;
                     }
                     if ( last )
                         break;
                     bool ok;
                     incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok );
                     if ( ! ok )
                         break;
                     if ( incidenceStart.date() > endDate )
                         break;
             }
         } else { // no recur 
             int st =  event->dtStart().date().daysTo( endDate );
             if ( st >= 0 ) { // start before timeend
                 int end = mStartDate.daysTo( event->dtEnd().date() );
                 if ( end >= 0 ) { // end after timestart --- got one!
                     //normalize
                     st =  timeSpan - st;
                     if ( st < 0 ) st = 0;
                     if ( end > timeSpan ) end = timeSpan;
                     int iii;
                     for ( iii = st;iii<= end;++iii)
                         (*cells)[iii]->insertEvent( event );
                 }
             }
         }
     }
     // insert due todos
     QPtrList<Todo> todos = calendar()->todos( );
     Todo *todo;
     for(todo = todos.first(); todo; todo = todos.next()) {
         //insertTodo( todo );
         if ( todo->hasDueDate() ) {
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 6bdee18..78d4027 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -299,79 +299,75 @@ bool KOTodoViewItem::isAlternate()
           item->m_known = true;
           item = dynamic_cast<KOTodoViewItem *>(item->nextSibling());
        }
     }
     return m_odd;
   }
   return false;
 #else
   return false;
 #endif
 }
 
 void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment)
 {
   QColorGroup _cg = cg;
   QColorGroup::ColorRole role; 
   if ( KOPrefs::instance()->mTodoViewUsesForegroundColor )
       role = QColorGroup::Text;
   else
       role = QColorGroup::Base;
   //#ifndef KORG_NOLVALTERNATION
   // if (isAlternate())
   //    _cg.setColor(QColorGroup::Base, static_cast< KOTodoListView* >(listView())->alternateBackground());
   bool setColor = KOPrefs::instance()->mTodoViewUsesCatColors;
   QColor colorToSet;
    if ( setColor ) {
       QStringList categories = mTodo->categories();
       QString cat = categories.first();
       if ( !cat.isEmpty()) {
           colorToSet = *(KOPrefs::instance()->categoryColor(cat) );
       } else
           setColor = false;  
-  }
-  if (mTodo->hasDueDate()) {
-    if (mTodo->dtDue().date()==QDate::currentDate() &&
-        !mTodo->isCompleted()) {
-        //_cg.setColor( role , KOPrefs::instance()->mTodoDueTodayColor); 
-        colorToSet = KOPrefs::instance()->mTodoDueTodayColor;     
-        setColor = true;
-    }
-    if (mTodo->dtDue().date() < QDate::currentDate() &&
-        !mTodo->isCompleted()) {
-        //_cg.setColor( role, KOPrefs::instance()->mTodoOverdueColor);
-        colorToSet = KOPrefs::instance()->mTodoOverdueColor;
-        setColor = true;
-    }
-  } 
+   }
+
+   int odue = mTodo->hasDueSubTodo( !isOpen());
+   if (odue == 2) {
+       colorToSet = KOPrefs::instance()->mTodoOverdueColor;
+       setColor = true;
+   } else if ( odue == 1 ) {
+       colorToSet = KOPrefs::instance()->mTodoDueTodayColor;     
+       setColor = true;
+   }
+ 
 
   if ( setColor ) {
       _cg.setColor(role,colorToSet );
       if ( role == QColorGroup::Base) {
           int rgb = colorToSet.red();
           rgb += colorToSet.blue()/2;
           rgb += colorToSet.green();
           if ( rgb < 200 )
               _cg.setColor(QColorGroup::Text,Qt::white );
       }
   }
   //#endif
   if ( column > 0 ){
       if ( column == 2 && !KOPrefs::instance()->mTodoViewShowsPercentage ) {
           p->save();
           int progress = (int)(( (width-6)*mTodo->percentComplete())/100.0 + 0.5);
           
           p->fillRect( 0, 0, width, height(), _cg.base() ); // background
           // p->setPen(Qt::black );  //border
           // p->setBrush( KOPrefs::instance()->mHighlightColorKGlobalSettings::baseColor() );  //filling
           QColor fc = KOPrefs::instance()->mHighlightColor;
           if ( mTodo->percentComplete() == 100 )
               fc = darkGreen;
           p->drawRect( 2, 2, width-4, height()-4);
           p->fillRect( 3, 3, progress, height()-6, 
                        fc );
           p->restore();
       } else {
           QCheckListItem::paintCell(p, _cg, column, width, alignment);
       }
       return;
   }
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a2c20a8..5bc8c00 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1317,65 +1317,74 @@ QString MainWindow::syncFileName()
 #endif
 }
 
 void MainWindow::processIncidenceSelection( Incidence *incidence )
 {
     if ( !incidence ) {
         enableIncidenceActions( false );
 
         mNewSubTodoAction->setEnabled( false );
         setCaptionToDates();
         return;
 
     }
 
     //KGlobal::locale()->formatDateTime(nextA, true);
     QString startString = "";
     if ( incidence->type() != "Todo" ) {
         if ( incidence->dtStart().date() < incidence->dtEnd().date()   ) {
             if ( incidence->doesFloat() ) {
             startString += ": "+incidence->dtStartDateStr( true );
             startString += " --- "+((Event*)incidence)->dtEndDateStr( true );
 
             } else {
             startString = ": "+incidence->dtStartStr(true);
             startString += " --- "+((Event*)incidence)->dtEndStr(true);
 
             }
 
         } else {
             if ( incidence->dtStart().time() != incidence->dtEnd().time() )
                 startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+
                     "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time());
-            startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true);
+            if ( incidence->categories().contains( i18n("Birthday") ) || incidence->categories().contains( i18n("Anniversary") )  ) {
+                bool ok;
+                QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok );
+                if ( ok ) {
+                    int years = noc.date().year() - incidence->dtStart().date().year();
+                    startString += i18n(" (%1 y.)"). arg( years );
+                }
+            }
+            else
+                startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true);
         }
 
     }
     else
         startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed");
     if ( !incidence->location().isEmpty() )
         startString += " (" +incidence->location()+")";
     setCaption( incidence->summary()+startString);
 
     enableIncidenceActions( true );
 
     if ( incidence->type() == "Event" ) {
         mShowAction->setText( i18n("Show Event...") );
         mEditAction->setText( i18n("Edit Event...") );
         mDeleteAction->setText( i18n("Delete Event...") );
 
         mNewSubTodoAction->setEnabled( false );
     } else if ( incidence->type() == "Todo" ) {
         mShowAction->setText( i18n("Show Todo...") );
         mEditAction->setText( i18n("Edit Todo...") );
         mDeleteAction->setText( i18n("Delete Todo...") );
 
         mNewSubTodoAction->setEnabled( true );
     } else {
         mShowAction->setText( i18n("Show...") );
         mShowAction->setText( i18n("Edit...") );
         mShowAction->setText( i18n("Delete...") );
 
         mNewSubTodoAction->setEnabled( false );
     }
 }
 
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index 1807bc4..de2a381 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -237,63 +237,63 @@ class Incidence : public IncidenceBase
     /** Remove an alarm that is associated with this incidence */
     void removeAlarm(Alarm*);
     /** Remove all alarms that are associated with this incidence */
     void clearAlarms();
     /** return whether any alarm associated with this incidence is enabled */
     bool isAlarmEnabled() const;
 
     /**
       Return the recurrence rule associated with this incidence. If there is
       none, returns an appropriate (non-0) object.
     */
     Recurrence *recurrence() const;
     void setRecurrence(Recurrence * r);
     /**
       Forward to Recurrence::doesRecur().
     */
     ushort doesRecur() const;
 
     /** set the event's/todo's location. Do _not_ use it with journal */
     void setLocation(const QString &location);
     /** return the event's/todo's location. Do _not_ use it with journal */
     QString location() const;  
    /** returns TRUE or FALSE depending on whether the todo has a start date */
     bool hasStartDate() const;
     /** sets the event's hasStartDate value. */
     void setHasStartDate(bool f);
     QDateTime getNextOccurence( const QDateTime& dt, bool* yes ) const;
     bool cancelled() const;
     void setCancelled( bool b );
 
 protected:
     QPtrList<Alarm> mAlarms;
+    QPtrList<Incidence> mRelations;
   private:
     int mRevision;
     bool mCancelled;
 
     // base components of jounal, event and todo
     QDateTime mCreated;
     QString mDescription;
     QString mSummary;
     QStringList mCategories;
     Incidence *mRelatedTo;
     QString mRelatedToUid;
-    QPtrList<Incidence> mRelations;
     DateList mExDates;
     QPtrList<Attachment> mAttachments;
     QStringList mResources;
     bool mHasStartDate;                  // if todo has associated start date
 
     int mSecrecy;
     int mPriority;                        // 1 = highest, 2 = less, etc.
 
     //QPtrList<Alarm> mAlarms;
     Recurrence *mRecurrence;
     
     QString mLocation;
 };
 
 bool operator==( const Incidence&, const Incidence& );
 
 }
 
 #endif
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index 7f1de78..d81a68f 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -164,65 +164,95 @@ void Todo::setDtDue(const QDateTime &dtDue)
     }
   }*/
   mDtDue = getEvenTime(dtDue);
 
   //kdDebug(5800) << "setDtDue says date is " << mDtDue.toString() << endl;
 
   /*const QPtrList<Alarm>& alarms = alarms();
   for (Alarm* alarm = alarms.first(); alarm; alarm = alarms.next())
     alarm->setAlarmStart(mDtDue);*/
 
   updated();
 }
 
 QDateTime Todo::dtDue() const
 {
   return mDtDue;
 }
 
 QString Todo::dtDueTimeStr() const
 {
   return KGlobal::locale()->formatTime(mDtDue.time());
 }
 
 QString Todo::dtDueDateStr(bool shortfmt) const
 {
   return KGlobal::locale()->formatDate(mDtDue.date(),shortfmt);
 }
 
 QString Todo::dtDueStr(bool shortfmt) const
 {
   return KGlobal::locale()->formatDateTime(mDtDue, shortfmt);
 }
-
+// retval 0 : no found
+//        1 : due for date found
+//        2 : overdue for date found
+int Todo::hasDueSubTodoForDate( const QDate & date, bool checkSubtodos  )
+{
+    int retval = 0;
+    if ( isCompleted() )
+        return 0;
+    if ( hasDueDate() ) {
+        if ( dtDue().date() < date )
+            return 2;
+        // we do not return, because we may find an overdue sub todo
+        if ( dtDue().date() == date )
+            retval = 1;
+    }
+    if ( checkSubtodos ) {
+        Incidence *aTodo;
+        for (aTodo = mRelations.first(); aTodo; aTodo = mRelations.next()) {
+            int ret = ((Todo*)aTodo)->hasDueSubTodoForDate( date ,checkSubtodos );
+            if ( ret == 2 )
+                return 2;
+            if ( ret == 1)
+                retval = 1;
+        }
+    }
+    return retval;
+}
+int Todo::hasDueSubTodo( bool checkSubtodos  ) //= true
+{  
+    return hasDueSubTodoForDate(QDate::currentDate(), checkSubtodos );
+}
 bool Todo::hasDueDate() const
 {
   return mHasDueDate;
 }
 
 void Todo::setHasDueDate(bool f)
 {
   if (mReadOnly) return;
   mHasDueDate = f;
   updated();
 }
 
 
 #if 0
 void Todo::setStatus(const QString &statStr)
 {
   if (mReadOnly) return;
   QString ss(statStr.upper());
 
   if (ss == "X-ACTION")
     mStatus = NEEDS_ACTION;
   else if (ss == "NEEDS ACTION")
     mStatus = NEEDS_ACTION;
   else if (ss == "ACCEPTED")
     mStatus = ACCEPTED;
   else if (ss == "SENT")
     mStatus = SENT;
   else if (ss == "TENTATIVE")
     mStatus = TENTATIVE;
   else if (ss == "CONFIRMED")
     mStatus = CONFIRMED;
   else if (ss == "DECLINED")
diff --git a/libkcal/todo.h b/libkcal/todo.h
index 41f5841..137b252 100644
--- a/libkcal/todo.h
+++ b/libkcal/todo.h
@@ -33,64 +33,76 @@ namespace KCal {
 class Todo : public Incidence
 {
   public:
     Todo();
     Todo(const Todo &);
     ~Todo();
     typedef ListBase<Todo> List;
     QCString type() const { return "Todo"; }
 
     /** Return an exact copy of this todo. */
     Incidence *clone();
     QDateTime getNextAlarmDateTime( bool * ok, int * offset ) const;
 
     /** for setting the todo's due date/time with a QDateTime. */
     void setDtDue(const QDateTime &dtDue);
     /** returns an event's Due date/time as a QDateTime. */
     QDateTime dtDue() const;
     /** returns an event's due time as a string formatted according to the
      users locale settings */
     QString dtDueTimeStr() const;
     /** returns an event's due date as a string formatted according to the
      users locale settings */
     QString dtDueDateStr(bool shortfmt=true) const;
     /** returns an event's due date and time as a string formatted according
      to the users locale settings */
     QString dtDueStr(bool shortfmt=true) const;
 
     /** returns TRUE or FALSE depending on whether the todo has a due date */
     bool hasDueDate() const;
     /** sets the event's hasDueDate value. */
     void setHasDueDate(bool f);
 
+    /*
+      Looks for a subtodo (including itself ) which is not complete and is
+      - overdue, or
+      - due today.
+      It returns 0 for nothing found,
+      1 for found a todo which is due today and no overdue found
+      2 for found a overdue todo
+    */
+    int hasDueSubTodo( bool checkSubtodos = true );
+    /* same as above, but a specific date can be specified*/
+    int hasDueSubTodoForDate( const  QDate & date, bool checkSubtodos );
+
  
     /** sets the event's status to the string specified.  The string
      * must be a recognized value for the status field, i.e. a string
      * equivalent of the possible status enumerations previously described. */
 //    void setStatus(const QString &statStr);
     /** sets the event's status to the value specified.  See the enumeration
      * above for possible values. */
 //    void setStatus(int);
     /** return the event's status. */
 //    int status() const;
     /** return the event's status in string format. */
 //    QString statusStr() const;
 
     /** return, if this todo is completed */
     bool isCompleted() const;
     /** set completed state of this todo */
     void setCompleted(bool);
     
     /**
       Return how many percent of the task are completed. Returns a value
       between 0 and 100.
     */
     int percentComplete() const;
     /**
       Set how many percent of the task are completed. Valid values are in the
       range from 0 to 100.
     */
     void setPercentComplete(int);
 
     /** return date and time when todo was completed */
     QDateTime completed() const;
     QString completedStr(bool shortF = true) const;