summaryrefslogtreecommitdiffabout
path: root/kalarmd
Side-by-side diff
Diffstat (limited to 'kalarmd') (more/less context) (ignore whitespace changes)
-rw-r--r--kalarmd/alarmdialog.cpp31
-rw-r--r--kalarmd/alarmdialog.h4
-rw-r--r--kalarmd/simplealarmdaemonimpl.cpp13
3 files changed, 28 insertions, 20 deletions
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp
index 794c8ae..d6feedc 100644
--- a/kalarmd/alarmdialog.cpp
+++ b/kalarmd/alarmdialog.cpp
@@ -81,7 +81,4 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
mMessage->setAlignment( AlignCenter);
- l = new QLabel("Missed Alarms:",this);
- l->setAlignment( AlignCenter);
layout->addWidget ( mMessage );
- layout->addWidget ( l );
- mMissedAlarms= new QLabel ( "", this );
+ mMissedAlarms= new QLabel ( "(No missed Alarms)", this );
mMissedAlarms->setAlignment( AlignCenter);
@@ -94,2 +91,4 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
layout->addWidget ( mMissedAlarms );
+ mMissedAlarmsCombo = new QComboBox ( this );
+ layout->addWidget ( mMissedAlarmsCombo );
QVBox *suspendBox = new QVBox( this );
@@ -114,10 +113,11 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
bbox->layout()->setSpacing( 2 );
- QPushButton* suspend = new QPushButton( "Suspend", bbox);
+ mSuspendButton = new QPushButton( "Suspend", bbox);
QPushButton* silen = new QPushButton( " Stop sound ", bbox);
QPushButton* okbut = new QPushButton( "Ok", bbox);
- suspend->setFont( fo );
+ mSuspendButton->setFont( fo );
silen->setFont( fo );
okbut->setFont( fo );
+ okbut->setDefault( true );
connect (silen , SIGNAL( clicked() ), this, SLOT (silent() ) );
- connect (suspend , SIGNAL( clicked() ), this, SLOT (slotSuspend() ) );
+ connect (mSuspendButton, SIGNAL( clicked() ), this, SLOT (slotSuspend() ) );
connect (okbut , SIGNAL( clicked() ), this, SLOT (slotOk() ) );
@@ -162,4 +162,5 @@ void AlarmDialog::slotOk()
mStopAlarm = true;
- mMissedAlarms->setText("");
+ mMissedAlarms->setText("(No missed Alarms)");
mMessage->setText("");
+ mMissedAlarmsCombo->clear();
#ifndef _WIN32_
@@ -216,8 +217,8 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo
mSilent = false;
- if ( mMissedAlarms->text() == "" )
- mMissedAlarms->setText( mMessage->text());
- else
- mMissedAlarms->setText( mMessage->text()+ "\n" + mMissedAlarms->text() );
- if ( mMissedAlarms->text().length() > 180 )
- mMissedAlarms->setText(mMissedAlarms->text().left ( 180 ));
+ if ( !mMessage->text().stripWhiteSpace().isEmpty() ) {
+ mMissedAlarmsCombo->show();
+ mMissedAlarmsCombo->insertItem( mMessage->text().stripWhiteSpace() );
+ mMissedAlarms->setText( "Missed alarms:");
+ } else
+ mMissedAlarmsCombo->hide();
mMessage->setText(mess);
@@ -252,3 +253,3 @@ void AlarmDialog::playSound ()
setActiveWindow();
- setFocus();
+ mSuspendSpin->setFocus();
raise();
diff --git a/kalarmd/alarmdialog.h b/kalarmd/alarmdialog.h
index 3155f18..896cf60 100644
--- a/kalarmd/alarmdialog.h
+++ b/kalarmd/alarmdialog.h
@@ -30,2 +30,4 @@
#include <qstring.h>
+#include <qcombobox.h>
+#include <qpushbutton.h>
@@ -74,2 +76,4 @@ class AlarmDialog : public QDialog {
QSpinBox *mSuspendSpin;
+ QComboBox *mMissedAlarmsCombo;
+ QPushButton* mSuspendButton;
QString mFileName;
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index e8ec033..b3da428 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -363,3 +363,3 @@ void SimpleAlarmDaemonImpl::fillTimerPopUp()
QTime t ( secs/3600, (secs/60)%60, secs%60 );
- mTimerPopUp->changeItem ( 1 , t.toString() + " (remaining time)");
+ mTimerPopUp->changeItem ( 1 , t.toString() + " (countdown)");
}
@@ -381,4 +381,4 @@ void SimpleAlarmDaemonImpl::fillTimerPopUp()
mTimerPopUp->insertItem( "Stop timer "+ mRunningTimerText , 0 );
- mTimerPopUp->insertItem( t.toString() + " (remaining time)",1);
- mTimerPopUp->insertItem( mRunningTimer.time().toString() + " (alarm time)",2);
+ mTimerPopUp->insertItem( t.toString() + " (countdown)",1);
+ mTimerPopUp->insertItem( mRunningTimer.time().toString() + " (alarm)",2);
} else {
@@ -562,4 +562,4 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
spinm.downButton ()->setGeometry( 50,50,50,50);
- spinm.setSuffix( " m" );
- spinh.setSuffix( " h" );
+ // spinm.setSuffix( " m" );
+ //spinh.setSuffix( " h" );
spinm.setWrapping ( true );
@@ -581,3 +581,5 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
QPushButton ok ( "Start timer", &dia);
+ ok.setDefault( true );
ok.setFont( fo );
+ spinh.setFocus();
lay.addWidget( &ok);
@@ -610,2 +612,3 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
//minutes = 1;
+
mRunningTimer = QDateTime::currentDateTime().addSecs( minutes * 60 );