summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-04-01 21:26:34 (UTC)
committer zautrix <zautrix>2005-04-01 21:26:34 (UTC)
commitefb66afca923f23a94b19da1fa12555956e70844 (patch) (side-by-side diff)
tree0259b37dc87cc74308b3600f79675dc785216d11
parent12fc62df25e15f6b20d8026ceb09118ca3ed7205 (diff)
downloadkdepimpi-efb66afca923f23a94b19da1fa12555956e70844.zip
kdepimpi-efb66afca923f23a94b19da1fa12555956e70844.tar.gz
kdepimpi-efb66afca923f23a94b19da1fa12555956e70844.tar.bz2
alarm fixes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kalarmd/alarmdialog.cpp26
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
@@ -68,12 +68,11 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
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 );
@@ -103,18 +102,19 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
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 ();
@@ -244,8 +244,8 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo
setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
show();
raise();
- qApp->processEvents();
- repaint();
+ //qApp->processEvents();
+ //repaint();
qApp->processEvents();
#ifndef _WIN32_
@@ -262,12 +262,16 @@ 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) {
@@ -302,7 +306,7 @@ void AlarmDialog::playSound ()
#else
QSound::play ( mFileName );
#endif
- //qDebug("BEEP!");
+ qDebug("BEEP!");
}
} else {
if ( ! mSilent && mSuspendCounter > 0 ) {