[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/korganizer
From:       Bram Schoenmakers <bram_s () hccnet ! nl>
Date:       2004-05-04 18:23:22
Message-ID: 20040504182322.AAA949A81 () office ! kde ! org
[Download RAW message or body]

CVS commit by bram: 

Monthview: Distinguish done and undone todo's.


  M +16 -10    komonthview.cpp   1.94
  M +3 -0      komonthview.h   1.47


--- kdepim/korganizer/komonthview.cpp  #1.93:1.94
@@ -181,5 +181,6 @@ MonthViewItem::MonthViewItem( Incidence 
   mDate = qd;
 
-  mTodoPixmap  = KOGlobals::self()->smallIcon("checkedbox");
+  mTodoPixmap      = KOGlobals::self()->smallIcon("todo");
+  mTodoDonePixmap  = KOGlobals::self()->smallIcon("checkedbox");
   mAlarmPixmap = KOGlobals::self()->smallIcon("bell");
   mRecurPixmap = KOGlobals::self()->smallIcon("recur");
@@ -187,4 +188,5 @@ MonthViewItem::MonthViewItem( Incidence 
 
   mTodo  = false;
+  mTodoDone  = false;
   mRecur = false;
   mAlarm = false;
@@ -212,4 +214,8 @@ void MonthViewItem::paint(QPainter *p)
     x += mTodoPixmap.width() + 2;
   }
+  if ( mTodoDone ) {
+    p->drawPixmap( x, 0, mTodoDonePixmap );
+    x += mTodoPixmap.width() + 2;
+  }
   if ( mRecur ) {
     p->drawPixmap( x, 0, mRecurPixmap );
@@ -458,5 +464,5 @@ void MonthViewCell::addIncidence( Incide
          
     item = new MonthViewItem( todo, mDate, text );
-    item->setTodo( true );
+    todo->isCompleted() ? item->setTodoDone( true ) : item->setTodo( true );
     item->setPalette( mStandardPalette );
   }

--- kdepim/korganizer/komonthview.h  #1.46:1.47
@@ -87,4 +87,5 @@ class MonthViewItem: public QListBoxItem
 
     void setTodo(bool on)  { mTodo  = on; }
+    void setTodoDone(bool on) { mTodoDone = on; }
     void setRecur(bool on) { mRecur = on; }
     void setAlarm(bool on) { mAlarm = on; }
@@ -104,4 +105,5 @@ class MonthViewItem: public QListBoxItem
   private:
     bool mTodo;
+    bool mTodoDone;
     bool mRecur;
     bool mAlarm;
@@ -109,4 +111,5 @@ class MonthViewItem: public QListBoxItem
 
     QPixmap mTodoPixmap;
+    QPixmap mTodoDonePixmap;
     QPixmap mAlarmPixmap;
     QPixmap mRecurPixmap;


[prev in list] [next in list] [prev in thread] [next in thread]