theme work

4 files changed, 14 insertions, 4 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 689366e..300a5c8 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index bce6b89..48caf00 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -88,4 +88,4 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
 
-    QString backgroundPix, Button0aPix, Button0bPix, controlsPix;
-    backgroundPix=cfg.readEntry( "backgroundPix", "opieplayer/metalFinish");
+    QString Button0aPix, Button0bPix, controlsPix;
+    //backgroundPix=cfg.readEntry( "backgroundPix", "opieplayer/metalFinish");
     Button0aPix=cfg.readEntry( "Button0aPix", "opieplayer/mediaButton0a");
@@ -94,2 +94,7 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
 
+    cfg.setGroup("AudioWidget");
+    QString skin = cfg.readEntry("Skin","default");
+    QString skinPath = "opieplayer/skins/" + skin;
+    backgroundPix =   QString("%1/background").arg(skinPath) ;
+
     setBackgroundPixmap( Resource::loadPixmap( backgroundPix) );
@@ -125,3 +130,3 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
     videoFrame = new XineVideoWidget( 240, 155 ,this, "Video frame" );
-    videoFrame->setGeometry( QRect( 0, 15 , 240 ,170  ) );
+
 }
@@ -277,3 +282,3 @@ void VideoWidget::makeVisible() {
     } else {
-        setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) );
+    setBackgroundPixmap( Resource::loadPixmap(  backgroundPix ) );
         showNormal();
@@ -294,3 +299,6 @@ void VideoWidget::paintEvent( QPaintEvent * ) {
     } else {
+
+      videoFrame->setGeometry( QRect( 0, 15 , 240 ,170  ) );
          // draw the buttons
+
         for ( int i = 0; i < numButtons; i++ ) {
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index 8f98889..0122d5d 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -88,2 +88,3 @@ private:
 
+    QString backgroundPix;
     QSlider *slider;
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 3be9fa4..3faeab1 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -47,2 +47,3 @@ XineControl::XineControl( QObject *parent, const char *name )
     connect( this, SIGNAL( positionChanged( int position ) ),  mediaPlayerState, SLOT( updatePosition( long p ) ) );
+    connect(this, SIGNAL( postitionChanged(int position) ), mediaPlayerState, SLOT( setPosition( long p ) ) );
     connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) );