-rw-r--r-- | core/pim/today/today.cpp | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index ad1ec90..62becb0 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -24,3 +24,2 @@ | |||
24 | #include <qpe/qcopenvelope_qws.h> | 24 | #include <qpe/qcopenvelope_qws.h> |
25 | //#include <qpe/qprocess.h> | ||
26 | #include <qpe/resource.h> | 25 | #include <qpe/resource.h> |
@@ -40,3 +39,2 @@ | |||
40 | #include <qpixmap.h> | 39 | #include <qpixmap.h> |
41 | //#include <qfileinfo.h> | ||
42 | #include <qlayout.h> | 40 | #include <qlayout.h> |
@@ -45,3 +43,2 @@ | |||
45 | 43 | ||
46 | //#include <iostream.h> | ||
47 | #include <unistd.h> | 44 | #include <unistd.h> |
@@ -386,6 +383,11 @@ void Today::getTodo() { | |||
386 | it!=overDueList.end(); ++it ) { | 383 | it!=overDueList.end(); ++it ) { |
387 | if (!(*it).isCompleted() && ( ammount < MAX_LINES_TASK) ) { | 384 | if (!(*it).isCompleted() && ( ammount < MAX_LINES_TASK) ) { |
388 | tmpout += "<font color=#e00000><b>-" +((*it).description()).mid(0, MAX_CHAR_CLIP) + "</b></font><br>"; | 385 | QString desc = (*it).summary(); |
389 | ammount++; | 386 | if( desc.isEmpty() ) { |
390 | } | 387 | desc = (*it).description(); |
388 | } | ||
389 | tmpout += "<font color=#e00000><b>-" + desc.mid(0, MAX_CHAR_CLIP) + "</b></font><br>"; | ||
390 | |||
391 | ammount++; | ||
392 | } | ||
391 | } | 393 | } |
@@ -397,11 +399,15 @@ void Today::getTodo() { | |||
397 | it!=openTodo.end(); ++it ) { | 399 | it!=openTodo.end(); ++it ) { |
398 | if (!(*it).isCompleted()){ | 400 | if (!(*it).isCompleted()){ |
399 | count +=1; | 401 | count +=1; |
400 | // not the overdues, we allready got them, and not if we are | 402 | // not the overdues, we allready got them, and not if we are |
401 | // over the maxlines | 403 | // over the maxlines |
402 | if (!(*it).isOverdue() && ( ammount < MAX_LINES_TASK) ) { | 404 | if (!(*it).isOverdue() && ( ammount < MAX_LINES_TASK) ) { |
403 | tmpout += "<b>-</b>" + ((*it).description()).mid(0, MAX_CHAR_CLIP) + "<br>"; | 405 | QString desc = (*it).summary(); |
404 | ammount++; | 406 | if( desc.isEmpty() ) { |
407 | desc = (*it).description(); | ||
408 | } | ||
409 | tmpout += "<b>-</b>" + desc.mid(0, MAX_CHAR_CLIP) + "<br>"; | ||
410 | ammount++; | ||
411 | } | ||
405 | } | 412 | } |
406 | } | ||
407 | } | 413 | } |
@@ -446,4 +452,4 @@ void Today::editCard() { | |||
446 | void Today::startDatebook() { | 452 | void Today::startDatebook() { |
447 | QCopEnvelope e("QPE/System", "execute(QString)"); | 453 | QCopEnvelope e("QPE/System", "execute(QString)"); |
448 | e << QString("datebook"); | 454 | e << QString("datebook"); |
449 | } | 455 | } |