summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-04-24 21:04:40 (UTC)
committer kergoth <kergoth>2003-04-24 21:04:40 (UTC)
commitf7ed0f1e02fa05b330d94b2a4928f3e249edb98f (patch) (unidiff)
tree300a828ddf7f4d8c7441f394c0cd828cd5200be2
parentb59b200a00486bc68810317eb7f14c565604a475 (diff)
downloadopie-f7ed0f1e02fa05b330d94b2a4928f3e249edb98f.zip
opie-f7ed0f1e02fa05b330d94b2a4928f3e249edb98f.tar.gz
opie-f7ed0f1e02fa05b330d94b2a4928f3e249edb98f.tar.bz2
Add background to the clock.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/clock/clock.cpp6
-rw-r--r--noncore/tools/clock/clock.h5
-rw-r--r--pics/clock/bg.pngbin0 -> 14019 bytes
3 files changed, 9 insertions, 2 deletions
diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index 74b7147..41c99a8 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -513,23 +513,29 @@ void Clock::timerEvent( QTimerEvent *e )
513 killTimer( e->timerId() ); 513 killTimer( e->timerId() );
514 clearTimer(); 514 clearTimer();
515 setCaption( tr( "Clock: Alarm was missed." ) ); 515 setCaption( tr( "Clock: Alarm was missed." ) );
516 } 516 }
517} 517}
518 518
519AnalogClock::AnalogClock(QWidget * parent, const char * name) : QFrame( parent, name ), clear(true)
520{
521 bg = Resource::loadPixmap("clock/bg");
522}
519 523
520QSizePolicy AnalogClock::sizePolicy() const 524QSizePolicy AnalogClock::sizePolicy() const
521{ 525{
522 return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); 526 return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
523} 527}
524 528
525void AnalogClock::drawContents( QPainter *p ) 529void AnalogClock::drawContents( QPainter *p )
526{ 530{
527 QRect r = contentsRect(); 531 QRect r = contentsRect();
528 QRect fr; 532 QRect fr;
529 533
534 p->drawPixmap(QPoint(0, 0), bg, r);
535
530 if ( r. width ( ) > r. height ( )) 536 if ( r. width ( ) > r. height ( ))
531 fr. setRect (( r. width ( ) - r. height ( )) / 2, r. y ( ), r. height ( ), r. height ( )); 537 fr. setRect (( r. width ( ) - r. height ( )) / 2, r. y ( ), r. height ( ), r. height ( ));
532 else 538 else
533 fr. setRect ( r. x ( ), ( r. height ( ) - r. width ( )) / 2, r. width ( ), r. width ( )); 539 fr. setRect ( r. x ( ), ( r. height ( ) - r. width ( )) / 2, r. width ( ), r. width ( ));
534 540
535 QPoint center = fr. center ( ); // ( fr.x() + fr.width() / 2, fr.y() + fr.height() / 2 ); 541 QPoint center = fr. center ( ); // ( fr.x() + fr.width() / 2, fr.y() + fr.height() / 2 );
diff --git a/noncore/tools/clock/clock.h b/noncore/tools/clock/clock.h
index 1e5aa2c..fa12b61 100644
--- a/noncore/tools/clock/clock.h
+++ b/noncore/tools/clock/clock.h
@@ -19,12 +19,13 @@
19**********************************************************************/ 19**********************************************************************/
20#ifndef CLOCK_H 20#ifndef CLOCK_H
21#define CLOCK_H 21#define CLOCK_H
22 22
23#include <qdatetime.h> 23#include <qdatetime.h>
24#include <qvbox.h> 24#include <qvbox.h>
25#include <qpixmap.h>
25 26
26class QLCDNumber; 27class QLCDNumber;
27class QLabel; 28class QLabel;
28class QTimer; 29class QTimer;
29class QRadioButton; 30class QRadioButton;
30class QPushButton; 31class QPushButton;
@@ -32,24 +33,24 @@ class QDateTime;
32 33
33class AnalogClock : public QFrame 34class AnalogClock : public QFrame
34{ 35{
35 Q_OBJECT 36 Q_OBJECT
36 37
37public: 38public:
38 AnalogClock( QWidget * parent = 0, const char * name = 0 ) 39 AnalogClock( QWidget * parent = 0, const char * name = 0 );
39 : QFrame( parent, name ), clear(true) {}
40 40
41 QSizePolicy sizePolicy() const; 41 QSizePolicy sizePolicy() const;
42 42
43 void display( const QTime& time ); 43 void display( const QTime& time );
44 44
45protected: 45protected:
46 void drawContents( QPainter *p ); 46 void drawContents( QPainter *p );
47 47
48private: 48private:
49 49
50 QPixmap bg;
50 QTime currTime; 51 QTime currTime;
51 QTime prevTime; 52 QTime prevTime;
52 bool clear; 53 bool clear;
53 54
54 QPoint rotate( QPoint center, QPoint p, int angle ); 55 QPoint rotate( QPoint center, QPoint p, int angle );
55 void drawPointers ( QPainter *, const QRect &r, const QColor &c, const QTime &t, const QTime *t2 = 0 ); 56 void drawPointers ( QPainter *, const QRect &r, const QColor &c, const QTime &t, const QTime *t2 = 0 );
diff --git a/pics/clock/bg.png b/pics/clock/bg.png
new file mode 100644
index 0000000..0954ca6
--- a/dev/null
+++ b/pics/clock/bg.png
Binary files differ