[vlc-devel] commit: Qt: fix Menu->View->Fullscreen interface state. ( Jean-Baptiste Kempf )

git version control git at videolan.org
Sun Feb 8 03:40:10 CET 2009


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Feb  8 03:33:29 2009 +0100| [7ab733f2c39d5f2c56d3f52724d5b2274cede1ec] | committer: Jean-Baptiste Kempf 

Qt: fix Menu->View->Fullscreen interface state.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7ab733f2c39d5f2c56d3f52724d5b2274cede1ec
---

 modules/gui/qt4/main_interface.cpp |    5 +++++
 modules/gui/qt4/menus.cpp          |    2 ++
 modules/gui/qt4/menus.hpp          |    1 +
 3 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index ad14e4d..34cc1de 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -1159,9 +1159,14 @@ void MainInterface::toggleFullScreen( void )
     {
         showNormal();
         emit askUpdate(); // Needed if video was launched after the F11
+        QVLCMenu::fullscreenViewAction->setChecked( false );
     }
     else
+    {
         showFullScreen();
+        QVLCMenu::fullscreenViewAction->setChecked( true );
+    }
+
 }
 
 /*****************************************************************************
diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 9d55d26..42ef79d 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -76,6 +76,7 @@ static QActionGroup *currentGroup;
 /* HACK for minimalView to go around a Qt bug/feature
  * that doesn't update the QAction checked state when QMenu is hidden */
 QAction *QVLCMenu::minimalViewAction = NULL;
+QAction *QVLCMenu::fullscreenViewAction = NULL;
 
 QMenu *QVLCMenu::recentsMenu = NULL;
 
@@ -440,6 +441,7 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf,
         /* FullScreen View */
         action = menu->addAction( qtr( "&Fullscreen Interface" ), mi,
                                   SLOT( toggleFullScreen() ), QString( "F11" ) );
+        fullscreenViewAction = action;
         action->setCheckable( true );
         action->setData( true );
 
diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index 52ede2d..93b4dbe 100644
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -96,6 +96,7 @@ public:
 
     /* HACK for minimalView */
     static QAction *minimalViewAction;
+    static QAction *fullscreenViewAction;
 
 private:
     /* All main Menus */




More information about the vlc-devel mailing list