author | zautrix <zautrix> | 2005-04-01 21:26:34 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-01 21:26:34 (UTC) |
commit | efb66afca923f23a94b19da1fa12555956e70844 (patch) (unidiff) | |
tree | 0259b37dc87cc74308b3600f79675dc785216d11 | |
parent | 12fc62df25e15f6b20d8026ceb09118ca3ed7205 (diff) | |
download | kdepimpi-efb66afca923f23a94b19da1fa12555956e70844.zip kdepimpi-efb66afca923f23a94b19da1fa12555956e70844.tar.gz kdepimpi-efb66afca923f23a94b19da1fa12555956e70844.tar.bz2 |
alarm fixes
-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) | |||
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 | } |
@@ -105,3 +104,3 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name) | |||
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 ); |
@@ -112,7 +111,8 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name) | |||
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 ); |
@@ -246,4 +246,4 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo | |||
246 | raise(); | 246 | raise(); |
247 | qApp->processEvents(); | 247 | //qApp->processEvents(); |
248 | repaint(); | 248 | //repaint(); |
249 | qApp->processEvents(); | 249 | qApp->processEvents(); |
@@ -264,4 +264,7 @@ 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(); |
@@ -270,2 +273,3 @@ void AlarmDialog::playSound () | |||
270 | raise(); | 273 | raise(); |
274 | repaint(); | ||
271 | 275 | ||
@@ -304,3 +308,3 @@ void AlarmDialog::playSound () | |||
304 | #endif | 308 | #endif |
305 | //qDebug("BEEP!"); | 309 | qDebug("BEEP!"); |
306 | } | 310 | } |