Qt: Fix minimalView state in menus.

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 34cc1dea775b62fc5accb539cc7d025e18e52372..5f8de7e5065535da27f4b6b8e5fda3a12a686410 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -781,9 +781,6 @@ void MainInterface::dockPlaylist( pl_dock_e i_pos )
 
 void MainInterface::toggleMinimalView()
 {
-    /* HACK for minimalView, see menus.cpp */
-    if( !menuBar()->isVisible() ) QVLCMenu::minimalViewAction->toggle();
-
     if( i_visualmode != QT_ALWAYS_VIDEO_MODE &&
         i_visualmode != QT_MINIMAL_MODE )
     { /* NORMAL MODE then */
@@ -800,6 +797,8 @@ void MainInterface::toggleMinimalView()
     TOGGLEV( statusBar() );
     TOGGLEV( inputC );
     doComponentsUpdate();
+
+    QVLCMenu::minimalViewAction->setChecked( bgWasVisible );
 }
 
 /* Video widget cannot do this synchronously as it runs in another thread */

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 42ef79ded8b342c3c87452d0aa228d122861dd4c..adf625b51e3eb1f83ffeb7dcb6833db98173f78b 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -899,7 +899,7 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
                 action->setChecked( !( mi->getControlsVisibilityStatus() &
                             CONTROLS_VISIBLE ) );
                 action = submenu->addAction( QIcon( "" ),
-                        qtr( "Toggle Fullscreen Interface" ),
+                        qtr( "Fullscreen Interface" ),
                         mi, SLOT( toggleFullScreen() ) );
                 action->setCheckable( true );
                 action->setChecked( mi->isFullScreen() );