author | zautrix <zautrix> | 2005-04-15 07:31:29 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-15 07:31:29 (UTC) |
commit | 6a16de9a18235d2ddd771c97a4bb4512b43d181a (patch) (unidiff) | |
tree | 3fec37074addd6afc6eebb191d57a1d5ef5127ab /libkcal | |
parent | 7e87a287a0860882af27e26288bc9cc553dd3a0b (diff) | |
download | kdepimpi-6a16de9a18235d2ddd771c97a4bb4512b43d181a.zip kdepimpi-6a16de9a18235d2ddd771c97a4bb4512b43d181a.tar.gz kdepimpi-6a16de9a18235d2ddd771c97a4bb4512b43d181a.tar.bz2 |
fix
-rw-r--r-- | libkcal/todo.cpp | 36 | ||||
-rw-r--r-- | libkcal/todo.h | 1 |
2 files changed, 34 insertions, 3 deletions
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index 90e7eb9..b89abce 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <klocale.h> | 23 | #include <klocale.h> |
24 | #include <kdebug.h> | 24 | #include <kdebug.h> |
25 | #include <qregexp.h> | 25 | #include <qregexp.h> |
26 | #include <qfileinfo.h> | ||
26 | 27 | ||
27 | #include "calendarlocal.h" | 28 | #include "calendarlocal.h" |
28 | #include "icalformat.h" | 29 | #include "icalformat.h" |
@@ -30,7 +31,7 @@ | |||
30 | 31 | ||
31 | using namespace KCal; | 32 | using namespace KCal; |
32 | 33 | ||
33 | Todo::Todo(): Incidence() | 34 | Todo::Todo(): QObject(), Incidence() |
34 | { | 35 | { |
35 | // mStatus = TENTATIVE; | 36 | // mStatus = TENTATIVE; |
36 | 37 | ||
@@ -43,7 +44,7 @@ Todo::Todo(): Incidence() | |||
43 | mRunSaveTimer = 0; | 44 | mRunSaveTimer = 0; |
44 | } | 45 | } |
45 | 46 | ||
46 | Todo::Todo(const Todo &t) : Incidence(t) | 47 | Todo::Todo(const Todo &t) : QObject(),Incidence(t) |
47 | { | 48 | { |
48 | mDtDue = t.mDtDue; | 49 | mDtDue = t.mDtDue; |
49 | mHasDueDate = t.mHasDueDate; | 50 | mHasDueDate = t.mHasDueDate; |
@@ -81,8 +82,10 @@ void Todo::setRunning( bool run ) | |||
81 | void Todo::saveRunningInfoToFile() | 82 | void Todo::saveRunningInfoToFile() |
82 | { | 83 | { |
83 | //qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1()); | 84 | //qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1()); |
84 | if ( mRunStart.secsTo ( QDateTime::currentDateTime() ) < 30 ) | 85 | if ( mRunStart.secsTo ( QDateTime::currentDateTime() ) < 30 ) { |
86 | qDebug("Running time < 30 seconds. Skipped. "); | ||
85 | return; | 87 | return; |
88 | } | ||
86 | QString dir = KGlobalSettings::timeTrackerDir(); | 89 | QString dir = KGlobalSettings::timeTrackerDir(); |
87 | //qDebug("%s ", dir.latin1()); | 90 | //qDebug("%s ", dir.latin1()); |
88 | QString file = "%1%2%3-%4%5%6-"; | 91 | QString file = "%1%2%3-%4%5%6-"; |
@@ -103,8 +106,35 @@ void Todo::saveRunningInfoToFile() | |||
103 | ICalFormat format; | 106 | ICalFormat format; |
104 | file = dir +"/" +file +".ics"; | 107 | file = dir +"/" +file +".ics"; |
105 | format.save( &cal, file ); | 108 | format.save( &cal, file ); |
109 | saveParents(); | ||
106 | 110 | ||
107 | } | 111 | } |
112 | void Todo::saveParents() | ||
113 | { | ||
114 | if (!relatedTo() ) | ||
115 | return; | ||
116 | Incidence * inc = relatedTo(); | ||
117 | if ( inc->type() != "Todo" ) | ||
118 | return; | ||
119 | Todo* to = (Todo*)inc; | ||
120 | bool saveTodo = false; | ||
121 | QString file = KGlobalSettings::timeTrackerDir() + "/"+ to->uid() + ".ics"; | ||
122 | QFileInfo fi ( file ); | ||
123 | if ( fi.exists() ) { | ||
124 | if ( fi.lastModified () < to->lastModified ()) | ||
125 | saveTodo = true; | ||
126 | } else { | ||
127 | saveTodo = true; | ||
128 | } | ||
129 | if ( saveTodo ) { | ||
130 | CalendarLocal cal; | ||
131 | cal.setTimeZoneId( " 00:00 Europe/London(UTC)" ); | ||
132 | Todo * par = (Todo *) to->clone(); | ||
133 | cal.addIncidence( par ); | ||
134 | ICalFormat format; | ||
135 | format.save( &cal, file ); | ||
136 | } | ||
137 | } | ||
108 | 138 | ||
109 | int Todo::runTime() | 139 | int Todo::runTime() |
110 | { | 140 | { |
diff --git a/libkcal/todo.h b/libkcal/todo.h index fe43357..ec1ffda 100644 --- a/libkcal/todo.h +++ b/libkcal/todo.h | |||
@@ -124,6 +124,7 @@ namespace KCal { | |||
124 | QDateTime runStart () const { return mRunStart;} | 124 | QDateTime runStart () const { return mRunStart;} |
125 | public slots: | 125 | public slots: |
126 | void saveRunningInfoToFile(); | 126 | void saveRunningInfoToFile(); |
127 | void saveParents(); | ||
127 | private: | 128 | private: |
128 | bool mRunning; | 129 | bool mRunning; |
129 | QTimer * mRunSaveTimer; | 130 | QTimer * mRunSaveTimer; |