4 files changed, 18 insertions, 3 deletions

diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 7274849..0b923ad 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -55,8 +55,9 @@
 #endif
 JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   QFrame(parent)
 {
+    heiHint = QApplication::desktop()->height() / 5 ;
     showOnlyMode = false;
   mCalendar = calendar;
   mJournal = 0;
   mDirty = false;
@@ -116,10 +117,14 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
 }
 
 JournalEntry::~JournalEntry()
 {
+    qDebug("JournalEntry::~JournalEntry() ");
+}
+QSize JournalEntry::sizeHint() const
+{
+    return QSize ( 240, heiHint );
 }
-
 void JournalEntry::slotSaveTemplate()
 {
     QString fileName =locateLocal( "templates", "journals" ); 
     QDir t_dir;
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h
index 85ad5df..b0e9cc7 100644
--- a/korganizer/journalentry.h
+++ b/korganizer/journalentry.h
@@ -48,8 +48,9 @@ class JournalEntry : public QFrame {
     void clear();
 
     void flushEntry();
     void setShowOnly() {showOnlyMode = true;}
+    QSize sizeHint() const;
 
   protected slots:
     void slotSaveTemplate();
     void slotLoadTemplate();
@@ -72,8 +73,9 @@ class JournalEntry : public QFrame {
     QDate mDate;
     void keyPressEvent ( QKeyEvent * ) ;
     QLabel *mTitleLabel;
     KTextEdit *mEditor;
+    int heiHint;
 
     bool mDirty;
 };
 
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index fae59d6..9e354d3 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -24,8 +24,9 @@
 //
 // View of Journal entries
 
 #include <qlayout.h>
+#include <qscrollview.h>
 #include <qpopupmenu.h>
 
 #include <klocale.h>
 #include <kdebug.h>
@@ -42,9 +43,15 @@ KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent,
 		       const char *name)
   : KOrg::BaseView(calendar, parent, name)
 {
     mCalendar = calendar;
-  mTopLayout = new QVBoxLayout(this);
+    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);
   getNewEntry();
 }
 
 KOJournalView::~KOJournalView()
@@ -56,9 +63,9 @@ int KOJournalView::currentDateCount()
   return 0;
 }
 JournalEntry* KOJournalView::getNewEntry()
 {
-    JournalEntry* Entry = new JournalEntry(mCalendar,this);
+    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 *) ) )  ;
diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h
index aabf11c..0437d95 100644
--- a/korganizer/kojournalview.h
+++ b/korganizer/kojournalview.h
@@ -68,8 +68,9 @@ class KOJournalView : public KOrg::BaseView
     JournalEntry* getNewEntry();
     QPtrList<JournalEntry> jEntries; 
     void keyPressEvent ( QKeyEvent * ) ;
     QBoxLayout *mTopLayout;
+    QWidget *parWid;
     QDate mDate;
     
 };