-rw-r--r-- | libkcal/todo.cpp | 10 | ||||
-rw-r--r-- | libkcal/todo.h | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index d062492..62b74f1 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp | |||
@@ -86,50 +86,56 @@ void Todo::setRunning( bool run ) | |||
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 | 98 | void Todo::saveRunningInfo( QString comment, QDateTime start, QDateTime end ) | |
99 | { | ||
100 | mRunStart = start; | ||
101 | mRunEnd = end; | ||
102 | saveRunningInfoToFile( comment ); | ||
103 | } | ||
99 | void Todo::saveRunningInfoToFile() | 104 | void Todo::saveRunningInfoToFile() |
100 | { | 105 | { |
106 | mRunEnd = QDateTime::currentDateTime(); | ||
101 | saveRunningInfoToFile( QString::null ); | 107 | saveRunningInfoToFile( QString::null ); |
102 | } | 108 | } |
103 | void Todo::saveRunningInfoToFile( QString comment ) | 109 | void Todo::saveRunningInfoToFile( QString comment ) |
104 | { | 110 | { |
105 | //qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1()); | 111 | //qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1()); |
106 | if ( mRunStart.secsTo ( QDateTime::currentDateTime() ) < 10 ) { | 112 | if ( mRunStart.secsTo ( QDateTime::currentDateTime() ) < 10 ) { |
107 | qDebug("Running time < 30 seconds. Skipped. "); | 113 | qDebug("Running time < 30 seconds. Skipped. "); |
108 | return; | 114 | return; |
109 | } | 115 | } |
110 | QString dir = KGlobalSettings::timeTrackerDir(); | 116 | QString dir = KGlobalSettings::timeTrackerDir(); |
111 | //qDebug("%s ", dir.latin1()); | 117 | //qDebug("%s ", dir.latin1()); |
112 | QString file = "%1%2%3-%4%5%6-"; | 118 | QString file = "%1%2%3-%4%5%6-"; |
113 | 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 ); | 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 ); |
114 | file.replace ( QRegExp (" "), "0" ); | 120 | file.replace ( QRegExp (" "), "0" ); |
115 | file += uid(); | 121 | file += uid(); |
116 | //qDebug("File %s ",file.latin1() ); | 122 | //qDebug("File %s ",file.latin1() ); |
117 | CalendarLocal cal; | 123 | CalendarLocal cal; |
118 | cal.setLocalTime(); | 124 | cal.setLocalTime(); |
119 | Todo * to = (Todo*) clone(); | 125 | Todo * to = (Todo*) clone(); |
120 | to->setFloats( false ); | 126 | to->setFloats( false ); |
121 | to->setDtStart( mRunStart ); | 127 | to->setDtStart( mRunStart ); |
122 | to->setHasStartDate( true ); | 128 | to->setHasStartDate( true ); |
123 | to->setDtDue( QDateTime::currentDateTime() ); | 129 | to->setDtDue( mRunEnd ); |
124 | to->setHasDueDate( true ); | 130 | to->setHasDueDate( true ); |
125 | to->setUid( file ); | 131 | to->setUid( file ); |
126 | if ( !comment.isEmpty() ) { | 132 | if ( !comment.isEmpty() ) { |
127 | QString des = to->description(); | 133 | QString des = to->description(); |
128 | if ( des.isEmpty () ) | 134 | if ( des.isEmpty () ) |
129 | to->setDescription( "TT-Note: " + comment ); | 135 | to->setDescription( "TT-Note: " + comment ); |
130 | else | 136 | else |
131 | to->setDescription( "TT-Note: " + comment +"\n" + des ); | 137 | to->setDescription( "TT-Note: " + comment +"\n" + des ); |
132 | } | 138 | } |
133 | cal.addIncidence( to ); | 139 | cal.addIncidence( to ); |
134 | ICalFormat format; | 140 | ICalFormat format; |
135 | file = dir +"/" +file +".ics"; | 141 | file = dir +"/" +file +".ics"; |
diff --git a/libkcal/todo.h b/libkcal/todo.h index 42db025..11f848e 100644 --- a/libkcal/todo.h +++ b/libkcal/todo.h | |||
@@ -33,24 +33,25 @@ namespace KCal { | |||
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 ); | ||
45 | 46 | ||
46 | /** Return an exact copy of this todo. */ | 47 | /** Return an exact copy of this todo. */ |
47 | Incidence *clone(); | 48 | Incidence *clone(); |
48 | QDateTime getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const; | 49 | QDateTime getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const; |
49 | 50 | ||
50 | /** for setting the todo's due date/time with a QDateTime. */ | 51 | /** for setting the todo's due date/time with a QDateTime. */ |
51 | void setDtDue(const QDateTime &dtDue); | 52 | void setDtDue(const QDateTime &dtDue); |
52 | /** returns an event's Due date/time as a QDateTime. */ | 53 | /** returns an event's Due date/time as a QDateTime. */ |
53 | QDateTime dtDue() const; | 54 | QDateTime dtDue() const; |
54 | /** returns an event's due time as a string formatted according to the | 55 | /** returns an event's due time as a string formatted according to the |
55 | users locale settings */ | 56 | users locale settings */ |
56 | QString dtDueTimeStr() const; | 57 | QString dtDueTimeStr() const; |
@@ -124,24 +125,25 @@ namespace KCal { | |||
124 | void setRunningFalse( QString ); | 125 | void setRunningFalse( QString ); |
125 | void stopRunning(); | 126 | void stopRunning(); |
126 | int runTime(); | 127 | int runTime(); |
127 | QDateTime runStart () const { return mRunStart;} | 128 | QDateTime runStart () const { return mRunStart;} |
128 | public slots: | 129 | public slots: |
129 | void saveRunningInfoToFile( QString st ); | 130 | void saveRunningInfoToFile( QString st ); |
130 | void saveRunningInfoToFile( ); | 131 | void saveRunningInfoToFile( ); |
131 | void saveParents(); | 132 | void saveParents(); |
132 | private: | 133 | private: |
133 | bool mRunning; | 134 | bool mRunning; |
134 | QTimer * mRunSaveTimer; | 135 | QTimer * mRunSaveTimer; |
135 | QDateTime mRunStart; | 136 | QDateTime mRunStart; |
137 | QDateTime mRunEnd; | ||
136 | bool accept(Visitor &v) { return v.visit(this); } | 138 | bool accept(Visitor &v) { return v.visit(this); } |
137 | 139 | ||
138 | QDateTime mDtDue; // due date of todo | 140 | QDateTime mDtDue; // due date of todo |
139 | 141 | ||
140 | bool mHasDueDate; // if todo has associated due date | 142 | bool mHasDueDate; // if todo has associated due date |
141 | 143 | ||
142 | // int mStatus; // confirmed/delegated/tentative/etc | 144 | // int mStatus; // confirmed/delegated/tentative/etc |
143 | 145 | ||
144 | QDateTime mCompleted; | 146 | QDateTime mCompleted; |
145 | bool mHasCompletedDate; | 147 | bool mHasCompletedDate; |
146 | 148 | ||
147 | int mPercentComplete; | 149 | int mPercentComplete; |