-rw-r--r-- | core/pim/today/today.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 1f6f34e..c63a9ef 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -180,68 +180,68 @@ void Today::getDates() | |||
180 | 180 | ||
181 | // decide if to get all day or only later appointments | 181 | // decide if to get all day or only later appointments |
182 | if (!ONLY_LATER) | 182 | if (!ONLY_LATER) |
183 | { | 183 | { |
184 | msg += "<B>" + (*it).description() + "</B>"; | 184 | msg += "<B>" + (*it).description() + "</B>"; |
185 | if ( (*it).event().hasAlarm() ) | 185 | if ( (*it).event().hasAlarm() ) |
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><i>" + (*it).location(); | 192 | msg += "<BR><i>" + (*it).location(); |
193 | msg += "</i>"; | ||
193 | } | 194 | } |
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") ) | 196 | if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) |
197 | { | 197 | { |
198 | msg += "All day"; | 198 | msg += "<br>All day"; |
199 | } | 199 | } |
200 | else | 200 | else |
201 | { | 201 | { |
202 | // start time of event | 202 | // start time of event |
203 | msg += TimeString::timeString(QTime((*it).event().start().time()) ) | 203 | msg += "<br>" + TimeString::timeString(QTime((*it).event().start().time()) ) |
204 | // end time of event | 204 | // end time of event |
205 | + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ); | 205 | + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ); |
206 | } | 206 | } |
207 | msg += "<BR>"; | 207 | msg += "<BR>"; |
208 | // include possible note or not | 208 | // include possible note or not |
209 | if (SHOW_NOTES == 1) | 209 | if (SHOW_NOTES == 1) |
210 | { | 210 | { |
211 | 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>"; |
212 | } | 212 | } |
213 | } | 213 | } |
214 | else if ((time.toString() <= TimeString::dateString((*it).event().end())) ) | 214 | else if ((time.toString() <= TimeString::dateString((*it).event().end())) ) |
215 | { | 215 | { |
216 | msg += "<B>" + (*it).description() + "</B>"; | 216 | msg += "<B>" + (*it).description() + "</B>"; |
217 | if ( (*it).event().hasAlarm() ) | 217 | if ( (*it).event().hasAlarm() ) |
218 | { | 218 | { |
219 | msg += " <b>[with alarm]</b>"; | 219 | msg += " <b>[with alarm]</b>"; |
220 | } | 220 | } |
221 | // include location or not | 221 | // include location or not |
222 | if (SHOW_LOCATION == 1) | 222 | if (SHOW_LOCATION == 1) |
223 | { | 223 | { |
224 | msg+= "<BR><i>" + (*it).location(); | 224 | msg+= "<BR><i>" + (*it).location(); |
225 | msg += "</i>"; | ||
225 | } | 226 | } |
226 | msg += "</i><BR>"; | 227 | |
227 | |||
228 | if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) | 228 | if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) |
229 | { | 229 | { |
230 | msg += "All day"; | 230 | msg += "<br>All day"; |
231 | } | 231 | } |
232 | else | 232 | else |
233 | { | 233 | { |
234 | // start time of event | 234 | // start time of event |
235 | msg += TimeString::timeString(QTime((*it).event().start().time()) ) | 235 | msg += "<br>" + TimeString::timeString(QTime((*it).event().start().time()) ) |
236 | // end time of event | 236 | // end time of event |
237 | + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ); | 237 | + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ); |
238 | } | 238 | } |
239 | msg += "<BR>"; | 239 | msg += "<BR>"; |
240 | // include possible note or not | 240 | // include possible note or not |
241 | if (SHOW_NOTES == 1) | 241 | if (SHOW_NOTES == 1) |
242 | { | 242 | { |
243 | 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>"; |
244 | } | 244 | } |
245 | } | 245 | } |
246 | } | 246 | } |
247 | } | 247 | } |