focus fixes

1 files changed, 16 insertions, 10 deletions

diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index f6f7258..23e62d3 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -77,8 +77,8 @@ void KOEventViewerDialog::showMe()
 #else
     showMaximized();
 #endif
-    setFocus();
     setActiveWindow();
+    mEventViewer->setFocus(); 
 
 }
 void KOEventViewerDialog::setSyncMode( bool b )
@@ -119,8 +119,9 @@ void KOEventViewerDialog::updateConfig()
 void KOEventViewerDialog::setEvent(Event *event)
 {
   mEventViewer->setEvent(event);
-  mIncidence = event;
-  findButton( Close )->setFocus();
+  mIncidence = event; 
+  mEventViewer->setFocus(); 
+  //findButton( Close )->setFocus();
   if ( !mSyncMode ) {
     findButton( User1 )->setText( i18n("Agenda"));
   }
@@ -152,7 +153,8 @@ void KOEventViewerDialog::addEvent(Event *event)
 { 
   mEventViewer->addEvent(event);
   mIncidence = event; 
-  findButton( Close )->setFocus(); 
+  mEventViewer->setFocus(); 
+  //findButton( Close )->setFocus(); 
   if ( !mSyncMode ) {
     findButton( User1 )->setText( i18n("Agenda"));
   }
@@ -161,8 +163,9 @@ void KOEventViewerDialog::addEvent(Event *event)
 void KOEventViewerDialog::setTodo(Todo *event)
 {
   mEventViewer->setTodo(event);
-  mIncidence = (Incidence*)event;
-  findButton( Close )->setFocus(); 
+  mIncidence = (Incidence*)event; 
+  mEventViewer->setFocus(); 
+  //findButton( Close )->setFocus(); 
   if ( !mSyncMode ) {
     findButton( User1 )->setText( i18n("Set complete"));
   }
@@ -170,8 +173,9 @@ void KOEventViewerDialog::setTodo(Todo *event)
 void KOEventViewerDialog::setJournal(Journal *j)
 {
   mEventViewer->setJournal(j);
-  mIncidence = (Incidence*)j;
-  findButton( Close )->setFocus();
+  mIncidence = (Incidence*)j; 
+  mEventViewer->setFocus(); 
+  //findButton( Close )->setFocus();
   if ( !mSyncMode ) {
     findButton( User1 )->setText( i18n("Agenda"));
   }
@@ -179,8 +183,9 @@ void KOEventViewerDialog::setJournal(Journal *j)
 
 void KOEventViewerDialog::addText(QString text)
 {
-  mEventViewer->addText(text);
-  findButton( Close )->setFocus();
+  mEventViewer->addText(text); 
+  mEventViewer->setFocus(); 
+  //findButton( Close )->setFocus();
 }
 void KOEventViewerDialog::editIncidence()
 {   
@@ -254,6 +259,7 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
         accept();
         break; 
     default:
+        KDialogBase::keyPressEvent ( e );
         break; 
     }