many focus fixes

1 files changed, 19 insertions, 2 deletions

diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index 23e62d3..8bada3b 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -17,12 +17,13 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include <klocale.h>
 
 #include <libkcal/event.h>
+#include <qtimer.h>
 #include <qpushbutton.h>
 
 #include "koeventviewer.h"
 #include "koprefs.h"
 #include <libkcal/todo.h>
 #include "qapp.h"
@@ -36,13 +37,13 @@ KOEventViewerDialog::KOEventViewerDialog(QWidget *parent,const char *name)
                 true ,
 #else
                 false,
 #endif
                 i18n("Event Viewer"),Ok|User1|Close,Close, false,  i18n("Agenda"))
 {
-
+    sendSignalViewerClosed = true;
   mEventViewer = new KOEventViewer(this);
   mEventViewer->setFont( KOPrefs::instance()->mEventViewFont );
   setMainWidget(mEventViewer);
   setButtonText(Ok, i18n("Edit") );
 
  QObject::connect(findButton( Ok ),SIGNAL(clicked()),
@@ -186,12 +187,13 @@ void KOEventViewerDialog::addText(QString text)
   mEventViewer->addText(text); 
   mEventViewer->setFocus(); 
   //findButton( Close )->setFocus();
 }
 void KOEventViewerDialog::editIncidence()
 {   
+    sendSignalViewerClosed = false;
     if ( mSyncMode ) {
         mSyncResult = 2;
         accept();
         return;
     }
     if ( mIncidence ){
@@ -200,13 +202,13 @@ void KOEventViewerDialog::editIncidence()
 #endif
         emit editIncidence( mIncidence );
     }
 }
 void KOEventViewerDialog::showIncidence()
 {
-
+    sendSignalViewerClosed = false;
     if ( mSyncMode ) {
         mSyncResult = 1;
         accept();
         return;
     }
 
@@ -261,6 +263,21 @@ void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
     default:
         KDialogBase::keyPressEvent ( e );
         break; 
     }
     
 }
+void KOEventViewerDialog::hideEvent ( QHideEvent * e )
+{ 
+    KDialogBase::hideEvent ( e );
+    QTimer::singleShot( 1, this, SLOT (slotViewerClosed() ) );
+}
+
+void KOEventViewerDialog::slotViewerClosed()
+{
+    if ( sendSignalViewerClosed  ) {
+        //qDebug("KOEventViewerDialog::hideEvent ");
+        emit signalViewerClosed(); 
+    }
+    sendSignalViewerClosed = true;
+}
+