summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index c2080e6..0521419 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -132,25 +132,24 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
132 132
133 resizeEvent( NULL ); 133 resizeEvent( NULL );
134 134
135 connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); 135 connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
136 connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); 136 connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
137 connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); 137 connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) );
138 connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) ); 138 connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) );
139 connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); 139 connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
140 140
141 setLength( mediaPlayerState->length() ); 141 setLength( mediaPlayerState->length() );
142 setPosition( mediaPlayerState->position() ); 142 setPosition( mediaPlayerState->position() );
143 setFullscreen( mediaPlayerState->fullscreen() ); 143 setFullscreen( mediaPlayerState->fullscreen() );
144// setPaused( mediaPlayerState->paused() );
145 setPlaying( mediaPlayerState->playing() ); 144 setPlaying( mediaPlayerState->playing() );
146} 145}
147 146
148 147
149VideoWidget::~VideoWidget() { 148VideoWidget::~VideoWidget() {
150 149
151 for ( int i = 0; i < 7; i++ ) { 150 for ( int i = 0; i < 7; i++ ) {
152 delete buttonPixUp[i]; 151 delete buttonPixUp[i];
153 delete buttonPixDown[i]; 152 delete buttonPixDown[i];
154 } 153 }
155 154
156 delete pixBg; 155 delete pixBg;
@@ -384,26 +383,26 @@ void VideoWidget::showEvent( QShowEvent* ) {
384 makeVisible(); 383 makeVisible();
385 } 384 }
386 385
387void VideoWidget::makeVisible() { 386void VideoWidget::makeVisible() {
388 if ( mediaPlayerState->fullscreen() ) { 387 if ( mediaPlayerState->fullscreen() ) {
389 setBackgroundMode( QWidget::NoBackground ); 388 setBackgroundMode( QWidget::NoBackground );
390 showFullScreen(); 389 showFullScreen();
391 resize( qApp->desktop()->size() ); 390 resize( qApp->desktop()->size() );
392 slider->hide(); 391 slider->hide();
393 videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); 392 videoFrame-> setGeometry ( 0, 0, width ( ), height ( ));
394 393
395 } else { 394 } else {
396 showNormal();
397 showMaximized(); 395 showMaximized();
396 setBackgroundPixmap( *pixBg );
398 slider->show(); 397 slider->show();
399 videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) ); 398 videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) );
400 qApp->processEvents(); 399 qApp->processEvents();
401 } 400 }
402} 401}
403 402
404 403
405void VideoWidget::paintEvent( QPaintEvent * pe) { 404void VideoWidget::paintEvent( QPaintEvent * pe) {
406 QPainter p( this ); 405 QPainter p( this );
407 406
408 if ( mediaPlayerState->fullscreen() ) { 407 if ( mediaPlayerState->fullscreen() ) {
409 // Clear the background 408 // Clear the background