summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/clock/clock.cpp13
-rw-r--r--noncore/tools/clock/setAlarm.cpp35
-rw-r--r--noncore/tools/clock/setAlarm.h4
3 files changed, 46 insertions, 6 deletions
diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index a47793b..69d8214 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -306,6 +306,6 @@ void Clock::slotSetAlarm()
306 snoozeTime=setAlarmDlg->SnoozeSlider->value(); 306 snoozeTime=setAlarmDlg->SnoozeSlider->value();
307 if(ampm) { 307 if(ampm) {
308 if ( hour == 12 ) 308 if ( hour == 12 )
309 hour = 0; 309 hour = 0;
310 310
311 if(setAlarmDlg->Pm_RadioButton->isChecked() && hour < 12 ) 311 if(setAlarmDlg->Pm_RadioButton->isChecked() && hour < 12 )
@@ -388,6 +388,15 @@ void Clock::appMessage(const QCString& msg, const QByteArray& data)
388 qDebug("Message received in clock"); 388 qDebug("Message received in clock");
389 if ( msg == "alarm(QDateTime,int)" ) { 389 if ( msg == "alarm(QDateTime,int)" ) {
390 Config config( "qpe" );
391 config.setGroup("Time");
392 if(config.readBoolEntry("mp3Alarm",0)){
393
394 QCopEnvelope e("QPE/Application/opieplayer","setDocument(QString)");
395 e<<config.readEntry("mp3File","");
396 } else {
397
390 Sound::soundAlarm(); 398 Sound::soundAlarm();
391 stopTimer = startTimer( timerStay); 399 stopTimer = startTimer( timerStay);
400 }
392 } 401 }
393 show(); 402 show();
diff --git a/noncore/tools/clock/setAlarm.cpp b/noncore/tools/clock/setAlarm.cpp
index 990ff81..38de396 100644
--- a/noncore/tools/clock/setAlarm.cpp
+++ b/noncore/tools/clock/setAlarm.cpp
@@ -15,6 +15,8 @@
15#include "setAlarm.h" 15#include "setAlarm.h"
16 16
17#include <qpe/config.h> 17#include <opie/ofileselector.h>
18#include <opie/ofiledialog.h>
18 19
20#include <qpe/config.h>
19#include <qpe/qpeapplication.h> 21#include <qpe/qpeapplication.h>
20#include <qstring.h> 22#include <qstring.h>
@@ -29,4 +31,5 @@
29#include <qwhatsthis.h> 31#include <qwhatsthis.h>
30#include <qbuttongroup.h> 32#include <qbuttongroup.h>
33#include <qcheckbox.h>
31 34
32Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl ) 35Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl )
@@ -37,5 +40,5 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
37 resize( 240, 101 ); 40 resize( 240, 101 );
38 setMaximumSize( QSize( 240, 320 ) ); 41 setMaximumSize( QSize( 240, 320 ) );
39 move(0,48); 42 move(0,45);
40 setCaption( tr( "Set Alarm" ) ); 43 setCaption( tr( "Set Alarm" ) );
41 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); 44 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
@@ -98,4 +101,10 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
98 Set_AlarmLayout->addMultiCellWidget(Pm_RadioButton, 1, 2, 3, 4 ); 101 Set_AlarmLayout->addMultiCellWidget(Pm_RadioButton, 1, 2, 3, 4 );
99 102
103 useMp3Check = new QCheckBox ( tr( "mp3 alarm" ), this );
104 useMp3Check-> setFocusPolicy ( QWidget::NoFocus );
105 Set_AlarmLayout->addMultiCellWidget( useMp3Check, 2, 3, 3, 4 );
106
107
108
100 TextLabel3 = new QLabel( this, "TextLabel3" ); 109 TextLabel3 = new QLabel( this, "TextLabel3" );
101 TextLabel3->setText( tr( "Snooze Delay\n(minutes)" ) ); 110 TextLabel3->setText( tr( "Snooze Delay\n(minutes)" ) );
@@ -115,5 +124,5 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
115 connect(SnoozeSlider, SIGNAL( valueChanged(int)),this,SLOT(slotChangeSnooze(int))); 124 connect(SnoozeSlider, SIGNAL( valueChanged(int)),this,SLOT(slotChangeSnooze(int)));
116 125
117 Set_AlarmLayout->addMultiCellWidget( SnoozeSlider, 3, 3, 3, 4 ); 126 Set_AlarmLayout->addMultiCellWidget( SnoozeSlider, 4, 4, 1, 2 );
118 127
119 Config config( "qpe" ); 128 Config config( "qpe" );
@@ -149,5 +158,9 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
149 Pm_RadioButton->hide(); 158 Pm_RadioButton->hide();
150 } 159 }
160 if( config.readBoolEntry("mp3Alarm") )
161 useMp3Check->setChecked(true);
162
151 // signals and slots connections 163 // signals and slots connections
164 connect(useMp3Check,SIGNAL(toggled(bool)),this,SLOT(slotChangemp3CkeckBox(bool)));
152} 165}
153 166
@@ -187,2 +200,18 @@ void Set_Alarm::cleanUp()
187{ 200{
188} 201}
202
203void Set_Alarm::slotChangemp3CkeckBox(bool b) {
204 Config config( "qpe" );
205 config.setGroup("Time");
206 if(b) {
207 QString str = OFileDialog::getOpenFileName( 2,"/");//,"", "*", this );
208 if(!str.isEmpty() ) {
209 qDebug(str);
210 config.writeEntry("mp3Alarm",1);
211 config.writeEntry("mp3File",str);
212 }
213 } else {
214 config.writeEntry("mp3Alarm",0);
215 config.writeEntry("mp3File","");
216 }
217}
diff --git a/noncore/tools/clock/setAlarm.h b/noncore/tools/clock/setAlarm.h
index 7d63237..a21af05 100644
--- a/noncore/tools/clock/setAlarm.h
+++ b/noncore/tools/clock/setAlarm.h
@@ -27,5 +27,5 @@ class QRadioButton;
27class QSlider; 27class QSlider;
28class QButtonGroup; 28class QButtonGroup;
29 29class QCheckBox;
30class Set_Alarm : public QDialog 30class Set_Alarm : public QDialog
31{ 31{
@@ -44,5 +44,7 @@ public:
44 QRadioButton* Pm_RadioButton; 44 QRadioButton* Pm_RadioButton;
45 QButtonGroup *ButtonGroup1; 45 QButtonGroup *ButtonGroup1;
46 QCheckBox *useMp3Check;
46protected slots: 47protected slots:
48 void slotChangemp3CkeckBox(bool);
47 void slotChangeHour(int); 49 void slotChangeHour(int);
48 void slotChangeMinute(int); 50 void slotChangeMinute(int);