many small fixes

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
@@ -263,10 +263,16 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
     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:
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 6acee75..710a9f9 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -1084,6 +1084,6 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
                     setCurrentItem ( cn );
                     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
@@ -27,4 +27,5 @@
 #include <qgroupbox.h>
 #include <qlabel.h>
+#include <qlistview.h>
 #include <qwhatsthis.h>
 #include <qlineedit.h>
@@ -38,4 +39,5 @@
 #include "koglobals.h"
 #include "koprefs.h"
+#include "klineedit.h"
 
 #include "calendarview.h"
@@ -58,5 +60,5 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
     subLayout->addWidget(searchLabel);
 
-    searchEdit = new QLineEdit(topFrame);
+    searchEdit = new KLineEdit(topFrame);
     subLayout->addWidget(searchEdit);
     QPushButton *OkButton = new QPushButton(  i18n("&Find"), topFrame );
@@ -115,4 +117,5 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
 
     listView->readSettings(KOGlobals::config(),"SearchListView Layout");
+    connect(searchEdit,SIGNAL(scrollDOWN()),SLOT(setFocusToList()));
 
     setCaption( i18n("KO/Pi Find: "));
@@ -127,4 +130,8 @@ 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
@@ -37,4 +37,5 @@ class KDateEdit;
 class QCheckBox;
 class QLineEdit;
+class KLineEdit;
 class QLabel;
 class CalendarView;
@@ -55,4 +56,5 @@ class SearchDialog : public  QVBox
   void updateList();
   protected slots:
+  void setFocusToList();
     void  accept();
     void doSearch();
@@ -74,5 +76,5 @@ class SearchDialog : public  QVBox
     
     QLabel *searchLabel;
-    QLineEdit *searchEdit;
+    KLineEdit *searchEdit;
     KOListView *listView;