| -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 @@ -70,8 +70,7 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name) int fs2 = 12; + int baseSize = 6; if ( QApplication::desktop()->width() < 480 ) { - setMaximumSize(220, 260); fs2 = 10; - } - else { - setMaximumSize(440, 440); + fs = 12; + baseSize = 4; } @@ -105,3 +104,3 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name) if ( QApplication::desktop()->width() <= 320 ) - pointSize = 24; + pointSize = 18; fo.setPointSize( pointSize ); @@ -112,7 +111,8 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name) 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 ); @@ -246,4 +246,4 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo raise(); - qApp->processEvents(); - repaint(); + //qApp->processEvents(); + //repaint(); qApp->processEvents(); @@ -264,4 +264,7 @@ void AlarmDialog::playSound () { + if (mStopAlarm ) return; + if (mSilent ) + return; showNormal(); @@ -270,2 +273,3 @@ void AlarmDialog::playSound () raise(); + repaint(); @@ -304,3 +308,3 @@ void AlarmDialog::playSound () #endif - //qDebug("BEEP!"); + qDebug("BEEP!"); } |