-rw-r--r-- | core/pim/today/today.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 0f6e598..7a2d0c9 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -195,13 +195,13 @@ void Today::getDates() | |||
195 | // include possible note or not | 195 | // include possible note or not |
196 | if (SHOW_NOTES == 1) | 196 | if (SHOW_NOTES == 1) |
197 | { | 197 | { |
198 | msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>"; | 198 | msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>"; |
199 | } | 199 | } |
200 | } | 200 | } |
201 | else if ((time.toString() <= TimeString::dateString((*it).event().end())) && ONLY_LATER ) | 201 | else if ((time.toString() <= TimeString::dateString((*it).event().end())) ) |
202 | { | 202 | { |
203 | msg += "<B>" + (*it).description() + "</B>"; | 203 | msg += "<B>" + (*it).description() + "</B>"; |
204 | // include location or not | 204 | // include location or not |
205 | if (SHOW_LOCATION == 1) | 205 | if (SHOW_LOCATION == 1) |
206 | { | 206 | { |
207 | msg+= "<BR>" + (*it).location(); | 207 | msg+= "<BR>" + (*it).location(); |
@@ -216,18 +216,17 @@ void Today::getDates() | |||
216 | if (SHOW_NOTES == 1) | 216 | if (SHOW_NOTES == 1) |
217 | { | 217 | { |
218 | msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>"; | 218 | msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>"; |
219 | } | 219 | } |
220 | } | 220 | } |
221 | } | 221 | } |
222 | |||
223 | if (msg.isEmpty()) | ||
224 | { | ||
225 | msg = "No more appointments today"; | ||
226 | } | ||
227 | } | 222 | } |
223 | if (msg.isEmpty()) | ||
224 | { | ||
225 | msg = "No more appointments today"; | ||
226 | } | ||
228 | DatesField->setText(msg); | 227 | DatesField->setText(msg); |
229 | } | 228 | } |
230 | } | 229 | } |
231 | 230 | ||
232 | /* | 231 | /* |
233 | * Parse in the todolist.xml | 232 | * Parse in the todolist.xml |