many fixes

1 files changed, 42 insertions, 10 deletions

diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp
index c939ae0..7ead3b9 100644
--- a/kalarmd/alarmdialog.cpp
+++ b/kalarmd/alarmdialog.cpp
@@ -46,8 +46,9 @@
 #ifndef DESKTOP_VERSION
 #include <qtopia/alarmserver.h>
 #include <qpe/resource.h>
 #include <qtopia/sound.h>
+
 #endif     
 
 #include "alarmdialog.h"
 
@@ -90,16 +91,18 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   
   layout->addWidget ( mMissedAlarms );
   mMissedAlarmsCombo =  new QComboBox ( this );
   layout->addWidget ( mMissedAlarmsCombo );
-  QVBox *suspendBox = new QVBox( this );
-  suspendBox->setSpacing(3);
-  layout->addWidget ( suspendBox );
-  QLabel* labb = new QLabel("Suspend duration (minutes):",suspendBox);
+
+  QLabel* labb = new QLabel("Suspend duration (minutes):",this);
   labb->setAlignment(AlignCenter);
+  layout->addWidget ( labb );
   fo = font();
-  fo.setPointSize( 36 );
-  mSuspendSpin = new QSpinBox(1,1440,1,suspendBox);
+  int pointSize = 36;
+  if ( QApplication::desktop()->width() <= 320 )
+      pointSize = 24;
+  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 );
@@ -107,13 +110,19 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   mSuspendSpin->upButton ()->setFixedSize( QSize( 48, 30 ));
   mSuspendSpin->downButton ()->setFixedSize( QSize( 48, 30 ));
 #endif
   mSuspendSpin->setFixedSize( 100,62 );
-  mSuspendSpin->setButtonSymbols( QSpinBox::PlusMinus );
+  mSuspendSpin->setButtonSymbols( QSpinBox::PlusMinus ); 
+  QHBoxLayout* layoutSpin = new QHBoxLayout( layout );
+  layoutSpin->addStretch ();
+  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); 
   mSuspendButton->setFont( fo );
@@ -258,17 +267,40 @@ void  AlarmDialog::playSound ()
     
     qApp->processEvents();
     if (  alarmCounter < maxAlarmReplay && ! mSilent) {
         ++alarmCounter;
+#ifdef DESKTOP_VERSION
+        mPlayWav = true;
+#endif
         if ( !mPlayWav || mFileName.length() < 2 ) {
 
-#ifndef DESKTOP_VERSION
+#ifdef DESKTOP_VERSION
+            qDebug("Sound play not possible - file not found");
+#else
             Sound::soundAlarm ();
 #endif
-        } else {
+        } 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 ();