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
@@ -72,18 +72,18 @@ KOEventViewerDialog::~KOEventViewerDialog()
 void KOEventViewerDialog::showMe()
 {
  
 #ifdef DESKTOP_VERSION
     show();
 #else
     showMaximized();
 #endif
-    setFocus();
     setActiveWindow();
+    mEventViewer->setFocus(); 
 
 }
 void KOEventViewerDialog::setSyncMode( bool b )
 {
   mSyncMode = b;
   //qDebug("KOEventViewerDialog::setSyncMode %d ",mSyncMode );
   if ( mSyncMode ) {
     findButton( Close )->setText( i18n("Cancel Sync"));
@@ -114,18 +114,19 @@ int KOEventViewerDialog::executeS( bool local )
 void KOEventViewerDialog::updateConfig()
 {
   mEventViewer->setFont( KOPrefs::instance()->mEventViewFont );
 
 }
 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"));
   }
 }
 void KOEventViewerDialog::setIncidence(Incidence *in )
 {
     if ( in->type() == "Event" )
         setEvent( (Event*) in );
@@ -147,45 +148,49 @@ void KOEventViewerDialog::addIncidence(Incidence *in)
       setCaption(i18n("Conflict! Please choose entry"));
   }   
 }
 
 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"));
   }
 }
 
 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"));
   }
 }
 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"));
   }
 }
 
 void KOEventViewerDialog::addText(QString text)
 {
-  mEventViewer->addText(text);
-  findButton( Close )->setFocus();
+  mEventViewer->addText(text); 
+  mEventViewer->setFocus(); 
+  //findButton( Close )->setFocus();
 }
 void KOEventViewerDialog::editIncidence()
 {   
     if ( mSyncMode ) {
         mSyncResult = 2;
         accept();
         return;
     }
@@ -249,12 +254,13 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
     case Qt::Key_C:
     case Qt::Key_Escape:
         close();
         break; 
     case Qt::Key_I:
         accept();
         break; 
     default:
+        KDialogBase::keyPressEvent ( e );
         break; 
     }
     
 }