Diffstat (limited to 'noncore/multimedia/opieplayer2/audiowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 0516089..0b7cc45 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp @@ -137,18 +137,18 @@ void AudioWidget::resizeEvent( QResizeEvent * ) { songInfo.setGeometry( QRect( 2, 2, w - 4, 20 ) ); slider.setFixedWidth( w - 110 ); slider.setGeometry( QRect( 15, h - 22, w - 90, 20 ) ); slider.setBackgroundOrigin( QWidget::ParentOrigin ); time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) ); - upperLeftOfButtonMask.rx() = ( w - imgUp.width() ) / 2; - upperLeftOfButtonMask.ry() = (( h - imgUp.height() ) / 2) - 10; + upperLeftOfButtonMask.rx() = ( w - buttonUpImage.width() ) / 2; + upperLeftOfButtonMask.ry() = (( h - buttonUpImage.height() ) / 2) - 10; QPoint p = upperLeftOfButtonMask; - QPixmap pixUp = combineImageWithBackground( imgUp, backgroundPixmap, p ); - QPixmap pixDn = combineImageWithBackground( imgDn, backgroundPixmap, p ); + QPixmap pixUp = combineImageWithBackground( buttonUpImage, backgroundPixmap, p ); + QPixmap pixDn = combineImageWithBackground( buttonDownImage, backgroundPixmap, p ); for ( uint i = 0; i < buttons.size(); i++ ) { if ( !buttons[i].mask.isNull() ) { buttons[i].pixUp = maskPixToMask( pixUp, buttons[i].mask ); buttons[i].pixDown = maskPixToMask( pixDn, buttons[i].mask ); } @@ -197,16 +197,16 @@ void AudioWidget::loadSkin() skin = cfg.readEntry("Skin","default"); //skin = "scaleTest"; // color of background, frame, degree of transparency QString skinPath = "opieplayer2/skins/" + skin; backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); - imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); - imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); + buttonUpImage = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); + buttonDownImage = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); - setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_", imgUp.size() ); + setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_", buttonUpImage.size() ); setBackgroundPixmap( backgroundPixmap ); songInfo.setFocusPolicy( QWidget::NoFocus ); // changeTextColor( &songInfo ); // songInfo.setBackgroundColor( QColor( 167, 212, 167 )); |