4 files changed, 26 insertions, 7 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 417d89c..44da058 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -695 +695,13 @@ void KOEventViewer::addText(QString text)
 }
+void KOEventViewer::keyPressEvent ( QKeyEvent * e )
+{ 
+    switch ( e->key() ) {
+    case Qt::Key_Return:
+    case Qt::Key_Enter :
+        e->ignore();
+        break;
+    default:
+        QTextBrowser::keyPressEvent ( e );
+        break; 
+    }
+}
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index cf44284..d8142ca 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -62,2 +62,3 @@ class KOEventViewer : public QTextBrowser {
     void formatReadOnly(Incidence *event);
+    void keyPressEvent ( QKeyEvent * e );
 
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index f6f7258..23e62d3 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -79,4 +79,4 @@ void KOEventViewerDialog::showMe()
 #endif
-    setFocus();
     setActiveWindow();
+    mEventViewer->setFocus(); 
 
@@ -122,3 +122,4 @@ void KOEventViewerDialog::setEvent(Event *event)
   mIncidence = event;
-  findButton( Close )->setFocus();
+  mEventViewer->setFocus(); 
+  //findButton( Close )->setFocus();
   if ( !mSyncMode ) {
@@ -154,3 +155,4 @@ void KOEventViewerDialog::addEvent(Event *event)
   mIncidence = event; 
-  findButton( Close )->setFocus(); 
+  mEventViewer->setFocus(); 
+  //findButton( Close )->setFocus(); 
   if ( !mSyncMode ) {
@@ -164,3 +166,4 @@ void KOEventViewerDialog::setTodo(Todo *event)
   mIncidence = (Incidence*)event;
-  findButton( Close )->setFocus(); 
+  mEventViewer->setFocus(); 
+  //findButton( Close )->setFocus(); 
   if ( !mSyncMode ) {
@@ -173,3 +176,4 @@ void KOEventViewerDialog::setJournal(Journal *j)
   mIncidence = (Incidence*)j;
-  findButton( Close )->setFocus();
+  mEventViewer->setFocus(); 
+  //findButton( Close )->setFocus();
   if ( !mSyncMode ) {
@@ -182,3 +186,4 @@ void KOEventViewerDialog::addText(QString text)
   mEventViewer->addText(text);
-  findButton( Close )->setFocus();
+  mEventViewer->setFocus(); 
+  //findButton( Close )->setFocus();
 }
@@ -256,2 +261,3 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
     default:
+        KDialogBase::keyPressEvent ( e );
         break; 
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index aa1b244..cef59a2 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -86,3 +86,3 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
     mSummaryCheck->setChecked(true);
-    mDescriptionCheck = new QCheckBox(i18n("Descriptions"),subjectGroup);
+    mDescriptionCheck = new QCheckBox(i18n("Details"),subjectGroup);
     mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup);