4 files changed, 18 insertions, 3 deletions

diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index e2c8e6e..f606124 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -264,2 +264,3 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
     case Qt::Key_Escape:
+        sendSignalViewerClosed = true;
         close();
@@ -267,2 +268,6 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
     case Qt::Key_I:
+#ifndef DESKTOP_VERSION
+        sendSignalViewerClosed = true;
+        close();
+#else
         sendSignalViewerClosed = true;
@@ -270,2 +275,3 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
         //accept();
+#endif
         break; 
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 6acee75..710a9f9 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -1085,4 +1085,4 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
                     ensureItemVisible ( cn );
-                emit showIncidence( ci->data());
                 }
+                emit showIncidence( ci->data());
             }
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index cef59a2..678e1bd 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -28,2 +28,3 @@
 #include <qlabel.h>
+#include <qlistview.h>
 #include <qwhatsthis.h>
@@ -39,2 +40,3 @@
 #include "koprefs.h"
+#include "klineedit.h"
 
@@ -59,3 +61,3 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
 
-    searchEdit = new QLineEdit(topFrame);
+    searchEdit = new KLineEdit(topFrame);
     subLayout->addWidget(searchEdit);
@@ -116,2 +118,3 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
     listView->readSettings(KOGlobals::config(),"SearchListView Layout");
+    connect(searchEdit,SIGNAL(scrollDOWN()),SLOT(setFocusToList()));
 
@@ -128,2 +131,6 @@ SearchDialog::~SearchDialog()
 }
+void SearchDialog::setFocusToList()
+{
+    listView->resetFocus();
+}
 void SearchDialog::accept()
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index f4aad9e..b730ed5 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -38,2 +38,3 @@ class QCheckBox;
 class QLineEdit;
+class KLineEdit;
 class QLabel;
@@ -56,2 +57,3 @@ class SearchDialog : public  QVBox
   protected slots:
+  void setFocusToList();
     void  accept();
@@ -75,3 +77,3 @@ class SearchDialog : public  QVBox
     QLabel *searchLabel;
-    QLineEdit *searchEdit;
+    KLineEdit *searchEdit;
     KOListView *listView;