author | zautrix <zautrix> | 2005-03-26 22:32:32 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-26 22:32:32 (UTC) |
commit | 46b94158f6b115e175516a8432ec5b71f1403834 (patch) (side-by-side diff) | |
tree | b075219da97f93d4e09863fda822722872f8b94b /kalarmd | |
parent | 7177e62052b732f901eca6627825d0b38d8438be (diff) | |
download | kdepimpi-46b94158f6b115e175516a8432ec5b71f1403834.zip kdepimpi-46b94158f6b115e175516a8432ec5b71f1403834.tar.gz kdepimpi-46b94158f6b115e175516a8432ec5b71f1403834.tar.bz2 |
fixes
-rw-r--r-- | kalarmd/alarmdialog.cpp | 31 | ||||
-rw-r--r-- | kalarmd/alarmdialog.h | 4 | ||||
-rw-r--r-- | kalarmd/simplealarmdaemonimpl.cpp | 13 |
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 @@ -79,11 +79,8 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name) fo.setPointSize( fs ); mMessage->setFont(fo ); 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); playSoundTimer = new QTimer( this ); @@ -92,6 +89,8 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name) playSoundTimer->stop(); layout->addWidget ( mMissedAlarms ); + mMissedAlarmsCombo = new QComboBox ( this ); + layout->addWidget ( mMissedAlarmsCombo ); QVBox *suspendBox = new QVBox( this ); suspendBox->setSpacing(3); layout->addWidget ( suspendBox ); @@ -112,14 +111,15 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name) QVBox * bbox = new QVBox ( this ); layout->addWidget ( bbox ); 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() ) ); #ifndef _WIN32_ if ( QFile::exists ( "/dev/sharp_led" ) ) @@ -160,8 +160,9 @@ void AlarmDialog::suspend() void AlarmDialog::slotOk() { mStopAlarm = true; - mMissedAlarms->setText(""); + mMissedAlarms->setText("(No missed Alarms)"); mMessage->setText(""); + mMissedAlarmsCombo->clear(); #ifndef _WIN32_ if ( fd_led > 0 ) { statusLED.status = LED_SALARM_OFF ; @@ -214,12 +215,12 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo maxAlarmReplay = replay ; mStopAlarm = false; 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); int w =sizeHint().width() ; int h = sizeHint().height() ; @@ -250,7 +251,7 @@ void AlarmDialog::playSound () return; showNormal(); setActiveWindow(); - setFocus(); + mSuspendSpin->setFocus(); raise(); qApp->processEvents(); diff --git a/kalarmd/alarmdialog.h b/kalarmd/alarmdialog.h index 3155f18..896cf60 100644 --- a/kalarmd/alarmdialog.h +++ b/kalarmd/alarmdialog.h @@ -28,6 +28,8 @@ #include <qdialog.h> #include <qdatetime.h> #include <qstring.h> +#include <qcombobox.h> +#include <qpushbutton.h> #include "sharp_char.h" @@ -72,6 +74,8 @@ class AlarmDialog : public QDialog { QLabel* mMessage; QLabel* mMissedAlarms; QSpinBox *mSuspendSpin; + QComboBox *mMissedAlarmsCombo; + QPushButton* mSuspendButton; QString mFileName; int fd_led; sharp_led_status statusLED; diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp index e8ec033..b3da428 100644 --- a/kalarmd/simplealarmdaemonimpl.cpp +++ b/kalarmd/simplealarmdaemonimpl.cpp @@ -361,7 +361,7 @@ void SimpleAlarmDaemonImpl::fillTimerPopUp() if ( mTimerTime ) { int secs = QDateTime::currentDateTime().secsTo ( mRunningTimer ); QTime t ( secs/3600, (secs/60)%60, secs%60 ); - mTimerPopUp->changeItem ( 1 , t.toString() + " (remaining time)"); + mTimerPopUp->changeItem ( 1 , t.toString() + " (countdown)"); } else { QString text = mCustomText.stripWhiteSpace (); @@ -379,8 +379,8 @@ 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 { QString fileName = QDir::homeDirPath() +"/.kopialarmtimerrc"; @@ -560,8 +560,8 @@ void SimpleAlarmDaemonImpl::confTimer( int time ) spinm.upButton ()->setFixedSize( QSize( 48, 30 )); spinm.downButton ()->setFixedSize( QSize( 48, 30 )); spinm.downButton ()->setGeometry( 50,50,50,50); - spinm.setSuffix( " m" ); - spinh.setSuffix( " h" ); + // spinm.setSuffix( " m" ); + //spinh.setSuffix( " h" ); spinm.setWrapping ( true ); //spinm.editor ()->setFixedSize( QSize( 50, 100 )); spinm.setLineStep( 1 ); @@ -579,7 +579,9 @@ void SimpleAlarmDaemonImpl::confTimer( int time ) spinh.setValue( mCustomMinutes/60 ); spinm.setValue( mCustomMinutes%60 ); QPushButton ok ( "Start timer", &dia); + ok.setDefault( true ); ok.setFont( fo ); + spinh.setFocus(); lay.addWidget( &ok); connect ( &ok, SIGNAL (clicked()), &dia, SLOT ( accept() ) ); dia.resize( dia.sizeHint().width(), dia.sizeHint().height() ); @@ -608,6 +610,7 @@ void SimpleAlarmDaemonImpl::confTimer( int time ) } } //minutes = 1; + mRunningTimer = QDateTime::currentDateTime().addSecs( minutes * 60 ); timerMesssage = mess; AlarmServer::addAlarm ( mRunningTimer,"koalarm",timerMesssage.latin1()); |