summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -302,14 +302,14 @@ void Clock::slotSetAlarm()
config.setGroup("Time");
QString tmp;
hour = setAlarmDlg->Hour_Slider->value();
minute = setAlarmDlg->Minute_Slider->value();
snoozeTime=setAlarmDlg->SnoozeSlider->value();
if(ampm) {
- if ( hour == 12 )
- hour = 0;
+ if ( hour == 12 )
+ hour = 0;
if(setAlarmDlg->Pm_RadioButton->isChecked() && hour < 12 )
hour+=12;
}
config.writeEntry("clockAlarmHour", tmp.setNum( hour ),10);
config.writeEntry("clockAlarmMinute",tmp.setNum( minute ),10);
@@ -384,14 +384,23 @@ void Clock::appMessage(const QCString& msg, const QByteArray& data)
{
int stopTimer = 0;
int timerStay = 5000;
bSound=TRUE;
qDebug("Message received in clock");
if ( msg == "alarm(QDateTime,int)" ) {
+ Config config( "qpe" );
+ config.setGroup("Time");
+ if(config.readBoolEntry("mp3Alarm",0)){
+
+ QCopEnvelope e("QPE/Application/opieplayer","setDocument(QString)");
+ e<<config.readEntry("mp3File","");
+ } else {
+
Sound::soundAlarm();
stopTimer = startTimer( timerStay);
+ }
}
show();
raise();
QPEApplication::setKeepRunning();
setActiveWindow();
}
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
@@ -11,35 +11,38 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
***************************************************************************/
#include "setAlarm.h"
-#include <qpe/config.h>
+#include <opie/ofileselector.h>
+#include <opie/ofiledialog.h>
+#include <qpe/config.h>
#include <qpe/qpeapplication.h>
#include <qstring.h>
#include <qlabel.h>
#include <qlcdnumber.h>
#include <qpushbutton.h>
#include <qradiobutton.h>
#include <qslider.h>
#include <qlayout.h>
#include <qvariant.h>
#include <qtooltip.h>
#include <qwhatsthis.h>
#include <qbuttongroup.h>
+#include <qcheckbox.h>
Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl )
: QDialog( parent, name, modal, fl )
{
if ( !name )
setName( "Set_Alarm" );
resize( 240, 101 );
setMaximumSize( QSize( 240, 320 ) );
- move(0,48);
+ move(0,45);
setCaption( tr( "Set Alarm" ) );
connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
Set_AlarmLayout = new QGridLayout( this );
Set_AlarmLayout->setSpacing( 6 );
Set_AlarmLayout->setMargin( 11 );
@@ -94,12 +97,18 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
Pm_RadioButton = new QRadioButton( this, "Pm_RadioButton" );
Pm_RadioButton->setText( tr( "PM" ) );
connect( Pm_RadioButton, SIGNAL(toggled(bool)),this,SLOT( pmButtonToggled(bool)));
Set_AlarmLayout->addMultiCellWidget(Pm_RadioButton, 1, 2, 3, 4 );
+ useMp3Check = new QCheckBox ( tr( "mp3 alarm" ), this );
+ useMp3Check-> setFocusPolicy ( QWidget::NoFocus );
+ Set_AlarmLayout->addMultiCellWidget( useMp3Check, 2, 3, 3, 4 );
+
+
+
TextLabel3 = new QLabel( this, "TextLabel3" );
TextLabel3->setText( tr( "Snooze Delay\n(minutes)" ) );
Set_AlarmLayout->addMultiCellWidget( TextLabel3, 3, 3, 0, 1 );
Snooze_LCDNumber = new QLCDNumber( this, "Snooze_LCDNumber" );
@@ -111,13 +120,13 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
SnoozeSlider = new QSlider( this, "SnoozeSlider" );
SnoozeSlider->setMaxValue( 60 );
SnoozeSlider->setOrientation( QSlider::Horizontal );
connect(SnoozeSlider, SIGNAL( valueChanged(int)),this,SLOT(slotChangeSnooze(int)));
- Set_AlarmLayout->addMultiCellWidget( SnoozeSlider, 3, 3, 3, 4 );
+ Set_AlarmLayout->addMultiCellWidget( SnoozeSlider, 4, 4, 1, 2 );
Config config( "qpe" );
config.setGroup("Time");
bool ok;
bool ampm = config.readBoolEntry( "AMPM", TRUE );
@@ -145,13 +154,17 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
Hour_Slider->setValue( i_alarmHour);
Minute_Slider->setValue( alarmMinute.toInt(&ok,10) );
SnoozeSlider->setValue( snoozeTime.toInt(&ok,10) );
Am_RadioButton->hide();
Pm_RadioButton->hide();
}
+ if( config.readBoolEntry("mp3Alarm") )
+ useMp3Check->setChecked(true);
+
// signals and slots connections
+ connect(useMp3Check,SIGNAL(toggled(bool)),this,SLOT(slotChangemp3CkeckBox(bool)));
}
Set_Alarm::~Set_Alarm()
{
}
@@ -183,6 +196,22 @@ void Set_Alarm::pmButtonToggled(bool b)
Am_RadioButton->setChecked(FALSE);
}
void Set_Alarm::cleanUp()
{
}
+
+void Set_Alarm::slotChangemp3CkeckBox(bool b) {
+ Config config( "qpe" );
+ config.setGroup("Time");
+ if(b) {
+ QString str = OFileDialog::getOpenFileName( 2,"/");//,"", "*", this );
+ if(!str.isEmpty() ) {
+ qDebug(str);
+ config.writeEntry("mp3Alarm",1);
+ config.writeEntry("mp3File",str);
+ }
+ } else {
+ config.writeEntry("mp3Alarm",0);
+ config.writeEntry("mp3File","");
+ }
+}
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
@@ -23,13 +23,13 @@ class QHBoxLayout;
class QGridLayout;
class QLCDNumber;
class QLabel;
class QRadioButton;
class QSlider;
class QButtonGroup;
-
+class QCheckBox;
class Set_Alarm : public QDialog
{
Q_OBJECT
public:
Set_Alarm( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
@@ -40,13 +40,15 @@ public:
QLCDNumber *Hour_LCDNumber, *Minute_LCDNumber, *Snooze_LCDNumber;
QRadioButton* Am_RadioButton;
QRadioButton* Pm_RadioButton;
QButtonGroup *ButtonGroup1;
+ QCheckBox *useMp3Check;
protected slots:
+ void slotChangemp3CkeckBox(bool);
void slotChangeHour(int);
void slotChangeMinute(int);
void slotChangeSnooze(int);
void amButtonToggled(bool);
void pmButtonToggled(bool);
void cleanUp();