summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-02-21 22:43:28 (UTC)
committer harlekin <harlekin>2002-02-21 22:43:28 (UTC)
commit7fd3f2ce443a136079bb9230b90b31c8d172b16a (patch) (unidiff)
tree8786464c785def9cc0eaa874dcc10871bde11a64
parentec52599a5a9ca3397e6375b7aeb4ee391c614bfb (diff)
downloadopie-7fd3f2ce443a136079bb9230b90b31c8d172b16a.zip
opie-7fd3f2ce443a136079bb9230b90b31c8d172b16a.tar.gz
opie-7fd3f2ce443a136079bb9230b90b31c8d172b16a.tar.bz2
fixed some layout glitches
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/today.cpp18
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
@@ -168,92 +168,92 @@ void Today::getDates()
168 if ( list.count() > 0 ) { 168 if ( list.count() > 0 ) {
169 QString msg; 169 QString msg;
170 170
171 for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin(); 171 for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin();
172 it!=list.end(); ++it ) { 172 it!=list.end(); ++it ) {
173 173
174 count++; 174 count++;
175 175
176 if ( count <= MAX_LINES_MEET ) 176 if ( count <= MAX_LINES_MEET )
177 { 177 {
178 //cout << time.toString() << endl; 178 //cout << time.toString() << endl;
179 //cout << TimeString::dateString((*it).event().end()) << endl; 179 //cout << TimeString::dateString((*it).event().end()) << endl;
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 }
248 if (msg.isEmpty()) 248 if (msg.isEmpty())
249 { 249 {
250 msg = "No more appointments today"; 250 msg = "No more appointments today";
251 } 251 }
252 DatesField->setText(msg); 252 DatesField->setText(msg);
253 } 253 }
254} 254}
255 255
256/* 256/*
257 * Parse in the todolist.xml 257 * Parse in the todolist.xml
258 */ 258 */
259QList<TodoItem> Today::loadTodo(const char *filename) 259QList<TodoItem> Today::loadTodo(const char *filename)