2 files changed, 14 insertions, 1 deletions

diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 7f6f221..5269af7 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -134,4 +134,8 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   topLayout->addWidget(mEditor);
   mEditor->installEventFilter(this);
+  installEventFilter(this);
+  mTitle->installEventFilter(this);
+  setFocusPolicy (QWidget::NoFocus); 
+
   connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) );
   connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) );
@@ -312,5 +316,11 @@ bool JournalEntry::eventFilter( QObject *o, QEvent *e )
 {
 //  kdDebug() << "JournalEntry::event received " << e->type() << endl;
-
+    if ( isVisible() ) {
+        mEditor->setFocusPolicy (QWidget::StrongFocus); 
+        mTitle->setFocusPolicy (QWidget::StrongFocus); 
+    } else {
+        mEditor->setFocusPolicy (QWidget::NoFocus); 
+        mTitle->setFocusPolicy (QWidget::NoFocus); 
+    }
   if ( e->type() == QEvent::FocusOut ) {
     writeJournal();
@@ -318,4 +328,6 @@ bool JournalEntry::eventFilter( QObject *o, QEvent *e )
   if ( e->type() == QEvent::KeyPress ) {
       QKeyEvent * k = (QKeyEvent *) e;
+      if ( !isVisible() )
+          return true;
       if ( k->state() == Qt::ControlButton ) {
           k->ignore();
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 4fc1194..b378330 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -1295,4 +1295,5 @@ KOListViewListView::KOListViewListView(KOListView * lv )
 {  
     mYMousePos = 0; 
+    setAllColumnsShowFocus( true ); 
     mPopupTimer = new QTimer(this);
     connect(mPopupTimer , SIGNAL(timeout()), this, SLOT(popupMenu()));