-rw-r--r-- | kalarmd/alarmdialog.cpp | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp index 7b888ab..bdeee4a 100644 --- a/kalarmd/alarmdialog.cpp +++ b/kalarmd/alarmdialog.cpp @@ -67,14 +67,13 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name) l->setAlignment( AlignCenter); mMessage = new QLabel ( " ", this ); int fs = 18; int fs2 = 12; + int baseSize = 6; if ( QApplication::desktop()->width() < 480 ) { - setMaximumSize(220, 260); fs2 = 10; - } - else { - setMaximumSize(440, 440); + fs = 12; + baseSize = 4; } layout->setSpacing( 3 ); layout->setMargin( 3 ); QFont fo = QApplication::font(); @@ -102,20 +101,21 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name) layout->addWidget ( labb ); fo = font(); int pointSize = 36; if ( QApplication::desktop()->width() <= 320 ) - pointSize = 24; + 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( 48, 30 )); - mSuspendSpin->downButton ()->setFixedSize( QSize( 48, 30 )); + mSuspendSpin->upButton ()->setFixedSize( QSize( 8*baseSize, 5*baseSize )); + mSuspendSpin->downButton ()->setFixedSize( QSize( 8*baseSize, 5*baseSize )); #endif - mSuspendSpin->setFixedSize( 100,62 ); + mSuspendSpin->setFixedSize( 18*baseSize, 10*baseSize+2 ); mSuspendSpin->setButtonSymbols( QSpinBox::PlusMinus ); QHBoxLayout* layoutSpin = new QHBoxLayout( layout ); layoutSpin->addStretch (); layoutSpin->addWidget ( mSuspendSpin ); @@ -243,10 +243,10 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo int dh = QApplication::desktop()->height(); setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); show(); raise(); - qApp->processEvents(); - repaint(); + //qApp->processEvents(); + //repaint(); qApp->processEvents(); #ifndef _WIN32_ if ( fd_led > 0 ) { @@ -261,14 +261,18 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo void AlarmDialog::playSound () { + if (mStopAlarm ) return; + if (mSilent ) + return; showNormal(); setActiveWindow(); mSuspendSpin->setFocus(); raise(); + repaint(); qApp->processEvents(); if ( alarmCounter < maxAlarmReplay && ! mSilent) { ++alarmCounter; @@ -301,9 +305,9 @@ void AlarmDialog::playSound () #else QSound::play ( mFileName ); #endif - //qDebug("BEEP!"); + qDebug("BEEP!"); } } else { if ( ! mSilent && mSuspendCounter > 0 ) { --mSuspendCounter; |