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
@@ -135,19 +135,24 @@ bool ListItemVisitor::visit(Event *e)
     mItem->setText(6, e->recurrence()->recurrenceText());
     if( ! e->doesRecur() )
         mItem->setSortKey( 6, "-" );
     mItem->setText(7,"---");
     mItem->setText(8,"---");
     mItem->setText(9, e->cancelled() ? i18n("Yes") : i18n("No"));
     mItem->setText(10,e->categoriesStr());
     mItem->setText(11, KOPrefs::instance()->calName( e->calID() ));
+    mItem->setText(12, KGlobal::locale()->formatDateTime( e->lastModified(), true, true ));
 
     QString key;
-    QTime t = e->doesFloat() ? QTime(0,0) : e->dtStart().time();
+    QDate d = e->lastModified().date();
+    QTime t = e->lastModified().time();
+    key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute(),t.second() );
+    mItem->setSortKey(12,key);
+    t = e->doesFloat() ? QTime(0,0) : e->dtStart().time();
     key.sprintf("%04d%02d%02d%02d%02d",ds.year(),ds.month(),ds.day(),t.hour(),t.minute());
     mItem->setSortKey(1,key);
 
     t = e->doesFloat() ? QTime(0,0) : e->dtEnd().time();
     key.sprintf("%04d%02d%02d%02d%02d",de.year(),de.month(),de.day(),t.hour(),t.minute());
     mItem->setSortKey(3,key);
     return true;
 }
@@ -190,28 +195,31 @@ bool ListItemVisitor::visit(Todo *t)
         }
     } else {
         mItem->setText(7,"---");
         mItem->setText(8,"---");
     }
     mItem->setText(9, t->cancelled() ? i18n("Yes") : i18n("No"));
     mItem->setText(10,t->categoriesStr());
     mItem->setText(11, KOPrefs::instance()->calName( t->calID() ));
-
+    mItem->setText(12, KGlobal::locale()->formatDateTime( t->lastModified(), true, true ));
     QString key;
-    QDate d;
+    QDate d = t->lastModified().date();
+    QTime tm = t->lastModified().time();
+    key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute(),tm.second() );
+    mItem->setSortKey(12,key);
     if (t->hasDueDate()) {
         d = t->dtDue().date();
-        QTime tm = t->doesFloat() ? QTime(0,0) : t->dtDue().time();
+        tm = t->doesFloat() ? QTime(0,0) : t->dtDue().time();
         key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute());
         mItem->setSortKey(7,key);
     }
     if ( t->hasStartDate() ) {
         d = t->dtStart().date();
-        QTime tm = t->doesFloat() ? QTime(0,0) : t->dtStart().time();
+        tm = t->doesFloat() ? QTime(0,0) : t->dtStart().time();
         key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute());
         mItem->setSortKey(1,key);
     }
     return true;
 }
 
 bool ListItemVisitor::visit(Journal * j)
 { 
@@ -232,19 +240,24 @@ bool ListItemVisitor::visit(Journal * j)
     mItem->setText(4,"---");
     mItem->setText(5,"---");
     mItem->setText(6,"---");
     mItem->setText(7,j->dtStartDateStr());
     mItem->setText(8,"---");
     mItem->setText(9,"---");
     mItem->setText(10,j->categoriesStr());
     mItem->setText(11, KOPrefs::instance()->calName( j->calID() ));
+    mItem->setText(12, KGlobal::locale()->formatDateTime( j->lastModified(), true, true ));
 
     QString key;
-    QDate d = j->dtStart().date();
+    QDate d = j->lastModified().date();
+    QTime tm = j->lastModified().time();
+    key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute(),tm.second() );
+    mItem->setSortKey(12,key);
+    d = j->dtStart().date();
     key.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
     mItem->setSortKey(1,key);
     mItem->setSortKey(7,key);
 
     return true;
 }
 
 KOListView::KOListView(Calendar *calendar, QWidget *parent,
@@ -262,33 +275,35 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     mListView->addColumn(i18n("End Time"));
     mListView->addColumn(i18n("Alarm")); // alarm set?
     mListView->addColumn(i18n("Recurs")); // recurs?
     mListView->addColumn(i18n("Due Date"));
     mListView->addColumn(i18n("Due Time"));
     mListView->addColumn(i18n("Cancelled"));
     mListView->addColumn(i18n("Categories"));
     mListView->addColumn(i18n("Calendar"));
+    mListView->addColumn(i18n("Last Modified"));
 
     mListView->setColumnAlignment(0,AlignLeft);
     mListView->setColumnAlignment(1,AlignLeft);
     mListView->setColumnAlignment(2,AlignHCenter);
     mListView->setColumnAlignment(3,AlignLeft);
     mListView->setColumnAlignment(4,AlignHCenter);
     mListView->setColumnAlignment(5,AlignLeft);
     mListView->setColumnAlignment(6,AlignLeft);
     mListView->setColumnAlignment(7,AlignLeft);
     mListView->setColumnAlignment(8,AlignLeft);
     mListView->setColumnAlignment(9,AlignLeft);
     mListView->setColumnAlignment(10,AlignLeft);
     mListView->setColumnAlignment(11,AlignLeft);
+    mListView->setColumnAlignment(12,AlignLeft);
     mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this);
 
     int iii = 0;
-    for ( iii = 0; iii< 12 ; ++iii )
+    for ( iii = 0; iii< 13 ; ++iii )
         mListView->setColumnWidthMode( iii, QListView::Manual );
 
     QBoxLayout *layoutTop = new QVBoxLayout(this);
     layoutTop->addWidget(mListView);
     mListView->setFont ( KOPrefs::instance()->mListViewFont );
     mPopupMenu = eventPopup();
     QPopupMenu* selPopup = new QPopupMenu ( this );
     mPopupMenu->insertSeparator();