summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt2
-rw-r--r--korganizer/kolistview.cpp29
2 files changed, 23 insertions, 8 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index bd946fd..727921a 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1490,3 +1490,3 @@
1490{ "Edit","Edit" }, 1490{ "Edit","Edit" },
1491{ "","" }, 1491{ "Last Modified","Zuletzt geändert" },
1492{ "","" }, 1492{ "","" },
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index ea037a9..cec0476 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -142,5 +142,10 @@ bool ListItemVisitor::visit(Event *e)
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());
@@ -197,8 +202,11 @@ bool ListItemVisitor::visit(Todo *t)
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());
@@ -208,3 +216,3 @@ bool ListItemVisitor::visit(Todo *t)
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());
@@ -239,5 +247,10 @@ bool ListItemVisitor::visit(Journal * j)
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());
@@ -269,2 +282,3 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
269 mListView->addColumn(i18n("Calendar")); 282 mListView->addColumn(i18n("Calendar"));
283 mListView->addColumn(i18n("Last Modified"));
270 284
@@ -282,2 +296,3 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
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);
@@ -285,3 +300,3 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
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 );