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
@@ -96,11 +96,11 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   layout->addWidget ( mMissedAlarms );
   mMissedAlarmsCombo =  new QComboBox ( this );
   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;
   if ( QApplication::desktop()->width() <= 320 )
       pointSize = 18;
@@ -118,8 +118,9 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   mSuspendSpin->setFixedSize( 18*baseSize, 10*baseSize+2 );
   mSuspendSpin->setButtonSymbols( QSpinBox::PlusMinus ); 
   QHBoxLayout* layoutSpin = new QHBoxLayout( layout );
   layoutSpin->addStretch ();
+  layoutSpin->addWidget ( labb );
   layoutSpin->addWidget ( mSuspendSpin );
   layoutSpin->addStretch ();
 
   QVBox * bbox  = new QVBox ( this );
@@ -128,9 +129,9 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   labb = new QLabel("Press \"Cancel\" or \"Esc\" to suspend!",bbox);
   labb->setAlignment(AlignCenter);
   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 );
   okbut->setFont( fo );
   okbut->setDefault( true );
@@ -240,32 +241,40 @@ bool AlarmDialog::eventNotification( QString mess, int replay ,  QString fn, boo
         mMissedAlarms->setText( "Missed alarms:");
     } else
         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_
     if (  fd_led > 0 ) {
         statusLED.status =  LED_SALARM_ON ;
         ioctl (fd_led, SHARP_LED_SETSTATUS, &statusLED);
     }
 #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;
 }
 
 void  AlarmDialog::playSound ()
@@ -278,11 +287,8 @@ void  AlarmDialog::playSound ()
     showNormal();
     setActiveWindow();
     raise(); 
     mSuspendSpin->setFocus();
-   
-    
-    qApp->processEvents();
     if (  alarmCounter < maxAlarmReplay && ! mSilent) {
         ++alarmCounter;
 #ifdef DESKTOP_VERSION
         mPlayWav = true;
diff --git a/kalarmd/alarmdialog.h b/kalarmd/alarmdialog.h
index 1e4636c..52e681a 100644
--- a/kalarmd/alarmdialog.h
+++ b/kalarmd/alarmdialog.h
@@ -49,8 +49,9 @@ class AlarmDialog : public QDialog {
     void setSuspendTime( int );
     void setServerNotification( bool b );
 
   public slots:
+    void forceRepaint();
     void spinBoxChanged( int );
     void slotOk();
     void slotSuspend();
     void reject () ;
@@ -62,8 +63,9 @@ class AlarmDialog : public QDialog {
     // void suspendSignal(int duration);
     void addAlarm(const QDateTime &, const QString & );
 
   private:
+    QPushButton* okbut;
     int alarmCounter;
     int mPauseCount;
     int mSuspendCounter;
     int maxAlarmReplay;
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index 294ce7d..2a463b3 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -304,9 +304,11 @@ void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray&  )
         if ( error ) {
             mAlarmMessage = "Procedure Alarm\nError - File not found\n";
             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 ) {
                 execl ( tempfilename.latin1(), 0 );
                 return;
@@ -617,10 +619,11 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
     mTimerTime = 1;
 }
 
 void SimpleAlarmDaemonImpl::writeFile()
-{
-    QCopEnvelope e("QPE/Application/kopi", "-writeFile");
+{ 
+    QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent");
+    //QCopEnvelope e("QPE/Application/kopi", "-writeFile");
 }
 void SimpleAlarmDaemonImpl::showWN()
 {
     QCopEnvelope e("QPE/Application/kopi", "-showWN");