* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 11 insertions, 5 deletions

diff --git a/korganizer/koeditorgeneraltodo.h b/korganizer/koeditorgeneraltodo.h
index 7ebc1f7e..2d07ceca 100644
--- a/korganizer/koeditorgeneraltodo.h
+++ b/korganizer/koeditorgeneraltodo.h
@@ -25,6 +25,8 @@
 #define _KOEDITORGENERALTODO_H
 
 #include "koeditorgeneral.h"
+#include "koglobals.h"
+
 #include <tqdatetime.h>
 
 class KRestrictedLine;
@@ -54,30 +56,33 @@ class KOEditorGeneralTodo : public KOEditorGeneral
     /** Set widgets to default values */
     void setDefaults( const TQDateTime &due, bool allDay );
     /** Read todo object and setup widgets accordingly */
-    void readTodo(Todo *todo, Calendar *calendar);
+    void readTodo( Todo *todo, Calendar *calendar, const TQDate &date );
     /** Write todo settings to event object */
     void writeTodo(Todo *);
 
     /** Check if the input is valid. */
     bool validateInput();
 
+    void updateRecurrenceSummary( Todo *todo );
+
     /** The todo has been modified externally */
-    void modified (Todo*, int);
+    void modified( Todo *todo, KOGlobals::HowChanged modification );
 
   signals:
     void dueDateEditToggle( bool );
     void dateTimeStrChanged( const TQString & );
     void signalDateTimeChanged( const TQDateTime &, const TQDateTime & );
+    void editRecurrence();
 
   protected slots:
-    void completedChanged(int);
+    void completedChanged( int );
+    void completedChanged();
     void dateChanged();
     void startDateModified();
 
     void enableDueEdit( bool enable );
     void enableStartEdit( bool enable );
     void enableTimeEdits( bool enable );
-    void showAlarm();
 
   protected:
     void setCompletedDate();
@@ -92,6 +97,7 @@ class KOEditorGeneralTodo : public KOEditorGeneral
     TQCheckBox               *mDueCheck;
     KDateEdit               *mDueDateEdit;
     KTimeEdit               *mDueTimeEdit;
+    TQCheckBox               *mCompletedToggle;
     TQComboBox               *mCompletedCombo;
     TQLabel                  *mCompletedLabel;
     TQLabel                  *mPriorityLabel;
@@ -102,7 +108,7 @@ class KOEditorGeneralTodo : public KOEditorGeneral
 
     TQCheckBox               *mStartCheck;
 
-    TQDateTime mCompleted;
+    TQDateTime               mCompletedDateTime;
 };