author | simon <simon> | 2002-12-08 22:20:24 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-08 22:20:24 (UTC) |
commit | 00252c667bf6c6af3f2a1d2519bf23e448e8f174 (patch) (unidiff) | |
tree | 4ecb004aa67d993561178b33cad2a6f0a9e85049 /noncore | |
parent | 695398075ec5e4d01f29c40c00538ee8c60404d2 (diff) | |
download | opie-00252c667bf6c6af3f2a1d2519bf23e448e8f174.zip opie-00252c667bf6c6af3f2a1d2519bf23e448e8f174.tar.gz opie-00252c667bf6c6af3f2a1d2519bf23e448e8f174.tar.bz2 |
- share the buttons data in a buttons member variable in the base class
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 50 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 42 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 2 |
5 files changed, 48 insertions, 50 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 7fb3781..a9d5a88 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -81,15 +81,15 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
81 | toggleButton.isHeld = toggleButton.isDown = false; | 81 | toggleButton.isHeld = toggleButton.isDown = false; |
82 | 82 | ||
83 | audioButtons.reserve( 10 ); | 83 | buttons.reserve( 10 ); |
84 | audioButtons.push_back( toggleButton ); // play | 84 | buttons.push_back( toggleButton ); // play |
85 | audioButtons.push_back( defaultButton ); // stop | 85 | buttons.push_back( defaultButton ); // stop |
86 | audioButtons.push_back( defaultButton ); // next | 86 | buttons.push_back( defaultButton ); // next |
87 | audioButtons.push_back( defaultButton ); // previous | 87 | buttons.push_back( defaultButton ); // previous |
88 | audioButtons.push_back( defaultButton ); // volume up | 88 | buttons.push_back( defaultButton ); // volume up |
89 | audioButtons.push_back( defaultButton ); // volume down | 89 | buttons.push_back( defaultButton ); // volume down |
90 | audioButtons.push_back( toggleButton ); // repeat/loop | 90 | buttons.push_back( toggleButton ); // repeat/loop |
91 | audioButtons.push_back( defaultButton ); // playlist | 91 | buttons.push_back( defaultButton ); // playlist |
92 | audioButtons.push_back( defaultButton ); // forward | 92 | buttons.push_back( defaultButton ); // forward |
93 | audioButtons.push_back( defaultButton ); // back | 93 | buttons.push_back( defaultButton ); // back |
94 | 94 | ||
95 | setCaption( tr("OpiePlayer") ); | 95 | setCaption( tr("OpiePlayer") ); |
@@ -328,5 +328,5 @@ void AudioWidget::updateSlider( long i, long max ) { | |||
328 | void AudioWidget::setToggleButton( int i, bool down ) { | 328 | void AudioWidget::setToggleButton( int i, bool down ) { |
329 | qDebug("setToggleButton %d", i); | 329 | qDebug("setToggleButton %d", i); |
330 | if ( down != audioButtons[i].isDown ) { | 330 | if ( down != buttons[i].isDown ) { |
331 | toggleButton( i ); | 331 | toggleButton( i ); |
332 | } | 332 | } |
@@ -335,5 +335,5 @@ void AudioWidget::setToggleButton( int i, bool down ) { | |||
335 | 335 | ||
336 | void AudioWidget::toggleButton( int i ) { | 336 | void AudioWidget::toggleButton( int i ) { |
337 | audioButtons[i].isDown = !audioButtons[i].isDown; | 337 | buttons[i].isDown = !buttons[i].isDown; |
338 | QPainter p(this); | 338 | QPainter p(this); |
339 | paintButton ( &p, i ); | 339 | paintButton ( &p, i ); |
@@ -342,5 +342,5 @@ void AudioWidget::toggleButton( int i ) { | |||
342 | 342 | ||
343 | void AudioWidget::paintButton( QPainter *p, int i ) { | 343 | void AudioWidget::paintButton( QPainter *p, int i ) { |
344 | if ( audioButtons[i].isDown ) { | 344 | if ( buttons[i].isDown ) { |
345 | p->drawPixmap( xoff, yoff, *buttonPixDown[i] ); | 345 | p->drawPixmap( xoff, yoff, *buttonPixDown[i] ); |
346 | } else { | 346 | } else { |
@@ -379,5 +379,5 @@ void AudioWidget::timerEvent( QTimerEvent * ) { | |||
379 | 379 | ||
380 | void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | 380 | void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { |
381 | for ( unsigned int i = 0; i < audioButtons.size(); i++ ) { | 381 | for ( unsigned int i = 0; i < buttons.size(); i++ ) { |
382 | if ( event->state() == QMouseEvent::LeftButton ) { | 382 | if ( event->state() == QMouseEvent::LeftButton ) { |
383 | // The test to see if the mouse click is inside the button or not | 383 | // The test to see if the mouse click is inside the button or not |
@@ -389,6 +389,6 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
389 | && imgButtonMask.pixelIndex( x, y ) == i + 1 ); | 389 | && imgButtonMask.pixelIndex( x, y ) == i + 1 ); |
390 | 390 | ||
391 | if ( isOnButton && !audioButtons[i].isHeld ) { | 391 | if ( isOnButton && !buttons[i].isHeld ) { |
392 | audioButtons[i].isHeld = TRUE; | 392 | buttons[i].isHeld = TRUE; |
393 | toggleButton(i); | 393 | toggleButton(i); |
394 | switch (i) { | 394 | switch (i) { |
@@ -406,16 +406,16 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
406 | return; | 406 | return; |
407 | } | 407 | } |
408 | } else if ( !isOnButton && audioButtons[i].isHeld ) { | 408 | } else if ( !isOnButton && buttons[i].isHeld ) { |
409 | audioButtons[i].isHeld = FALSE; | 409 | buttons[i].isHeld = FALSE; |
410 | toggleButton(i); | 410 | toggleButton(i); |
411 | } | 411 | } |
412 | } else { | 412 | } else { |
413 | if ( audioButtons[i].isHeld ) { | 413 | if ( buttons[i].isHeld ) { |
414 | audioButtons[i].isHeld = FALSE; | 414 | buttons[i].isHeld = FALSE; |
415 | if ( !audioButtons[i].isToggle ) { | 415 | if ( !buttons[i].isToggle ) { |
416 | setToggleButton( i, FALSE ); | 416 | setToggleButton( i, FALSE ); |
417 | } | 417 | } |
418 | qDebug("mouseEvent %d", i); | 418 | qDebug("mouseEvent %d", i); |
419 | handleCommand( static_cast<Command>( i ), audioButtons[ i ].isDown ); | 419 | handleCommand( static_cast<Command>( i ), buttons[ i ].isDown ); |
420 | } | 420 | } |
421 | } | 421 | } |
@@ -447,5 +447,5 @@ void AudioWidget::paintEvent( QPaintEvent * pe ) { | |||
447 | p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); | 447 | p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); |
448 | p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() ); | 448 | p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() ); |
449 | for ( unsigned int i = 0; i < audioButtons.size(); i++ ) | 449 | for ( unsigned int i = 0; i < buttons.size(); i++ ) |
450 | paintButton( &p, i ); | 450 | paintButton( &p, i ); |
451 | QPainter p2( this ); | 451 | QPainter p2( this ); |
@@ -453,5 +453,5 @@ void AudioWidget::paintEvent( QPaintEvent * pe ) { | |||
453 | } else { | 453 | } else { |
454 | QPainter p( this ); | 454 | QPainter p( this ); |
455 | for ( unsigned int i = 0; i < audioButtons.size(); i++ ) | 455 | for ( unsigned int i = 0; i < buttons.size(); i++ ) |
456 | paintButton( &p, i ); | 456 | paintButton( &p, i ); |
457 | } | 457 | } |
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index e09c5f8..52a358c 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -111,6 +111,4 @@ private: | |||
111 | int xoff, yoff; | 111 | int xoff, yoff; |
112 | bool isStreaming : 1; | 112 | bool isStreaming : 1; |
113 | |||
114 | ButtonVector audioButtons; | ||
115 | }; | 113 | }; |
116 | 114 | ||
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index c81768c..b88d7e2 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -68,4 +68,6 @@ protected: | |||
68 | MediaPlayerState &mediaPlayerState; | 68 | MediaPlayerState &mediaPlayerState; |
69 | PlayListWidget &playList; | 69 | PlayListWidget &playList; |
70 | |||
71 | ButtonVector buttons; | ||
70 | }; | 72 | }; |
71 | 73 | ||
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 6e2e03e..7838229 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -77,12 +77,12 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
77 | toggleButton.isHeld = toggleButton.isDown = false; | 77 | toggleButton.isHeld = toggleButton.isDown = false; |
78 | 78 | ||
79 | videoButtons.reserve( 7 ); | 79 | buttons.reserve( 7 ); |
80 | videoButtons.push_back( defaultButton ); // stop | 80 | buttons.push_back( defaultButton ); // stop |
81 | videoButtons.push_back( toggleButton ); // play | 81 | buttons.push_back( toggleButton ); // play |
82 | videoButtons.push_back( defaultButton ); // previous | 82 | buttons.push_back( defaultButton ); // previous |
83 | videoButtons.push_back( defaultButton ); // next | 83 | buttons.push_back( defaultButton ); // next |
84 | videoButtons.push_back( defaultButton ); // volUp | 84 | buttons.push_back( defaultButton ); // volUp |
85 | videoButtons.push_back( defaultButton ); // volDown | 85 | buttons.push_back( defaultButton ); // volDown |
86 | videoButtons.push_back( toggleButton ); //fullscreen | 86 | buttons.push_back( toggleButton ); //fullscreen |
87 | 87 | ||
88 | videoFrame = new XineVideoWidget ( this, "Video frame" ); | 88 | videoFrame = new XineVideoWidget ( this, "Video frame" ); |
@@ -259,5 +259,5 @@ void VideoWidget::updateSlider( long i, long max ) { | |||
259 | 259 | ||
260 | void VideoWidget::setToggleButton( int i, bool down ) { | 260 | void VideoWidget::setToggleButton( int i, bool down ) { |
261 | if ( down != videoButtons[i].isDown ) { | 261 | if ( down != buttons[i].isDown ) { |
262 | toggleButton( i ); | 262 | toggleButton( i ); |
263 | } | 263 | } |
@@ -265,5 +265,5 @@ void VideoWidget::setToggleButton( int i, bool down ) { | |||
265 | 265 | ||
266 | void VideoWidget::toggleButton( int i ) { | 266 | void VideoWidget::toggleButton( int i ) { |
267 | videoButtons[i].isDown = !videoButtons[i].isDown; | 267 | buttons[i].isDown = !buttons[i].isDown; |
268 | QPainter p(this); | 268 | QPainter p(this); |
269 | paintButton ( &p, i ); | 269 | paintButton ( &p, i ); |
@@ -272,5 +272,5 @@ void VideoWidget::toggleButton( int i ) { | |||
272 | void VideoWidget::paintButton( QPainter *p, int i ) { | 272 | void VideoWidget::paintButton( QPainter *p, int i ) { |
273 | 273 | ||
274 | if ( videoButtons[i].isDown ) { | 274 | if ( buttons[i].isDown ) { |
275 | p->drawPixmap( xoff, yoff, *buttonPixDown[i] ); | 275 | p->drawPixmap( xoff, yoff, *buttonPixDown[i] ); |
276 | } else { | 276 | } else { |
@@ -280,5 +280,5 @@ void VideoWidget::paintButton( QPainter *p, int i ) { | |||
280 | 280 | ||
281 | void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | 281 | void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { |
282 | for ( unsigned int i = 0; i < videoButtons.size(); i++ ) { | 282 | for ( unsigned int i = 0; i < buttons.size(); i++ ) { |
283 | if ( event->state() == QMouseEvent::LeftButton ) { | 283 | if ( event->state() == QMouseEvent::LeftButton ) { |
284 | // The test to see if the mouse click is inside the button or not | 284 | // The test to see if the mouse click is inside the button or not |
@@ -290,6 +290,6 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
290 | && imgButtonMask.pixelIndex( x, y ) == i + 1 ); | 290 | && imgButtonMask.pixelIndex( x, y ) == i + 1 ); |
291 | 291 | ||
292 | if ( isOnButton && !videoButtons[i].isHeld ) { | 292 | if ( isOnButton && !buttons[i].isHeld ) { |
293 | videoButtons[i].isHeld = TRUE; | 293 | buttons[i].isHeld = TRUE; |
294 | toggleButton(i); | 294 | toggleButton(i); |
295 | 295 | ||
@@ -302,13 +302,13 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
302 | return; | 302 | return; |
303 | } | 303 | } |
304 | } else if ( !isOnButton && videoButtons[i].isHeld ) { | 304 | } else if ( !isOnButton && buttons[i].isHeld ) { |
305 | videoButtons[i].isHeld = FALSE; | 305 | buttons[i].isHeld = FALSE; |
306 | toggleButton(i); | 306 | toggleButton(i); |
307 | } | 307 | } |
308 | } else { | 308 | } else { |
309 | 309 | ||
310 | if ( videoButtons[i].isHeld ) { | 310 | if ( buttons[i].isHeld ) { |
311 | videoButtons[i].isHeld = FALSE; | 311 | buttons[i].isHeld = FALSE; |
312 | if ( !videoButtons[i].isToggle ) { | 312 | if ( !buttons[i].isToggle ) { |
313 | setToggleButton( i, FALSE ); | 313 | setToggleButton( i, FALSE ); |
314 | } | 314 | } |
@@ -427,5 +427,5 @@ void VideoWidget::paintEvent( QPaintEvent * pe) { | |||
427 | p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); | 427 | p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); |
428 | p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() ); | 428 | p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() ); |
429 | for ( unsigned int i = 0; i < videoButtons.size(); i++ ) { | 429 | for ( unsigned int i = 0; i < buttons.size(); i++ ) { |
430 | paintButton( &p, i ); | 430 | paintButton( &p, i ); |
431 | } | 431 | } |
@@ -434,5 +434,5 @@ void VideoWidget::paintEvent( QPaintEvent * pe) { | |||
434 | } else { | 434 | } else { |
435 | QPainter p( this ); | 435 | QPainter p( this ); |
436 | for ( unsigned int i = 0; i < videoButtons.size(); i++ ) | 436 | for ( unsigned int i = 0; i < buttons.size(); i++ ) |
437 | paintButton( &p, i ); | 437 | paintButton( &p, i ); |
438 | } | 438 | } |
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h index 34558f8..f996803 100644 --- a/noncore/multimedia/opieplayer2/videowidget.h +++ b/noncore/multimedia/opieplayer2/videowidget.h | |||
@@ -121,6 +121,4 @@ private: | |||
121 | int scaledHeight; | 121 | int scaledHeight; |
122 | XineVideoWidget* videoFrame; | 122 | XineVideoWidget* videoFrame; |
123 | |||
124 | ButtonVector videoButtons; | ||
125 | }; | 123 | }; |
126 | 124 | ||