author | harlekin <harlekin> | 2002-02-21 16:57:40 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-02-21 16:57:40 (UTC) |
commit | ec52599a5a9ca3397e6375b7aeb4ee391c614bfb (patch) (unidiff) | |
tree | 5570c7a511f7d089e410a5fecadb2fee0fb73d63 /core/pim/today/today.cpp | |
parent | 4c965fa187f642cb3db4cd32d70a68cfa8c41022 (diff) | |
download | opie-ec52599a5a9ca3397e6375b7aeb4ee391c614bfb.zip opie-ec52599a5a9ca3397e6375b7aeb4ee391c614bfb.tar.gz opie-ec52599a5a9ca3397e6375b7aeb4ee391c614bfb.tar.bz2 |
all day detection, bumped to 0.2.6
-rw-r--r-- | core/pim/today/today.cpp | 43 |
1 files changed, 29 insertions, 14 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 | |||
@@ -190,13 +190,20 @@ void Today::getDates() | |||
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 | // start time of event | 196 | if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) |
197 | + TimeString::timeString(QTime((*it).event().start().time()) ) | 197 | { |
198 | // end time of event | 198 | msg += "All day"; |
199 | + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ) | 199 | } |
200 | + "<BR>"; | 200 | else |
201 | { | ||
202 | // start time of event | ||
203 | msg += TimeString::timeString(QTime((*it).event().start().time()) ) | ||
204 | // end time of event | ||
205 | + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ); | ||
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) |
@@ -215,12 +222,20 @@ void Today::getDates() | |||
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>"; |
220 | // start time of event | 227 | |
221 | + TimeString::timeString(QTime((*it).event().start().time()) ) | 228 | if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) |
222 | // end time of event | 229 | { |
223 | + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ) | 230 | msg += "All day"; |
224 | + "<BR>"; | 231 | } |
232 | else | ||
233 | { | ||
234 | // start time of event | ||
235 | msg += TimeString::timeString(QTime((*it).event().start().time()) ) | ||
236 | // end time of event | ||
237 | + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ); | ||
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) |