| -rw-r--r-- | kalarmd/simplealarmdaemonimpl.cpp | 102 | ||||
| -rw-r--r-- | kalarmd/simplealarmdaemonimpl.h | 33 |
2 files changed, 121 insertions, 14 deletions
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp index 50c4605..ec7f730 100644 --- a/kalarmd/simplealarmdaemonimpl.cpp +++ b/kalarmd/simplealarmdaemonimpl.cpp @@ -31,10 +31,14 @@ #include <qhbox.h> #include <qtimer.h> #include <qfile.h> +#include <qdatetime.h> +#include <qpushbutton.h> #include <qlayout.h> #include <qlineedit.h> #include <qdialog.h> +#define protected public #include <qspinbox.h> +#undef protected #include <qtextstream.h> #include <qtopia/qcopenvelope_qws.h> #include <qtopia/alarmserver.h> @@ -63,7 +67,9 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent ) mPopUp->insertSeparator(); mPopUp->insertItem( "Multi Sync", this, SLOT ( ringSync() ) ); mTimerPopUp = new QPopupMenu( this ); - + QFont fon = mTimerPopUp->font(); + fon.setPointSize( fon.pointSize() *3/2 ); + mTimerPopUp->setFont( fon ); mBeepPopUp = new QPopupMenu( this ); mSoundPopUp = new QPopupMenu( this ); mPausePopUp = new QPopupMenu( this ); @@ -355,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()); + mTimerPopUp->changeItem ( 1 , t.toString() + " (remaining time)"); } else { QString text = mCustomText.stripWhiteSpace (); @@ -370,8 +376,11 @@ void SimpleAlarmDaemonImpl::fillTimerPopUp() if ( mTimerTime ) { int secs = QDateTime::currentDateTime().secsTo ( mRunningTimer ); QTime t ( secs/3600, (secs/60)%60, secs%60 ); - mTimerPopUp->insertItem( "Stop", 0 ); - mTimerPopUp->insertItem( t.toString(),1); + + + mTimerPopUp->insertItem( "Stop timer "+ mRunningTimerText , 0 ); + mTimerPopUp->insertItem( t.toString() + " (remaining time)",1); + mTimerPopUp->insertItem( mRunningTimer.time().toString() + " (alarm time)",2); } else { QString fileName = QDir::homeDirPath() +"/.kopialarmtimerrc"; @@ -464,13 +473,25 @@ void SimpleAlarmDaemonImpl::confTimer( int time ) return; QDialog dia ( 0, ("Stop Timer" ), true ); - QLabel lab (("Really stop the timer?"), &dia ); + QLabel lab (("Really stop the timer?\n\n"+ mRunningTimerText+"\n"), &dia ); + lab.setAlignment( AlignCenter ); dia.setCaption(("KO/Pi Timer Stop" )); QVBoxLayout lay( &dia ); + lay.addWidget( &lab); + QPushButton ok ( "Stop timer!", &dia); + QFont fo = dia.font(); + fo.setPointSize( 36 ); + ok.setFont( fo ); + lay.addWidget( &ok); + connect ( &ok, SIGNAL (clicked()), &dia, SLOT ( accept() ) ); + QPushButton con ( "Continue timer!", &dia); + fo.setPointSize( 36 ); + con.setFont( fo ); + lay.addWidget( &con); + connect ( &con, SIGNAL (clicked()), &dia, SLOT ( reject() ) ); lay.setMargin(5); lay.setSpacing(5); - lay.addWidget( &lab); - dia.resize( 200, dia.sizeHint().height() ); + dia.resize(dia.sizeHint() ); if ( !dia.exec() ) return; @@ -486,15 +507,24 @@ void SimpleAlarmDaemonImpl::confTimer( int time ) } QString mess = "timer_alarm"; mess += ("Timer Alarm!\n"); - if ( minutes == 22 ) + if ( minutes == 22 ) { mess += ( "Pizza is ready"); - else if ( minutes == 45 ) + mRunningTimerText = "Pizza"; + } + else if ( minutes == 45 ) { mess += ( "Please wake up!"); - else if ( minutes == 5 ) + mRunningTimerText = "Nap"; + } + else if ( minutes == 5 ) { mess += ( "Tea is ready"); + mRunningTimerText = "Tea"; + } else if ( minutes == 3 ) { mess += mCustomText; minutes = mCustomMinutes ; + mRunningTimerText = mCustomText.stripWhiteSpace (); + int in = mRunningTimerText.find( " " ); + mRunningTimerText = mRunningTimerText.left ( in ); } else { if ( minutes == 2 ) { @@ -510,15 +540,50 @@ void SimpleAlarmDaemonImpl::confTimer( int time ) lay.addWidget( &lEdit); QLabel lab2 (("Countdown time (1 min - 24 h):"), &dia ); lay.addWidget( &lab2); + QHBox hbox1 ( &dia ); + lay.addWidget( &hbox1); + QLabel lab3 (("Hours"), &hbox1 ); + QLabel lab4 (("Minutes"), &hbox1 ); QHBox hbox ( &dia ); - QLabel lab3 (("h:"), &hbox ); QSpinBox spinh( 0, 24, 1,& hbox ); - QLabel lab4 ((" min:"), &hbox ); + QFont fo = dia.font(); + fo.setPointSize( 36 ); QSpinBox spinm( 0, 59, 1,&hbox ); + spinm.setFont( fo ); + spinh.setFont( fo ); + spinh.setButtonSymbols( QSpinBox::PlusMinus ); + spinm.setButtonSymbols( QSpinBox::PlusMinus ); + spinh.upButton ()->setFixedSize( QSize( 48, 30 )); + spinh.downButton ()->setFixedSize( QSize( 48, 30 )); + //spinh.editor ()->setFixedSize( QSize( 50, 100 )); + spinh.setFixedSize( 100,62 ); + 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.setWrapping ( true ); + //spinm.editor ()->setFixedSize( QSize( 50, 100 )); + spinm.setLineStep( 1 ); + spinm.setFixedSize( 110,62 ); + lay.addWidget( &hbox); + QLabel lab5 ("Timer fires at:", &dia ); + lab5.setAlignment( AlignCenter ); + lay.addWidget( &lab5); + KODateLabel dl ( &dia ); + dl.setAlignment( AlignCenter ); + dl.setFont( fo ); + connect ( &spinh, SIGNAL ( valueChanged (int)), &dl, SLOT ( slot_hours( int ) ) ); + connect ( &spinm, SIGNAL ( valueChanged (int)), &dl, SLOT ( slot_minutes( int ) ) ); + lay.addWidget( &dl); spinh.setValue( mCustomMinutes/60 ); spinm.setValue( mCustomMinutes%60 ); - lay.addWidget( &hbox); + QPushButton ok ( "Start timer", &dia); + ok.setFont( fo ); + lay.addWidget( &ok); + connect ( &ok, SIGNAL (clicked()), &dia, SLOT ( accept() ) ); dia.resize( dia.sizeHint().width(), dia.sizeHint().height() ); + if ( !dia.exec() ) return; mCustomText = lEdit.text(); @@ -529,9 +594,18 @@ void SimpleAlarmDaemonImpl::confTimer( int time ) mCustomMinutes = 1440; mess += mCustomText; minutes = mCustomMinutes; + mRunningTimerText = mCustomText.stripWhiteSpace (); + int in = mRunningTimerText.find( " " ); + mRunningTimerText = mRunningTimerText.left ( in ); } - else + else { mess+= QString::number ( minutes ) + ( " minutes are past!"); + int min = minutes; + if ( min % 60 == 0 ) + mRunningTimerText = QString::number ( min/60 ) + ( " hours"); + else + mRunningTimerText = QString::number ( minutes ) + ( " minutes"); + } } //minutes = 1; mRunningTimer = QDateTime::currentDateTime().addSecs( minutes * 60 ); diff --git a/kalarmd/simplealarmdaemonimpl.h b/kalarmd/simplealarmdaemonimpl.h index 32a3867..cbdba47 100644 --- a/kalarmd/simplealarmdaemonimpl.h +++ b/kalarmd/simplealarmdaemonimpl.h @@ -26,6 +26,7 @@ //#include "simplealarmdaemon.h" #include <qdatetime.h> #include <qlabel.h> +#include <qtimer.h> class QLabel; class QTimer; @@ -78,9 +79,41 @@ class SimpleAlarmDaemonImpl : public QLabel void fillTimerPopUp(); QString timerMesssage; QString mCustomText; + QString mRunningTimerText; int mCustomMinutes; int mTimerPopupConf; bool wavAlarm; }; +class KODateLabel : public QLabel +{ + Q_OBJECT + public: + KODateLabel( QWidget *parent=0, const char *name=0 ) : + QLabel( parent, name ) + { + hour = 0; + minutes = 0; + QTimer * ti = new QTimer( this ); + connect ( ti, SIGNAL ( timeout () ), this, SLOT ( updateText() )); + ti->start( 1000 ); + } +public slots: + void slot_minutes( int m ) + { + minutes = m; updateText(); + } + void slot_hours( int h ) + { + hour = h; updateText(); + } +private slots: + void updateText() + { + QDateTime dt = QDateTime::currentDateTime(); + dt = dt.addSecs( minutes * 60 + hour * 3600 ); + setText( dt.time().toString() ); + } + int hour, minutes; +}; #endif |