Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 0 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 16 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 1 |
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) : | |||
88 | 88 | ||
89 | QString backgroundPix, Button0aPix, Button0bPix, controlsPix; | 89 | QString Button0aPix, Button0bPix, controlsPix; |
90 | backgroundPix=cfg.readEntry( "backgroundPix", "opieplayer/metalFinish"); | 90 | //backgroundPix=cfg.readEntry( "backgroundPix", "opieplayer/metalFinish"); |
91 | Button0aPix=cfg.readEntry( "Button0aPix", "opieplayer/mediaButton0a"); | 91 | Button0aPix=cfg.readEntry( "Button0aPix", "opieplayer/mediaButton0a"); |
@@ -94,2 +94,7 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | |||
94 | 94 | ||
95 | cfg.setGroup("AudioWidget"); | ||
96 | QString skin = cfg.readEntry("Skin","default"); | ||
97 | QString skinPath = "opieplayer/skins/" + skin; | ||
98 | backgroundPix = QString("%1/background").arg(skinPath) ; | ||
99 | |||
95 | setBackgroundPixmap( Resource::loadPixmap( backgroundPix) ); | 100 | setBackgroundPixmap( Resource::loadPixmap( backgroundPix) ); |
@@ -125,3 +130,3 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | |||
125 | videoFrame = new XineVideoWidget( 240, 155 ,this, "Video frame" ); | 130 | videoFrame = new XineVideoWidget( 240, 155 ,this, "Video frame" ); |
126 | videoFrame->setGeometry( QRect( 0, 15 , 240 ,170 ) ); | 131 | |
127 | } | 132 | } |
@@ -277,3 +282,3 @@ void VideoWidget::makeVisible() { | |||
277 | } else { | 282 | } else { |
278 | setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) ); | 283 | setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) ); |
279 | showNormal(); | 284 | showNormal(); |
@@ -294,3 +299,6 @@ void VideoWidget::paintEvent( QPaintEvent * ) { | |||
294 | } else { | 299 | } else { |
300 | |||
301 | videoFrame->setGeometry( QRect( 0, 15 , 240 ,170 ) ); | ||
295 | // draw the buttons | 302 | // draw the buttons |
303 | |||
296 | for ( int i = 0; i < numButtons; i++ ) { | 304 | 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: | |||
88 | 88 | ||
89 | QString backgroundPix; | ||
89 | QSlider *slider; | 90 | 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 ) | |||
47 | connect( this, SIGNAL( positionChanged( int position ) ), mediaPlayerState, SLOT( updatePosition( long p ) ) ); | 47 | connect( this, SIGNAL( positionChanged( int position ) ), mediaPlayerState, SLOT( updatePosition( long p ) ) ); |
48 | connect(this, SIGNAL( postitionChanged(int position) ), mediaPlayerState, SLOT( setPosition( long p ) ) ); | ||
48 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); | 49 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); |