summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (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)
81 mMessage->setAlignment( AlignCenter); 81 mMessage->setAlignment( AlignCenter);
82 l = new QLabel("Missed Alarms:",this);
83 l->setAlignment( AlignCenter);
84 layout->addWidget ( mMessage ); 82 layout->addWidget ( mMessage );
85 layout->addWidget ( l ); 83 mMissedAlarms= new QLabel ( "(No missed Alarms)", this );
86 mMissedAlarms= new QLabel ( "", this );
87 mMissedAlarms->setAlignment( AlignCenter); 84 mMissedAlarms->setAlignment( AlignCenter);
@@ -94,2 +91,4 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
94 layout->addWidget ( mMissedAlarms ); 91 layout->addWidget ( mMissedAlarms );
92 mMissedAlarmsCombo = new QComboBox ( this );
93 layout->addWidget ( mMissedAlarmsCombo );
95 QVBox *suspendBox = new QVBox( this ); 94 QVBox *suspendBox = new QVBox( this );
@@ -114,10 +113,11 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
114 bbox->layout()->setSpacing( 2 ); 113 bbox->layout()->setSpacing( 2 );
115 QPushButton* suspend = new QPushButton( "Suspend", bbox); 114 mSuspendButton = new QPushButton( "Suspend", bbox);
116 QPushButton* silen = new QPushButton( " Stop sound ", bbox); 115 QPushButton* silen = new QPushButton( " Stop sound ", bbox);
117 QPushButton* okbut = new QPushButton( "Ok", bbox); 116 QPushButton* okbut = new QPushButton( "Ok", bbox);
118 suspend->setFont( fo ); 117 mSuspendButton->setFont( fo );
119 silen->setFont( fo ); 118 silen->setFont( fo );
120 okbut->setFont( fo ); 119 okbut->setFont( fo );
120 okbut->setDefault( true );
121 connect (silen , SIGNAL( clicked() ), this, SLOT (silent() ) ); 121 connect (silen , SIGNAL( clicked() ), this, SLOT (silent() ) );
122 connect (suspend , SIGNAL( clicked() ), this, SLOT (slotSuspend() ) ); 122 connect (mSuspendButton, SIGNAL( clicked() ), this, SLOT (slotSuspend() ) );
123 connect (okbut , SIGNAL( clicked() ), this, SLOT (slotOk() ) ); 123 connect (okbut , SIGNAL( clicked() ), this, SLOT (slotOk() ) );
@@ -162,4 +162,5 @@ void AlarmDialog::slotOk()
162 mStopAlarm = true; 162 mStopAlarm = true;
163 mMissedAlarms->setText(""); 163 mMissedAlarms->setText("(No missed Alarms)");
164 mMessage->setText(""); 164 mMessage->setText("");
165 mMissedAlarmsCombo->clear();
165#ifndef _WIN32_ 166#ifndef _WIN32_
@@ -216,8 +217,8 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo
216 mSilent = false; 217 mSilent = false;
217 if ( mMissedAlarms->text() == "" ) 218 if ( !mMessage->text().stripWhiteSpace().isEmpty() ) {
218 mMissedAlarms->setText( mMessage->text()); 219 mMissedAlarmsCombo->show();
219 else 220 mMissedAlarmsCombo->insertItem( mMessage->text().stripWhiteSpace() );
220 mMissedAlarms->setText( mMessage->text()+ "\n" + mMissedAlarms->text() ); 221 mMissedAlarms->setText( "Missed alarms:");
221 if ( mMissedAlarms->text().length() > 180 ) 222 } else
222 mMissedAlarms->setText(mMissedAlarms->text().left ( 180 )); 223 mMissedAlarmsCombo->hide();
223 mMessage->setText(mess); 224 mMessage->setText(mess);
@@ -252,3 +253,3 @@ void AlarmDialog::playSound ()
252 setActiveWindow(); 253 setActiveWindow();
253 setFocus(); 254 mSuspendSpin->setFocus();
254 raise(); 255 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 @@
30#include <qstring.h> 30#include <qstring.h>
31#include <qcombobox.h>
32#include <qpushbutton.h>
31 33
@@ -74,2 +76,4 @@ class AlarmDialog : public QDialog {
74 QSpinBox *mSuspendSpin; 76 QSpinBox *mSuspendSpin;
77 QComboBox *mMissedAlarmsCombo;
78 QPushButton* mSuspendButton;
75 QString mFileName; 79 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()
363 QTime t ( secs/3600, (secs/60)%60, secs%60 ); 363 QTime t ( secs/3600, (secs/60)%60, secs%60 );
364 mTimerPopUp->changeItem ( 1 , t.toString() + " (remaining time)"); 364 mTimerPopUp->changeItem ( 1 , t.toString() + " (countdown)");
365 } 365 }
@@ -381,4 +381,4 @@ void SimpleAlarmDaemonImpl::fillTimerPopUp()
381 mTimerPopUp->insertItem( "Stop timer "+ mRunningTimerText , 0 ); 381 mTimerPopUp->insertItem( "Stop timer "+ mRunningTimerText , 0 );
382 mTimerPopUp->insertItem( t.toString() + " (remaining time)",1); 382 mTimerPopUp->insertItem( t.toString() + " (countdown)",1);
383 mTimerPopUp->insertItem( mRunningTimer.time().toString() + " (alarm time)",2); 383 mTimerPopUp->insertItem( mRunningTimer.time().toString() + " (alarm)",2);
384 } else { 384 } else {
@@ -562,4 +562,4 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
562 spinm.downButton ()->setGeometry( 50,50,50,50); 562 spinm.downButton ()->setGeometry( 50,50,50,50);
563 spinm.setSuffix( " m" ); 563 // spinm.setSuffix( " m" );
564 spinh.setSuffix( " h" ); 564 //spinh.setSuffix( " h" );
565 spinm.setWrapping ( true ); 565 spinm.setWrapping ( true );
@@ -581,3 +581,5 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
581 QPushButton ok ( "Start timer", &dia); 581 QPushButton ok ( "Start timer", &dia);
582 ok.setDefault( true );
582 ok.setFont( fo ); 583 ok.setFont( fo );
584 spinh.setFocus();
583 lay.addWidget( &ok); 585 lay.addWidget( &ok);
@@ -610,2 +612,3 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
610 //minutes = 1; 612 //minutes = 1;
613
611 mRunningTimer = QDateTime::currentDateTime().addSecs( minutes * 60 ); 614 mRunningTimer = QDateTime::currentDateTime().addSecs( minutes * 60 );