-rw-r--r-- | korganizer/kolistview.cpp | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index ea037a9..cec0476 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -141,7 +141,12 @@ bool ListItemVisitor::visit(Event *e) | |||
141 | mItem->setText(10,e->categoriesStr()); | 141 | mItem->setText(10,e->categoriesStr()); |
142 | mItem->setText(11, KOPrefs::instance()->calName( e->calID() )); | 142 | mItem->setText(11, KOPrefs::instance()->calName( e->calID() )); |
143 | mItem->setText(12, KGlobal::locale()->formatDateTime( e->lastModified(), true, true )); | ||
143 | 144 | ||
144 | QString key; | 145 | QString key; |
145 | QTime t = e->doesFloat() ? QTime(0,0) : e->dtStart().time(); | 146 | QDate d = e->lastModified().date(); |
147 | QTime t = e->lastModified().time(); | ||
148 | key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute(),t.second() ); | ||
149 | mItem->setSortKey(12,key); | ||
150 | t = e->doesFloat() ? QTime(0,0) : e->dtStart().time(); | ||
146 | key.sprintf("%04d%02d%02d%02d%02d",ds.year(),ds.month(),ds.day(),t.hour(),t.minute()); | 151 | key.sprintf("%04d%02d%02d%02d%02d",ds.year(),ds.month(),ds.day(),t.hour(),t.minute()); |
147 | mItem->setSortKey(1,key); | 152 | mItem->setSortKey(1,key); |
@@ -196,10 +201,13 @@ bool ListItemVisitor::visit(Todo *t) | |||
196 | mItem->setText(10,t->categoriesStr()); | 201 | mItem->setText(10,t->categoriesStr()); |
197 | mItem->setText(11, KOPrefs::instance()->calName( t->calID() )); | 202 | mItem->setText(11, KOPrefs::instance()->calName( t->calID() )); |
198 | 203 | mItem->setText(12, KGlobal::locale()->formatDateTime( t->lastModified(), true, true )); | |
199 | QString key; | 204 | QString key; |
200 | QDate d; | 205 | QDate d = t->lastModified().date(); |
206 | QTime tm = t->lastModified().time(); | ||
207 | key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute(),tm.second() ); | ||
208 | mItem->setSortKey(12,key); | ||
201 | if (t->hasDueDate()) { | 209 | if (t->hasDueDate()) { |
202 | d = t->dtDue().date(); | 210 | d = t->dtDue().date(); |
203 | QTime tm = t->doesFloat() ? QTime(0,0) : t->dtDue().time(); | 211 | tm = t->doesFloat() ? QTime(0,0) : t->dtDue().time(); |
204 | key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute()); | 212 | key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute()); |
205 | mItem->setSortKey(7,key); | 213 | mItem->setSortKey(7,key); |
@@ -207,5 +215,5 @@ bool ListItemVisitor::visit(Todo *t) | |||
207 | if ( t->hasStartDate() ) { | 215 | if ( t->hasStartDate() ) { |
208 | d = t->dtStart().date(); | 216 | d = t->dtStart().date(); |
209 | QTime tm = t->doesFloat() ? QTime(0,0) : t->dtStart().time(); | 217 | tm = t->doesFloat() ? QTime(0,0) : t->dtStart().time(); |
210 | key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute()); | 218 | key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute()); |
211 | mItem->setSortKey(1,key); | 219 | mItem->setSortKey(1,key); |
@@ -238,7 +246,12 @@ bool ListItemVisitor::visit(Journal * j) | |||
238 | mItem->setText(10,j->categoriesStr()); | 246 | mItem->setText(10,j->categoriesStr()); |
239 | mItem->setText(11, KOPrefs::instance()->calName( j->calID() )); | 247 | mItem->setText(11, KOPrefs::instance()->calName( j->calID() )); |
248 | mItem->setText(12, KGlobal::locale()->formatDateTime( j->lastModified(), true, true )); | ||
240 | 249 | ||
241 | QString key; | 250 | QString key; |
242 | QDate d = j->dtStart().date(); | 251 | QDate d = j->lastModified().date(); |
252 | QTime tm = j->lastModified().time(); | ||
253 | key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute(),tm.second() ); | ||
254 | mItem->setSortKey(12,key); | ||
255 | d = j->dtStart().date(); | ||
243 | key.sprintf("%04d%02d%02d",d.year(),d.month(),d.day()); | 256 | key.sprintf("%04d%02d%02d",d.year(),d.month(),d.day()); |
244 | mItem->setSortKey(1,key); | 257 | mItem->setSortKey(1,key); |
@@ -268,4 +281,5 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, | |||
268 | mListView->addColumn(i18n("Categories")); | 281 | mListView->addColumn(i18n("Categories")); |
269 | mListView->addColumn(i18n("Calendar")); | 282 | mListView->addColumn(i18n("Calendar")); |
283 | mListView->addColumn(i18n("Last Modified")); | ||
270 | 284 | ||
271 | mListView->setColumnAlignment(0,AlignLeft); | 285 | mListView->setColumnAlignment(0,AlignLeft); |
@@ -281,8 +295,9 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, | |||
281 | mListView->setColumnAlignment(10,AlignLeft); | 295 | mListView->setColumnAlignment(10,AlignLeft); |
282 | mListView->setColumnAlignment(11,AlignLeft); | 296 | mListView->setColumnAlignment(11,AlignLeft); |
297 | mListView->setColumnAlignment(12,AlignLeft); | ||
283 | mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this); | 298 | mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this); |
284 | 299 | ||
285 | int iii = 0; | 300 | int iii = 0; |
286 | for ( iii = 0; iii< 12 ; ++iii ) | 301 | for ( iii = 0; iii< 13 ; ++iii ) |
287 | mListView->setColumnWidthMode( iii, QListView::Manual ); | 302 | mListView->setColumnWidthMode( iii, QListView::Manual ); |
288 | 303 | ||