7 files changed, 79 insertions, 43 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 2981762..7fa92bf 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1349,12 +1349,12 @@
 { "Reparenting aborted!","Übertodo setzen abgebrochen" },
 { "Cannot move Todo to itself\nor a child of itself","Kann nicht Todo auf\nsich selbst oder\nein Untertodo verschieben" },
 { "Recursive reparenting not possible!","Rekursives Verschieben nicht möglich" },
 { "Delete all completed todos?\n(Completed recurring todos\nwill not be deleted!)","Entferne alle erledigten Todos?\n(Erledigte wiederholende Todos\nwerden nicht gelöscht!)" },
 { "Alternating background of list views","Abwechselnder Hintergrund für Listen" },
 { "times","Zeiten" },
-{ "","" },
+{ "The todo\n%1\nhas subtodos!\nDo you want to set\nthe categories for\nall subtodos as well?","Das Todo\n%1\nhat Untertodos!\nMöchten Sie die Kategorien\nauch für alle Untertodos setzen?" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index 4a1576a..e86b4d0 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -36,12 +36,13 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <krestrictedline.h>
 #include <kstandarddirs.h>
 #include <kfiledialog.h>
+#include <kdialog.h>
 
 #include <libkcal/todo.h>
 
 #include <libkdepim/kdateedit.h>
 
 #include "koprefs.h"
@@ -85,42 +86,42 @@ void KOEditorGeneralTodo::initTime(QWidget *parent,QBoxLayout *topLayout)
 {
   QBoxLayout *timeLayout = new QVBoxLayout(topLayout);
 
   QGroupBox *timeGroupBox = new QGroupBox(1,QGroupBox::Horizontal,
                                           i18n("Date && Time"),parent);
   timeLayout->addWidget(timeGroupBox);
-  timeGroupBox->layout()->setSpacing( 0 ); 
-  timeGroupBox->layout()->setMargin( 5 ); 
+  timeGroupBox->layout()->setSpacing( KDialog::spacingHintSmall() ); 
+  timeGroupBox->layout()->setMargin(  KDialog::marginHint() ); 
   QFrame *timeBoxFrame = new QFrame(timeGroupBox);
 
   QGridLayout *layoutTimeBox = new QGridLayout(timeBoxFrame,3,3);
-  layoutTimeBox->setSpacing(topLayout->spacing());
+  layoutTimeBox->setSpacing(KDialog::spacingHintSmall());
   layoutTimeBox->setColStretch( 1, 1 );
 
   mDueCheck = new QCheckBox(i18n("Due:"),timeBoxFrame);
-  layoutTimeBox->addWidget(mDueCheck,0,0);
+  layoutTimeBox->addWidget(mDueCheck,1,0);
   connect(mDueCheck,SIGNAL(toggled(bool)),SLOT(enableDueEdit(bool)));
   connect(mDueCheck,SIGNAL(toggled(bool)),SLOT(showAlarm()));
   
   
   mDueDateEdit = new KDateEdit(timeBoxFrame);
-  layoutTimeBox->addWidget(mDueDateEdit,0,1);
+  layoutTimeBox->addWidget(mDueDateEdit,1,1);
 
   mDueTimeEdit = new KOTimeEdit(timeBoxFrame);
-  layoutTimeBox->addWidget(mDueTimeEdit,0,2);
+  layoutTimeBox->addWidget(mDueTimeEdit,1,2);
 
 
   mStartCheck = new QCheckBox(i18n("Start:"),timeBoxFrame);
-  layoutTimeBox->addWidget(mStartCheck,1,0);
+  layoutTimeBox->addWidget(mStartCheck,0,0);
   connect(mStartCheck,SIGNAL(toggled(bool)),SLOT(enableStartEdit(bool)));
 
   mStartDateEdit = new KDateEdit(timeBoxFrame);
-  layoutTimeBox->addWidget(mStartDateEdit,1,1);
+  layoutTimeBox->addWidget(mStartDateEdit,0,1);
 
   mStartTimeEdit = new KOTimeEdit(timeBoxFrame);
-  layoutTimeBox->addWidget(mStartTimeEdit,1,2);
+  layoutTimeBox->addWidget(mStartTimeEdit,0,2);
 
 
   mTimeButton = new QCheckBox(i18n("Time associated"),timeBoxFrame);
   layoutTimeBox->addMultiCellWidget(mTimeButton,2,2,0,1);
 
   connect(mTimeButton,SIGNAL(toggled(bool)),SLOT(enableTimeEdits(bool)));
@@ -338,13 +339,12 @@ void KOEditorGeneralTodo::writeTodo(Todo *todo)
   todo->setPriority(mPriorityCombo->currentItem()+1);
 
   // set completion state
   if ( mCompletedCombo->currentItem() == 5 ) {
       QDateTime comp ( mCompleteDateEdit->date(), mCompleteTimeEdit->getTime() );
       if ( comp.isValid () ) {
-          todo->setPercentComplete(0);
           todo->setPercentComplete(100);
           todo->setCompleted(comp);
       } else {
           todo->setPercentComplete( 100 );
           if ( mCompleted.isValid() )
               todo->setCompleted(mCompleted);
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index bbf83d9..fd86095 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -368,14 +368,12 @@ void KOListView::setCat()
 }
 void  KOListView::setAlarm()
 {
     KOAlarmPrefs kap( this);
     if ( !kap.exec() )
         return;
-
-
     QStringList itemList;
     QPtrList<KOListViewItem> sel ;
     QListViewItem *qitem  = mListView->firstChild ();
     while ( qitem ) {
         if ( qitem->isSelected() ) {
             Incidence* inc = ((KOListViewItem *) qitem)->data();
@@ -425,36 +423,35 @@ void  KOListView::setAlarm()
                 Alarm* alarm = inc->alarms().first();
                 if ( alarm ) {
                     alarm->setEnabled(false);
                     alarm->setType(Alarm::Invalid);
                 }
             }
-        temp = item;
+            ListItemVisitor v(item, mStartDate );
+            inc->accept(v);
         item = sel.next();
-        mUidDict.remove( inc->uid() ); 
-        delete temp;;
-        addIncidence( inc );
     }
     topLevelWidget()->setCaption( i18n("Canged alarm for %1 items").arg( count )  );
     qDebug("KO: Set alarm for %d items", count);
     calendar()->reInitAlarmSettings();
     QTimer::singleShot( 1, this, SLOT ( resetFocus() ) );
 }
 void KOListView::setCategories( bool removeOld )
 {
    
     KPIM::CategorySelectDialog* csd = new KPIM::CategorySelectDialog( KOPrefs::instance(), 0 );
+    csd->setColorEnabled();
     if (! csd->exec()) { 
         delete csd;
         return;
     }
     QStringList catList = csd->selectedCategories();
     delete csd;
     // if ( catList.count() == 0 )
     //   return;
-    catList.sort();
+    //catList.sort();
     QString categoriesStr = catList.join(",");
     int i;
     QStringList itemList;
     QPtrList<KOListViewItem> sel ;
     QListViewItem *qitem  = mListView->firstChild ();
     while ( qitem ) {
@@ -462,31 +459,35 @@ void KOListView::setCategories( bool removeOld )
             sel.append(((KOListViewItem *)qitem));
         }
         qitem = qitem->nextSibling();
     }
     KOListViewItem * item, *temp;
     item = sel.first();
-    Incidence* inc;
+    if( item ) {
+        Incidence* inc = item->data() ;
+        bool setSub = false;
+        if( inc->type() == "Todo" && sel.count() == 1 &&  inc->relations().count() > 0 ) {
+            int result = KMessageBox::warningYesNoCancel(this, 
+                                                         i18n("The todo\n%1\nhas subtodos!\nDo you want to set\nthe categories for\nall subtodos as well?").arg( inc->summary().left ( 25 ) ),
+                                                         i18n("Todo has subtodos"),
+                                                         i18n("Yes"),
+                                                         i18n("No"));
+            if (result == KMessageBox::Cancel) item = 0;
+            if (result == KMessageBox::Yes) setSub = true;
+        }
     while ( item ) {
         inc = item->data();
         if ( removeOld ) {
-            inc->setCategories( categoriesStr );
+                inc->setCategories( catList, setSub );
         } else {
-            itemList = QStringList::split (",", inc->categoriesStr() );
-            for( i = 0; i<   catList.count(); ++i ) {
-                if (  !itemList.contains (catList[i]))
-                    itemList.append( catList[i] );
-            }
-            itemList.sort();
-            inc->setCategories( itemList.join(",") );
+                inc->addCategories( catList, setSub );
         }
-        temp = item;
+            ListItemVisitor v(item, mStartDate );
+            inc->accept(v);
         item = sel.next();
-        mUidDict.remove( inc->uid() ); 
-        delete temp;;
-        addIncidence( inc );
+        }
     }
     QTimer::singleShot( 1, this, SLOT ( resetFocus() ) );
 }
 
 void KOListView::beamSelected()
 {
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 6a05cc8..5513e8b 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -107,17 +107,17 @@ void KOTodoEditor::setupGeneral()
 
   if (KOPrefs::instance()->mCompactDialogs) {
     QFrame *topFrame = addPage(i18n("General"));
 
     QBoxLayout *topLayout = new QVBoxLayout(topFrame);  
     if ( QApplication::desktop()->width() < 480 ) {
-        topLayout->setMargin(1);
-        topLayout->setSpacing(1);
+        topLayout->setMargin(marginHintSmall());
+        topLayout->setSpacing(spacingHintSmall());
     } else {
-        topLayout->setMargin(marginHint()-1);
-        topLayout->setSpacing(spacingHint()-1);
+        topLayout->setMargin(marginHint());
+        topLayout->setSpacing(spacingHint());
     }
    mGeneral->initHeader(topFrame,topLayout);
     mGeneral->initTime(topFrame,topLayout); 
    mGeneral->initAlarm(topFrame,topLayout);
     mGeneral->enableAlarm( false );
     
@@ -341,23 +341,30 @@ void KOTodoEditor::readTodo(Todo *todo)
 
   // We should handle read-only events here.
 }
 
 void KOTodoEditor::writeTodo(Todo *event)
 {
+    bool maybeComputeRecurrenceTime = false;
+    if( event->hasRecurrenceID() && event->percentComplete() < 100)
+        maybeComputeRecurrenceTime = true;
+    event->setHasRecurrenceID( false );
   mGeneral->writeTodo(event);
   mDetails->writeEvent(event);
 
   // set related event, i.e. parent to-do in this case.
   if (mRelatedTodo) {
     event->setRelatedTo(mRelatedTodo);
   }  
   if ( mGeneral->mDueCheck->isChecked() && mGeneral->mStartCheck->isChecked()) {
       mRecurrence->writeEvent(event);
       if ( event->doesRecur() ) {
-          event->setRecurrenceID( event->dtStart().addSecs(-1) );
+            int addSec = -1 ;
+            if ( maybeComputeRecurrenceTime && event->percentComplete() == 100 )
+                addSec = 1;
+            event->setRecurrenceID( event->dtStart().addSecs( addSec ) );
           event->setRecurDates();
       } else {
           event->setHasRecurrenceID( false );
       }
   } else {
       event->setHasRecurrenceID( false );
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 25be63a..f26d16d 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -462,15 +462,12 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   }
   connect (mPercentageCompletedPopupMenu, SIGNAL (activated (int)), SLOT (setNewPercentage (int)));
 
 
   
   mItemPopupMenu = new QPopupMenu(this); 
-  mItemPopupMenu->insertItem( i18n("Start/Stop todo..."), this,
-                             SLOT (toggleRunningItem()));
-  mItemPopupMenu->insertSeparator();
   mItemPopupMenu->insertItem(i18n("Show..."), this,
                              SLOT (showTodo()));
   mItemPopupMenu->insertItem(i18n("Edit..."), this,
                              SLOT (editTodo()));
   mItemPopupMenu->insertItem( i18n("Delete"), this,
                              SLOT (deleteTodo()));
@@ -480,12 +477,15 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
                              SLOT (moveTodo()));
   mItemPopupMenu->insertItem( i18n("Beam..."), this,
                              SLOT (beamTodo()));
   mItemPopupMenu->insertItem( i18n("Toggle Cancel"), this,
                              SLOT (cancelTodo()));
   mItemPopupMenu->insertSeparator();
+  mItemPopupMenu->insertItem( i18n("Start/Stop todo..."), this,
+                             SLOT (toggleRunningItem()));
+  mItemPopupMenu->insertSeparator();
   /*
   mItemPopupMenu->insertItem( i18n("New Todo..."), this,
                              SLOT (newTodo()));
   */
   mItemPopupMenu->insertItem(i18n("New Sub-Todo..."), this,
                              SLOT (newSubTodo())); 
@@ -509,22 +509,23 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   mPopupMenu->insertItem(SmallIconSet("todo"), i18n("New Todo..."), this,
                          SLOT (newTodo()),0,1);
   mPopupMenu->insertItem(i18n("delete completed To-Dos","Purge Completed"),
                          this, SLOT(purgeCompleted()),0,2);
   mPopupMenu->insertItem(i18n("Show Completed"),
                              this, SLOT( toggleCompleted() ),0,3 );
-  mPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"),
-                             this, SLOT( toggleQuickTodo() ),0,4 );
   mPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"),
                              this, SLOT( toggleRunning() ),0,5 );
   mPopupMenu->insertItem(i18n(" set all open","Display all opened"),
                              this, SLOT( setAllOpen() ),0,6 );
   mPopupMenu->insertItem(i18n(" set all close","Display all closed"),
                              this, SLOT( setAllClose() ),0,7 );
   mPopupMenu->insertItem(i18n(" set all flat","Display all flat"),
                              this, SLOT( setAllFlat() ),0,8 );
+  mPopupMenu->insertSeparator();
+  mPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"),
+                             this, SLOT( toggleQuickTodo() ),0,4 );
   mDocPrefs = new DocPrefs( name );
  
   mItemPopupMenu->insertItem(i18n("Todo View"),mPopupMenu );
   mPopupMenu->setCheckable( true );
   mItemPopupMenu->setCheckable( true );
 
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 9c35b1d..762103f 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -342,18 +342,44 @@ void Incidence::checkCategories()
 {
     mHoliday =  mCategories.contains("Holiday") || mCategories.contains(i18n("Holiday"));
     mBirthday =  mCategories.contains("Birthday") || mCategories.contains(i18n("Birthday"));
     mAnniversary =  mCategories.contains("Anniversary") || mCategories.contains(i18n("Anniversary"));
 }
 
-void Incidence::setCategories(const QStringList &categories)
+void Incidence::addCategories(const QStringList &categories, bool addToRelations ) //addToRelations = false
+{
+    if (mReadOnly) return;
+    int i;
+    for( i = 0; i < categories.count(); ++i ) {
+        if (  !mCategories.contains (categories[i]))
+            mCategories.append( categories[i] );
+    }
+    checkCategories();
+    updated();
+    if ( addToRelations ) {
+        Incidence * inc;
+        QPtrList<Incidence> Relations = relations();
+        for (inc=Relations.first();inc;inc=Relations.next()) {
+            inc->addCategories( categories, true );
+        } 
+    }
+}
+
+void Incidence::setCategories(const QStringList &categories, bool setForRelations ) //setForRelations = false
 {
   if (mReadOnly) return;
   mCategories = categories;
   checkCategories();
   updated();
+  if ( setForRelations ) {
+      Incidence * inc;
+      QPtrList<Incidence> Relations = relations();
+      for (inc=Relations.first();inc;inc=Relations.next()) {
+          inc->setCategories( categories, true );
+      } 
+  }
 }
 
 // TODO: remove setCategories(QString) function
 void Incidence::setCategories(const QString &catStr)
 {
   if (mReadOnly) return;
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index 327e7dd..ebd50d0 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -148,13 +148,14 @@ class Incidence : public IncidenceBase
     /** sets the event's short summary. */
     void setSummary(const QString &summary);
     /** returns a reference to the event's summary. */
     QString summary() const;
 
     /** set event's applicable categories */
-    void setCategories(const QStringList &categories);
+    void setCategories(const QStringList &categories, bool setForRelations = false);
+    void addCategories(const QStringList &categories, bool addToRelations = false);
     /** set event's categories based on a comma delimited string */
     void setCategories(const QString &catStr);
     /** return categories in a list */
     QStringList categories() const;
     /** return categories as a comma separated string */
     QString categoriesStr();