author | simon <simon> | 2002-12-11 00:51:29 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-11 00:51:29 (UTC) |
commit | ccef9ec4aff9822b0f2468e590d05c9484bc027e (patch) (side-by-side diff) | |
tree | f6a0b4ee201c24f2200ab79851d41fb640550962 /noncore/multimedia/opieplayer2/videowidget.cpp | |
parent | 8605e11e5965521291e70f47159487ea9f1e5b49 (diff) | |
download | opie-ccef9ec4aff9822b0f2468e590d05c9484bc027e.zip opie-ccef9ec4aff9822b0f2468e590d05c9484bc027e.tar.gz opie-ccef9ec4aff9822b0f2468e590d05c9484bc027e.tar.bz2 |
- moved the shared button up/down image variables into the base class
- removed some unused variables
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 a03d43e..0047ac0 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp @@ -132,8 +132,8 @@ void VideoWidget::resizeEvent( QResizeEvent * ) { upperLeftOfButtonMask.ry() = 185;//(( Vh - imgUp->height() ) / 2) - 10; QPoint p = upperLeftOfButtonMask; - QPixmap *pixUp = combineVImageWithBackground( imgUp, backgroundPixmap, p ); - QPixmap *pixDn = combineVImageWithBackground( imgDn, backgroundPixmap, p ); + QPixmap *pixUp = combineVImageWithBackground( buttonUpImage, backgroundPixmap, p ); + QPixmap *pixDn = combineVImageWithBackground( buttonDownImage, backgroundPixmap, p ); for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) { Button &button = *it; @@ -187,14 +187,14 @@ void VideoWidget::loadSkin() { Config cfg("OpiePlayer"); cfg.setGroup("Options"); - skin = cfg.readEntry("Skin","default"); + QString skin = cfg.readEntry("Skin","default"); QString skinPath = "opieplayer2/skins/" + skin; 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) ) ); + buttonUpImage = QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); + buttonDownImage = QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); - setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_", imgUp.size() ); + setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_", buttonUpImage.size() ); setBackgroundPixmap( backgroundPixmap ); @@ -202,7 +202,7 @@ void VideoWidget::loadSkin() slider = new QSlider( Qt::Horizontal, this ); slider->setMinValue( 0 ); slider->setMaxValue( 1 ); - slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) ); + slider->setBackgroundPixmap( backgroundPixmap ); //slider->setFocusPolicy( QWidget::NoFocus ); resizeEvent( 0 ); |