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 * ) { | |||
132 | upperLeftOfButtonMask.ry() = 185;//(( Vh - imgUp->height() ) / 2) - 10; | 132 | upperLeftOfButtonMask.ry() = 185;//(( Vh - imgUp->height() ) / 2) - 10; |
133 | QPoint p = upperLeftOfButtonMask; | 133 | QPoint p = upperLeftOfButtonMask; |
134 | 134 | ||
135 | QPixmap *pixUp = combineVImageWithBackground( imgUp, backgroundPixmap, p ); | 135 | QPixmap *pixUp = combineVImageWithBackground( buttonUpImage, backgroundPixmap, p ); |
136 | QPixmap *pixDn = combineVImageWithBackground( imgDn, backgroundPixmap, p ); | 136 | QPixmap *pixDn = combineVImageWithBackground( buttonDownImage, backgroundPixmap, p ); |
137 | 137 | ||
138 | for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) { | 138 | for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) { |
139 | Button &button = *it; | 139 | Button &button = *it; |
@@ -187,14 +187,14 @@ void VideoWidget::loadSkin() | |||
187 | { | 187 | { |
188 | Config cfg("OpiePlayer"); | 188 | Config cfg("OpiePlayer"); |
189 | cfg.setGroup("Options"); | 189 | cfg.setGroup("Options"); |
190 | skin = cfg.readEntry("Skin","default"); | 190 | QString skin = cfg.readEntry("Skin","default"); |
191 | 191 | ||
192 | QString skinPath = "opieplayer2/skins/" + skin; | 192 | QString skinPath = "opieplayer2/skins/" + skin; |
193 | backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); | 193 | backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); |
194 | imgUp = QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); | 194 | buttonUpImage = QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); |
195 | imgDn = QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); | 195 | buttonDownImage = QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); |
196 | 196 | ||
197 | setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_", imgUp.size() ); | 197 | setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_", buttonUpImage.size() ); |
198 | 198 | ||
199 | setBackgroundPixmap( backgroundPixmap ); | 199 | setBackgroundPixmap( backgroundPixmap ); |
200 | 200 | ||
@@ -202,7 +202,7 @@ void VideoWidget::loadSkin() | |||
202 | slider = new QSlider( Qt::Horizontal, this ); | 202 | slider = new QSlider( Qt::Horizontal, this ); |
203 | slider->setMinValue( 0 ); | 203 | slider->setMinValue( 0 ); |
204 | slider->setMaxValue( 1 ); | 204 | slider->setMaxValue( 1 ); |
205 | slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) ); | 205 | slider->setBackgroundPixmap( backgroundPixmap ); |
206 | //slider->setFocusPolicy( QWidget::NoFocus ); | 206 | //slider->setFocusPolicy( QWidget::NoFocus ); |
207 | 207 | ||
208 | resizeEvent( 0 ); | 208 | resizeEvent( 0 ); |