3 files changed, 39 insertions, 23 deletions

diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index bbc43e4..42a6f7c 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -1116,97 +1116,96 @@ void KOAgendaView::fillAgenda()
                                 QDateTime nextOcend =nextOcstart.addSecs( secs ); ;
                                 beginX = currentDate.daysTo(nextOcstart.date()) + curCol;
                                 endX = currentDate.daysTo(nextOcend.date()) + curCol;
                             
                         }
                 }
                 int startY = mAgenda->timeToY(event->dtStart().time());
                 int endY = mAgenda->timeToY(event->dtEnd().time()) - 1;
                 //qDebug("insert %d %d %d %d   %d ",beginX,endX,startY,endY , curCol );
                 if ((beginX <= 0 && curCol == 0) || beginX == curCol) {
                     //qDebug("insert!!! ");
                     mAgenda->insertMultiItem(event,currentDate,beginX,endX,startY,endY);
                 }
                 if (beginX == curCol) {
                     mMaxY[curCol] = mAgenda->timeToY(QTime(23,59));
                     if (startY < mMinY[curCol]) mMinY[curCol] = startY;
                 } else if (endX == curCol) {
                     mMinY[curCol] = mAgenda->timeToY(QTime(0,0));
                     if (endY > mMaxY[curCol]) mMaxY[curCol] = endY;
                 } else {
                     mMinY[curCol] = mAgenda->timeToY(QTime(0,0));
                     mMaxY[curCol] = mAgenda->timeToY(QTime(23,59));
                 }
             } else {
                 int startY = mAgenda->timeToY(event->dtStart().time());
                 int endY = mAgenda->timeToY(event->dtEnd().time()) - 1;
                 if (endY < startY) endY = startY;
                 mAgenda->insertItem(event,currentDate,curCol,startY,endY);
                 if (startY < mMinY[curCol]) mMinY[curCol] = startY;
                 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY;
             }
         }
         // ---------- [display Todos --------------
         unsigned int numTodo;
         for (numTodo = 0; numTodo < todos.count(); ++numTodo) {
             Todo *todo = todos.at(numTodo);
 
             if ( ! todo->hasDueDate() && !todo->hasCompletedDate()) continue;  // todo shall not be displayed if it has no date
 
             // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue.
             // Already completed items can be displayed on their original due date
             //if not KOPrefs::instance()->mShowTodoInAgenda, show overdue in agenda
             bool overdue = (!todo->isCompleted()) && (todo->dtDue() < today) && KOPrefs::instance()->mShowTodoInAgenda;
             bool fillIn = false;
             if ( todo->hasCompletedDate() && todo->completed().date() == currentDate )
                 fillIn = true;
             if ( ! fillIn && !todo->hasCompletedDate() ) 
                 fillIn = ((todo->dtDue().date() == currentDate) && !overdue) || ((currentDate == today) && overdue);
-            qDebug("refill todo ");
             if ( fillIn ) {
                 if ( (todo->doesFloat() || overdue ) && !todo->hasCompletedDate() ) {  // Todo has no due-time set or is already overdue
                     if ( KOPrefs::instance()->mShowTodoInAgenda )
                         mAllDayAgenda->insertAllDayItem(todo, currentDate, curCol, curCol);
                 }
                 else {
                     QDateTime dt;
                     if ( todo->hasCompletedDate() )
                         dt = todo->completed();
                     else
                         dt = todo->dtDue();;
                         
 
                     int endY = mAgenda->timeToY(dt.time()) - 1;
                     int hi = (18/KOPrefs::instance()->mHourSize);
                     //qDebug("hei %d ",KOPrefs::instance()->mHourSize);
                     int startY = endY -hi;
 
                     mAgenda->insertItem(todo,currentDate,curCol,startY,endY);
 
                     if (startY < mMinY[curCol]) mMinY[curCol] = startY;
                     if (endY > mMaxY[curCol]) mMaxY[curCol] = endY;
                 }
             }
         }
         // ---------- display Todos] --------------
 
         ++curCol;
     }
     mAgenda->hideUnused();
     mAllDayAgenda->hideUnused();
     mAgenda->checkScrollBoundaries();
 
     deleteSelectedDateTime();
   
     createDayLabels();
     emit incidenceSelected( 0 );
 
     if ( globalFlagBlockAgenda == 2 ) {
         if ( KOPrefs::instance()->mSetTimeToDayStartAt )
             setStartHour( KOPrefs::instance()->mDayBegins  );
         else if ( KOPrefs::instance()->mCenterOnCurrentTime )
             setStartHour( QTime::currentTime ().hour() );
         //  qApp->processEvents();   
     }
     qApp->processEvents(); 
     //qDebug("qApp->processEvents(); END ");
     globalFlagBlockAgenda = 0; 
@@ -1463,88 +1462,88 @@ void KOAgendaView::newTimeSpanSelected(int gxStart, int gyStart,
                                        int gxEnd, int gyEnd)
 {
     if (!mSelectedDates.count()) return;
  
     QDate dayStart = mSelectedDates[gxStart];
     QDate dayEnd = mSelectedDates[gxEnd];
 
     QTime timeStart = mAgenda->gyToTime(gyStart);
     QTime timeEnd = mAgenda->gyToTime( gyEnd + 1 );
 
     QDateTime dtStart(dayStart,timeStart);
     QDateTime dtEnd(dayEnd,timeEnd);
 
     mTimeSpanBegin = dtStart;
     mTimeSpanEnd = dtEnd;
  
 }
                                    
 void KOAgendaView::deleteSelectedDateTime()
 {
     mTimeSpanBegin.setDate(QDate());
     mTimeSpanEnd.setDate(QDate());
     mTimeSpanInAllDay = false;
 }
 
 void KOAgendaView::keyPressEvent ( QKeyEvent * e ) 
 {
     e->ignore();
 }
 
 void KOAgendaView::scrollOneHourUp()
 {
  
     mAgenda->scrollBy ( 0,  -mAgenda->contentsHeight () / 24 );
 }
 void KOAgendaView::scrollOneHourDown()
 {
     mAgenda->scrollBy ( 0,  mAgenda->contentsHeight () / 24 );
 }
 
 void  KOAgendaView::setStartHour( int h )
 {
     mAgenda->setStartHour( h );
 
 }
 
 void  KOAgendaView::updateTodo( Todo * t, int )
 { 
- 
+
     bool remove = false;
     bool removeAD = false;
     QDate da;
     if ( t->hasCompletedDate() )
         da = t->completed().date();
     else 
         da = t->dtDue().date();
     if ( ! t->hasDueDate() && !t->hasCompletedDate() ) {
         remove = true;
         removeAD = true;
     }
     else {
         bool overdue = (!t->isCompleted()) && (t->dtDue() < QDate::currentDate()) && KOPrefs::instance()->mShowTodoInAgenda ;
         if ( overdue && 
              QDate::currentDate() >= mSelectedDates.first() &&
              QDate::currentDate() <= mSelectedDates.last()) {
             removeAD = false;
             remove = true;
         }
         else {
             
             if ( da < mSelectedDates.first() ||
                  da > mSelectedDates.last() ) {
                 remove = true;
                 removeAD = true;
             } else {
                 remove = t->doesFloat() && !t->hasCompletedDate();
                 removeAD = !remove;
             }
         }
     }
     int days = mSelectedDates.first().daysTo( da  );
     // qDebug("daysto %d ", days );
     mAgenda->updateTodo( t , days, remove); 
     if ( KOPrefs::instance()->mShowTodoInAgenda )
         mAllDayAgenda->updateTodo( t , days, removeAD);
     //qDebug("KOAgendaView::updateTodo( Todo *, int ) ");
 
 }
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 14e8b5c..902f3f4 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -812,107 +812,116 @@ void KOTodoView::cloneTodo()
   }
 }
 void KOTodoView::cancelTodo()
 {
   if (mActiveItem) {
     emit cancelTodoSignal((Incidence*)mActiveItem->todo());
   }
 }
 void KOTodoView::moveTodo()
 {
   if (mActiveItem) {
     emit moveTodoSignal((Incidence*)mActiveItem->todo());
   }
 }
 void KOTodoView::beamTodo()
 {
   if (mActiveItem) {
     emit beamTodoSignal((Incidence*)mActiveItem->todo());
   }
 }
 
 
 void KOTodoView::showTodo()
 {
   if (mActiveItem) {
     emit showTodoSignal(mActiveItem->todo());
   }
 }
 
 void KOTodoView::deleteTodo()
 {
   if (mActiveItem) {
       emit deleteTodoSignal(mActiveItem->todo());
   }
 }
 
 void KOTodoView::setNewPriority(int index)
 {
   if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) {
     mActiveItem->todo()->setPriority(mPriority[index]);
     mActiveItem->construct();
    todoModified (mActiveItem->todo(), KOGlobals::PRIORITY_MODIFIED);
    mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1  );
   }
 }
 
 void KOTodoView::setNewPercentage(int index)
 {
-  if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) {
-    if (mPercentage[index] == 100) {
-      mActiveItem->todo()->setCompleted(QDateTime::currentDateTime());
-    } else {
-      mActiveItem->todo()->setCompleted(false);
+    if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) {
+
+        if ( mPercentage[index] == 100 && !mActiveItem->isOn() ) {
+            mActiveItem->setOn( true );
+            return;
+        } else   if ( mPercentage[index] != 100 && mActiveItem->isOn() ) {
+            KOTodoViewItem* par = (static_cast<KOTodoViewItem*>(mActiveItem->parent()));
+            if ( par && par->isOn()  )
+                par->setOn( false );
+        }
+        if (mPercentage[index] == 100) {
+            mActiveItem->todo()->setCompleted(QDateTime::currentDateTime());
+        } else {
+            mActiveItem->todo()->setCompleted(false);
+        }
+        mActiveItem->todo()->setPercentComplete(mPercentage[index]);
+        mActiveItem->construct();
+        todoModified (mActiveItem->todo (), KOGlobals::COMPLETION_MODIFIED);
+        mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1  );
     }
-    mActiveItem->todo()->setPercentComplete(mPercentage[index]);
-    mActiveItem->construct();
-    todoModified (mActiveItem->todo (), KOGlobals::COMPLETION_MODIFIED);
-    mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1  );
-  }
 }
 
 
 QPopupMenu * KOTodoView::getCategoryPopupMenu (KOTodoViewItem *todoItem)
 {
   QPopupMenu* tempMenu = new QPopupMenu (this);
   QStringList checkedCategories = todoItem->todo()->categories ();
 
   tempMenu->setCheckable (true);
   for (QStringList::Iterator it = KOPrefs::instance()->mCustomCategories.begin ();
        it != KOPrefs::instance()->mCustomCategories.end ();
        ++it) {
     int index = tempMenu->insertItem (*it);
     mCategory[index] = *it;
     if (checkedCategories.find (*it) != checkedCategories.end ()) tempMenu->setItemChecked (index, true);
   }
 
   connect (tempMenu, SIGNAL (activated (int)), SLOT (changedCategories (int)));
   return tempMenu;
 
 
 }
 void KOTodoView::changedCategories(int index)
 {
   if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) {
     QStringList categories = mActiveItem->todo()->categories ();
     if (categories.find (mCategory[index]) != categories.end ())
       categories.remove (mCategory[index]);
     else
       categories.insert (categories.end(), mCategory[index]);
     categories.sort ();
     mActiveItem->todo()->setCategories (categories);
     mActiveItem->construct();
     mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1  );
     todoModified (mActiveItem->todo (), KOGlobals::CATEGORY_MODIFIED);
   }
 }
 void KOTodoView::itemDoubleClicked(QListViewItem *item)
 {
     if ( pendingSubtodo != 0 ) {
         topLevelWidget()->setCaption(i18n("Reparenting aborted!"));
     }
     pendingSubtodo = 0;
     if (!item) {
         newTodo();
         return;
     }
     if ( KOPrefs::instance()->mEditOnDoubleClick )
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 2822237..1edddac 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -158,139 +158,147 @@ void KOTodoViewItem::construct()
   }
 #endif
 
   m_known = false;
   m_init = false; 
 
   setMyPixmap();
 
 }
 void KOTodoViewItem::setMyPixmap()
 {
   int size = 5;
   QPixmap pixi =  QPixmap( 1, 1 );
   // if ( !mTodo->isCompleted() &&  mTodo->hasDueDate() && mTodo->dtDue() < QDateTime::currentDateTime() ) {
 //       pixi = SmallIcon("redcross16"); 
 //   } else {
       QPainter p;
  
   int pixSize = 0;
   QPixmap pPix =  QPixmap(  size, size );
   if ( mTodo->description().length() > 0 ) {
       pixi.resize(size, pixSize+size);
       pPix.fill( Qt::darkGreen );
       p.begin( &pixi );
       p. drawPixmap ( 0, pixSize, pPix);
       p.end();
       pixSize += size;
   } 
   if ( mTodo->isAlarmEnabled() ) {
       pixi.resize(size, pixSize+size);
       pPix.fill( Qt::red );
       p.begin( &pixi );
       p. drawPixmap ( 0, pixSize, pPix);
       p.end();
       pixSize += size;
   } 
   //   }
   if ( pixi.width() > 1 ) {
       setPixmap ( 0,pixi ) ; 
   } else {
       setPixmap ( 0,QPixmap() ) ; 
   }
 }
 void KOTodoViewItem::stateChange(bool state)
 {
     // qDebug("KOTodoViewItem::stateChange ");
   // do not change setting on startup
   if ( m_init ) return;
-  qDebug("KOTodoViewItem::stateChange ");
+  if (isOn()!=state) {
+      setOn(state);
+      //qDebug("SETON ");
+      return;
+  }
   QString keyd = "==";
   QString keyt = "==";
-  
+  //qDebug("KOTodoViewItem::stateChange %s ", text(0).latin1());
   mTodo->setCompleted(state);
   if (state) mTodo->setCompleted(QDateTime::currentDateTime());
-  if (isOn()!=state) {
-    setOn(state);
-  }
 
   if (mTodo->hasDueDate()) {
     setText(3, mTodo->dtDueDateStr());
     QDate d = mTodo->dtDue().date();
     keyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
     setSortKey(3,keyd);
     if (mTodo->doesFloat()) {
       setText(4,"");
     }
     else {
       setText(4,mTodo->dtDueTimeStr());
       QTime t = mTodo->dtDue().time();
       keyt.sprintf("%02d%02d",t.hour(),t.minute());
       setSortKey(4,keyt);
     }
   }
   if (mTodo->isCompleted()) setSortKey(1,QString::number(9)+keyd+keyt);
   else setSortKey(1,QString::number(mTodo->priority())+keyd+keyt);
   
   setText(2,i18n("%1 %").arg(QString::number(mTodo->percentComplete())));
   if (mTodo->percentComplete()<100) {
     if (mTodo->isCompleted()) setSortKey(2,QString::number(999));
     else setSortKey(2,QString::number(mTodo->percentComplete()));
   }
   else {
     if (mTodo->isCompleted()) setSortKey(2,QString::number(999));
     else setSortKey(2,QString::number(99));
   }
-  QListViewItem * myChild = firstChild();
-  KOTodoViewItem *item;
-  while( myChild ) {
-    item = static_cast<KOTodoViewItem*>(myChild);
-    item->stateChange(state);
-    myChild = myChild->nextSibling();
+  if ( state ) {
+      QListViewItem * myChild = firstChild();
+      KOTodoViewItem *item;
+      while( myChild ) {
+          //qDebug("stateCH ");
+          item = static_cast<KOTodoViewItem*>(myChild);
+          item->stateChange(state);
+          myChild = myChild->nextSibling();
+      }
+  } else {
+      QListViewItem * myChild = parent();
+      if ( myChild )
+          (static_cast<KOTodoViewItem*>(myChild))->stateChange(state);
   }
   mTodoView->modified(true);
   setMyPixmap();
   mTodoView->setTodoModified( mTodo );
 }
 
 bool KOTodoViewItem::isAlternate()
 {
 #ifndef KORG_NOLVALTERNATION
   KOTodoListView *lv = static_cast<KOTodoListView *>(listView());
   if (lv && lv->alternateBackground().isValid())
   {
     KOTodoViewItem *above = 0;
     above = dynamic_cast<KOTodoViewItem *>(itemAbove());
     m_known = above ? above->m_known : true;
     if (m_known)
     {
        m_odd = above ? !above->m_odd : false;
     }
     else
     {
        KOTodoViewItem *item;
        bool previous = true;
        if (QListViewItem::parent())
        {
           item = dynamic_cast<KOTodoViewItem *>(QListViewItem::parent());
           if (item)
              previous = item->m_odd;
           item = dynamic_cast<KOTodoViewItem *>(QListViewItem::parent()->firstChild());
        }
        else
        {
           item = dynamic_cast<KOTodoViewItem *>(lv->firstChild());
        }
 
        while(item)
        {
           item->m_odd = previous = !previous;
           item->m_known = true;
           item = dynamic_cast<KOTodoViewItem *>(item->nextSibling());
        }
     }
     return m_odd;
   }
   return false;
 #else
   return false;
 #endif