Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index a483434..a8bf252 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp @@ -91,9 +91,9 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye cfg.setGroup("Options"); skin = cfg.readEntry("Skin","default"); QString skinPath = "opieplayer2/skins/" + skin; - pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); + backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); imgUp = QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); imgDn = QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); buttonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 ); @@ -117,9 +117,9 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye } } } - setBackgroundPixmap( pixBg ); + setBackgroundPixmap( backgroundPixmap ); slider = new QSlider( Qt::Horizontal, this ); slider->setMinValue( 0 ); slider->setMaxValue( 1 ); @@ -162,19 +162,19 @@ void VideoWidget::resizeEvent( QResizeEvent * ) { slider->setFixedWidth( w - 20 ); slider->setGeometry( QRect( 15, h - 22, w - 90, 20 ) ); slider->setBackgroundOrigin( QWidget::ParentOrigin ); slider->setFocusPolicy( QWidget::NoFocus ); - slider->setBackgroundPixmap( pixBg ); + slider->setBackgroundPixmap( backgroundPixmap ); upperLeftOfButtonMask.rx() = 0;// ( imgUp->width() ) / 2; if(w>h) upperLeftOfButtonMask.ry() = 0; else upperLeftOfButtonMask.ry() = 185;//(( Vh - imgUp->height() ) / 2) - 10; QPoint p = upperLeftOfButtonMask; - QPixmap *pixUp = combineVImageWithBackground( imgUp, pixBg, p ); - QPixmap *pixDn = combineVImageWithBackground( imgDn, pixBg, p ); + QPixmap *pixUp = combineVImageWithBackground( imgUp, backgroundPixmap, p ); + QPixmap *pixDn = combineVImageWithBackground( imgDn, backgroundPixmap, p ); for ( int i = 0; i < 7; i++ ) { Button &button = buttons[ i ]; @@ -344,9 +344,9 @@ void VideoWidget::makeVisible() { } else { showNormal(); showMaximized(); - setBackgroundPixmap( pixBg ); + setBackgroundPixmap( backgroundPixmap ); QWidget *d = QApplication::desktop(); int w = d->width(); int h = d->height(); @@ -389,9 +389,9 @@ void VideoWidget::paintEvent( QPaintEvent * pe) { // Combine with background and double buffer QPixmap pix( pe->rect().size() ); QPainter p( &pix ); p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); - p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() ); + p.drawTiledPixmap( pe->rect(), backgroundPixmap, pe->rect().topLeft() ); for ( unsigned int i = 0; i < buttons.count(); i++ ) { paintButton( p, buttons[ i ] ); } QPainter p2( this ); |