-rw-r--r-- | noncore/tools/clock/clock.cpp | 6 | ||||
-rw-r--r-- | noncore/tools/clock/clock.h | 5 | ||||
-rw-r--r-- | pics/clock/bg.png | bin | 0 -> 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 | |||
@@ -516,6 +516,10 @@ void Clock::timerEvent( QTimerEvent *e ) | |||
516 | } | 516 | } |
517 | } | 517 | } |
518 | 518 | ||
519 | AnalogClock::AnalogClock(QWidget * parent, const char * name) : QFrame( parent, name ), clear(true) | ||
520 | { | ||
521 | bg = Resource::loadPixmap("clock/bg"); | ||
522 | } | ||
519 | 523 | ||
520 | QSizePolicy AnalogClock::sizePolicy() const | 524 | QSizePolicy AnalogClock::sizePolicy() const |
521 | { | 525 | { |
@@ -527,6 +531,8 @@ void AnalogClock::drawContents( QPainter *p ) | |||
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 |
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 | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include <qdatetime.h> | 23 | #include <qdatetime.h> |
24 | #include <qvbox.h> | 24 | #include <qvbox.h> |
25 | #include <qpixmap.h> | ||
25 | 26 | ||
26 | class QLCDNumber; | 27 | class QLCDNumber; |
27 | class QLabel; | 28 | class QLabel; |
@@ -35,8 +36,7 @@ class AnalogClock : public QFrame | |||
35 | Q_OBJECT | 36 | Q_OBJECT |
36 | 37 | ||
37 | public: | 38 | public: |
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 | ||
@@ -47,6 +47,7 @@ protected: | |||
47 | 47 | ||
48 | private: | 48 | private: |
49 | 49 | ||
50 | QPixmap bg; | ||
50 | QTime currTime; | 51 | QTime currTime; |
51 | QTime prevTime; | 52 | QTime prevTime; |
52 | bool clear; | 53 | bool clear; |
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 | |||