-rw-r--r-- | libopie2/opiepim/otodo.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp index c84eeeb..38b93f7 100644 --- a/libopie2/opiepim/otodo.cpp +++ b/libopie2/opiepim/otodo.cpp | |||
@@ -258,96 +258,96 @@ bool OTodo::isOverdue( ) | |||
258 | return false; | 258 | return false; |
259 | } | 259 | } |
260 | void OTodo::setProgress(ushort progress ) | 260 | void OTodo::setProgress(ushort progress ) |
261 | { | 261 | { |
262 | changeOrModify(); | 262 | changeOrModify(); |
263 | data->prog = progress; | 263 | data->prog = progress; |
264 | } | 264 | } |
265 | QString OTodo::toShortText() const { | 265 | QString OTodo::toShortText() const { |
266 | return summary(); | 266 | return summary(); |
267 | } | 267 | } |
268 | /*! | 268 | /*! |
269 | Returns a richt text string | 269 | Returns a richt text string |
270 | */ | 270 | */ |
271 | QString OTodo::toRichText() const | 271 | QString OTodo::toRichText() const |
272 | { | 272 | { |
273 | QString text; | 273 | QString text; |
274 | QStringList catlist; | 274 | QStringList catlist; |
275 | 275 | ||
276 | // summary | 276 | // summary |
277 | text += "<b><h3><img src=\"todo/TodoList\">"; | 277 | text += "<b><h3><img src=\"todo/TodoList\">"; |
278 | if ( !summary().isEmpty() ) { | 278 | if ( !summary().isEmpty() ) { |
279 | text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"), "" ); | 279 | text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"), "" ); |
280 | } | 280 | } |
281 | text += "</h3></b><br><hr><br>"; | 281 | text += "</h3></b><br><hr><br>"; |
282 | 282 | ||
283 | // description | 283 | // description |
284 | if( !description().isEmpty() ){ | 284 | if( !description().isEmpty() ){ |
285 | text += "<b>" + QObject::tr( "Description:" ) + "</b><br>"; | 285 | text += "<b>" + QObject::tr( "Description:" ) + "</b><br>"; |
286 | text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) ; | 286 | text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) ; |
287 | } | 287 | } |
288 | 288 | ||
289 | // priority | 289 | // priority |
290 | int priorityval = priority(); | 290 | int priorityval = priority(); |
291 | text += "<b>" + QObject::tr( "Priority:") +" </b><img src=\"todo/priority" + | 291 | text += "<b>" + QObject::tr( "Priority:") +" </b><img src=\"todo/priority" + |
292 | QString::number( priorityval ) + "\">"; | 292 | QString::number( priorityval ) + "\">"; |
293 | // text += "<b>" + QObject::tr( "Priority:") +"</b><img src=\"todo/priority" + | 293 | // text += "<b>" + QObject::tr( "Priority:") +"</b><img src=\"todo/priority" + |
294 | // QString::number( priority() ) + "\"><br>"; | 294 | // QString::number( priority() ) + "\"><br>"; |
295 | switch ( priorityval ) | 295 | switch ( priorityval ) |
296 | { | 296 | { |
297 | case 1 : text += QObject::tr( "Very high" ); | 297 | case 1 : text += QObject::tr( "Very high" ); |
298 | break; | 298 | break; |
299 | case 2 : text += QObject::tr( "High" ); | 299 | case 2 : text += QObject::tr( "High" ); |
300 | break; | 300 | break; |
301 | case 3 : text += QObject::tr( "Normal" ); | 301 | case 3 : text += QObject::tr( "Normal" ); |
302 | break; | 302 | break; |
303 | case 4 : text += QObject::tr( "Low" ); | 303 | case 4 : text += QObject::tr( "Low" ); |
304 | break; | 304 | break; |
305 | case 5 : text += QObject::tr( "Very low" ); | 305 | case 5 : text += QObject::tr( "Very low" ); |
306 | break; | 306 | break; |
307 | }; | 307 | }; |
308 | text += "<br>"; | 308 | text += "<br>"; |
309 | 309 | ||
310 | // progress | 310 | // progress |
311 | text += "<b>" + QObject::tr( "Progress:") + " </b>" | 311 | text += "<b>" + QObject::tr( "Progress:") + " </b>" |
312 | + QString::number( progress() ) + " %<br>"; | 312 | + QString::number( progress() ) + " %<br>"; |
313 | 313 | ||
314 | // due date | 314 | // due date |
315 | if (hasDueDate() ){ | 315 | if (hasDueDate() ){ |
316 | QDate dd = dueDate(); | 316 | QDate dd = dueDate(); |
317 | int off = QDate::currentDate().daysTo( dd ); | 317 | int off = QDate::currentDate().daysTo( dd ); |
318 | 318 | ||
319 | text += "<b>" + QObject::tr( "Deadline:" ) + " </b><font color=\""; | 319 | text += "<b>" + QObject::tr( "Deadline:" ) + " </b><font color=\""; |
320 | if ( off < 0 ) | 320 | if ( off < 0 ) |
321 | text += "#FF0000"; | 321 | text += "#FF0000"; |
322 | else if ( off == 0 ) | 322 | else if ( off == 0 ) |
323 | text += "#FFFF00"; | 323 | text += "#FFFF00"; |
324 | else if ( off > 0 ) | 324 | else if ( off > 0 ) |
325 | text += "#00FF00"; | 325 | text += "#00FF00"; |
326 | 326 | ||
327 | text += "\">" + dd.toString() + "</font><br>"; | 327 | text += "\">" + dd.toString() + "</font><br>"; |
328 | } | 328 | } |
329 | 329 | ||
330 | // categories | 330 | // categories |
331 | text += "<b>" + QObject::tr( "Category:") + "</b> "; | 331 | text += "<b>" + QObject::tr( "Category:") + "</b> "; |
332 | text += categoryNames( "Todo List" ).join(", "); | 332 | text += categoryNames( "Todo List" ).join(", "); |
333 | text += "<br>"; | 333 | text += "<br>"; |
334 | 334 | ||
335 | return text; | 335 | return text; |
336 | } | 336 | } |
337 | bool OTodo::hasNotifiers()const { | 337 | bool OTodo::hasNotifiers()const { |
338 | if (!data->notifiers) return false; | 338 | if (!data->notifiers) return false; |
339 | return !data->notifiers->isEmpty(); | 339 | return !data->notifiers->isEmpty(); |
340 | } | 340 | } |
341 | OPimNotifyManager& OTodo::notifiers() { | 341 | OPimNotifyManager& OTodo::notifiers() { |
342 | if (!data->notifiers ) | 342 | if (!data->notifiers ) |
343 | data->notifiers = new OPimNotifyManager; | 343 | data->notifiers = new OPimNotifyManager; |
344 | return (*data->notifiers); | 344 | return (*data->notifiers); |
345 | } | 345 | } |
346 | const OPimNotifyManager& OTodo::notifiers()const{ | 346 | const OPimNotifyManager& OTodo::notifiers()const{ |
347 | if (!data->notifiers ) | 347 | if (!data->notifiers ) |
348 | data->notifiers = new OPimNotifyManager; | 348 | data->notifiers = new OPimNotifyManager; |
349 | 349 | ||
350 | return (*data->notifiers); | 350 | return (*data->notifiers); |
351 | } | 351 | } |
352 | 352 | ||
353 | bool OTodo::operator<( const OTodo &toDoEvent )const{ | 353 | bool OTodo::operator<( const OTodo &toDoEvent )const{ |
@@ -439,51 +439,48 @@ OTodo &OTodo::operator=(const OTodo &item ) | |||
439 | 439 | ||
440 | QMap<int, QString> OTodo::toMap() const { | 440 | QMap<int, QString> OTodo::toMap() const { |
441 | QMap<int, QString> map; | 441 | QMap<int, QString> map; |
442 | 442 | ||
443 | map.insert( Uid, QString::number( uid() ) ); | 443 | map.insert( Uid, QString::number( uid() ) ); |
444 | map.insert( Category, idsToString( categories() ) ); | 444 | map.insert( Category, idsToString( categories() ) ); |
445 | map.insert( HasDate, QString::number( data->hasDate ) ); | 445 | map.insert( HasDate, QString::number( data->hasDate ) ); |
446 | map.insert( Completed, QString::number( data->isCompleted ) ); | 446 | map.insert( Completed, QString::number( data->isCompleted ) ); |
447 | map.insert( Description, data->desc ); | 447 | map.insert( Description, data->desc ); |
448 | map.insert( Summary, data->sum ); | 448 | map.insert( Summary, data->sum ); |
449 | map.insert( Priority, QString::number( data->priority ) ); | 449 | map.insert( Priority, QString::number( data->priority ) ); |
450 | map.insert( DateDay, QString::number( data->date.day() ) ); | 450 | map.insert( DateDay, QString::number( data->date.day() ) ); |
451 | map.insert( DateMonth, QString::number( data->date.month() ) ); | 451 | map.insert( DateMonth, QString::number( data->date.month() ) ); |
452 | map.insert( DateYear, QString::number( data->date.year() ) ); | 452 | map.insert( DateYear, QString::number( data->date.year() ) ); |
453 | map.insert( Progress, QString::number( data->prog ) ); | 453 | map.insert( Progress, QString::number( data->prog ) ); |
454 | // map.insert( CrossReference, crossToString() ); | 454 | // map.insert( CrossReference, crossToString() ); |
455 | /* FIXME!!! map.insert( State, ); | 455 | /* FIXME!!! map.insert( State, ); |
456 | map.insert( Recurrence, ); | 456 | map.insert( Recurrence, ); |
457 | map.insert( Reminders, ); | 457 | map.insert( Reminders, ); |
458 | map. | 458 | map. |
459 | */ | 459 | */ |
460 | return map; | 460 | return map; |
461 | } | 461 | } |
462 | 462 | ||
463 | QMap<QString, QString> OTodo::toExtraMap()const { | ||
464 | return data->extra; | ||
465 | } | ||
466 | /** | 463 | /** |
467 | * change or modify looks at the ref count and either | 464 | * change or modify looks at the ref count and either |
468 | * creates a new QShared Object or it can modify it | 465 | * creates a new QShared Object or it can modify it |
469 | * right in place | 466 | * right in place |
470 | */ | 467 | */ |
471 | void OTodo::changeOrModify() { | 468 | void OTodo::changeOrModify() { |
472 | if ( data->count != 1 ) { | 469 | if ( data->count != 1 ) { |
473 | qWarning("changeOrModify"); | 470 | qWarning("changeOrModify"); |
474 | data->deref(); | 471 | data->deref(); |
475 | OTodoData* d2 = new OTodoData(); | 472 | OTodoData* d2 = new OTodoData(); |
476 | copy(data, d2 ); | 473 | copy(data, d2 ); |
477 | data = d2; | 474 | data = d2; |
478 | } | 475 | } |
479 | } | 476 | } |
480 | // WATCHOUT | 477 | // WATCHOUT |
481 | /* | 478 | /* |
482 | * if you add something to the Data struct | 479 | * if you add something to the Data struct |
483 | * be sure to copy it here | 480 | * be sure to copy it here |
484 | */ | 481 | */ |
485 | void OTodo::copy( OTodoData* src, OTodoData* dest ) { | 482 | void OTodo::copy( OTodoData* src, OTodoData* dest ) { |
486 | dest->date = src->date; | 483 | dest->date = src->date; |
487 | dest->isCompleted = src->isCompleted; | 484 | dest->isCompleted = src->isCompleted; |
488 | dest->hasDate = src->hasDate; | 485 | dest->hasDate = src->hasDate; |
489 | dest->priority = src->priority; | 486 | dest->priority = src->priority; |