Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
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 toggleButton.isHeld = toggleButton.isDown = false; - videoButtons.reserve( 7 ); - videoButtons.push_back( defaultButton ); // stop - videoButtons.push_back( toggleButton ); // play - videoButtons.push_back( defaultButton ); // previous - videoButtons.push_back( defaultButton ); // next - videoButtons.push_back( defaultButton ); // volUp - videoButtons.push_back( defaultButton ); // volDown - videoButtons.push_back( toggleButton ); //fullscreen + buttons.reserve( 7 ); + buttons.push_back( defaultButton ); // stop + buttons.push_back( toggleButton ); // play + buttons.push_back( defaultButton ); // previous + buttons.push_back( defaultButton ); // next + buttons.push_back( defaultButton ); // volUp + buttons.push_back( defaultButton ); // volDown + buttons.push_back( toggleButton ); //fullscreen videoFrame = new XineVideoWidget ( this, "Video frame" ); @@ -259,5 +259,5 @@ void VideoWidget::updateSlider( long i, long max ) { void VideoWidget::setToggleButton( int i, bool down ) { - if ( down != videoButtons[i].isDown ) { + if ( down != buttons[i].isDown ) { toggleButton( i ); } @@ -265,5 +265,5 @@ void VideoWidget::setToggleButton( int i, bool down ) { void VideoWidget::toggleButton( int i ) { - videoButtons[i].isDown = !videoButtons[i].isDown; + buttons[i].isDown = !buttons[i].isDown; QPainter p(this); paintButton ( &p, i ); @@ -272,5 +272,5 @@ void VideoWidget::toggleButton( int i ) { void VideoWidget::paintButton( QPainter *p, int i ) { - if ( videoButtons[i].isDown ) { + if ( buttons[i].isDown ) { p->drawPixmap( xoff, yoff, *buttonPixDown[i] ); } else { @@ -280,5 +280,5 @@ void VideoWidget::paintButton( QPainter *p, int i ) { void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { - for ( unsigned int i = 0; i < videoButtons.size(); i++ ) { + for ( unsigned int i = 0; i < buttons.size(); i++ ) { if ( event->state() == QMouseEvent::LeftButton ) { // The test to see if the mouse click is inside the button or not @@ -290,6 +290,6 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { && imgButtonMask.pixelIndex( x, y ) == i + 1 ); - if ( isOnButton && !videoButtons[i].isHeld ) { - videoButtons[i].isHeld = TRUE; + if ( isOnButton && !buttons[i].isHeld ) { + buttons[i].isHeld = TRUE; toggleButton(i); @@ -302,13 +302,13 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { return; } - } else if ( !isOnButton && videoButtons[i].isHeld ) { - videoButtons[i].isHeld = FALSE; + } else if ( !isOnButton && buttons[i].isHeld ) { + buttons[i].isHeld = FALSE; toggleButton(i); } } else { - if ( videoButtons[i].isHeld ) { - videoButtons[i].isHeld = FALSE; - if ( !videoButtons[i].isToggle ) { + if ( buttons[i].isHeld ) { + buttons[i].isHeld = FALSE; + if ( !buttons[i].isToggle ) { setToggleButton( i, FALSE ); } @@ -427,5 +427,5 @@ void VideoWidget::paintEvent( QPaintEvent * pe) { p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() ); - for ( unsigned int i = 0; i < videoButtons.size(); i++ ) { + for ( unsigned int i = 0; i < buttons.size(); i++ ) { paintButton( &p, i ); } @@ -434,5 +434,5 @@ void VideoWidget::paintEvent( QPaintEvent * pe) { } else { QPainter p( this ); - for ( unsigned int i = 0; i < videoButtons.size(); i++ ) + for ( unsigned int i = 0; i < buttons.size(); i++ ) paintButton( &p, i ); } |