1 files changed, 27 insertions, 20 deletions

diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index d1efaad..a03d43e 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -58,74 +58,56 @@ namespace
 
 const int xo = 2; // movable x offset
 const int yo = 0; // movable y offset
 
 const MediaWidget::SkinButtonInfo skinInfo[] =
 {
     { MediaWidget::Play, "play", MediaWidget::ToggleButton },
     { MediaWidget::Stop, "stop", MediaWidget::NormalButton },
     { MediaWidget::Next, "fwd", MediaWidget::NormalButton },
     { MediaWidget::Previous, "back", MediaWidget::NormalButton },
     { MediaWidget::VolumeUp, "up", MediaWidget::NormalButton },
     { MediaWidget::VolumeDown, "down", MediaWidget::NormalButton },
     { MediaWidget::FullScreen, "full", MediaWidget::ToggleButton }
 };
 
 const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] );
 
 }
 
 VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) 
     : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ), videoSliderBeingMoved( false )
 {
     setCaption( tr("OpiePlayer - Video") );
 
-
     videoFrame = new XineVideoWidget ( this, "Video frame" );
 
     connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
     connect ( videoFrame,  SIGNAL( clicked () ),  this,  SLOT ( backToNormal() ) );
 
-    Config cfg("OpiePlayer");
-    cfg.setGroup("Options");
-    skin = cfg.readEntry("Skin","default");
+    slider = 0;
 
-    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) ) );
-
-    setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir()  + "/pics/" + skinPath + "/skinV_mask_", imgUp.size() );
-
-    setBackgroundPixmap( backgroundPixmap );
-
-    slider = new QSlider( Qt::Horizontal, this );
-    slider->setMinValue( 0 );
-    slider->setMaxValue( 1 );
-    slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) );
-    //slider->setFocusPolicy( QWidget::NoFocus );
-
-    resizeEvent( NULL );
+    loadSkin();
 
     setLength( mediaPlayerState.length() );
     setPosition( mediaPlayerState.position() );
     setFullscreen( mediaPlayerState.isFullscreen() );
     setPlaying( mediaPlayerState.isPlaying() );
 }
 
 
 VideoWidget::~VideoWidget() 
 {
 }
 
 QPixmap *combineVImageWithBackground( QImage img, QPixmap bg, QPoint offset ) {
     QPixmap pix( img.width(), img.height() );
     QPainter p( &pix );
     p.drawTiledPixmap( pix.rect(), bg, offset );
     p.drawImage( 0, 0, img );
     return new QPixmap( pix );
 }
 
 QPixmap maskVPixToMask( QPixmap pix, QBitmap mask ) {
     QPixmap pixmap( pix );
     pixmap.setMask( mask );
     return pixmap;
@@ -180,48 +162,73 @@ void VideoWidget::sliderReleased() {
 }
 
 void VideoWidget::setPosition( long i ) {
     updateSlider( i, mediaPlayerState.length() );
 }
 
 
 void VideoWidget::setLength( long max ) {
     updateSlider( mediaPlayerState.position(), max );
 }
 
 void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType )
 {
     if ( displayType == MediaPlayerState::Video ) {
         makeVisible();
         return;
     }
 
     // Effectively blank the view next time we show it so it looks nicer
     scaledWidth = 0;
     scaledHeight = 0;
     hide();
 }
 
+void VideoWidget::loadSkin()
+{
+    Config cfg("OpiePlayer");
+    cfg.setGroup("Options");
+    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) ) );
+
+    setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir()  + "/pics/" + skinPath + "/skinV_mask_", imgUp.size() );
+
+    setBackgroundPixmap( backgroundPixmap );
+
+    delete slider;
+    slider = new QSlider( Qt::Horizontal, this );
+    slider->setMinValue( 0 );
+    slider->setMaxValue( 1 );
+    slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) );
+    //slider->setFocusPolicy( QWidget::NoFocus );
+
+    resizeEvent( 0 );
+}
+
 void VideoWidget::updateSlider( long i, long max ) {
     // Will flicker too much if we don't do this
     if ( max == 0 ) {
         return;
     }
     int width = slider->width();
     int val = int((double)i * width / max);
     if ( !mediaPlayerState.isFullscreen() && !videoSliderBeingMoved ) {
         if ( slider->value() != val ) {
             slider->setValue( val );
         }
         if ( slider->maxValue() != width ) {
             slider->setMaxValue( width );
         }
     }
 }
 
 void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
     if ( mediaPlayerState.isFullscreen() ) {
         mediaPlayerState.setFullscreen( FALSE );
         makeVisible();
     }
     MediaWidget::mouseReleaseEvent( event );
 }