-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) | |||
67 | l->setAlignment( AlignCenter); | 67 | l->setAlignment( AlignCenter); |
68 | mMessage = new QLabel ( " ", this ); | 68 | mMessage = new QLabel ( " ", this ); |
69 | int fs = 18; | 69 | int fs = 18; |
70 | int fs2 = 12; | 70 | int fs2 = 12; |
71 | int baseSize = 6; | ||
71 | if ( QApplication::desktop()->width() < 480 ) { | 72 | if ( QApplication::desktop()->width() < 480 ) { |
72 | setMaximumSize(220, 260); | ||
73 | fs2 = 10; | 73 | fs2 = 10; |
74 | } | 74 | fs = 12; |
75 | else { | 75 | baseSize = 4; |
76 | setMaximumSize(440, 440); | ||
77 | } | 76 | } |
78 | layout->setSpacing( 3 ); | 77 | layout->setSpacing( 3 ); |
79 | layout->setMargin( 3 ); | 78 | layout->setMargin( 3 ); |
80 | QFont fo = QApplication::font(); | 79 | QFont fo = QApplication::font(); |
@@ -102,20 +101,21 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name) | |||
102 | layout->addWidget ( labb ); | 101 | layout->addWidget ( labb ); |
103 | fo = font(); | 102 | fo = font(); |
104 | int pointSize = 36; | 103 | int pointSize = 36; |
105 | if ( QApplication::desktop()->width() <= 320 ) | 104 | if ( QApplication::desktop()->width() <= 320 ) |
106 | pointSize = 24; | 105 | pointSize = 18; |
107 | fo.setPointSize( pointSize ); | 106 | fo.setPointSize( pointSize ); |
108 | mSuspendSpin = new QSpinBox(1,1440,1,this); | 107 | mSuspendSpin = new QSpinBox(1,1440,1,this); |
109 | mSuspendSpin->setFont( fo ); | 108 | mSuspendSpin->setFont( fo ); |
110 | mSuspendSpin->setValue(7); // default suspend duration | 109 | mSuspendSpin->setValue(7); // default suspend duration |
111 | mSuspendSpin->setButtonSymbols( QSpinBox::PlusMinus ); | 110 | mSuspendSpin->setButtonSymbols( QSpinBox::PlusMinus ); |
112 | mSuspendSpin->setButtonSymbols( QSpinBox::PlusMinus ); | 111 | mSuspendSpin->setButtonSymbols( QSpinBox::PlusMinus ); |
112 | |||
113 | #if QT_VERSION < 0x030000 | 113 | #if QT_VERSION < 0x030000 |
114 | mSuspendSpin->upButton ()->setFixedSize( QSize( 48, 30 )); | 114 | mSuspendSpin->upButton ()->setFixedSize( QSize( 8*baseSize, 5*baseSize )); |
115 | mSuspendSpin->downButton ()->setFixedSize( QSize( 48, 30 )); | 115 | mSuspendSpin->downButton ()->setFixedSize( QSize( 8*baseSize, 5*baseSize )); |
116 | #endif | 116 | #endif |
117 | mSuspendSpin->setFixedSize( 100,62 ); | 117 | mSuspendSpin->setFixedSize( 18*baseSize, 10*baseSize+2 ); |
118 | mSuspendSpin->setButtonSymbols( QSpinBox::PlusMinus ); | 118 | mSuspendSpin->setButtonSymbols( QSpinBox::PlusMinus ); |
119 | QHBoxLayout* layoutSpin = new QHBoxLayout( layout ); | 119 | QHBoxLayout* layoutSpin = new QHBoxLayout( layout ); |
120 | layoutSpin->addStretch (); | 120 | layoutSpin->addStretch (); |
121 | layoutSpin->addWidget ( mSuspendSpin ); | 121 | layoutSpin->addWidget ( mSuspendSpin ); |
@@ -243,10 +243,10 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo | |||
243 | int dh = QApplication::desktop()->height(); | 243 | int dh = QApplication::desktop()->height(); |
244 | setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 244 | setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
245 | show(); | 245 | show(); |
246 | raise(); | 246 | raise(); |
247 | qApp->processEvents(); | 247 | //qApp->processEvents(); |
248 | repaint(); | 248 | //repaint(); |
249 | qApp->processEvents(); | 249 | qApp->processEvents(); |
250 | 250 | ||
251 | #ifndef _WIN32_ | 251 | #ifndef _WIN32_ |
252 | if ( fd_led > 0 ) { | 252 | if ( fd_led > 0 ) { |
@@ -261,14 +261,18 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo | |||
261 | 261 | ||
262 | 262 | ||
263 | void AlarmDialog::playSound () | 263 | void AlarmDialog::playSound () |
264 | { | 264 | { |
265 | |||
265 | if (mStopAlarm ) | 266 | if (mStopAlarm ) |
266 | return; | 267 | return; |
268 | if (mSilent ) | ||
269 | return; | ||
267 | showNormal(); | 270 | showNormal(); |
268 | setActiveWindow(); | 271 | setActiveWindow(); |
269 | mSuspendSpin->setFocus(); | 272 | mSuspendSpin->setFocus(); |
270 | raise(); | 273 | raise(); |
274 | repaint(); | ||
271 | 275 | ||
272 | qApp->processEvents(); | 276 | qApp->processEvents(); |
273 | if ( alarmCounter < maxAlarmReplay && ! mSilent) { | 277 | if ( alarmCounter < maxAlarmReplay && ! mSilent) { |
274 | ++alarmCounter; | 278 | ++alarmCounter; |
@@ -301,9 +305,9 @@ void AlarmDialog::playSound () | |||
301 | 305 | ||
302 | #else | 306 | #else |
303 | QSound::play ( mFileName ); | 307 | QSound::play ( mFileName ); |
304 | #endif | 308 | #endif |
305 | //qDebug("BEEP!"); | 309 | qDebug("BEEP!"); |
306 | } | 310 | } |
307 | } else { | 311 | } else { |
308 | if ( ! mSilent && mSuspendCounter > 0 ) { | 312 | if ( ! mSilent && mSuspendCounter > 0 ) { |
309 | --mSuspendCounter; | 313 | --mSuspendCounter; |