summaryrefslogtreecommitdiffabout
path: root/kalarmd
authorzautrix <zautrix>2005-04-03 04:33:19 (UTC)
committer zautrix <zautrix>2005-04-03 04:33:19 (UTC)
commitf6c8249db564c1276d4c7ed5ad88c6fbac361b8d (patch) (unidiff)
tree8e5b6e2d6f9a7bc00326f7c0115bf2af53ae9ce8 /kalarmd
parent40e5edc1ab153144f0e824ad2d3a0ab37357e408 (diff)
downloadkdepimpi-f6c8249db564c1276d4c7ed5ad88c6fbac361b8d.zip
kdepimpi-f6c8249db564c1276d4c7ed5ad88c6fbac361b8d.tar.gz
kdepimpi-f6c8249db564c1276d4c7ed5ad88c6fbac361b8d.tar.bz2
fixes
Diffstat (limited to 'kalarmd') (more/less context) (show whitespace changes)
-rw-r--r--kalarmd/alarmdialog.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp
index bdeee4a..53ff488 100644
--- a/kalarmd/alarmdialog.cpp
+++ b/kalarmd/alarmdialog.cpp
@@ -33,4 +33,5 @@
33#include <qsound.h> 33#include <qsound.h>
34#include <qpushbutton.h> 34#include <qpushbutton.h>
35#include <qregexp.h>
35#ifndef DESKTOP_VERSION 36#ifndef DESKTOP_VERSION
36#define protected public 37#define protected public
@@ -59,5 +60,5 @@
59 60
60AlarmDialog::AlarmDialog(QWidget *parent,const char *name) 61AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
61 : QDialog (parent, name, true, Qt::WStyle_StaysOnTop ) 62 : QDialog (parent, name, true, Qt::WStyle_Customize |Qt::WStyle_StaysOnTop | Qt::WStyle_DialogBorder)
62{ 63{
63 setCaption( "KO/Pi Alarm!" ); 64 setCaption( "KO/Pi Alarm!" );
@@ -233,5 +234,7 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo
233 if ( !mMessage->text().stripWhiteSpace().isEmpty() ) { 234 if ( !mMessage->text().stripWhiteSpace().isEmpty() ) {
234 mMissedAlarmsCombo->show(); 235 mMissedAlarmsCombo->show();
235 mMissedAlarmsCombo->insertItem( mMessage->text().stripWhiteSpace() ); 236 QString newItem = mMessage->text().stripWhiteSpace();
237 newItem.replace( QRegExp("\n"), QString(" ") );
238 mMissedAlarmsCombo->insertItem( newItem );
236 mMissedAlarms->setText( "Missed alarms:"); 239 mMissedAlarms->setText( "Missed alarms:");
237 } else 240 } else
@@ -270,7 +273,7 @@ void AlarmDialog::playSound ()
270 showNormal(); 273 showNormal();
271 setActiveWindow(); 274 setActiveWindow();
272 mSuspendSpin->setFocus();
273 raise(); 275 raise();
274 repaint(); 276 mSuspendSpin->setFocus();
277
275 278
276 qApp->processEvents(); 279 qApp->processEvents();