Qt4 - Remove unreachable code.

[vlc] / modules / gui / qt4 / menus.cpp

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index c9e2b9889ddb7e1edfef7b4219df74fadfe961d0..c68999dc3f70f731d2e6de31a82c1fc90331e801 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -164,15 +164,11 @@ static int AudioAutoMenuBuilder( vlc_object_t *p_object,
  * Main Menu Bar Creation
  **/
 void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf,
-        bool playlist,
         bool visual_selector_enabled )
 {
     QMenuBar *bar = mi->menuBar();
     BAR_ADD( FileMenu(), qtr( "&Media" ) );
-    if( playlist )
-    {
-        BAR_ADD( PlaylistMenu( mi,p_intf ), qtr( "&Playlist" ) );
-    }
+    BAR_ADD( PlaylistMenu( p_intf, mi ), qtr( "&Playlist" ) );
     BAR_ADD( ToolsMenu( p_intf, mi, visual_selector_enabled, true ), qtr( "&Tools" ) );
     BAR_DADD( AudioMenu( p_intf, NULL ), qtr( "&Audio" ), 2 );
     BAR_DADD( VideoMenu( p_intf, NULL ), qtr( "&Video" ), 1 );
@@ -189,7 +185,7 @@ QMenu *QVLCMenu::FileMenu()
 {
     QMenu *menu = new QMenu();
 
-    DP_SADD( menu, qtr( "Open &File..." ), "",
+    DP_SADD( menu, qtr( "&Open File..." ), "",
             ":/pixmaps/file-asym_16px.png", openFileDialog(), "Ctrl+O" );
     DP_SADD( menu, qtr( I_OPEN_FOLDER ), "",
             ":/pixmaps/folder-grey_16px.png", PLAppendDir(), "Ctrl+F" );
@@ -213,8 +209,7 @@ QMenu *QVLCMenu::FileMenu()
     return menu;
 }
 
-/* Playlist Menu, undocked when playlist is undocked */
-QMenu *QVLCMenu::PlaylistMenu( MainInterface *mi, intf_thread_t *p_intf )
+QMenu *QVLCMenu::PlaylistMenu( intf_thread_t *p_intf, MainInterface *mi )
 {
     QMenu *menu = new QMenu();
     menu->addMenu( SDMenu( p_intf ) );
@@ -262,15 +257,18 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
     {
         /* Minimal View */
         QAction *action=menu->addAction( qtr( "Minimal View..." ), mi,
-                SLOT( toggleMenus() ), qtr( "Ctrl+H" ) );
+                SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) );
+        //FIXME: remove useless thing. But keep it until the release, pls.
         action->setCheckable( true );
-        if( mi->getControlsVisibilityStatus() & 0x2 ) action->setChecked( true );
+        if( mi->getControlsVisibilityStatus() & CONTROLS_VISIBLE )
+            action->setChecked( true );
 
         /* Advanced Controls */
         action = menu->addAction( qtr( "Advanced controls" ), mi,
                 SLOT( toggleAdvanced() ) );
         action->setCheckable( true );
-        if( mi->getControlsVisibilityStatus() & 0x1 ) action->setChecked( true );
+        if( mi->getControlsVisibilityStatus() & CONTROLS_ADVANCED )
+            action->setChecked( true );
      #if 0 /* For Visualisations. Not yet working */
         adv = menu->addAction( qtr( "Visualizations selector" ),
                 mi, SLOT( visual() ) );
@@ -678,7 +676,7 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi,
     if( mi->isVisible() || b_force_visible )
     {
         sysMenu->addAction( QIcon( ":/vlc16.png" ),
-                qtr( "Hide VLC media player" ), mi,
+                qtr( "Hide VLC media player in taskbar" ), mi,
                 SLOT( toggleUpdateSystrayMenu() ) );
     }
     else
@@ -694,7 +692,7 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi,
     sysMenu->addSeparator();
     DP_SADD( sysMenu, qtr( "&Open Media" ), "",
             ":/pixmaps/file-wide_16px.png", openFileDialog(), "" );
-    DP_SADD( sysMenu, qtr( "&Quit" ) , "", ":/pixmaps/quit_16px.png",
+    DP_SADD( sysMenu, qtr( "&Quit" ) , "", ":/pixmaps/menus_quit_16px.png",
              quit(), "" );
 
     /* Set the menu */