click in fullscreen leeds to going back to the normal videowidget now

5 files changed, 19 insertions, 8 deletions

diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 93819f2..22afe19 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -71,7 +71,7 @@ void MediaPlayer::play() {
 
 void MediaPlayer::setPlaying( bool play ) {
     if ( !play ) {
-        //mediaPlayerState->setPaused( TRUE );
+        // mediaPlayerState->setPaused( FALSE );
         return;
     }
 
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
@@ -84,7 +84,9 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
     setCaption( tr("OpiePlayer - Video") );
 
     videoFrame = new XineVideoWidget ( this, "Video frame" );
+
     connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
+    connect ( videoFrame,  SIGNAL( clicked () ),  this,  SLOT ( backToNormal() ) );
 
     Config cfg("OpiePlayer");
     cfg.setGroup("Options");
@@ -343,8 +345,7 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
                         mediaPlayerState->setPaused( TRUE );
                         return;
                     } else {
-                        //  setToggleButton( i, TRUE );
-                        // mediaPlayerState->setPlaying( videoButtons[i].isDown );
+                        return;
                     }
                 }
 
@@ -378,6 +379,11 @@ void VideoWidget::showEvent( QShowEvent* ) {
 }
 
 
+ void VideoWidget::backToNormal() {
+     mediaPlayerState->setFullscreen( FALSE );
+     makeVisible();
+ }
+
 void VideoWidget::makeVisible() {
   if ( mediaPlayerState->fullscreen() ) {
     setBackgroundMode( QWidget::NoBackground );
@@ -385,11 +391,12 @@ void VideoWidget::makeVisible() {
     resize( qApp->desktop()->size() );
     slider->hide();
     videoFrame-> setGeometry ( 0, 0, width ( ), height ( ));
+
   } else {
       showNormal();
     showMaximized();
     slider->show();
-    videoFrame->setGeometry( QRect( 10, 20, 220, 160  ) );
+        videoFrame->setGeometry( QRect( 0, 30, 240, 170  ) );
     qApp->processEvents();
   }
 }
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index b35558b..990fa5f 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -66,6 +66,7 @@ public slots:
     void setPlaying( bool b);
     void setFullscreen( bool b );
     void makeVisible();
+    void backToNormal();
     void setPosition( long );
     void setLength( long );
     void setView( char );
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
index d65006b..3e28e54 100644
--- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp
+++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
@@ -249,9 +249,10 @@ void XineVideoWidget::mousePressEvent ( QMouseEvent *me )
   QWidget *p = parentWidget ( );
   
   if ( p ) {
-    QMouseEvent pme ( QEvent::MouseButtonPress, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( ));
+      // QMouseEvent pme ( QEvent::MouseButtonPress, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( ));
     
-    QApplication::sendEvent ( p, &pme );
+      // QApplication::sendEvent ( p, &pme );
+      //  emit clicked();
   }
 }
 
@@ -260,9 +261,10 @@ void XineVideoWidget::mouseReleaseEvent ( QMouseEvent *me )
   QWidget *p = parentWidget ( );
   
   if ( p ) {
-    QMouseEvent pme ( QEvent::MouseButtonRelease, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( ));
+      //  QMouseEvent pme ( QEvent::MouseButtonRelease, mapToParent ( me-> pos ( )), me-> globalPos ( ), me-> button ( ), me-> state ( ));
     
-    QApplication::sendEvent ( p, &pme );
+      // QApplication::sendEvent ( p, &pme );
+     emit clicked();
   }
 }
 
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.h b/noncore/multimedia/opieplayer2/xinevideowidget.h
index 2fc627d..c5101da 100644
--- a/noncore/multimedia/opieplayer2/xinevideowidget.h
+++ b/noncore/multimedia/opieplayer2/xinevideowidget.h
@@ -56,6 +56,7 @@ protected:
 	void mouseReleaseEvent ( QMouseEvent *e );
 
 signals:
+    void clicked();
 	void videoResized ( const QSize &s );
     
 private: