-rw-r--r-- | library/backend/rohfeedback.cpp | 28 | ||||
-rw-r--r-- | library/backend/rohfeedback.h | 3 |
2 files changed, 17 insertions, 14 deletions
diff --git a/library/backend/rohfeedback.cpp b/library/backend/rohfeedback.cpp index ff76a36..21aad34 100644 --- a/library/backend/rohfeedback.cpp +++ b/library/backend/rohfeedback.cpp | |||
@@ -1,7 +1,7 @@ | |||
1 | #include <rohfeedback.h> | 1 | #ifdef OPIE_WITHROHFEEDBACK |
2 | |||
3 | 2 | ||
3 | #include <rohfeedback.h> | ||
4 | #include <stdio.h> | 4 | #include <stdio.h> |
5 | #include <qpeapplication.h> | 5 | #include <qpeapplication.h> |
6 | #include <qevent.h> | 6 | #include <qevent.h> |
7 | #include <resource.h> | 7 | #include <resource.h> |
@@ -34,14 +34,13 @@ RoHFeedback::RoHFeedback() : | |||
34 | QString S; | 34 | QString S; |
35 | 35 | ||
36 | 36 | ||
37 | for( int i = 0; i < NOOFICONS ; i ++ ) { | 37 | for( int i = 0; i < NOOFICONS ; i ++ ) { |
38 | Imgs[i] = new QPixmap( Resource::loadPixmap("RoH/star/"+ | 38 | Imgs[i] = new QPixmap( Resource::loadPixmap( |
39 | QString::number(i+1) + | 39 | "RoH/star/"+ QString::number(i+1) + ".png" )); |
40 | ".png" )); | ||
41 | Masks[i] = new QBitmap(); | 40 | Masks[i] = new QBitmap(); |
42 | (*Masks[i]) = Resource::loadPixmap("RoH/star/"+QString::number(i+1) + | 41 | (*Masks[i]) = Resource::loadPixmap( |
43 | ".png" ); | 42 | "RoH/star/"+QString::number(i+1) + "-mask.png" ); |
44 | } | 43 | } |
45 | } | 44 | } |
46 | 45 | ||
47 | IconWidth = Imgs[0]->size().width(); | 46 | IconWidth = Imgs[0]->size().width(); |
@@ -65,18 +64,16 @@ void RoHFeedback::init( const QPoint & P, QWidget* wid ) { | |||
65 | if( ! IconWidth ) | 64 | if( ! IconWidth ) |
66 | return; | 65 | return; |
67 | 66 | ||
68 | Receiver = wid; | 67 | Receiver = wid; |
69 | IconNr = -1; | 68 | IconNr = FeedbackTimerStart; |
70 | move( P.x()-IconWidth/2, P.y() - IconHeight/2 ); | 69 | move( P.x()-IconWidth/2, P.y() - IconHeight/2 ); |
71 | // to initialize | 70 | // to initialize |
72 | Timer.start( DELAY - SPEED/NOOFICONS ); | 71 | Timer.start( DELAY ); |
73 | } | 72 | } |
74 | 73 | ||
75 | void RoHFeedback::stop( void ) { | 74 | void RoHFeedback::stop( void ) { |
76 | IconNr = -2; // stop | 75 | IconNr = FeedbackStopped; // stop |
77 | hide(); | ||
78 | Timer.stop(); | ||
79 | } | 76 | } |
80 | 77 | ||
81 | bool RoHFeedback::event( QEvent * E ) { | 78 | bool RoHFeedback::event( QEvent * E ) { |
82 | 79 | ||
@@ -99,15 +96,16 @@ bool RoHFeedback::event( QEvent * E ) { | |||
99 | 96 | ||
100 | void RoHFeedback::iconShow( void ) { | 97 | void RoHFeedback::iconShow( void ) { |
101 | switch( IconNr ) { | 98 | switch( IconNr ) { |
102 | case FeedbackTimerStart: | 99 | case FeedbackTimerStart: |
103 | IconNr = 0; | 100 | IconNr = FeedbackShow; |
104 | Timer.start( SPEED/NOOFICONS ); | 101 | Timer.start( SPEED/NOOFICONS ); |
105 | break; | 102 | break; |
106 | case FeedbackStopped: | 103 | case FeedbackStopped: |
107 | // stopped | 104 | // stopped |
108 | IconNr = FeedbackTimerStart; | 105 | IconNr = FeedbackTimerStart; |
109 | hide(); | 106 | hide(); |
107 | Timer.stop(); | ||
110 | break; | 108 | break; |
111 | case FeedbackShow: // first | 109 | case FeedbackShow: // first |
112 | show(); | 110 | show(); |
113 | // FT | 111 | // FT |
@@ -121,5 +119,7 @@ void RoHFeedback::iconShow( void ) { | |||
121 | } | 119 | } |
122 | } | 120 | } |
123 | 121 | ||
124 | } | 122 | } |
125 | } \ No newline at end of file | 123 | } |
124 | |||
125 | #endif | ||
diff --git a/library/backend/rohfeedback.h b/library/backend/rohfeedback.h index f38a095..9ffd35a 100644 --- a/library/backend/rohfeedback.h +++ b/library/backend/rohfeedback.h | |||
@@ -1,7 +1,9 @@ | |||
1 | #ifndef ROHFEEDBACK_H | 1 | #ifndef ROHFEEDBACK_H |
2 | #define ROHFEEDBACK_H | 2 | #define ROHFEEDBACK_H |
3 | 3 | ||
4 | #ifdef OPIE_WITHROHFEEDBACK | ||
5 | |||
4 | /* | 6 | /* |
5 | 7 | ||
6 | RightOnHold feedback show | 8 | RightOnHold feedback show |
7 | 9 | ||
@@ -59,4 +61,5 @@ protected : | |||
59 | } | 61 | } |
60 | } | 62 | } |
61 | 63 | ||
62 | #endif | 64 | #endif |
65 | #endif | ||