summaryrefslogtreecommitdiff
path: root/core/pim/today/today.cpp
Unidiff
Diffstat (limited to 'core/pim/today/today.cpp') (more/less context) (show whitespace changes)
-rw-r--r--core/pim/today/today.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index bed3a74..9e5c27e 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -147,13 +147,12 @@ void Today::startConfig()
147 cfg.write(); 147 cfg.write();
148 148
149 draw(); 149 draw();
150} 150}
151 151
152 152
153
154/* 153/*
155 * Get all events that are in the datebook xml file for today 154 * Get all events that are in the datebook xml file for today
156 */ 155 */
157void Today::getDates() 156void Today::getDates()
158{ 157{
159 QDate date = QDate::currentDate(); 158 QDate date = QDate::currentDate();
@@ -173,16 +172,14 @@ void Today::getDates()
173 it!=list.end(); ++it ) { 172 it!=list.end(); ++it ) {
174 173
175 count++; 174 count++;
176 175
177 if ( count <= MAX_LINES_MEET ) 176 if ( count <= MAX_LINES_MEET )
178 { 177 {
179 //only get events past current time (start or end??)
180 //cout << time.toString() << endl; 178 //cout << time.toString() << endl;
181 //cout << TimeString::dateString((*it).event().end()) << endl; 179 //cout << TimeString::dateString((*it).event().end()) << endl;
182 // still some bug in here, 1 h off
183 180
184 // decide if to get all day or only later appointments 181 // decide if to get all day or only later appointments
185 if (!ONLY_LATER) 182 if (!ONLY_LATER)
186 { 183 {
187 msg += "<B>" + (*it).description() + "</B>"; 184 msg += "<B>" + (*it).description() + "</B>";
188 if ( (*it).event().hasAlarm() ) 185 if ( (*it).event().hasAlarm() )
@@ -192,12 +189,13 @@ void Today::getDates()
192 // include location or not 189 // include location or not
193 if (SHOW_LOCATION == 1) 190 if (SHOW_LOCATION == 1)
194 { 191 {
195 msg+= "<BR>" + (*it).location(); 192 msg+= "<BR>" + (*it).location();
196 } 193 }
197 msg += "<BR>" 194 msg += "<BR>"
195
198 // start time of event 196 // start time of event
199 + TimeString::timeString(QTime((*it).event().start().time()) ) 197 + TimeString::timeString(QTime((*it).event().start().time()) )
200 // end time of event 198 // end time of event
201 + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ) 199 + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) )
202 + "<BR>"; 200 + "<BR>";
203 // include possible note or not 201 // include possible note or not