-rw-r--r-- | korganizer/kolistview.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 5690bdb..5f90dc6 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -67,8 +67,9 @@ | |||
67 | #include "kolistview.h" | 67 | #include "kolistview.h" |
68 | #include "koeventviewer.h" | 68 | #include "koeventviewer.h" |
69 | 69 | ||
70 | extern QPixmap* sgListViewCompletedPix[6]; | 70 | extern QPixmap* sgListViewCompletedPix[6]; |
71 | extern QPixmap* sgListViewJournalPix; | ||
71 | 72 | ||
72 | class KOListViewWhatsThis :public QWhatsThis | 73 | class KOListViewWhatsThis :public QWhatsThis |
73 | { | 74 | { |
74 | public: | 75 | public: |
@@ -162,9 +163,9 @@ bool ListItemVisitor::visit(Todo *t) | |||
162 | mItem->setText(0,t->summary()); | 163 | mItem->setText(0,t->summary()); |
163 | if ( t->isCompleted() ) { | 164 | if ( t->isCompleted() ) { |
164 | mItem->setSortKey(0,"99"+ t->summary().left(10)); | 165 | mItem->setSortKey(0,"99"+ t->summary().left(10)); |
165 | } else | 166 | } else |
166 | mItem->setSortKey(0,QString::number( t->percentComplete() )+ t->summary().left(10)); | 167 | mItem->setSortKey(0,QString::number( t->percentComplete()+1 )+ t->summary().left(10)); |
167 | mItem->setPixmap( 0, *(sgListViewCompletedPix[t->percentComplete()/20])); | 168 | mItem->setPixmap( 0, *(sgListViewCompletedPix[t->percentComplete()/20])); |
168 | if (t->hasStartDate()) { | 169 | if (t->hasStartDate()) { |
169 | mItem->setText(1,t->dtStartDateStr()); | 170 | mItem->setText(1,t->dtStartDateStr()); |
170 | if (t->doesFloat()) { | 171 | if (t->doesFloat()) { |
@@ -224,17 +225,19 @@ bool ListItemVisitor::visit(Todo *t) | |||
224 | bool ListItemVisitor::visit(Journal * j) | 225 | bool ListItemVisitor::visit(Journal * j) |
225 | { | 226 | { |
226 | 227 | ||
227 | QString des; | 228 | QString des; |
229 | mItem->setPixmap( 0, *sgListViewJournalPix); | ||
228 | if ( !j->summary().isEmpty() ) { | 230 | if ( !j->summary().isEmpty() ) { |
229 | des = j->summary(); | 231 | des = j->summary(); |
230 | } else { | 232 | } else { |
231 | des = j->description().left(30); | 233 | des = j->description().left(30); |
232 | des = des.simplifyWhiteSpace (); | 234 | des = des.simplifyWhiteSpace (); |
233 | des.replace (QRegExp ("\\n"),"" ); | 235 | des.replace (QRegExp ("\\n"),"" ); |
234 | des.replace (QRegExp ("\\r"),"" ); | 236 | des.replace (QRegExp ("\\r"),"" ); |
235 | } | 237 | } |
236 | mItem->setText(0,i18n("Journal: ")+des.left(25)); | 238 | mItem->setText(0,des.left(25)); |
239 | mItem->setSortKey(0,"0"+ des.left(25)); | ||
237 | mItem->setText(1,j->dtStartDateStr()); | 240 | mItem->setText(1,j->dtStartDateStr()); |
238 | mItem->setText(2,"---"); | 241 | mItem->setText(2,"---"); |
239 | mItem->setText(3,"---"); | 242 | mItem->setText(3,"---"); |
240 | mItem->setText(4,"---"); | 243 | mItem->setText(4,"---"); |