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
@@ -262,12 +262,18 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
         break;
     case Qt::Key_C:
     case Qt::Key_Escape:
+        sendSignalViewerClosed = true;
         close();
         break; 
     case Qt::Key_I:
+#ifndef DESKTOP_VERSION
+        sendSignalViewerClosed = true;
+        close();
+#else
         sendSignalViewerClosed = true;
         slotViewerClosed();
         //accept();
+#endif
         break; 
     default:
         KDialogBase::keyPressEvent ( e );
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 6acee75..710a9f9 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -1083,8 +1083,8 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
                 if ( cn ) {
                     setCurrentItem ( cn );
                     ensureItemVisible ( cn );
-                emit showIncidence( ci->data());
                 }
+                emit showIncidence( ci->data());
             }
         }
         e->accept();
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index cef59a2..678e1bd 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -26,6 +26,7 @@
 #include <qcheckbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
+#include <qlistview.h>
 #include <qwhatsthis.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
@@ -37,6 +38,7 @@
 
 #include "koglobals.h"
 #include "koprefs.h"
+#include "klineedit.h"
 
 #include "calendarview.h"
 #include "koviewmanager.h"
@@ -57,7 +59,7 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
     searchLabel->setText(i18n("Search for:"));
     subLayout->addWidget(searchLabel);
 
-    searchEdit = new QLineEdit(topFrame);
+    searchEdit = new KLineEdit(topFrame);
     subLayout->addWidget(searchEdit);
     QPushButton *OkButton = new QPushButton(  i18n("&Find"), topFrame );
     //OkButton->setDefault( true );
@@ -114,6 +116,7 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
     layout->addWidget(listView);
 
     listView->readSettings(KOGlobals::config(),"SearchListView Layout");
+    connect(searchEdit,SIGNAL(scrollDOWN()),SLOT(setFocusToList()));
 
     setCaption( i18n("KO/Pi Find: "));
 #ifdef DESKTOP_VERSION
@@ -126,6 +129,10 @@ SearchDialog::~SearchDialog()
 {
   
 }
+void SearchDialog::setFocusToList()
+{
+    listView->resetFocus();
+}
 void SearchDialog::accept()
 {
     doSearch();
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index f4aad9e..b730ed5 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -36,6 +36,7 @@
 class KDateEdit;
 class QCheckBox;
 class QLineEdit;
+class KLineEdit;
 class QLabel;
 class CalendarView;
 
@@ -54,6 +55,7 @@ class SearchDialog : public  QVBox
   void updateConfig();
   void updateList();
   protected slots:
+  void setFocusToList();
     void  accept();
     void doSearch();
     void searchTextChanged( const QString &_text );	
@@ -73,7 +75,7 @@ class SearchDialog : public  QVBox
     QPtrList<Journal> mMatchedJournals;
     
     QLabel *searchLabel;
-    QLineEdit *searchEdit;
+    KLineEdit *searchEdit;
     KOListView *listView;
     
     KDateEdit *mStartDate;