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

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index ad14e4d79b210c430bd2135cc4821a574be4d2e1..34cc1dea775b62fc5accb539cc7d025e18e52372 100644 (file)
--- 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 9d55d264fa2d6f4db430c3c38723dbcecbcaa7ce..42ef79ded8b342c3c87452d0aa228d122861dd4c 100644 (file)
--- 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 52ede2d8bbfbdd63aa0e8e8b5c692a3ad548fdfb..93b4dbe17704594e96d84a447e5133a6b8bc84dd 100644 (file)
--- 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 */