-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 | |||
@@ -503,43 +503,49 @@ void Clock::timerEvent( QTimerEvent *e ) | |||
503 | { | 503 | { |
504 | static int stop = 0; | 504 | static int stop = 0; |
505 | if ( stop < 120 && bSound ) | 505 | if ( stop < 120 && bSound ) |
506 | { | 506 | { |
507 | Sound::soundAlarm(); | 507 | Sound::soundAlarm(); |
508 | stop++; | 508 | stop++; |
509 | } | 509 | } |
510 | else | 510 | else |
511 | { | 511 | { |
512 | stop = 0; | 512 | stop = 0; |
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 | ||
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 | { |
522 | return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); | 526 | return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); |
523 | } | 527 | } |
524 | 528 | ||
525 | void AnalogClock::drawContents( QPainter *p ) | 529 | void 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 ); |
536 | QPoint l1 ( center. x ( ), fr. y ( ) + 2 ); | 542 | QPoint l1 ( center. x ( ), fr. y ( ) + 2 ); |
537 | QPoint l2 ( center. x ( ), fr. y ( ) + 8 ); | 543 | QPoint l2 ( center. x ( ), fr. y ( ) + 8 ); |
538 | 544 | ||
539 | 545 | ||
540 | 546 | ||
541 | if ( clear ) | 547 | if ( clear ) |
542 | { | 548 | { |
543 | erase ( r ); | 549 | erase ( r ); |
544 | p-> setPen ( NoPen ); | 550 | p-> setPen ( NoPen ); |
545 | p-> setBrush ( colorGroup ( ). color ( QColorGroup::Base )); | 551 | p-> setBrush ( colorGroup ( ). color ( QColorGroup::Base )); |
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 | |||
@@ -9,57 +9,58 @@ | |||
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
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 | ||
26 | class QLCDNumber; | 27 | class QLCDNumber; |
27 | class QLabel; | 28 | class QLabel; |
28 | class QTimer; | 29 | class QTimer; |
29 | class QRadioButton; | 30 | class QRadioButton; |
30 | class QPushButton; | 31 | class QPushButton; |
31 | class QDateTime; | 32 | class QDateTime; |
32 | 33 | ||
33 | class AnalogClock : public QFrame | 34 | class AnalogClock : public QFrame |
34 | { | 35 | { |
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 | ||
43 | void display( const QTime& time ); | 43 | void display( const QTime& time ); |
44 | 44 | ||
45 | protected: | 45 | protected: |
46 | void drawContents( QPainter *p ); | 46 | void drawContents( QPainter *p ); |
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; |
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 ); |
56 | 57 | ||
57 | }; | 58 | }; |
58 | 59 | ||
59 | class Clock : public QVBox | 60 | class Clock : public QVBox |
60 | { | 61 | { |
61 | Q_OBJECT | 62 | Q_OBJECT |
62 | 63 | ||
63 | public: | 64 | public: |
64 | Clock( QWidget * parent = 0, const char * name = 0, WFlags f=0 ); | 65 | Clock( QWidget * parent = 0, const char * name = 0, WFlags f=0 ); |
65 | ~Clock(); | 66 | ~Clock(); |
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 | |||