j fixes

9 files changed, 113 insertions, 54 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 4df2005..510f4bf 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1441,27 +1441,32 @@
 { "Messanger","Messanger" },
 { "Assistant","Assistent" },
 { "Manager","Manager" },
 { "Secrecy","Sichtbar" },
 { "male","männlich" },
 { "female","weiblich" },
 { "Hide!","Verbergen!" },
 { "Show!","Anzeigen!" },
 { "Details","Details" },
 { "Profession","Beruf" },
 { "Children","Kinder" },
 { "Department","Abteilung" },
 { "Backup cancelled","Backup abgebrochen" },
 { "Backup globally disabled","Backup global abgeschaltet" },
 { "Backup succesfully finished","Backup erfolgreich beendet" },
 { "(Hint: You can enable automatic backup in the global settings!)","(Hinweis: Sie können ein automatisches Backup in den globalen Einstellungen konfigurieren!)" },
 { "This will <b>backup all calendar files</b> to the directory %1 %2","Das schreibt ein <b>Backup aller Kalenderdateien</b> in das Verzeichnis %1 %2" },
 { "Birthdays","Geburtstage" },
 { "KO/Pi import information!","KO/Pi Import Information!" },
 { "Start this todo\nand stop all running","Starte dieses Todo\nund stoppe alle Laufenden" },
 { "Cancel - do not start"," Abbrechen - Todo nicht starten" }, 
 { "The timezone has changed!\nShould the calendar be reloaded\nto shift the time of the events?\nPlease read Menu: Help->FAQ:\n"How do I change the timezone?"\nas well!","Die Zeitzone wurde geändert!\nSollen die Kalender neu geladen\nwerden num die Zeiten\nder Termine zu ändern?\nBitte lesen Sie auch\nMenu: Help->FAQ:\n"How do I change the timezone?"" },
 { "Reload","Neu laden" },
 { "Timezone settings","Zeitzoneneinstellung" },
+{ " Title: "," Titel: " },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
 { "","" },
 { "","" },
 { "","" },
\ No newline at end of file
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 0b923ad..05bfd31 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -21,125 +21,116 @@
     without including the source code for Qt in the source distribution.
 */
 
 //
 // Journal Entry
 
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qvbox.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <qpixmap.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
 
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <ktextedit.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include "koprefs.h"
+#include <klineedit.h>
 
 #include <libkcal/journal.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 #include <kresources/resourceselectdialog.h>
 
 #include "journalentry.h"
 //#include "journalentry.moc"
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #endif
 JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   QFrame(parent)
 {
     heiHint = QApplication::desktop()->height() / 5 ;
     showOnlyMode = false;
   mCalendar = calendar;
   mJournal = 0;
   mDirty = false;
 
   QHBox * vb = new QHBox ( this );
-  QPushButton * newJournal = new QPushButton( vb );
   QIconSet icon;
-  if ( QApplication::desktop()->width() < 321 ) 
-      icon = SmallIcon("ko16old");
-  else
-      icon = SmallIcon("ko24old");
-  newJournal->setIconSet (icon ) ;
-  int size = newJournal->sizeHint().height();
-  newJournal->setFixedSize(  size, size );
-
 
   QPushButton * toggleJournal = new QPushButton( vb );
   icon = SmallIcon("1updownarrow");
   toggleJournal->setIconSet (icon ) ;
-  //int size = toggleJournal->sizeHint().height();
+  int size = toggleJournal->sizeHint().height();
   toggleJournal->setFixedSize( size * 2 /3  , size );
-
-
-
+  new QLabel(i18n(" Title: "),vb);
+  mTitle = new KLineEdit ( vb );
   mTitleLabel = new QLabel(i18n("Title"),vb);
-  mTitleLabel->setMargin(2);
+  mTitleLabel->setMargin(0);
   mTitleLabel->setAlignment(AlignCenter);
   QPushButton * loadTemplate = new QPushButton( vb );
   QPushButton * saveTemplate = new QPushButton( vb );
   if ( QApplication::desktop()->width() < 321 ) 
       icon = SmallIcon("fileexport16");
   else
       icon = SmallIcon("fileexport");
   saveTemplate->setIconSet (icon ) ;
   //size = saveTemplate->sizeHint().height();
   saveTemplate->setFixedSize(  size, size );
   if ( QApplication::desktop()->width() < 321 ) 
       icon = SmallIcon("fileimport16");
   else
       icon = SmallIcon("fileimport");
   loadTemplate->setIconSet (icon ) ;
   loadTemplate->setFixedSize(  size, size );
   mEditor = new KTextEdit(this);
   connect(mEditor,SIGNAL(textChanged()),SLOT(setDirty()));
 #ifndef DESKTOP_VERSION
   QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold );
 #endif
   mEditor->setWordWrap( KTextEdit::WidgetWidth );
   QBoxLayout *topLayout = new QVBoxLayout(this);
   topLayout->addWidget(vb);
   topLayout->addWidget(mEditor);
   mEditor->installEventFilter(this);
   connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) );
+  connect(  mTitle, SIGNAL( textChanged ( const QString & ) ), this , SLOT( setDirty() ) );
   connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) );
-  connect( newJournal, SIGNAL( clicked() ), this , SIGNAL( newJournal() ) );
   connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) );
 }
 
 JournalEntry::~JournalEntry()
 {
-    qDebug("JournalEntry::~JournalEntry() ");
+    //qDebug("JournalEntry::~JournalEntry() ");
 }
 QSize JournalEntry::sizeHint() const
 {
     return QSize ( 240, heiHint );
 }
 void JournalEntry::slotSaveTemplate()
 {
     QString fileName =locateLocal( "templates", "journals" ); 
     QDir t_dir;
     if ( !t_dir.exists(fileName) )
         t_dir.mkdir ( fileName );
     fileName += "/journal";
     fileName = KFileDialog::getSaveFileName(  fileName , i18n("Save as Journal template"), this );
     if ( fileName.length() == 0 )
         return;
 
     QFile fileIn( fileName );
     if (!fileIn.open( IO_WriteOnly ) ) {
         KMessageBox::error( this, i18n("Error saving template file\n '%1'.")
                             .arg( fileName ) );
         return;
     } 
     // QString text;
     QTextStream tsIn( &fileIn );
@@ -158,78 +149,77 @@ void JournalEntry::slotLoadTemplate()
     if ( fileName.length() == 0 )
         return;
     QFile fileIn( fileName );
     if (!fileIn.open( IO_ReadOnly ) ) {
         KMessageBox::error( this, i18n("Error loading template file\n '%1'.")
                             .arg( fileName ) );
         return;
     }
     QTextStream tsIn( &fileIn );
     tsIn.setCodec( QTextCodec::codecForName("utf8") );
     QString text =  tsIn.read();
     fileIn.close();  
     int line, col;
     mEditor->getCursorPosition (& line, & col );
     mEditor-> insertAt ( text, line, col, true ); 
     //mEditor->setIgnoreMark( true );
     setDirty();
 }
 void JournalEntry::setDate(const QDate &date)
 {
     showOnlyMode = false;
   mDate = date;
   writeJournal();
   int id = mCalendar->defaultCalendar();
-  if ( id == 1 ) {
-      mTitleLabel->setText(KGlobal::locale()->formatDate(date));
-  } else {
-      QString calname = KOPrefs::instance()->getCalendar( id )->mName;
-      mTitleLabel->setText( KGlobal::locale()->formatDate(mDate,true) + " (" + calname +")");
-  }
+  QString calname = KOPrefs::instance()->getCalendar( id )->mName;
+  mTitleLabel->setText( " (" + calname +")");
 }
 
 void JournalEntry::toggleShowJournal()
 { 
+    flushEntry();
     if ( showOnlyMode )
         emit showJournalOnly( 0 );
     else
         emit showJournalOnly( mJournal );
 }
-
+void JournalEntry::setShowOnly() 
+{
+    showOnlyMode = true;
+    mEditor->setFocus();
+}
 void JournalEntry::setJournal(Journal *journal)
 {
   writeJournal();
 
   mJournal = journal;
-  
+  mTitle->setText(mJournal->summary());
   mEditor->setText(mJournal->description());
   int id = mJournal->calID();
-  if ( id > 1 ) {
-      QString calname = KOPrefs::instance()->getCalendar( id )->mName;
-      mTitleLabel->setText( KGlobal::locale()->formatDate(mDate,true) + " (" + calname +")");
-  } else {
-      mTitleLabel->setText(KGlobal::locale()->formatDate(mDate));
-  }
+ 
+  QString calname = KOPrefs::instance()->getCalendar( id )->mName;
+  mTitleLabel->setText( " (" + calname +")");
+ 
   mDirty = false;
 }
 
 Journal *JournalEntry::journal() const
 {
   return mJournal;
 }
 
 void JournalEntry::setDirty()
 {
   mDirty = true;
 
 //  kdDebug() << "JournalEntry::setDirty()" << endl;
 }
 
 void JournalEntry::clear()
 {
   mJournal = 0;
   mEditor->setText("");
 }
 
 bool JournalEntry::eventFilter( QObject *o, QEvent *e )
 {
 //  kdDebug() << "JournalEntry::event received " << e->type() << endl;
@@ -253,40 +243,39 @@ void JournalEntry::writeJournal()
 //  kdDebug() << "JournalEntry::writeJournal()" << endl;
   if (!mDirty) return;
  
   if (mEditor->text().isEmpty()) {
       if ( mJournal ) {
           mDirty = false;
           bool conf = KOPrefs::instance()->mConfirm;
           KOPrefs::instance()->mConfirm = false;
           emit deleteJournal(mJournal);
           KOPrefs::instance()->mConfirm = conf;
           mJournal = 0;
       }
       return;
   }
 
 //  kdDebug() << "JournalEntry::writeJournal()..." << endl;
   
   if (!mJournal) {
     mJournal = new Journal;
     mJournal->setDtStart(QDateTime(mDate,QTime(0,0,0)));
     mCalendar->addJournal(mJournal);
   }
 
   mJournal->setDescription(mEditor->text());
-  //qDebug("tttt%s ", mEditor->text().latin1());
-
+  mJournal->setSummary(mTitle->text());
   mDirty = false;
 }
 
 void JournalEntry::flushEntry()
 {
   if (!mDirty) return;
   
   writeJournal();
 }
 void JournalEntry::keyPressEvent ( QKeyEvent * e ) 
 {
     e->ignore();
 
 }
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h
index b0e9cc7..b37cabd 100644
--- a/korganizer/journalentry.h
+++ b/korganizer/journalentry.h
@@ -10,73 +10,75 @@
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef JOURNALENTRY_H
 #define JOURNALENTRY_H
 //
 // Widget showing one Journal entry
 
 #include <qframe.h>
 
 #include <libkcal/calendar.h>
 
 class QLabel;
 class KTextEdit;
+class KLineEdit;
 
 using namespace KCal;
 
 class JournalEntry : public QFrame {
     Q_OBJECT
   public:
     JournalEntry(Calendar *,QWidget *parent);
     virtual ~JournalEntry();
     
     void setJournal(Journal *);
     Journal *journal() const;
 
     void setDate(const QDate &);
 
     void clear();
 
     void flushEntry();
-    void setShowOnly() {showOnlyMode = true;}
+    void setShowOnly();
     QSize sizeHint() const;
 
   protected slots:
     void slotSaveTemplate();
     void slotLoadTemplate();
     void setDirty();
     void toggleShowJournal();
  signals:
      void deleteJournal(Journal *);
      void newJournal();
      void showJournalOnly( Journal * );
 
   protected:    
     bool eventFilter( QObject *o, QEvent *e );
 
     void writeJournal();
     
   private:
     bool showOnlyMode;
     Calendar *mCalendar;
     Journal *mJournal;
     QDate mDate;
     void keyPressEvent ( QKeyEvent * ) ;
     QLabel *mTitleLabel;
+    KLineEdit * mTitle;
     KTextEdit *mEditor;
     int heiHint;
 
     bool mDirty;
 };
 
 #endif
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 3468657..067c34c 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -199,56 +199,65 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
             }
         }
         if ( !event->location().isEmpty() )
             mToolTipText += " (" + event->location() + ")";
         //qDebug("TTT: %s ", mToolTipText.latin1());
         mToolTip.append( deTag( mToolTipText ) );
     }
     mToolTip.sort();
     if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
         QPtrList<Todo> todolist = mCalendar->todos(mDate);
         Todo  *todo;
         for(todo=todolist.first();todo != 0;todo=todolist.next()) { 
             QString mToolTipText;
             if ( !todo->doesFloat() )
                 mToolTipText += KGlobal::locale()->formatTime(todo->dtDue().time())+" ";
             mToolTipText +=  todo->summary();
             if ( !todo->location().isEmpty() )
                 mToolTipText += " (" + todo->location() + ")";
             mToolTipText = deTag( mToolTipText);
             mToolTipText = "<b>" + i18n("Todo: ") + "</b>"+ mToolTipText;
             mToolTip.append(  mToolTipText );
         }               
     }
     if (KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) {
-        Journal *j = mCalendar->journal( mDate );
-        if ( j ) {
-            QString mToolTipText = j->description().left(100);
-            if ( j->description().length() > 100 )
-                mToolTipText += " ...";
-            mToolTipText = deTag( mToolTipText);
+        QPtrList<Journal> j_list = mCalendar->journals4Date( mDate );
+        Journal *j = j_list.first();
+        while ( j ) {
+            QString mToolTipText;
+            if ( !j->summary().isEmpty() ) {
+                mToolTipText = j->summary().left(30);
+                if ( j->summary().length() > 30 )
+                    mToolTipText += " ...";
+            } else {
+                mToolTipText = j->description().left(25);
+                if ( j->description().length() > 25 )
+                    mToolTipText += " ...";
+                mToolTipText = deTag( mToolTipText);
+            }
             mToolTipText = "<b>" + i18n("Journal: ") + "</b>"+ mToolTipText;
-            mToolTip.append(  mToolTipText );    
+            mToolTip.append(  mToolTipText );
+            j = j_list.next();
         }
     }
     return  "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>");
 }
 
 
 QString KODayMatrix::deTag( QString mToolTipText  )
 {
 
 #if QT_VERSION >= 0x030000
     mToolTipText.replace( '<' , "&lt;" );
     mToolTipText.replace( '>' , "&gt;" );
 #else
     if ( mToolTipText.find ('<') >= 0 ) {
         mToolTipText.replace( QRegExp("<") , "&lt;" );
     }
     if ( mToolTipText.find ('>') >= 0 ) {
         mToolTipText.replace( QRegExp(">") , "&gt;" );
     }
 #endif
     return mToolTipText;
 }
 void KODayMatrix::setCalendar( Calendar *cal )
 {
@@ -528,49 +537,51 @@ void KODayMatrix::updateViewTimed()
                         holiStr += "\n";
                     holiStr += i18n("Todo") + ": "+todo->summary();
                     if ( !todo->location().isEmpty() )
                         holiStr += " (" + todo->location() + ")";
                     bDays.setBit(i);
                     mHolidays[i] =holiStr ;
                     eDays.setBit(i);
                 }
             }
         }
     } 
     if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW  ) {
         bDays.fill( false);
         // insert due todos
         QPtrList<Journal> todos = mCalendar->journals( );
         Journal *todo;
         for(todo = todos.first(); todo; todo = todos.next()) {
             int day = mStartDate.daysTo( todo->dtStart().date() );
             if ( day >= 0 && day < timeSpan + 1)  {
                 int i = day;
                 QString holiStr = mHolidays[i];
                 pDays.setBit(i);
                 if ( !holiStr.isEmpty() )
                     holiStr += "\n";
-                holiStr += i18n("Journal");
+                holiStr += i18n("Journal: ")+todo->summary().left(25);
+                if ( todo->summary().length() > 25 )
+                    holiStr +="...";
                 bDays.setBit(i);
                 mHolidays[i] =holiStr ;
                 eDays.setBit(i);
                 
             }
         }
     }
 #else
     //qDebug("KODayMatrix::updateViewTimed ");
     for(int i = 0; i < NUMDAYS; i++) {
         // if events are set for the day then remember to draw it bold
         QPtrList<Event> eventlist = mCalendar->events(days[i]);
         Event *event;
         int numEvents = eventlist.count();
         QString holiStr = "";
         bDays.clearBit(i);
         hDays.clearBit(i);
         eDays.clearBit(i);
         for(event=eventlist.first();event != 0;event=eventlist.next()) {
             ushort recurType = event->recurrence()->doesRecur();
             if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) ||
                 (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) {
                 numEvents--;
             }
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 6315827..dcbb99f 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -680,48 +680,51 @@ void KOEventViewer::formatAttendees(Incidence *event)
                 mText += i18n( "Mail to selected" );
                 mText += "</a> ( ";
                 mText += i18n( "<IMG src=\"%1\"> only )").arg ( iconPath );
                 mText += "<br>\n";
         }
     }
 
 }
 void KOEventViewer::appendJournal(Journal *jour, int mode )
 { 
     bool shortDate = KOPrefs::instance()->mShortDateInViewer;
     if (mode == 0 ) {
         addTag("h2",i18n("Journal from: "));
     }
     else {
         if ( mode == 1 ) {
             addTag("h2",i18n( "Local: " ) +i18n("Journal from: "));
         } else {
             addTag("h2",i18n( "Remote: " ) +i18n("Journal from: ")); 
         } 
     }
     topLevelWidget()->setCaption("Journal Viewer");
     mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer)));
     addTag("b",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) );
+    if (!jour->summary().isEmpty()) {
+        addTag("p",i18n(" Title: ") + deTag(jour->summary()));
+    }
     if (!jour->description().isEmpty()) {
         addTag("p",deTag(jour->description()));
     }
     setText(mText);
 }
 
 void KOEventViewer::formatReadOnly(Incidence *event)
 {
     if (event->isReadOnly()) {
         addTag("p","<em>(" + i18n("read-only") + ")</em>");
     }
 }
 void KOEventViewer::setSyncMode( bool b )
 {
     mSyncMode = b;
 }
 
 void KOEventViewer::setTodo(Todo *event, bool clearV )
 {
     if ( clearV )
         clearEvents();
     if ( mSyncMode ) {
         if ( clearV )
             appendTodo(event,1 );
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index 9e354d3..4fc9013 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -6,72 +6,93 @@
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 //
 // View of Journal entries
 
 #include <qlayout.h>
 #include <qscrollview.h>
 #include <qpopupmenu.h>
+#include <qhbox.h>
+#include <qpushbutton.h>
+#include <qlabel.h>
+#include <qpushbutton.h>
+#include <qapplication.h>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include "koprefs.h"
+#include <kglobal.h>
 
 #include <libkcal/calendar.h>
 
 #include "journalentry.h"
 
 #include "kojournalview.h"
 using namespace KOrg;
 
 KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent,
                        const char *name)
   : KOrg::BaseView(calendar, parent, name)
 {
     mCalendar = calendar;
     QScrollView * sv = new QScrollView( this );
     QHBoxLayout * hbl = new QHBoxLayout( this );
     hbl->addWidget( sv );
     parWid = new QWidget( sv->viewport() );
     sv->addChild(parWid);
     sv->setResizePolicy( QScrollView:: AutoOneFit );
   mTopLayout = new QVBoxLayout(parWid);
+  QHBox * vb = new QHBox ( parWid );
+  QPushButton * newJournal = new QPushButton( vb );
+  QIconSet icon;
+  if ( QApplication::desktop()->width() < 321 ) 
+      icon = SmallIcon("ko16old");
+  else
+      icon = SmallIcon("ko24old");
+  newJournal->setIconSet (icon ) ;
+  int size = newJournal->sizeHint().height();
+  newJournal->setFixedSize(  size, size );
+  mDateLabel = new QLabel ( vb );
+  mTopLayout->addWidget( vb );
+  mDateLabel->setMargin(2);
+  mDateLabel->setAlignment(AlignCenter);
+  connect( newJournal, SIGNAL( clicked() ), this , SLOT( newJournal() ) );
   getNewEntry();
 }
 
 KOJournalView::~KOJournalView()
 {
 }
 
 int KOJournalView::currentDateCount()
 {
   return 0;
 }
 JournalEntry* KOJournalView::getNewEntry()
 {
     JournalEntry* Entry = new JournalEntry(mCalendar,parWid);
     jEntries.append( Entry );
     mTopLayout->addWidget(Entry); 
     Entry->setFont ( KOPrefs::instance()->mJornalViewFont  );
     connect ( Entry,SIGNAL(deleteJournal(Journal *) ),this ,SIGNAL(deleteJournal(Journal *) ) )  ;
     connect ( Entry,SIGNAL(newJournal() ),this ,SLOT(newJournal() ) )  ;
     connect ( Entry,SIGNAL(showJournalOnly( Journal * ) ),this ,SLOT(showOnly ( Journal* ) ) )  ;
     return Entry;
 }
 
 QPtrList<Incidence> KOJournalView::selectedIncidences()
@@ -149,47 +170,48 @@ void KOJournalView::showList(QPtrList<Journal> jl)
             mEntry->setJournal(jl.at(iii));
             mEntry = 0;
         } else {
             mEntry->setDate(mDate);
             mEntry->setJournal(jl.at(iii));
             mEntry->show();
             mEntry = jEntries.next();
         }
         ++iii;
     } 
     while ( mEntry ) {
         mEntry->setDate(mDate);
         mEntry->clear();
         if ( mEntry != firstEntry )
             mEntry->hide(); 
         else
             mEntry->show();
         mEntry = jEntries.next();
     }
 }
 
 void KOJournalView::showDates(const QDate &start, const QDate &)
 {
     mDate = start;
+    mDateLabel-> setText(KGlobal::locale()->formatDate(mDate));
     QPtrList<Journal> jl = calendar()->journals4Date( start );
     showList( jl );
 }
 
 void KOJournalView::showEvents(QPtrList<Event>)
 {
   // After new creation of list view no events are selected.
 //  emit incidenceSelected( 0 );
 }
 
 void KOJournalView::changeEventDisplay(Event *, int /*action*/)
 {
   updateView();
 }
  
 void KOJournalView::keyPressEvent ( QKeyEvent * e ) 
 {
     //qDebug("keyPressEven ");
     if ( e->state() == Qt::ControlButton  ) {  
         if ( e->key () == Qt::Key_Right ||  e->key () == Qt::Key_Left )
              e->ignore();
     }
 }
diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h
index 0437d95..331bdfa 100644
--- a/korganizer/kojournalview.h
+++ b/korganizer/kojournalview.h
@@ -6,72 +6,74 @@
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef _KOJOURNALVIEW_H
 #define _KOJOURNALVIEW_H
 
 #include <korganizer/baseview.h>
 #include <qlayout.h>
 
 class JournalEntry;
+class QLabel;
 
 /**
  * This class provides a journal view.
  
  * @short View for Journal components.
  * @author Cornelius Schumacher <schumacher@kde.org>
  * @see KOBaseView
  */
 class KOJournalView : public KOrg::BaseView
 {
     Q_OBJECT
   public:
     KOJournalView(Calendar *calendar, QWidget *parent = 0, 
                const char *name = 0);
     ~KOJournalView();
 
     virtual int currentDateCount();
     void clearList();
     virtual QPtrList<Incidence> selectedIncidences();
     DateList selectedDates()
       {DateList q;
        return q;};
  signals:
      void deleteJournal(Journal *);
   public slots:
      void showOnly ( Journal* );
      void newJournal();
     void updateView();
     void flushView();
     void updateConfig();
     void showDates( const QDate &start, const QDate &end );
     void showEvents(QPtrList<Event> eventList);
 
     void changeEventDisplay(Event *, int);
   
   private:
     void showList(QPtrList<Journal> jl);
     Calendar *mCalendar;
     JournalEntry* getNewEntry();
     QPtrList<JournalEntry> jEntries; 
     void keyPressEvent ( QKeyEvent * ) ;
     QBoxLayout *mTopLayout;
     QWidget *parWid;
+    QLabel * mDateLabel;
     QDate mDate;
     
 };
 
 #endif
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 22d9ac0..0c1ac7a 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -194,52 +194,58 @@ bool ListItemVisitor::visit(Todo *t)
     }
     mItem->setText(9, t->cancelled() ? i18n("Yes") : i18n("No"));
     mItem->setText(10,t->categoriesStr());
     mItem->setText(11, KOPrefs::instance()->calName( t->calID() ));
 
     QString key;
     QDate d;
     if (t->hasDueDate()) {
         d = t->dtDue().date();
         QTime 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();
         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 = j->description().left(30);
-    des = des.simplifyWhiteSpace ();
-    des.replace (QRegExp ("\\n"),"" );
-    des.replace (QRegExp ("\\r"),"" );
+    
+    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,i18n("Last Modified: ")+  KGlobal::locale()->formatDateTime( j->lastModified() , true) );
     mItem->setText(11, KOPrefs::instance()->calName( j->calID() ));
 
     QString key;
     QDate 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)
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 0e9f64c..72359df 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -197,48 +197,51 @@ void SearchDialog::toggleCheckboxes()
 }
 void SearchDialog::raiseAndSelect()
 {
 
     static int currentState = 0;
 
     if ( !mSearchJournal->isChecked() && !mSearchTodo->isChecked()  && !mSearchEvent->isChecked() )
         currentState = 0;
     int newState = 0;
     if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) {
         newState = VIEW_J_VIEW;
     }
     else if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
         newState = VIEW_T_VIEW;
     }
     else {
         newState = VIEW_A_VIEW;
     }
     if ( newState != currentState ) {
         if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) {
             if ( ! mSearchJournal->isChecked() ) {
                 mSearchJournal->setChecked( true );
                 mSearchTodo->setChecked( false );
                 mSearchEvent->setChecked( false );
+                mSummaryCheck->setChecked( true ); 
+                mDescriptionCheck->setChecked( true ); 
+
             }
         }
         else if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
             if ( !  mSearchTodo->isChecked()    ) {
                 mSearchTodo->setChecked( true );
                 mSearchJournal->setChecked( false );
                 mSearchEvent->setChecked( false );
             }
         }
         else {
             if ( ! mSearchEvent->isChecked() ) {
                 mSearchEvent->setChecked( true );
                 mSearchJournal->setChecked( false );
                 mSearchTodo->setChecked( false );
             }
         }
     }
     currentState = newState;
     raise();
 }
 void SearchDialog::setFocusToList()
 {
     listView->resetFocus();
 }
@@ -529,60 +532,76 @@ void SearchDialog::search(const QRegExp &re)
                                     if ( mSubItems->isChecked() )
                                         mMatchedTodos.remove(tod);
                                     else if (!mMatchedTodos.contains( tod )) 
                                         mMatchedTodos.append(tod);
                                     break;
                                 }
                     }
                 }
             }
         }
     }
 
     QPtrList<Journal> journals;
     if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) {
         if ( mRefineItems->isChecked() ) journals = mMatchedJournals ;
         mMatchedJournals.clear();
     } 
     if (mSearchJournal->isChecked() ) {
         if ( ! mRefineItems->isChecked() ) journals = mCalendar->journals();
         Journal* journ;
         
         for(journ=journals.first();journ;journ=journals.next()) {
             if ( journ->dtStart().date() <= mEndDate->date() 
                  &&journ->dtStart().date() >= mStartDate->date()) {
+                if (mDescriptionCheck->isChecked()) {
 #if QT_VERSION >= 0x030000
-                if (re.search(journ->description()) != -1) 
+                    if (re.search(journ->description()) != -1) 
 #else
-                    if (re.match(journ->description()) != -1) 
+                        if (re.match(journ->description()) != -1) 
 #endif
-                        {
-                            if ( mSubItems->isChecked() )
-                                mMatchedJournals.remove(journ);
-                            else if (!mMatchedJournals.contains( journ )) 
-                                mMatchedJournals.append(journ);
-                            continue;
-                        }
+                            {
+                                if ( mSubItems->isChecked() )
+                                    mMatchedJournals.remove(journ);
+                                else if (!mMatchedJournals.contains( journ )) 
+                                    mMatchedJournals.append(journ);
+                                continue;
+                            }
+                }
+                if (mSummaryCheck->isChecked()) {
+#if QT_VERSION >= 0x030000
+                    if (re.search(journ->summary()) != -1) 
+#else
+                        if (re.match(journ->summary()) != -1) 
+#endif
+                            {
+                                if ( mSubItems->isChecked() )
+                                    mMatchedJournals.remove(journ);
+                                else if (!mMatchedJournals.contains( journ )) 
+                                    mMatchedJournals.append(journ);
+                                continue;
+                            }
+                }
             }
         }
     }
     if ( mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count()  < 1 ) {
         qDebug("count %d ", mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count() );
         if ( mRefineItems->isChecked() )
             mRefineItems->setChecked( false );
         else if ( mSubItems->isChecked() )
             mSubItems->setChecked( false );
     }
 }
 
 void SearchDialog::keyPressEvent ( QKeyEvent *e) 
 {
     switch ( e->key() ) {
     case Qt::Key_Escape:
         close();
         break;
     case Qt::Key_F:
         if ( e->state() == Qt::ControlButton ) {
 
         }
         break;
     case Qt::Key_Return: