Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 38 |
1 files changed, 23 insertions, 15 deletions
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 ); |