-rw-r--r-- | kalarmd/simplealarmdaemonimpl.cpp | 23 | ||||
-rw-r--r-- | kalarmd/simplealarmdaemonimpl.h | 1 |
2 files changed, 23 insertions, 1 deletions
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp index 8ea8a73..04b8b21 100644 --- a/kalarmd/simplealarmdaemonimpl.cpp +++ b/kalarmd/simplealarmdaemonimpl.cpp | |||
@@ -143,23 +143,32 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent ) | |||
143 | wavAlarm = false; | 143 | wavAlarm = false; |
144 | mSoundPopUp->setItemChecked ( 0, true ); | 144 | mSoundPopUp->setItemChecked ( 0, true ); |
145 | } | 145 | } |
146 | else { | 146 | else { |
147 | wavAlarm = true; | 147 | wavAlarm = true; |
148 | mSoundPopUp->setItemChecked ( 1, true ); | 148 | mSoundPopUp->setItemChecked ( 1, true ); |
149 | } | 149 | } |
150 | saveSlot( 1 ); | 150 | saveSlot( 1 ); |
151 | mTimerStartLabel = new QLabel( 0 ); | ||
152 | mTimerStartLabel->setCaption( "Timer started!"); | ||
153 | fon = mTimerPopUp->font(); | ||
154 | fon.setBold( true ); | ||
155 | points = (fon.pointSize()*2); | ||
156 | fon.setPointSize( points ); | ||
157 | mTimerStartLabel->setFont( fon ); | ||
151 | } | 158 | } |
152 | 159 | ||
153 | SimpleAlarmDaemonImpl::~SimpleAlarmDaemonImpl() | 160 | SimpleAlarmDaemonImpl::~SimpleAlarmDaemonImpl() |
154 | { | 161 | { |
155 | //delete mPopUp; | 162 | //delete mPopUp; |
156 | delete mAlarmDialog; | 163 | delete mAlarmDialog; |
164 | delete mTimerStartLabel; | ||
157 | } | 165 | } |
166 | |||
158 | void SimpleAlarmDaemonImpl::saveSlot( int load ) | 167 | void SimpleAlarmDaemonImpl::saveSlot( int load ) |
159 | { | 168 | { |
160 | QString fileName = QDir::homeDirPath() +"/.kopialarmrc"; | 169 | QString fileName = QDir::homeDirPath() +"/.kopialarmrc"; |
161 | //qDebug("save %d ", load ); | 170 | //qDebug("save %d ", load ); |
162 | QFile file( fileName ); | 171 | QFile file( fileName ); |
163 | if ( load ) { | 172 | if ( load ) { |
164 | if( !QFile::exists( fileName) ) | 173 | if( !QFile::exists( fileName) ) |
165 | return; | 174 | return; |
@@ -397,18 +406,18 @@ void SimpleAlarmDaemonImpl::fillTimerPopUp() | |||
397 | // write defaults | 406 | // write defaults |
398 | if (!file.open( IO_WriteOnly ) ) { | 407 | if (!file.open( IO_WriteOnly ) ) { |
399 | return; | 408 | return; |
400 | } | 409 | } |
401 | QString configString ; | 410 | QString configString ; |
402 | configString += "#config file for kopi alarm timer\n"; | 411 | configString += "#config file for kopi alarm timer\n"; |
403 | configString += "#format: <Text for popup menu>;<timer countdown in minutes>\n"; | 412 | configString += "#format: <Text for popup menu>;<timer countdown in minutes>\n"; |
404 | configString += "24 hours; 1440\n"; | 413 | configString += "24 hours; 1440\n"; |
414 | configString += "9 hours; 540\n"; | ||
405 | configString += "8 hours; 480\n"; | 415 | configString += "8 hours; 480\n"; |
406 | configString += "5 hours; 300\n"; | ||
407 | configString += "1 hour; 60\n"; | 416 | configString += "1 hour; 60\n"; |
408 | configString += "30 min; 30\n"; | 417 | configString += "30 min; 30\n"; |
409 | configString += "15 min; 15\n"; | 418 | configString += "15 min; 15\n"; |
410 | configString += "SEPARATOR\n"; | 419 | configString += "SEPARATOR\n"; |
411 | configString += "Pizza; 22\n"; | 420 | configString += "Pizza; 22\n"; |
412 | configString += "Nap; 45\n"; | 421 | configString += "Nap; 45\n"; |
413 | configString += "Tea; 5\n"; | 422 | configString += "Tea; 5\n"; |
414 | QTextStream ts( &file ); | 423 | QTextStream ts( &file ); |
@@ -508,23 +517,25 @@ void SimpleAlarmDaemonImpl::confTimer( int time ) | |||
508 | return; | 517 | return; |
509 | } | 518 | } |
510 | if ( mTimerTime ) | 519 | if ( mTimerTime ) |
511 | return; | 520 | return; |
512 | if ( minutes == 1 ) { | 521 | if ( minutes == 1 ) { |
513 | return; | 522 | return; |
514 | } | 523 | } |
515 | QString mess = "timer_alarm"; | 524 | QString mess = "timer_alarm"; |
525 | QString disp; | ||
516 | mess += ("Timer Alarm!\n"); | 526 | mess += ("Timer Alarm!\n"); |
517 | if ( minutes == 3 ) { | 527 | if ( minutes == 3 ) { |
518 | mess += mCustomText; | 528 | mess += mCustomText; |
519 | minutes = mCustomMinutes ; | 529 | minutes = mCustomMinutes ; |
520 | mRunningTimerText = mCustomText.stripWhiteSpace (); | 530 | mRunningTimerText = mCustomText.stripWhiteSpace (); |
521 | int in = mRunningTimerText.find( " " ); | 531 | int in = mRunningTimerText.find( " " ); |
522 | mRunningTimerText = mRunningTimerText.left ( in ); | 532 | mRunningTimerText = mRunningTimerText.left ( in ); |
533 | disp = mCustomText; | ||
523 | } | 534 | } |
524 | else { | 535 | else { |
525 | if ( minutes == 2 ) { | 536 | if ( minutes == 2 ) { |
526 | // ask time | 537 | // ask time |
527 | QDialog dia ( 0, ("Customize Timer" ), true ); | 538 | QDialog dia ( 0, ("Customize Timer" ), true ); |
528 | QLabel lab (("Message Text:"), &dia ); | 539 | QLabel lab (("Message Text:"), &dia ); |
529 | dia.setCaption(("KO/Pi Timer" )); | 540 | dia.setCaption(("KO/Pi Timer" )); |
530 | QVBoxLayout lay( &dia ); | 541 | QVBoxLayout lay( &dia ); |
@@ -585,32 +596,42 @@ void SimpleAlarmDaemonImpl::confTimer( int time ) | |||
585 | return; | 596 | return; |
586 | mCustomText = lEdit.text(); | 597 | mCustomText = lEdit.text(); |
587 | mCustomMinutes = spinh.value()*60+spinm.value(); | 598 | mCustomMinutes = spinh.value()*60+spinm.value(); |
588 | if ( mCustomMinutes == 0 ) | 599 | if ( mCustomMinutes == 0 ) |
589 | mCustomMinutes = 1; | 600 | mCustomMinutes = 1; |
590 | if ( mCustomMinutes > 1440 ) | 601 | if ( mCustomMinutes > 1440 ) |
591 | mCustomMinutes = 1440; | 602 | mCustomMinutes = 1440; |
592 | mess += mCustomText; | 603 | mess += mCustomText; |
604 | disp = mCustomText; | ||
593 | minutes = mCustomMinutes; | 605 | minutes = mCustomMinutes; |
594 | mRunningTimerText = mCustomText.stripWhiteSpace (); | 606 | mRunningTimerText = mCustomText.stripWhiteSpace (); |
595 | int in = mRunningTimerText.find( " " ); | 607 | int in = mRunningTimerText.find( " " ); |
596 | mRunningTimerText = mRunningTimerText.left ( in ); | 608 | mRunningTimerText = mRunningTimerText.left ( in ); |
597 | } | 609 | } |
598 | else { | 610 | else { |
599 | mess += mTimerPopUp->text( minutes ); | 611 | mess += mTimerPopUp->text( minutes ); |
612 | disp = mTimerPopUp->text( minutes ); | ||
600 | mRunningTimerText = mTimerPopUp->text( minutes ); | 613 | mRunningTimerText = mTimerPopUp->text( minutes ); |
601 | minutes -= 10; | 614 | minutes -= 10; |
602 | } | 615 | } |
603 | } | 616 | } |
604 | //minutes = 1; | 617 | //minutes = 1; |
605 | 618 | ||
606 | mRunningTimer = QDateTime::currentDateTime().addSecs( minutes * 60 ); | 619 | mRunningTimer = QDateTime::currentDateTime().addSecs( minutes * 60 ); |
607 | timerMesssage = mess; | 620 | timerMesssage = mess; |
608 | AlarmServer::addAlarm ( mRunningTimer,"koalarm",timerMesssage.utf8()); | 621 | AlarmServer::addAlarm ( mRunningTimer,"koalarm",timerMesssage.utf8()); |
622 | mTimerStartLabel->setText( disp ); | ||
623 | int w = 200; | ||
624 | int h = mTimerStartLabel->sizeHint().height() ; | ||
625 | int dw = QApplication::desktop()->width(); | ||
626 | int dh = QApplication::desktop()->height(); | ||
627 | mTimerStartLabel->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | ||
628 | mTimerStartLabel->show(); | ||
629 | QTimer::singleShot( 3000, mTimerStartLabel, SLOT ( hide() ) ); | ||
609 | mTimerTime = 1; | 630 | mTimerTime = 1; |
610 | } | 631 | } |
611 | 632 | ||
612 | void SimpleAlarmDaemonImpl::writeFile() | 633 | void SimpleAlarmDaemonImpl::writeFile() |
613 | { | 634 | { |
614 | QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent"); | 635 | QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent"); |
615 | //QCopEnvelope e("QPE/Application/kopi", "-writeFile"); | 636 | //QCopEnvelope e("QPE/Application/kopi", "-writeFile"); |
616 | } | 637 | } |
diff --git a/kalarmd/simplealarmdaemonimpl.h b/kalarmd/simplealarmdaemonimpl.h index cbdba47..9b7de94 100644 --- a/kalarmd/simplealarmdaemonimpl.h +++ b/kalarmd/simplealarmdaemonimpl.h | |||
@@ -63,16 +63,17 @@ class SimpleAlarmDaemonImpl : public QLabel | |||
63 | void confSound( int num ); | 63 | void confSound( int num ); |
64 | void startAlarm(QString mess, QString fn ); | 64 | void startAlarm(QString mess, QString fn ); |
65 | 65 | ||
66 | protected: | 66 | protected: |
67 | void mousePressEvent( QMouseEvent * ); | 67 | void mousePressEvent( QMouseEvent * ); |
68 | 68 | ||
69 | private: | 69 | private: |
70 | AlarmDialog *mAlarmDialog; | 70 | AlarmDialog *mAlarmDialog; |
71 | QLabel * mTimerStartLabel; | ||
71 | int mPlayBeeps; | 72 | int mPlayBeeps; |
72 | int mPausePlay; | 73 | int mPausePlay; |
73 | int mSuspend; | 74 | int mSuspend; |
74 | QString mAlarmMessage; | 75 | QString mAlarmMessage; |
75 | int mTimerTime; | 76 | int mTimerTime; |
76 | int getFileNameLen( QString ); | 77 | int getFileNameLen( QString ); |
77 | QPopupMenu* mPopUp, *mBeepPopUp, *mTimerPopUp, *mSoundPopUp,*mPausePopUp,*mSuspendPopUp; | 78 | QPopupMenu* mPopUp, *mBeepPopUp, *mTimerPopUp, *mSoundPopUp,*mPausePopUp,*mSuspendPopUp; |
78 | QDateTime mRunningTimer; | 79 | QDateTime mRunningTimer; |