ad fix

3 files changed, 29 insertions, 18 deletions

diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp
index 65073f6..d72a8c2 100644
--- a/kalarmd/alarmdialog.cpp
+++ b/kalarmd/alarmdialog.cpp
@@ -98,7 +98,7 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   layout->addWidget ( mMissedAlarmsCombo );
 
-  QLabel* labb = new QLabel("Suspend duration (minutes):",this);
+  QLabel* labb = new QLabel("Suspend\nduration\n(minutes):",this);
   labb->setAlignment(AlignCenter);
-  layout->addWidget ( labb );
+  //layout->addWidget ( labb );
   fo = font();
   int pointSize = 36;
@@ -120,4 +120,5 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   QHBoxLayout* layoutSpin = new QHBoxLayout( layout );
   layoutSpin->addStretch ();
+  layoutSpin->addWidget ( labb );
   layoutSpin->addWidget ( mSuspendSpin );
   layoutSpin->addStretch ();
@@ -130,5 +131,5 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   mSuspendButton = new QPushButton( "Suspend", bbox);
   QPushButton* silen = new QPushButton( " Stop sound ", bbox);
-  QPushButton* okbut = new QPushButton( "Ok", bbox); 
+  okbut = new QPushButton( "Ok", bbox); 
   mSuspendButton->setFont( fo );
   silen->setFont( fo );
@@ -242,14 +243,10 @@ bool AlarmDialog::eventNotification( QString mess, int replay ,  QString fn, boo
         mMissedAlarmsCombo->hide();
     mMessage->setText(mess);
-    int w =sizeHint().width() ;
-    int h = sizeHint().height() ;
+    int w = minimumSizeHint().width() ;
+    int h = minimumSizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
-    show();
-    raise();
-    //qApp->processEvents();
-    //repaint();
-    qApp->processEvents();
+    hide();
 
 #ifndef _WIN32_
@@ -259,11 +256,23 @@ bool AlarmDialog::eventNotification( QString mess, int replay ,  QString fn, boo
     }
 #endif
-    playSoundTimer->start( 1000, true );
+    okbut->setDefault( true );
+    QTimer::singleShot( 1, this, SLOT ( forceRepaint() ) );
+    // playSoundTimer->start( 1000, true );
     return true;
  
 }
 
-void AlarmDialog::spinBoxChanged( int )
+void AlarmDialog::forceRepaint()
 {
+   
+    showNormal();
+    setActiveWindow();
+    raise(); 
+    playSoundTimer->start( 1000, true );
+
+}
+void AlarmDialog::spinBoxChanged( int v )
+{
+    okbut->setDefault( false );
     mSilent = true;
 }
@@ -280,7 +289,4 @@ void  AlarmDialog::playSound ()
     raise(); 
     mSuspendSpin->setFocus();
-   
-    
-    qApp->processEvents();
     if (  alarmCounter < maxAlarmReplay && ! mSilent) {
         ++alarmCounter;
diff --git a/kalarmd/alarmdialog.h b/kalarmd/alarmdialog.h
index 1e4636c..52e681a 100644
--- a/kalarmd/alarmdialog.h
+++ b/kalarmd/alarmdialog.h
@@ -51,4 +51,5 @@ class AlarmDialog : public QDialog {
 
   public slots:
+    void forceRepaint();
     void spinBoxChanged( int );
     void slotOk();
@@ -64,4 +65,5 @@ class AlarmDialog : public QDialog {
 
   private:
+    QPushButton* okbut;
     int alarmCounter;
     int mPauseCount;
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index 294ce7d..2a463b3 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -306,5 +306,7 @@ void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray&  )
             mAlarmMessage += mess.mid( 10+len+3+9 );
         } else {
-            QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent");
+            {
+                QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent");
+            }
             //qDebug("-----system command %s ",tempfilename.latin1() );
             if ( vfork () == 0 ) {
@@ -619,6 +621,7 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
 
 void SimpleAlarmDaemonImpl::writeFile()
-{
-    QCopEnvelope e("QPE/Application/kopi", "-writeFile");
+{ 
+    QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent");
+    //QCopEnvelope e("QPE/Application/kopi", "-writeFile");
 }
 void SimpleAlarmDaemonImpl::showWN()