summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2/videowidget.cpp
Unidiff
Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp38
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
@@ -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}
@@ -271,13 +276,13 @@ void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
271void VideoWidget::makeVisible() { 276void VideoWidget::makeVisible() {
272 if ( mediaPlayerState->fullscreen() ) { 277 if ( mediaPlayerState->fullscreen() ) {
273 setBackgroundMode( QWidget::NoBackground ); 278 setBackgroundMode( QWidget::NoBackground );
274 showFullScreen(); 279 showFullScreen();
275 resize( qApp->desktop()->size() ); 280 resize( qApp->desktop()->size() );
276 slider->hide(); 281 slider->hide();
277 } else { 282 } else {
278 setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) ); 283 setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) );
279 showNormal(); 284 showNormal();
280 showMaximized(); 285 showMaximized();
281 slider->show(); 286 slider->show();
282 } 287 }
283} 288}
@@ -292,5 +297,8 @@ void VideoWidget::paintEvent( QPaintEvent * ) {
292 videoFrame->setGeometry( QRect( 0, 0 , 240 ,340 ) ); 297 videoFrame->setGeometry( QRect( 0, 0 , 240 ,340 ) );
293 298
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++ ) {