summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/tools/clock/clock.cpp53
-rw-r--r--noncore/tools/clock/clock.h2
-rw-r--r--noncore/tools/clock/clock.pro2
3 files changed, 48 insertions, 9 deletions
diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index 2f81c3a..0937362 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -42,20 +42,35 @@
#include <qpushbutton.h>
#include <qradiobutton.h>
#include <qbuttongroup.h>
#include <qpainter.h>
#include <qmessagebox.h>
#include <qdatetime.h>
#include <math.h>
+#include <unistd.h>
+#include <sys/types.h>
+
+#include <pthread.h>
+
const double deg2rad = 0.017453292519943295769; // pi/180
const int sw_prec = 2;
+void startPlayer()
+{
+ Config config( "qpe" );
+ config.setGroup( "Time" );
+ sleep(15);
+ QCopEnvelope e( "QPE/Application/opieplayer", "setDocument(QString)" );
+ e << config.readEntry( "mp3File", "" );
+}
+
+
static void toggleScreenSaver( bool on )
{
QCopEnvelope e( "QPE/System", "setScreenSaverMode(int)" );
e << ( on ? QPEApplication::Enable : QPEApplication::DisableSuspend );
}
Clock::Clock( QWidget * parent, const char * name, WFlags f )
: QVBox( parent, name , f )
@@ -392,31 +407,57 @@ void Clock::alarmOff()
bSound = FALSE;
AlarmServer::deleteAlarm( when,
"QPE/Application/clock",
"alarm(QDateTime,int)", warn );
qDebug( "Alarm Off " + when.toString() );
setCaption( "Clock" );
}
+void Clock::clearTimer()
+{
+ alarmOffBtn->setText( tr( "Alarm Is Off" ) );
+ alarmBool = FALSE;
+ snoozeBtn->hide();
+ setCaption( "Clock" );
+}
+
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 ) ) {
+ if ( config.readBoolEntry( "mp3Alarm", 0 ) )
+ {
+ clearTimer();
+// pid_t pid;
+// switch(pid = fork())
+// {
+// case -1:
+// {//failed
+// }
+// break;
+// case 0:
+// {//child
+// QCopEnvelope e( "QPE/Application/opieplayer", "setDocument(QString)" );
+// e << config.readEntry( "mp3File", "" );
+ pthread_t thread;
+ pthread_create(&thread, NULL, (void * (*) (void *))startPlayer, NULL/* &*/);
+// startPlayer();
+// }
+// break;
+// };
- QCopEnvelope e( "QPE/Application/opieplayer", "setDocument(QString)" );
- e << config.readEntry( "mp3File", "" );
}
- else {
+ else
+ {
Sound::soundAlarm();
stopTimer = startTimer( timerStay );
}
}
show();
raise();
QPEApplication::setKeepRunning();
@@ -428,19 +469,17 @@ void Clock::timerEvent( QTimerEvent *e )
static int stop = 0;
if ( stop < 120 && bSound ) {
Sound::soundAlarm();
stop++;
}
else {
stop = 0;
killTimer( e->timerId() );
- alarmOffBtn->setText( tr( "Alarm Is Off" ) );
- alarmBool = FALSE;
- snoozeBtn->hide();
+ clearTimer();
setCaption( tr( "Clock: Alarm was missed." ) );
}
}
QSizePolicy AnalogClock::sizePolicy() const
{
return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
diff --git a/noncore/tools/clock/clock.h b/noncore/tools/clock/clock.h
index 092d84f..23cc143 100644
--- a/noncore/tools/clock/clock.h
+++ b/noncore/tools/clock/clock.h
@@ -75,17 +75,17 @@ private slots:
void slotToggleAlarm();
void alarmOn();
void alarmOff();
void appMessage(const QCString& msg, const QByteArray& data);
void timerEvent( QTimerEvent *e );
void slotAdjustTime();
private:
void clearClock();
-
+ void clearTimer();
bool alarmBool;
QTimer *t;
QLCDNumber *lcd;
QLabel *date;
QLabel *ampmLabel;
QPushButton *set, *reset, *alarmBtn, *snoozeBtn, *alarmOffBtn;
QRadioButton *clockRB, *swatchRB;
AnalogClock *aclock;
diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro
index 29dd52b..8b92118 100644
--- a/noncore/tools/clock/clock.pro
+++ b/noncore/tools/clock/clock.pro
@@ -1,17 +1,17 @@
TEMPLATE = app
CONFIG = qt warn_on release
DESTDIR = $(OPIEDIR)/bin
HEADERS = clock.h setAlarm.h
SOURCES = clock.cpp setAlarm.cpp \
main.cpp
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopie -lpthread
INTERFACES =
TARGET = clock
TRANSLATIONS = ../../../i18n/de/clock.ts \
../../../i18n/xx/clock.ts \
../../../i18n/en/clock.ts \
../../../i18n/es/clock.ts \
../../../i18n/fr/clock.ts \