author | zautrix <zautrix> | 2005-07-06 19:41:06 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-06 19:41:06 (UTC) |
commit | 984e2132871c79990f6d9eac5702f7f32186f235 (patch) (unidiff) | |
tree | 2bc4b50ee8b8284e74fd53bdfb78d6d3107806a0 /korganizer/kolistview.cpp | |
parent | c79a8a4950c098fa6f5a7ae8396feb4dd3a91577 (diff) | |
download | kdepimpi-984e2132871c79990f6d9eac5702f7f32186f235.zip kdepimpi-984e2132871c79990f6d9eac5702f7f32186f235.tar.gz kdepimpi-984e2132871c79990f6d9eac5702f7f32186f235.tar.bz2 |
fixxx
-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 | |||
@@ -63,16 +63,17 @@ | |||
63 | #include "koglobals.h" | 63 | #include "koglobals.h" |
64 | #include "koprefs.h" | 64 | #include "koprefs.h" |
65 | #include "kfiledialog.h" | 65 | #include "kfiledialog.h" |
66 | 66 | ||
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: |
75 | KOListViewWhatsThis( QWidget *wid, KOListView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { }; | 76 | KOListViewWhatsThis( QWidget *wid, KOListView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { }; |
76 | 77 | ||
77 | protected: | 78 | protected: |
78 | virtual QString text( const QPoint& p) | 79 | virtual QString text( const QPoint& p) |
@@ -158,17 +159,17 @@ bool ListItemVisitor::visit(Event *e) | |||
158 | } | 159 | } |
159 | 160 | ||
160 | bool ListItemVisitor::visit(Todo *t) | 161 | bool ListItemVisitor::visit(Todo *t) |
161 | { | 162 | { |
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()) { |
171 | mItem->setText(2,"---"); | 172 | mItem->setText(2,"---"); |
172 | } else { | 173 | } else { |
173 | mItem->setText(2,t->dtStartTimeStr()); | 174 | mItem->setText(2,t->dtStartTimeStr()); |
174 | } | 175 | } |
@@ -220,25 +221,27 @@ bool ListItemVisitor::visit(Todo *t) | |||
220 | } | 221 | } |
221 | return true; | 222 | return true; |
222 | } | 223 | } |
223 | 224 | ||
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,"---"); |
241 | mItem->setText(5,"---"); | 244 | mItem->setText(5,"---"); |
242 | mItem->setText(6,"---"); | 245 | mItem->setText(6,"---"); |
243 | mItem->setText(7,j->dtStartDateStr()); | 246 | mItem->setText(7,j->dtStartDateStr()); |
244 | mItem->setText(8,"---"); | 247 | mItem->setText(8,"---"); |