small fixes

1 files changed, 12 insertions, 1 deletions

diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 9a3ba73..bafd349 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -34,2 +34,3 @@
 #include <qdir.h>
+#include <qregexp.h>
 
@@ -167,3 +168,7 @@ bool ListItemVisitor::visit(Journal * j)
 { 
-    mItem->setText(0,i18n("Journal"));
+    QString des = j->description().left(50);
+    des = des.simplifyWhiteSpace ();
+    des.replace (QRegExp ("\\n"),"" );
+    des.replace (QRegExp ("\\r"),"" );
+    mItem->setText(0,i18n("Journal")+": "+des.left(25));
     mItem->setText(1,j->dtStartDateStr());
@@ -177,2 +182,3 @@ bool ListItemVisitor::visit(Journal * j)
     mItem->setText(9,"---");
+    mItem->setText(10,i18n("Last Modified: ")+  KGlobal::locale()->formatDateTime( j->lastModified() , true) );
 
@@ -691,2 +697,3 @@ void KOListView::showDates(const QDate &start, const QDate &end)
     QDate date = start;
+    QPtrList<Journal> j_list;
     while( date <= end ) {
@@ -694,4 +701,8 @@ void KOListView::showDates(const QDate &start, const QDate &end)
         addTodos(calendar()->todos(date));
+        Journal* jo = calendar()->journal(date);
+        if ( jo )
+            j_list.append( jo );
         date = date.addDays( 1 );
     }
+    addJournals(j_list);
     emit incidenceSelected( 0 );