Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 238770b..c2080e6 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -81,13 +81,15 @@ static const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton)); | |||
81 | 81 | ||
82 | VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | 82 | VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : |
83 | QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { | 83 | QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { |
84 | setCaption( tr("OpiePlayer - Video") ); | 84 | setCaption( tr("OpiePlayer - Video") ); |
85 | 85 | ||
86 | videoFrame = new XineVideoWidget ( this, "Video frame" ); | 86 | videoFrame = new XineVideoWidget ( this, "Video frame" ); |
87 | |||
87 | connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & ))); | 88 | connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & ))); |
89 | connect ( videoFrame, SIGNAL( clicked () ), this, SLOT ( backToNormal() ) ); | ||
88 | 90 | ||
89 | Config cfg("OpiePlayer"); | 91 | Config cfg("OpiePlayer"); |
90 | cfg.setGroup("Options"); | 92 | cfg.setGroup("Options"); |
91 | skin = cfg.readEntry("Skin","default"); | 93 | skin = cfg.readEntry("Skin","default"); |
92 | 94 | ||
93 | QString skinPath = "opieplayer2/skins/" + skin; | 95 | QString skinPath = "opieplayer2/skins/" + skin; |
@@ -340,14 +342,13 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
340 | return; | 342 | return; |
341 | } else if( !mediaPlayerState->isPaused ) { | 343 | } else if( !mediaPlayerState->isPaused ) { |
342 | setToggleButton( i, TRUE ); | 344 | setToggleButton( i, TRUE ); |
343 | mediaPlayerState->setPaused( TRUE ); | 345 | mediaPlayerState->setPaused( TRUE ); |
344 | return; | 346 | return; |
345 | } else { | 347 | } else { |
346 | // setToggleButton( i, TRUE ); | 348 | return; |
347 | // mediaPlayerState->setPlaying( videoButtons[i].isDown ); | ||
348 | } | 349 | } |
349 | } | 350 | } |
350 | 351 | ||
351 | case VideoStop: mediaPlayerState->setPlaying( FALSE ); return; | 352 | case VideoStop: mediaPlayerState->setPlaying( FALSE ); return; |
352 | case VideoNext: mediaPlayerState->setNext(); return; | 353 | case VideoNext: mediaPlayerState->setNext(); return; |
353 | case VideoPrevious: mediaPlayerState->setPrev(); return; | 354 | case VideoPrevious: mediaPlayerState->setPrev(); return; |
@@ -375,26 +376,32 @@ void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { | |||
375 | void VideoWidget::showEvent( QShowEvent* ) { | 376 | void VideoWidget::showEvent( QShowEvent* ) { |
376 | QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 ); | 377 | QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 ); |
377 | mouseMoveEvent( &event ); | 378 | mouseMoveEvent( &event ); |
378 | } | 379 | } |
379 | 380 | ||
380 | 381 | ||
382 | void VideoWidget::backToNormal() { | ||
383 | mediaPlayerState->setFullscreen( FALSE ); | ||
384 | makeVisible(); | ||
385 | } | ||
386 | |||
381 | void VideoWidget::makeVisible() { | 387 | void VideoWidget::makeVisible() { |
382 | if ( mediaPlayerState->fullscreen() ) { | 388 | if ( mediaPlayerState->fullscreen() ) { |
383 | setBackgroundMode( QWidget::NoBackground ); | 389 | setBackgroundMode( QWidget::NoBackground ); |
384 | showFullScreen(); | 390 | showFullScreen(); |
385 | resize( qApp->desktop()->size() ); | 391 | resize( qApp->desktop()->size() ); |
386 | slider->hide(); | 392 | slider->hide(); |
387 | videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); | 393 | videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); |
388 | } else { | 394 | |
389 | showNormal(); | 395 | } else { |
390 | showMaximized(); | 396 | showNormal(); |
391 | slider->show(); | 397 | showMaximized(); |
392 | videoFrame->setGeometry( QRect( 10, 20, 220, 160 ) ); | 398 | slider->show(); |
393 | qApp->processEvents(); | 399 | videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) ); |
394 | } | 400 | qApp->processEvents(); |
401 | } | ||
395 | } | 402 | } |
396 | 403 | ||
397 | 404 | ||
398 | void VideoWidget::paintEvent( QPaintEvent * pe) { | 405 | void VideoWidget::paintEvent( QPaintEvent * pe) { |
399 | QPainter p( this ); | 406 | QPainter p( this ); |
400 | 407 | ||