summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt2
-rw-r--r--korganizer/kolistview.cpp37
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
@@ -1487,9 +1487,9 @@
1487{ "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" }, 1487{ "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" },
1488{ "\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" }, 1488{ "\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" },
1489{ "\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" }, 1489{ "\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" },
1490{ "Edit","Edit" }, 1490{ "Edit","Edit" },
1491{ "","" }, 1491{ "Last Modified","Zuletzt geändert" },
1492{ "","" }, 1492{ "","" },
1493{ "","" }, 1493{ "","" },
1494{ "","" }, 1494{ "","" },
1495{ "","" }, 1495{ "","" },
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index ea037a9..cec0476 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -139,11 +139,16 @@ bool ListItemVisitor::visit(Event *e)
139 mItem->setText(8,"---"); 139 mItem->setText(8,"---");
140 mItem->setText(9, e->cancelled() ? i18n("Yes") : i18n("No")); 140 mItem->setText(9, e->cancelled() ? i18n("Yes") : i18n("No"));
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 143 mItem->setText(12, KGlobal::locale()->formatDateTime( e->lastModified(), true, true ));
144 QString key; 144
145 QTime t = e->doesFloat() ? QTime(0,0) : e->dtStart().time(); 145 QString key;
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);
148 153
149 t = e->doesFloat() ? QTime(0,0) : e->dtEnd().time(); 154 t = e->doesFloat() ? QTime(0,0) : e->dtEnd().time();
@@ -194,20 +199,23 @@ bool ListItemVisitor::visit(Todo *t)
194 } 199 }
195 mItem->setText(9, t->cancelled() ? i18n("Yes") : i18n("No")); 200 mItem->setText(9, t->cancelled() ? i18n("Yes") : i18n("No"));
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);
206 } 214 }
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);
212 } 220 }
213 return true; 221 return true;
@@ -236,11 +244,16 @@ bool ListItemVisitor::visit(Journal * j)
236 mItem->setText(8,"---"); 244 mItem->setText(8,"---");
237 mItem->setText(9,"---"); 245 mItem->setText(9,"---");
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() ));
240 248 mItem->setText(12, KGlobal::locale()->formatDateTime( j->lastModified(), true, true ));
241 QString key; 249
242 QDate d = j->dtStart().date(); 250 QString key;
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);
245 mItem->setSortKey(7,key); 258 mItem->setSortKey(7,key);
246 259
@@ -266,8 +279,9 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
266 mListView->addColumn(i18n("Due Time")); 279 mListView->addColumn(i18n("Due Time"));
267 mListView->addColumn(i18n("Cancelled")); 280 mListView->addColumn(i18n("Cancelled"));
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);
272 mListView->setColumnAlignment(1,AlignLeft); 286 mListView->setColumnAlignment(1,AlignLeft);
273 mListView->setColumnAlignment(2,AlignHCenter); 287 mListView->setColumnAlignment(2,AlignHCenter);
@@ -279,12 +293,13 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
279 mListView->setColumnAlignment(8,AlignLeft); 293 mListView->setColumnAlignment(8,AlignLeft);
280 mListView->setColumnAlignment(9,AlignLeft); 294 mListView->setColumnAlignment(9,AlignLeft);
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
289 QBoxLayout *layoutTop = new QVBoxLayout(this); 304 QBoxLayout *layoutTop = new QVBoxLayout(this);
290 layoutTop->addWidget(mListView); 305 layoutTop->addWidget(mListView);