author | simon <simon> | 2002-12-09 15:23:45 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-09 15:23:45 (UTC) |
commit | ab22599627d84a6c6427d2440da4271b48f47c8e (patch) (unidiff) | |
tree | 7afdd78444dc58245a5dd3a110f454354ddd3e2f /noncore | |
parent | 47d689545e68f2439cc88630ac78016712f92cc9 (diff) | |
download | opie-ab22599627d84a6c6427d2440da4271b48f47c8e.zip opie-ab22599627d84a6c6427d2440da4271b48f47c8e.tar.gz opie-ab22599627d84a6c6427d2440da4271b48f47c8e.tar.bz2 |
- minor cleanup
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 11 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index 3a44185..b73a5c0 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -83,38 +83,41 @@ void MediaWidget::handleCommand( Command command, bool buttonDown ) | |||
83 | case VolumeUp: emit moreReleased(); return; | 83 | case VolumeUp: emit moreReleased(); return; |
84 | case VolumeDown: emit lessReleased(); return; | 84 | case VolumeDown: emit lessReleased(); return; |
85 | case PlayList: mediaPlayerState.setList(); return; | 85 | case PlayList: mediaPlayerState.setList(); return; |
86 | case Forward: emit forwardReleased(); return; | 86 | case Forward: emit forwardReleased(); return; |
87 | case Back: emit backReleased(); return; | 87 | case Back: emit backReleased(); return; |
88 | } | 88 | } |
89 | } | 89 | } |
90 | 90 | ||
91 | bool MediaWidget::isOverButton( const QPoint &position, int buttonId ) const | 91 | bool MediaWidget::isOverButton( const QPoint &position, int buttonId ) const |
92 | { | 92 | { |
93 | return ( position.x() > 0 && position.y() > 0 && | 93 | return ( position.x() > 0 && position.y() > 0 && |
94 | position.x() < buttonMask.width() && | 94 | position.x() < buttonMask.width() && |
95 | position.y() < buttonMask.height() && | 95 | position.y() < buttonMask.height() && |
96 | buttonMask.pixelIndex( position.x(), position.y() ) == buttonId + 1 ); | 96 | buttonMask.pixelIndex( position.x(), position.y() ) == buttonId + 1 ); |
97 | } | 97 | } |
98 | 98 | ||
99 | void MediaWidget::paintButton( int buttonId ) | 99 | void MediaWidget::paintButton( const Button &button ) |
100 | { | 100 | { |
101 | QPainter p( this ); | 101 | QPainter p( this ); |
102 | paintButton( p, buttons[ buttonId ] ); | 102 | paintButton( p, button ); |
103 | } | 103 | } |
104 | 104 | ||
105 | void MediaWidget::paintButton( QPainter &p, const Button &button ) | 105 | void MediaWidget::paintButton( QPainter &p, const Button &button ) |
106 | { | 106 | { |
107 | if ( button.isDown ) | 107 | if ( button.isDown ) |
108 | p.drawPixmap( upperLeftOfButtonMask, button.pixDown ); | 108 | p.drawPixmap( upperLeftOfButtonMask, button.pixDown ); |
109 | else | 109 | else |
110 | p.drawPixmap( upperLeftOfButtonMask, button.pixUp ); | 110 | p.drawPixmap( upperLeftOfButtonMask, button.pixUp ); |
111 | } | 111 | } |
112 | 112 | ||
113 | void MediaWidget::toggleButton( int buttonId ) | 113 | void MediaWidget::toggleButton( int buttonId ) |
114 | { | 114 | { |
115 | buttons[ buttonId ].isDown = !buttons[ buttonId ].isDown; | 115 | Button &button = buttons[ buttonId ]; |
116 | paintButton( buttonId ); | 116 | |
117 | button.isDown = !button.isDown; | ||
118 | |||
119 | paintButton( button ); | ||
117 | } | 120 | } |
118 | 121 | ||
119 | /* vim: et sw=4 ts=4 | 122 | /* vim: et sw=4 ts=4 |
120 | */ | 123 | */ |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 8cdaad1..dcf7fb8 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -74,33 +74,33 @@ public slots: | |||
74 | 74 | ||
75 | signals: | 75 | signals: |
76 | void moreReleased(); | 76 | void moreReleased(); |
77 | void lessReleased(); | 77 | void lessReleased(); |
78 | void forwardReleased(); | 78 | void forwardReleased(); |
79 | void backReleased(); | 79 | void backReleased(); |
80 | 80 | ||
81 | protected: | 81 | protected: |
82 | virtual void closeEvent( QCloseEvent * ); | 82 | virtual void closeEvent( QCloseEvent * ); |
83 | 83 | ||
84 | virtual void paintEvent( QPaintEvent *pe ); | 84 | virtual void paintEvent( QPaintEvent *pe ); |
85 | 85 | ||
86 | void handleCommand( Command command, bool buttonDown ); | 86 | void handleCommand( Command command, bool buttonDown ); |
87 | 87 | ||
88 | bool isOverButton( const QPoint &position, int buttonId ) const; | 88 | bool isOverButton( const QPoint &position, int buttonId ) const; |
89 | 89 | ||
90 | void paintButton( int buttonId ); | 90 | void paintButton( const Button &button ); |
91 | void paintButton( QPainter &p, const Button &button ); | 91 | void paintButton( QPainter &p, const Button &button ); |
92 | 92 | ||
93 | void toggleButton( int buttonId ); | 93 | void toggleButton( int buttonId ); |
94 | 94 | ||
95 | MediaPlayerState &mediaPlayerState; | 95 | MediaPlayerState &mediaPlayerState; |
96 | PlayListWidget &playList; | 96 | PlayListWidget &playList; |
97 | 97 | ||
98 | ButtonMap buttons; | 98 | ButtonMap buttons; |
99 | 99 | ||
100 | QImage buttonMask; | 100 | QImage buttonMask; |
101 | 101 | ||
102 | QPoint upperLeftOfButtonMask; | 102 | QPoint upperLeftOfButtonMask; |
103 | 103 | ||
104 | QPixmap backgroundPixmap; | 104 | QPixmap backgroundPixmap; |
105 | }; | 105 | }; |
106 | 106 | ||