author | zautrix <zautrix> | 2005-06-17 09:29:18 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-17 09:29:18 (UTC) |
commit | 160b471e4d254fd45dbbd161178de15a14163a0c (patch) (unidiff) | |
tree | 149a5bf6ef1eb0399c46c928a53d31fa298ac383 /libkcal | |
parent | cd71ce2dd43e4cca3b3da3f599616e7b1b6b8deb (diff) | |
download | kdepimpi-160b471e4d254fd45dbbd161178de15a14163a0c.zip kdepimpi-160b471e4d254fd45dbbd161178de15a14163a0c.tar.gz kdepimpi-160b471e4d254fd45dbbd161178de15a14163a0c.tar.bz2 |
fixxx
-rw-r--r-- | libkcal/todo.cpp | 2 | ||||
-rw-r--r-- | libkcal/todo.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index 62b74f1..9a8b6e4 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp | |||
@@ -76,48 +76,50 @@ void Todo::stopRunning() | |||
76 | if ( mRunSaveTimer ) | 76 | if ( mRunSaveTimer ) |
77 | mRunSaveTimer->stop(); | 77 | mRunSaveTimer->stop(); |
78 | mRunning = false; | 78 | mRunning = false; |
79 | } | 79 | } |
80 | void Todo::setRunning( bool run ) | 80 | void Todo::setRunning( bool run ) |
81 | { | 81 | { |
82 | if ( run == mRunning ) | 82 | if ( run == mRunning ) |
83 | return; | 83 | return; |
84 | //qDebug("Todo::setRunning %d ", run); | 84 | //qDebug("Todo::setRunning %d ", run); |
85 | if ( !mRunSaveTimer ) { | 85 | if ( !mRunSaveTimer ) { |
86 | mRunSaveTimer = new QTimer ( this ); | 86 | mRunSaveTimer = new QTimer ( this ); |
87 | connect ( mRunSaveTimer, SIGNAL( timeout() ), this , SLOT ( saveRunningInfoToFile() ) ); | 87 | connect ( mRunSaveTimer, SIGNAL( timeout() ), this , SLOT ( saveRunningInfoToFile() ) ); |
88 | } | 88 | } |
89 | mRunning = run; | 89 | mRunning = run; |
90 | if ( mRunning ) { | 90 | if ( mRunning ) { |
91 | mRunSaveTimer->start( 1000 * 60 * 5 ); // 5 min | 91 | mRunSaveTimer->start( 1000 * 60 * 5 ); // 5 min |
92 | mRunStart = QDateTime::currentDateTime(); | 92 | mRunStart = QDateTime::currentDateTime(); |
93 | } else { | 93 | } else { |
94 | mRunSaveTimer->stop(); | 94 | mRunSaveTimer->stop(); |
95 | saveRunningInfoToFile(); | 95 | saveRunningInfoToFile(); |
96 | } | 96 | } |
97 | } | 97 | } |
98 | void Todo::saveRunningInfo( QString comment, QDateTime start, QDateTime end ) | 98 | void Todo::saveRunningInfo( QString comment, QDateTime start, QDateTime end ) |
99 | { | 99 | { |
100 | if ( !mRunning) return; | ||
101 | mRunning = false; | ||
100 | mRunStart = start; | 102 | mRunStart = start; |
101 | mRunEnd = end; | 103 | mRunEnd = end; |
102 | saveRunningInfoToFile( comment ); | 104 | saveRunningInfoToFile( comment ); |
103 | } | 105 | } |
104 | void Todo::saveRunningInfoToFile() | 106 | void Todo::saveRunningInfoToFile() |
105 | { | 107 | { |
106 | mRunEnd = QDateTime::currentDateTime(); | 108 | mRunEnd = QDateTime::currentDateTime(); |
107 | saveRunningInfoToFile( QString::null ); | 109 | saveRunningInfoToFile( QString::null ); |
108 | } | 110 | } |
109 | void Todo::saveRunningInfoToFile( QString comment ) | 111 | void Todo::saveRunningInfoToFile( QString comment ) |
110 | { | 112 | { |
111 | //qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1()); | 113 | //qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1()); |
112 | if ( mRunStart.secsTo ( QDateTime::currentDateTime() ) < 10 ) { | 114 | if ( mRunStart.secsTo ( QDateTime::currentDateTime() ) < 10 ) { |
113 | qDebug("Running time < 30 seconds. Skipped. "); | 115 | qDebug("Running time < 30 seconds. Skipped. "); |
114 | return; | 116 | return; |
115 | } | 117 | } |
116 | QString dir = KGlobalSettings::timeTrackerDir(); | 118 | QString dir = KGlobalSettings::timeTrackerDir(); |
117 | //qDebug("%s ", dir.latin1()); | 119 | //qDebug("%s ", dir.latin1()); |
118 | QString file = "%1%2%3-%4%5%6-"; | 120 | QString file = "%1%2%3-%4%5%6-"; |
119 | file = file.arg( mRunStart.date().year(), 4).arg( mRunStart.date().month(),2 ).arg( mRunStart.date().day(), 2 ).arg( mRunStart.time().hour(),2 ).arg( mRunStart.time().minute(),2 ).arg( mRunStart.time().second(),2 ); | 121 | file = file.arg( mRunStart.date().year(), 4).arg( mRunStart.date().month(),2 ).arg( mRunStart.date().day(), 2 ).arg( mRunStart.time().hour(),2 ).arg( mRunStart.time().minute(),2 ).arg( mRunStart.time().second(),2 ); |
120 | file.replace ( QRegExp (" "), "0" ); | 122 | file.replace ( QRegExp (" "), "0" ); |
121 | file += uid(); | 123 | file += uid(); |
122 | //qDebug("File %s ",file.latin1() ); | 124 | //qDebug("File %s ",file.latin1() ); |
123 | CalendarLocal cal; | 125 | CalendarLocal cal; |
diff --git a/libkcal/todo.h b/libkcal/todo.h index 11f848e..425dfad 100644 --- a/libkcal/todo.h +++ b/libkcal/todo.h | |||
@@ -21,49 +21,48 @@ | |||
21 | #define TODO_H | 21 | #define TODO_H |
22 | // | 22 | // |
23 | // Todo component, representing a VTODO object | 23 | // Todo component, representing a VTODO object |
24 | // | 24 | // |
25 | 25 | ||
26 | #include "incidence.h" | 26 | #include "incidence.h" |
27 | 27 | ||
28 | #include <qtimer.h> | 28 | #include <qtimer.h> |
29 | 29 | ||
30 | namespace KCal { | 30 | namespace KCal { |
31 | 31 | ||
32 | /** | 32 | /** |
33 | This class provides a Todo in the sense of RFC2445. | 33 | This class provides a Todo in the sense of RFC2445. |
34 | */ | 34 | */ |
35 | class Todo : public QObject,public Incidence | 35 | class Todo : public QObject,public Incidence |
36 | { | 36 | { |
37 | Q_OBJECT | 37 | Q_OBJECT |
38 | public: | 38 | public: |
39 | Todo(); | 39 | Todo(); |
40 | Todo(const Todo &); | 40 | Todo(const Todo &); |
41 | ~Todo(); | 41 | ~Todo(); |
42 | typedef ListBase<Todo> List; | 42 | typedef ListBase<Todo> List; |
43 | QCString type() const { return "Todo"; } | 43 | QCString type() const { return "Todo"; } |
44 | IncTypeID typeID() const { return todoID; } | 44 | IncTypeID typeID() const { return todoID; } |
45 | void saveRunningInfo( QString comment, QDateTime start, QDateTime end ); | ||
46 | 45 | ||
47 | /** Return an exact copy of this todo. */ | 46 | /** Return an exact copy of this todo. */ |
48 | Incidence *clone(); | 47 | Incidence *clone(); |
49 | QDateTime getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const; | 48 | QDateTime getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const; |
50 | 49 | ||
51 | /** for setting the todo's due date/time with a QDateTime. */ | 50 | /** for setting the todo's due date/time with a QDateTime. */ |
52 | void setDtDue(const QDateTime &dtDue); | 51 | void setDtDue(const QDateTime &dtDue); |
53 | /** returns an event's Due date/time as a QDateTime. */ | 52 | /** returns an event's Due date/time as a QDateTime. */ |
54 | QDateTime dtDue() const; | 53 | QDateTime dtDue() const; |
55 | /** returns an event's due time as a string formatted according to the | 54 | /** returns an event's due time as a string formatted according to the |
56 | users locale settings */ | 55 | users locale settings */ |
57 | QString dtDueTimeStr() const; | 56 | QString dtDueTimeStr() const; |
58 | /** returns an event's due date as a string formatted according to the | 57 | /** returns an event's due date as a string formatted according to the |
59 | users locale settings */ | 58 | users locale settings */ |
60 | QString dtDueDateStr(bool shortfmt=true) const; | 59 | QString dtDueDateStr(bool shortfmt=true) const; |
61 | /** returns an event's due date and time as a string formatted according | 60 | /** returns an event's due date and time as a string formatted according |
62 | to the users locale settings */ | 61 | to the users locale settings */ |
63 | QString dtDueStr(bool shortfmt=true) const; | 62 | QString dtDueStr(bool shortfmt=true) const; |
64 | 63 | ||
65 | /** returns TRUE or FALSE depending on whether the todo has a due date */ | 64 | /** returns TRUE or FALSE depending on whether the todo has a due date */ |
66 | bool hasDueDate() const; | 65 | bool hasDueDate() const; |
67 | /** sets the event's hasDueDate value. */ | 66 | /** sets the event's hasDueDate value. */ |
68 | void setHasDueDate(bool f); | 67 | void setHasDueDate(bool f); |
69 | 68 | ||
@@ -105,48 +104,49 @@ namespace KCal { | |||
105 | /** | 104 | /** |
106 | Set how many percent of the task are completed. Valid values are in the | 105 | Set how many percent of the task are completed. Valid values are in the |
107 | range from 0 to 100. | 106 | range from 0 to 100. |
108 | */ | 107 | */ |
109 | void setPercentComplete(int); | 108 | void setPercentComplete(int); |
110 | 109 | ||
111 | /** return date and time when todo was completed */ | 110 | /** return date and time when todo was completed */ |
112 | QDateTime completed() const; | 111 | QDateTime completed() const; |
113 | QString completedStr(bool shortF = true) const; | 112 | QString completedStr(bool shortF = true) const; |
114 | /** set date and time of completion */ | 113 | /** set date and time of completion */ |
115 | void setCompleted(const QDateTime &completed); | 114 | void setCompleted(const QDateTime &completed); |
116 | 115 | ||
117 | /** Return true, if todo has a date associated with completion */ | 116 | /** Return true, if todo has a date associated with completion */ |
118 | bool hasCompletedDate() const; | 117 | bool hasCompletedDate() const; |
119 | bool contains ( Todo*); | 118 | bool contains ( Todo*); |
120 | void checkSetCompletedFalse(); | 119 | void checkSetCompletedFalse(); |
121 | bool setRecurDates(); | 120 | bool setRecurDates(); |
122 | bool isRunning() {return mRunning;} | 121 | bool isRunning() {return mRunning;} |
123 | bool hasRunningSub(); | 122 | bool hasRunningSub(); |
124 | void setRunning( bool ); | 123 | void setRunning( bool ); |
125 | void setRunningFalse( QString ); | 124 | void setRunningFalse( QString ); |
126 | void stopRunning(); | 125 | void stopRunning(); |
127 | int runTime(); | 126 | int runTime(); |
128 | QDateTime runStart () const { return mRunStart;} | 127 | QDateTime runStart () const { return mRunStart;} |
128 | void saveRunningInfo( QString comment, QDateTime start, QDateTime end ); | ||
129 | public slots: | 129 | public slots: |
130 | void saveRunningInfoToFile( QString st ); | 130 | void saveRunningInfoToFile( QString st ); |
131 | void saveRunningInfoToFile( ); | 131 | void saveRunningInfoToFile( ); |
132 | void saveParents(); | 132 | void saveParents(); |
133 | private: | 133 | private: |
134 | bool mRunning; | 134 | bool mRunning; |
135 | QTimer * mRunSaveTimer; | 135 | QTimer * mRunSaveTimer; |
136 | QDateTime mRunStart; | 136 | QDateTime mRunStart; |
137 | QDateTime mRunEnd; | 137 | QDateTime mRunEnd; |
138 | bool accept(Visitor &v) { return v.visit(this); } | 138 | bool accept(Visitor &v) { return v.visit(this); } |
139 | 139 | ||
140 | QDateTime mDtDue; // due date of todo | 140 | QDateTime mDtDue; // due date of todo |
141 | 141 | ||
142 | bool mHasDueDate; // if todo has associated due date | 142 | bool mHasDueDate; // if todo has associated due date |
143 | 143 | ||
144 | // int mStatus; // confirmed/delegated/tentative/etc | 144 | // int mStatus; // confirmed/delegated/tentative/etc |
145 | 145 | ||
146 | QDateTime mCompleted; | 146 | QDateTime mCompleted; |
147 | bool mHasCompletedDate; | 147 | bool mHasCompletedDate; |
148 | 148 | ||
149 | int mPercentComplete; | 149 | int mPercentComplete; |
150 | }; | 150 | }; |
151 | 151 | ||
152 | bool operator==( const Todo&, const Todo& ); | 152 | bool operator==( const Todo&, const Todo& ); |