-rw-r--r-- | core/pim/today/today.cpp | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 9e5c27e..1f6f34e 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -186,21 +186,28 @@ void Today::getDates() | |||
186 | { | 186 | { |
187 | msg += " <b>[with alarm]</b>"; | 187 | msg += " <b>[with alarm]</b>"; |
188 | } | 188 | } |
189 | // include location or not | 189 | // include location or not |
190 | if (SHOW_LOCATION == 1) | 190 | if (SHOW_LOCATION == 1) |
191 | { | 191 | { |
192 | msg+= "<BR>" + (*it).location(); | 192 | msg+= "<BR><i>" + (*it).location(); |
193 | } | 193 | } |
194 | msg += "<BR>" | 194 | msg += "</i><BR>"; |
195 | 195 | ||
196 | if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) | ||
197 | { | ||
198 | msg += "All day"; | ||
199 | } | ||
200 | else | ||
201 | { | ||
196 | // start time of event | 202 | // start time of event |
197 | + TimeString::timeString(QTime((*it).event().start().time()) ) | 203 | msg += TimeString::timeString(QTime((*it).event().start().time()) ) |
198 | // end time of event | 204 | // end time of event |
199 | + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ) | 205 | + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ); |
200 | + "<BR>"; | 206 | } |
207 | msg += "<BR>"; | ||
201 | // include possible note or not | 208 | // include possible note or not |
202 | if (SHOW_NOTES == 1) | 209 | if (SHOW_NOTES == 1) |
203 | { | 210 | { |
204 | msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>"; | 211 | msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>"; |
205 | } | 212 | } |
206 | } | 213 | } |
@@ -211,20 +218,28 @@ void Today::getDates() | |||
211 | { | 218 | { |
212 | msg += " <b>[with alarm]</b>"; | 219 | msg += " <b>[with alarm]</b>"; |
213 | } | 220 | } |
214 | // include location or not | 221 | // include location or not |
215 | if (SHOW_LOCATION == 1) | 222 | if (SHOW_LOCATION == 1) |
216 | { | 223 | { |
217 | msg+= "<BR>" + (*it).location(); | 224 | msg+= "<BR><i>" + (*it).location(); |
218 | } | 225 | } |
219 | msg += "<BR>" | 226 | msg += "</i><BR>"; |
227 | |||
228 | if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) | ||
229 | { | ||
230 | msg += "All day"; | ||
231 | } | ||
232 | else | ||
233 | { | ||
220 | // start time of event | 234 | // start time of event |
221 | + TimeString::timeString(QTime((*it).event().start().time()) ) | 235 | msg += TimeString::timeString(QTime((*it).event().start().time()) ) |
222 | // end time of event | 236 | // end time of event |
223 | + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ) | 237 | + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ); |
224 | + "<BR>"; | 238 | } |
239 | msg += "<BR>"; | ||
225 | // include possible note or not | 240 | // include possible note or not |
226 | if (SHOW_NOTES == 1) | 241 | if (SHOW_NOTES == 1) |
227 | { | 242 | { |
228 | msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>"; | 243 | msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>"; |
229 | } | 244 | } |
230 | } | 245 | } |