ad fix

3 files changed, 27 insertions, 16 deletions

diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp
index 65073f6..d72a8c2 100644
--- a/kalarmd/alarmdialog.cpp
+++ b/kalarmd/alarmdialog.cpp
@@ -36,293 +36,299 @@
 #ifndef DESKTOP_VERSION
 #define protected public
 #include <qspinbox.h>
 #undef protected 
 #else
 #include <qspinbox.h>
 #endif
 #include <stdlib.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #include <sys/ioctl.h>
 #endif
 #include <stdio.h>
 #include <fcntl.h>
 
 #ifndef DESKTOP_VERSION
 #include <qtopia/alarmserver.h>
 #include <qpe/resource.h>
 #include <qtopia/sound.h>
 
 #endif     
 
 #include "alarmdialog.h"
 
 
 AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
     : QDialog (parent, name, true, Qt::WStyle_Customize |Qt::WStyle_StaysOnTop | Qt::WStyle_DialogBorder) 
 {
     setCaption( "KO/Pi Alarm!" );
     QVBoxLayout* layout = new QVBoxLayout( this);
   QLabel* l = new QLabel("The following event triggered alarm:",this);
   layout->addWidget ( l );
   l->setAlignment( AlignCenter);
   mMessage = new QLabel ( " ", this );
   int fs = 18;
   int fs2 = 12;
   int baseSize = 6;
   if ( QApplication::desktop()->width() < 480 ) {
       fs2 = 10;
       fs = 12;
       baseSize = 4;
   }
   layout->setSpacing( 3 );
   layout->setMargin( 3 );
   QFont fo = QApplication::font();
   fo.setBold( true );
   fo.setPointSize( fs2 );
   l->setFont( fo );
   fo.setPointSize( fs );
   mMessage->setFont(fo );
   mMessage->setAlignment( AlignCenter);
   layout->addWidget ( mMessage );
   mMissedAlarms= new QLabel ( "(No missed Alarms)", this );
   mMissedAlarms->setAlignment( AlignCenter);
 
   playSoundTimer = new QTimer( this );
   connect ( playSoundTimer, SIGNAL( timeout()  ), this, SLOT (playSound() ) );
 
   playSoundTimer->stop();
   
   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;
   fo.setPointSize( pointSize );
   mSuspendSpin = new QSpinBox(1,1440,1,this);
   mSuspendSpin->setFont( fo );
   mSuspendSpin->setValue(7);  // default suspend duration
   mSuspendSpin->setButtonSymbols( QSpinBox::PlusMinus );
   mSuspendSpin->setButtonSymbols( QSpinBox::PlusMinus );
   
 #if QT_VERSION < 0x030000
   mSuspendSpin->upButton ()->setFixedSize( QSize( 8*baseSize, 5*baseSize ));
   mSuspendSpin->downButton ()->setFixedSize( QSize( 8*baseSize, 5*baseSize ));
 #endif
   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 );
   layout->addWidget ( bbox );
   bbox->layout()->setSpacing( 2 );
   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 );
   connect (silen , SIGNAL( clicked() ), this, SLOT (silent() ) ); 
   connect (mSuspendButton, SIGNAL( clicked() ), this, SLOT (slotSuspend() ) );
   connect (okbut , SIGNAL( clicked() ), this, SLOT (slotOk() ) );
   connect (mSuspendSpin , SIGNAL( valueChanged ( int ) ), this, SLOT ( spinBoxChanged( int ) ) );
 #ifndef _WIN32_
   if ( QFile::exists ( "/dev/sharp_led" ) )
       fd_led = open ( "/dev/sharp_led", O_RDWR|O_NONBLOCK );
   else
 #endif
       fd_led = 0;
   statusLED.which = SHARP_LED_SALARM;
   mSilent = false;
   mSuspendCounter = 0;
   setServerNotification( true );
 }
 void AlarmDialog::reject () 
 {
     QTimer::singleShot ( 3000, this, SLOT (suspend())  );
     slotSuspend();
 }
 AlarmDialog::~AlarmDialog()
 {
 }
 void AlarmDialog::silent () 
 {
     mSilent = true;
 }
 void AlarmDialog::accept()
 {
     slotOk();
 }
 
 void AlarmDialog::suspend()
 {
 #ifdef DESKTOP_VERSION
 
 #else
     Sound::soundAlarm ();
 #endif
 }
 void AlarmDialog::slotOk()
 {
     mStopAlarm = true;
     mMissedAlarms->setText("(No missed Alarms)");
     mMessage->setText("");
     mMissedAlarmsCombo->clear();
 #ifndef _WIN32_
     if (  fd_led > 0 ) {
         statusLED.status =  LED_SALARM_OFF ;
         ioctl (fd_led, SHARP_LED_SETSTATUS, &statusLED);
     }
 #endif
     QDialog::accept();
 }
 
 void AlarmDialog::slotSuspend() 
 {
     //qDebug("AlarmDialog::suspend() ");  // emit suspendSignal(mSuspendSpin->value());
    mStopAlarm = true;
    QDateTime nextA = QDateTime::currentDateTime().addSecs( mSuspendSpin->value() * 60 );
    QString mess = "suspend_alarm" +mFileName+"+++" ;
    if ( mMessage->text().left( 10 ) !="Suspended:" )
        mess += "Suspended:\n";
    mess +=mMessage->text();
 #ifndef DESKTOP_VERSION
    if ( mServerNotification )
        AlarmServer::addAlarm ( nextA,"koalarm",mess.latin1());
 #endif 
     emit addAlarm( nextA , mess  );  
    slotOk();
 }
 
 void AlarmDialog::setServerNotification( bool b )
 {
     mServerNotification = b;
 }
 int  AlarmDialog::getSuspendTime( )
 {
     return mSuspendSpin->value();
 
 }
 void AlarmDialog::setSuspendTime( int val )
 {
     mSuspendSpin->setValue( val );
 }
 bool AlarmDialog::eventNotification( QString mess, int replay ,  QString fn, bool playwav, int pause , int suspendtimes)
 {
     if ( mess.left( 9) != "Suspended" )
         mSuspendCounter = suspendtimes;
     mPauseCount = pause;
     mFileName = fn;
     mPlayWav = playwav;
     if ( !QFile::exists( fn ) )
         mFileName = "";
     alarmCounter = 0 ;
     maxAlarmReplay = replay ;
     mStopAlarm = false;
     mSilent = false;
     if ( !mMessage->text().stripWhiteSpace().isEmpty() ) {
         mMissedAlarmsCombo->show();
         QString newItem = mMessage->text().stripWhiteSpace();
         newItem.replace( QRegExp("\n"), QString(" ") );
         mMissedAlarmsCombo->insertItem( newItem );
         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 ()
 {
     
     if (mStopAlarm )
         return;
     if ( mSilent )
         return;
     showNormal();
     setActiveWindow();
     raise(); 
     mSuspendSpin->setFocus();
-   
-    
-    qApp->processEvents();
     if (  alarmCounter < maxAlarmReplay && ! mSilent) {
         ++alarmCounter;
 #ifdef DESKTOP_VERSION
         mPlayWav = true;
 #endif
         if ( !mPlayWav || mFileName.length() < 2 ) {
 
 #ifdef DESKTOP_VERSION
             qDebug("Sound play not possible - file not found");
 #else
             Sound::soundAlarm ();
 #endif
         } else
 
             {
 #ifdef DESKTOP_VERSION
 #ifdef _WIN32_
                 QSound::play ( mFileName );
 #else
 
                 QString command = "playwave -r 22050 " + mFileName;
                 qDebug("KO: Playing file %s with 22kHz",mFileName.latin1() );
                 int ret = system ( command.latin1() );
                 if ( ret != 0 ) {
                     qDebug("Sound play command failed: %s ",command.latin1() );
                 }
 
 #endif
 
 #else
             QSound::play ( mFileName );
 #endif
             qDebug("BEEP!");
             }
     } else {
         if ( ! mSilent && mSuspendCounter > 0 ) {
             --mSuspendCounter;
             reject (); 
             hide();
             return;
         } 
     }
     playSoundTimer->start( mPauseCount * 1000, true );
 }
diff --git a/kalarmd/alarmdialog.h b/kalarmd/alarmdialog.h
index 1e4636c..52e681a 100644
--- a/kalarmd/alarmdialog.h
+++ b/kalarmd/alarmdialog.h
@@ -1,85 +1,87 @@
 /*
     This file is part of the KDE alarm daemon.
     Copyright (c) 2000 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef ALARMDIALOG_H
 #define ALARMDIALOG_H
 
 
 
 #include <qdialog.h>
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qcombobox.h>
 #include <qpushbutton.h>
 
 #include "sharp_char.h"
 
 
 class QSpinBox;
 class QLabel;
 class QString;
 
 class AlarmDialog : public QDialog {
     Q_OBJECT
   public:
     AlarmDialog( QWidget *parent = 0, const char *name = 0 );
     virtual ~AlarmDialog();
 
     bool eventNotification(QString m, int replay , QString m2 , bool, int, int );
     int  getSuspendTime( );
     void setSuspendTime( int );
     void setServerNotification( bool b );
 
   public slots:
+    void forceRepaint();
     void spinBoxChanged( int );
     void slotOk();
     void slotSuspend();
     void reject () ;
     void silent () ;
     void accept();
     void suspend();
     void playSound ();
   signals:
     // void suspendSignal(int duration);
     void addAlarm(const QDateTime &, const QString & );
 
   private:
+    QPushButton* okbut;
     int alarmCounter;
     int mPauseCount;
     int mSuspendCounter;
     int maxAlarmReplay;
     QTimer* playSoundTimer;
     bool mStopAlarm;
     bool mSilent;
     bool mPlayWav;
     bool mServerNotification;
     QLabel* mMessage;
     QLabel* mMissedAlarms;
     QSpinBox *mSuspendSpin;
     QComboBox *mMissedAlarmsCombo;
     QPushButton* mSuspendButton;
     QString mFileName;
     int fd_led;  
     sharp_led_status statusLED;
 };
 
 #endif
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index 294ce7d..2a463b3 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -244,129 +244,131 @@ void  SimpleAlarmDaemonImpl::confPause( int num )
 void  SimpleAlarmDaemonImpl::confSound( int num )
 {
     if ( num == 0 ) {
         wavAlarm = false;
         mSoundPopUp->setItemChecked ( 0, true );
         mSoundPopUp->setItemChecked ( 1, false );
     } else {
         wavAlarm = true;
         mSoundPopUp->setItemChecked ( 0, false );
         mSoundPopUp->setItemChecked ( 1, true );
     }
 }
 void  SimpleAlarmDaemonImpl::slotPlayBeep( int num )
 {
     mBeepPopUp->setItemChecked ( mPlayBeeps,false );
     mPlayBeeps = num;
     mBeepPopUp->setItemChecked ( mPlayBeeps, true );
 }
 
 void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray&  )
 {
     //qDebug("SimpleAlarmDaemonImpl::ALARM RECEIVED! %s", msg.data()); 
     QString mess = msg; 
     mAlarmMessage = mess.mid( 9 ); 
     QString filename =  getenv("QPEDIR") ;
     filename += "/pics/kdepim/korganizer/koalarm.wav";
     QString tempfilename;
     if ( mess.left( 13 )  == "suspend_alarm") {  
         bool error = false;
         int len = mess.mid( 13 ).find("+++");
         if ( len < 2 )
             error = true;
         else {
             tempfilename = mess.mid( 13, len );
             if ( !QFile::exists( tempfilename  ) )
                 error = true;
         }
         if ( ! error ) {
             filename = tempfilename;
         }
         mAlarmMessage = mess.mid( 13+len+3 );
         //qDebug("suspend file %s ",tempfilename.latin1() );
         startAlarm( mAlarmMessage, filename);
         return;
     }
     if ( mess.left( 11 )  == "timer_alarm") {
         mTimerTime = 0;
         startAlarm( mess.mid( 11 ), filename );
         return;
     } 
     if ( mess.left( 10 )  == "proc_alarm") {
         bool error = false;
         int len = mess.mid( 10 ).find("+++");
         if ( len < 2 )
             error = true;
         else {
             tempfilename = mess.mid( 10, len );
             if ( !QFile::exists( tempfilename  ) )
                 error = true;
         }
         if ( error ) {
             mAlarmMessage = "Procedure Alarm\nError - File not found\n";
             mAlarmMessage += mess.mid( 10+len+3+9 );
         } else {
+            {
             QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent");
+            }
             //qDebug("-----system command %s ",tempfilename.latin1() );
             if ( vfork () == 0 ) {
                 execl ( tempfilename.latin1(), 0 );
                 return;
             }
             return;
         }
        
         //qDebug("+++++++system command %s ",tempfilename.latin1() );
     }  
     if ( mess.left( 11 )  == "audio_alarm") {
         bool error = false;
         int len = mess.mid( 11 ).find("+++");
         if ( len < 2 )
             error = true;
         else {
             tempfilename = mess.mid( 11, len );
             if ( !QFile::exists( tempfilename  ) )
                 error = true;
         }
         if ( ! error ) {
             filename = tempfilename;
         }
         mAlarmMessage = mess.mid( 11+len+3+9 );
         //qDebug("audio file command %s ",tempfilename.latin1() );
     } 
     if ( mess.left( 9 )  == "cal_alarm") {
         mAlarmMessage = mess.mid( 9 ) ;
     }
     
     writeFile();
     startAlarm( mAlarmMessage, filename );
      
 }
 
 int  SimpleAlarmDaemonImpl::getFileNameLen( QString mess  )
 {
     return 0;
 }
 void SimpleAlarmDaemonImpl::startAlarm( QString mess, QString filename )
 {
     //mAlarmDialog->show(); 
     //mAlarmDialog->raise();
     mAlarmDialog->eventNotification( mess, mPlayBeeps, filename, wavAlarm,mPausePlay ,mSuspend );
 }
 
 
 void SimpleAlarmDaemonImpl::fillTimerPopUp()
 {
    
     // qDebug(" timer %d %d ",mTimerPopupConf,  mTimerTime  );
     if ( mTimerPopupConf == mTimerTime ) {
         if ( mTimerTime ) {
             int secs = QDateTime::currentDateTime().secsTo ( mRunningTimer );
             QTime t ( secs/3600, (secs/60)%60,  secs%60  ); 
             mTimerPopUp->changeItem ( 1 , t.toString() + " (countdown)");
         }
         else { 
             QString text = mCustomText.stripWhiteSpace ();
             int in = text.find( " " );
             text = text.left ( in );
             mTimerPopUp->changeItem ( 3,  text );
         }
         return; 
@@ -558,129 +560,130 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
             //spinh.editor ()->setFixedSize( QSize( 50, 100 ));
             spinh.setFixedSize( 100,62 );
             spinm.upButton ()->setFixedSize( QSize( 48, 30 ));
             spinm.downButton ()->setFixedSize( QSize( 48, 30 ));
             spinm.downButton ()->setGeometry( 50,50,50,50); 
             // spinm.setSuffix( " m" );  
             //spinh.setSuffix( " h" ); 
             spinm.setWrapping ( true );
             //spinm.editor ()->setFixedSize( QSize( 50, 100 ));
             spinm.setLineStep( 1 );
             spinm.setFixedSize( 110,62 );
             lay.addWidget( &hbox);
             QLabel lab5 ("Timer fires at:", &dia );
             lab5.setAlignment( AlignCenter );
             lay.addWidget( &lab5);
             KODateLabel dl (  &dia );
             dl.setAlignment( AlignCenter );
             dl.setFont( fo  );
             connect ( &spinh, SIGNAL ( valueChanged (int)), &dl, SLOT ( slot_hours( int ) ) );
             connect ( &spinm, SIGNAL ( valueChanged (int)), &dl, SLOT ( slot_minutes( int ) ) );
             lay.addWidget( &dl);
             spinh.setValue( mCustomMinutes/60 );
             spinm.setValue( mCustomMinutes%60 );
             QPushButton ok ( "Start timer", &dia);
             ok.setDefault( true );
             ok.setFont(  fo );
             spinh.setFocus();
             lay.addWidget( &ok);
             connect ( &ok, SIGNAL (clicked()), &dia, SLOT ( accept() ) );
             dia.resize( dia.sizeHint().width(), dia.sizeHint().height() );
             
             if ( !dia.exec() )
                 return;
             mCustomText = lEdit.text();
             mCustomMinutes = spinh.value()*60+spinm.value();
             if ( mCustomMinutes == 0 )
                 mCustomMinutes = 1;
             if ( mCustomMinutes > 1440 )
                 mCustomMinutes = 1440;
             mess += mCustomText;
             minutes = mCustomMinutes; 
             mRunningTimerText = mCustomText.stripWhiteSpace ();
             int in = mRunningTimerText.find( " " );
             mRunningTimerText = mRunningTimerText.left ( in );
         }
         else {
             mess+= QString::number ( minutes ) + ( " minutes are past!");
             int min = minutes;
             if ( min % 60 == 0 )
                 mRunningTimerText = QString::number ( min/60 ) + ( " hours");
             else
                 mRunningTimerText = QString::number ( minutes ) + ( " minutes");
         }
     }
     //minutes = 1;
 
     mRunningTimer = QDateTime::currentDateTime().addSecs( minutes * 60 );
     timerMesssage = mess;
     AlarmServer::addAlarm ( mRunningTimer,"koalarm",timerMesssage.latin1());
     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");
 }
 void SimpleAlarmDaemonImpl::newTodo()
 {
     QCopEnvelope e("QPE/Application/kopi", "-newTodo");
 }
 
 void SimpleAlarmDaemonImpl::newEvent()
 {
     QCopEnvelope e("QPE/Application/kopi", "-newEvent");
 
 }
 void SimpleAlarmDaemonImpl::newMail()
 {
  QCopEnvelope e("QPE/Application/ompi", "newMail()");
 }
 void SimpleAlarmDaemonImpl::showAdd()
 {
  QCopEnvelope e("QPE/Application/kapi", "raise()");
 }
 void SimpleAlarmDaemonImpl::ringSync()
 {
     QCopEnvelope e("QPE/Application/kopi", "-ringSync");
 
 }
 void SimpleAlarmDaemonImpl::newCountdown()
 {
     //recieve("cal_alarm", 10 );
 }
 void SimpleAlarmDaemonImpl::simulate()
 {
     writeFile();
     QString filename =  getenv("QPEDIR") ;
     filename += "/pics/kdepim/korganizer/koalarm.wav";
     startAlarm("Alarm simulation", filename );
 }
 void SimpleAlarmDaemonImpl::showKO()
 {
      QCopEnvelope e("QPE/Application/kopi", "-showKO");
     // testing only
     //QCopEnvelope e("QPE/Application/kopi", "nextView()");
 
 }
 void SimpleAlarmDaemonImpl::showTodo()
 {
     QCopEnvelope e("QPE/Application/kopi", "-showTodo");
 
 }
 void SimpleAlarmDaemonImpl::writeJournal()
 {
     QCopEnvelope e("QPE/Application/kopi", "-showJournal");
 
 }
 
 void SimpleAlarmDaemonImpl::mousePressEvent( QMouseEvent * )
 {
 
     mPopUp->popup(mapToGlobal(QPoint (0, -mPopUp->height() )));
 
 }