summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-05-31 13:00:05 (UTC)
committer llornkcor <llornkcor>2002-05-31 13:00:05 (UTC)
commit075f2ae74f328581ec0db05d633961f3baa5ed36 (patch) (side-by-side diff)
tree370eb2838813a9fa2aaf47e32f6e711dd2a8f36e
parentdd08e7fa2ccbcc0489c17ed305b20a9a7d187161 (diff)
downloadopie-075f2ae74f328581ec0db05d633961f3baa5ed36.zip
opie-075f2ae74f328581ec0db05d633961f3baa5ed36.tar.gz
opie-075f2ae74f328581ec0db05d633961f3baa5ed36.tar.bz2
added clock to popup if closed before app gets alarm message
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/clock/clock.cpp11
-rw-r--r--noncore/tools/clock/clock.h1
2 files changed, 9 insertions, 3 deletions
diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index 0a21146..9b9e644 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -8,24 +8,25 @@
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
+// changes added and Copyright (C) by L. J. Potter <ljp@llornkcor.com> 2002
#include "clock.h"
#include "setAlarm.h"
#include <qpe/qpeapplication.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/config.h>
#include <qpe/timestring.h>
#include <qpe/alarmserver.h>
#include <qpe/sound.h>
#include <qpe/resource.h>
#include <qsound.h>
@@ -57,24 +58,25 @@ static void toggleScreenSaver( bool on )
}
Clock::Clock( QWidget * parent, const char * name, WFlags f )
: QVBox( parent, name , f )
{
setSpacing( 4 );
setMargin( 1 );
Config config( "qpe" );
config.setGroup("Time");
ampm = config.readBoolEntry( "AMPM", TRUE );
+
snoozeBtn = new QPushButton ( this);
snoozeBtn->setText( tr( "Snooze" ) );
aclock = new AnalogClock( this );
aclock->display( QTime::currentTime() );
aclock->setLineWidth( 2 );
QHBox *hb = new QHBox( this );
hb->setMargin( 0 );
QWidget *space = new QWidget( hb );
lcd = new QLCDNumber( hb );
lcd->setSegmentStyle( QLCDNumber::Flat );
@@ -371,28 +373,33 @@ void Clock::alarmOff()
AlarmServer::deleteAlarm( when,
"QPE/Application/clock",
"alarm(QDateTime,int)", warn );
qDebug("Alarm Off "+ when.toString());
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)" ) {
Sound::soundAlarm();
stopTimer = startTimer( timerStay);
}
+ show();
+ raise();
+ QPEApplication::setKeepRunning();
+ setActiveWindow();
}
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" ) );
@@ -476,17 +483,17 @@ void AnalogClock::display( const QTime& t )
repaint( false );
}
QPoint AnalogClock::rotate( QPoint c, QPoint p, int a )
{
double angle = deg2rad * ( - a + 180 );
double nx = c.x() - ( p.x() - c.x() ) * cos( angle ) -
( p.y() - c.y() ) * sin( angle );
double ny = c.y() - ( p.y() - c.y() ) * cos( angle ) +
( p.x() - c.x() ) * sin( angle );
return QPoint( nx, ny );
}
-void Clock::slotAdjustTime()
-{
+
+void Clock::slotAdjustTime() {
QCopEnvelope e("QPE/System", "execute(QString)");
e << QString("systemtime");
}
diff --git a/noncore/tools/clock/clock.h b/noncore/tools/clock/clock.h
index 024dd28..be71b9d 100644
--- a/noncore/tools/clock/clock.h
+++ b/noncore/tools/clock/clock.h
@@ -68,25 +68,24 @@ private slots:
void slotReset();
void modeSelect(int);
void updateClock();
void changeClock( bool );
void slotSetAlarm();
void slotSnooze();
void slotToggleAlarm();
void alarmOn();
void alarmOff();
void appMessage(const QCString& msg, const QByteArray& data);
void timerEvent( QTimerEvent *e );
void slotAdjustTime();
-
private:
void clearClock();
bool alarmBool;
QTimer *t;
QLCDNumber *lcd;
QLabel *date;
QLabel *ampmLabel;
QPushButton *set, *reset, *alarmBtn, *snoozeBtn, *alarmOffBtn;
QRadioButton *clockRB, *swatchRB;
AnalogClock *aclock;
QTime swatch_start;