2 files changed, 10 insertions, 0 deletions

diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h
index a69846c..ee17da8 100644
--- a/korganizer/journalentry.h
+++ b/korganizer/journalentry.h
@@ -53,12 +53,13 @@ class JournalEntry : public QFrame {
     void flushEntry();
     void setShowOnly();
     QSize sizeHint() const;
     void setVisibleMode( bool b ) { visibleMode = b;}
     void fillCalendar( int id = 0 );
     void resizeEvent(QResizeEvent* e ) ;
+    KTextEdit * editor() {return mEditor;};
   protected slots:
     void slotSaveTemplate();
     void slotLoadTemplate();
     void toggleShowJournal();
     void setVisibleOn(); 
  signals:
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index a23a3b2..406df5a 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -34,12 +34,13 @@
 #include <qapplication.h>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include "koprefs.h"
 #include <kglobal.h>
+#include <ktextedit.h>
 
 #include <libkcal/calendar.h>
 
 #include "journalentry.h"
 
 #include "kojournalview.h"
@@ -174,27 +175,35 @@ void KOJournalView::showList(QPtrList<Journal> jl)
     ff = true;
     //qDebug("KOJournalView::showList %d",jl.count() );
     JournalEntry* mEntry = jEntries.first();
     JournalEntry* firstEntry =  mEntry;
     int count = jl.count();
     int iii = 0;
+    QWidget* fw = qApp->focusWidget (); 
     while ( iii < count ) {
         if ( !mEntry ) {
             mEntry = getNewEntry();
             mEntry->setVisibleMode( true );
             mEntry->setDate(mDate);
             mEntry->setJournal(jl.at(iii), false);
             mEntry->setVisibleMode( true );
             mEntry->show();
             mEntry = 0;
         } else { 
+            int xxx = -1, yyy = -1;
+            if ( ((QWidget*) mEntry->editor() ) == fw ) {
+                mEntry->editor()->getCursorPosition( &xxx,&yyy);
+            }
             mEntry->setVisibleMode( true );
             mEntry->setDate(mDate);
             mEntry->setJournal(jl.at(iii), false);
             mEntry->setVisibleMode( true );
             mEntry->show();
+            if ( xxx > -1 && yyy > -1 ) {
+                mEntry->editor()->setCursorPosition( xxx, yyy );
+            } 
             mEntry = jEntries.next();
         }
         ++iii;
     } 
     while ( mEntry ) {
         mEntry->setDate(mDate);