author | harlekin <harlekin> | 2002-08-02 11:38:17 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-08-02 11:38:17 (UTC) |
commit | d3a54af5288cd30fc1a4f2dafc9f848b245046d6 (patch) (side-by-side diff) | |
tree | 7390858ac62708bfc81078493e580a57297c61fa /noncore | |
parent | 471dc69956af37e7c5f481c10482f280db853491 (diff) | |
download | opie-d3a54af5288cd30fc1a4f2dafc9f848b245046d6.zip opie-d3a54af5288cd30fc1a4f2dafc9f848b245046d6.tar.gz opie-d3a54af5288cd30fc1a4f2dafc9f848b245046d6.tar.bz2 |
theme work
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 38 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 1 |
4 files changed, 26 insertions, 16 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 @@ -162,5 +162,5 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( setPaused(bool) ) ); connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); - + // Intialise state setLength( mediaPlayerState->length() ); 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 @@ -87,10 +87,15 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : cfg.setGroup("VideoWidget"); - 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"); Button0bPix=cfg.readEntry( "Button0bPix","opieplayer/mediaButton0b"); controlsPix=cfg.readEntry( "controlsPix","opieplayer/mediaControls0" ); + cfg.setGroup("AudioWidget"); + QString skin = cfg.readEntry("Skin","default"); + QString skinPath = "opieplayer/skins/" + skin; + backgroundPix = QString("%1/background").arg(skinPath) ; + setBackgroundPixmap( Resource::loadPixmap( backgroundPix) ); pixmaps[0] = new QPixmap( Resource::loadPixmap( Button0aPix ) ); @@ -124,5 +129,5 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : videoFrame = new XineVideoWidget( 240, 155 ,this, "Video frame" ); - videoFrame->setGeometry( QRect( 0, 15 , 240 ,170 ) ); + } @@ -270,15 +275,15 @@ void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { void VideoWidget::makeVisible() { - if ( mediaPlayerState->fullscreen() ) { - setBackgroundMode( QWidget::NoBackground ); - showFullScreen(); - resize( qApp->desktop()->size() ); - slider->hide(); - } else { - setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) ); - showNormal(); - showMaximized(); - slider->show(); - } + if ( mediaPlayerState->fullscreen() ) { + setBackgroundMode( QWidget::NoBackground ); + showFullScreen(); + resize( qApp->desktop()->size() ); + slider->hide(); + } else { + setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) ); + showNormal(); + showMaximized(); + slider->show(); + } } @@ -291,7 +296,10 @@ void VideoWidget::paintEvent( QPaintEvent * ) { p.setBrush( QBrush( Qt::black ) ); videoFrame->setGeometry( QRect( 0, 0 , 240 ,340 ) ); - + } else { + + videoFrame->setGeometry( QRect( 0, 15 , 240 ,170 ) ); // draw the buttons + for ( int i = 0; i < numButtons; i++ ) { paintButton( &p, 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 @@ -87,4 +87,5 @@ private: void setToggleButton( int, bool ); + QString backgroundPix; QSlider *slider; QPixmap *pixmaps[3]; 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 @@ -46,4 +46,5 @@ XineControl::XineControl( QObject *parent, const char *name ) connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) ); 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 ) ) ); connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) ); |