2 files changed, 27 insertions, 12 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
@@ -1467,30 +1467,30 @@
 { "After importing/loading/syncing there may be new categories in events or todos which are not added automatically to the category list. Please choose what to do <b>now</b>:","Nach dem Importieren/Laden/Syncen kann es neue Kategorien in den Terminen oder Todos geben, die nicht automatisch der Kategorieliste hinzugefügt werden. Bitte wählen Sie, was <b>jetzt</b> passieren soll:" },
 { "Change category list now!","Ändere Kategorieliste jetzt!" },
 { "Edit category list...","Ändere Kategorieliste..." },
 { "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" },
 { "Filepath: ","Dateipfad: " },
 { "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" },
 { "<b>WARNING:</b> There is a pending suspended alarm!","<b>WARNUNG:</b> Es gibt einen laufenden Suspendalarm!" },
 { "Pending Suspend Alarm","Laufender Suspend Alarm" },
 { "Error loading calendar %1","Fehler beim Laden von Kalender %1" },
 { "Calendar(s) not loaded:","Nicht geladene(r) Kalender:" },
 { "Loding of calendar(s) failed","Laden von Kalendern fehlgeschlagen" },
 { "Alarm Options","Alarm Einstellungen" },
 { "Delete selected...","Lösche Ausgewählte..." },
 { "None","Nichts" },
 { "Selection","Auswahl" },
 { "Set categories","Setze Kategorien" },
 { "This adds the selected\nitems to the calendar\n%1\nand removes them from\ntheir current calendar!","Das fügt die ausgewählten\nEinträge dem Kalender\n%1\nhinzu und entfernt sie von\nihrem aktuellen Kalender!" },
 { "Reset","Neu setzen" },
 { "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" },
 { "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" },
 { "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" },
 { "\nNO\n WRITEABLE\n   CALENDAR\n      FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n  SCHREIBBARER\n    KALENDER\n      GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" },
 { "\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" },
 { "Edit","Edit" },
-{ "","" },
+{ "Last Modified","Zuletzt geändert" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index ea037a9..cec0476 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -119,51 +119,56 @@ bool ListItemVisitor::visit(Event *e)
     mItem->setText(0,e->summary());
     mItem->setText(1,start);
     if ( e->doesFloat() )
         mItem->setText(2,"---");
     else
         mItem->setText(2,e->dtStartTimeStr());
     mItem->setText(3,end);
     if ( e->doesFloat() )
         mItem->setText(4,"---");
     else
         mItem->setText(4,e->dtEndTimeStr());
     if ( e->isAlarmEnabled() ) {
         mItem->setText(5,e->alarms().first()->offsetText() );
     } else {
         mItem->setText(5, i18n("No"));
     }
     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() ));
-
-    QString key;
-    QTime t = e->doesFloat() ? QTime(0,0) : e->dtStart().time();
+    mItem->setText(12, KGlobal::locale()->formatDateTime( e->lastModified(), true, true ));
+
+    QString key; 
+    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;
 }
 
 bool ListItemVisitor::visit(Todo *t)
 {
     mItem->setText(0,t->summary());
     if ( t->isCompleted() ) {
         mItem->setSortKey(0,"99"+ t->summary().left(10));
     } else 
         mItem->setSortKey(0,QString::number( t->percentComplete() )+ t->summary().left(10));
     mItem->setPixmap( 0, *(sgListViewCompletedPix[t->percentComplete()/20]));
     if (t->hasStartDate()) {
         mItem->setText(1,t->dtStartDateStr());
         if (t->doesFloat()) {
             mItem->setText(2,"---");
         } else {
             mItem->setText(2,t->dtStartTimeStr());
         }
@@ -174,137 +179,147 @@ bool ListItemVisitor::visit(Todo *t)
     mItem->setText(3,"---");
     mItem->setText(4,"---");  
     if ( t->isAlarmEnabled() ) {
         mItem->setText(5,t->alarms().first()->offsetText() );
     } else {
         mItem->setText(5, i18n("No"));
     }
     mItem->setText(6, t->recurrence()->recurrenceText());
     if( ! t->doesRecur() )
         mItem->setSortKey( 6, "-" );
     if (t->hasDueDate()) {
         mItem->setText(7,t->dtDueDateStr());
         if (t->doesFloat()) {
             mItem->setText(8,"---");
         } else {
             mItem->setText(8,t->dtDueTimeStr());
         }
     } 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)
 { 
     
     QString des;
     if ( !j->summary().isEmpty() ) {
         des = j->summary();
     } else {
         des = j->description().left(30);
         des = des.simplifyWhiteSpace ();
         des.replace (QRegExp ("\\n"),"" );
         des.replace (QRegExp ("\\r"),"" );
     }
     mItem->setText(0,i18n("Journal: ")+des.left(25));
     mItem->setText(1,j->dtStartDateStr());
     mItem->setText(2,"---");
     mItem->setText(3,"---");
     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() ));
-
-    QString key;
-    QDate d = j->dtStart().date();
+    mItem->setText(12, KGlobal::locale()->formatDateTime( j->lastModified(), true, true ));
+
+    QString key; 
+    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,
                        const char *name)
     : KOEventView(calendar, parent, name)
 {
     
     mActiveItem = 0;
     mForceShowCompletedTodos = false;
     mListView = new KOListViewListView(this);
     mListView->addColumn(i18n("Summary"));
     mListView->addColumn(i18n("Start Date"));
     mListView->addColumn(i18n("Start Time"));
     mListView->addColumn(i18n("End Date"));
     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();
     
     selPopup->insertItem(i18n("All"),this,
                                   SLOT(allSelection()));
     selPopup->insertItem(i18n("None"),this,
                                   SLOT(clearSelection()));
     selPopup->insertItem(i18n("Delete selected..."),this,
                                   SLOT(deleteAll()));
     mPopupMenu->insertItem(i18n("Selection"), selPopup );
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Hide all selected"),this,
                                   SLOT(hideAll()),true);
 
     selPopup->insertSeparator();
 #ifdef DESKTOP_VERSION
     mPopupMenu->insertSeparator();
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),