Qt4 - Yet another icon for menus. Should be the last one.

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 2f109306a4bc659b539f1c0fa04b9e59dd5f95dc..753b430ccb8a79554b79354ae45f4d28cbaf4a63 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -193,6 +193,7 @@ EXTRA_DIST += \
        pixmaps/vlc_network_16px.png \
        pixmaps/vlc_stream_16px.png \
        pixmaps/vlc_quit_16px.png \
+       pixmaps/vlc_disc_16px.png \
        pixmaps/vlc_network_16px.png \
        pixmaps/vlc_capture-card_16px.png \
        pixmaps/vlc_preferences_16px.png \

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 75556d601db11ce3487b00279077afbda7ae1353..f4c17d6bdfcde28698602030fa8a262108d93ce3 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -218,7 +218,8 @@ QMenu *QVLCMenu::FileMenu()
             ":/pixmaps/vlc_folder-grey_16px.png", openDirDialog(), "Ctrl+F" );
 #endif /* WIN32 */
 
-    DP_SADD( menu, qtr("Open &Disc..." ), "", "", openDiscDialog(), "Ctrl+D" );
+    DP_SADD( menu, qtr("Open &Disc..." ), "", ":/pixmaps/vlc_disc_16px.png",
+             openDiscDialog(), "Ctrl+D" );
     DP_SADD( menu, qtr("Open &Network..." ), "",
                 ":/pixmaps/vlc_network_16px.png", openNetDialog(), "Ctrl+N" );
     DP_SADD( menu, qtr("Open &Capture Device..." ), "",
@@ -291,9 +292,15 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
         adv->setCheckable( true );
         if( visual_selector_enabled ) adv->setChecked( true );
 #endif
-        menu->addAction ( qtr( "Playlist"), mi, SLOT( playlist() ) );
+        QAction *plAction = menu->addAction ( qtr( "Playlist"), mi,
+                SLOT( playlist() ) );
+        plAction->setCheckable( true );
+
     }
-    DP_SADD( menu, qtr( I_MENU_EXT ), "","",extendedDialog(), "Ctrl+E" );
+    QAction *extAction = menu->addAction( qtr( I_MENU_EXT ), THEDP,
+                SLOT( extendedDialog() ), qtr( "Ctrl+E" ) );
+    extAction->setCheckable( true );
+
     DP_SADD( menu, qtr( "Hide Menus..." ), "","",hideMenus(), "Ctrl+H" );
 
     menu->addSeparator();

diff --git a/modules/gui/qt4/res.qrc b/modules/gui/qt4/res.qrc
index ebdbb855c1d97cecf4430de4d58ccaf217fe763b..bdc18b5ab6e13c816e226e4aa000724abe15e2b3 100644 (file)
--- a/modules/gui/qt4/res.qrc
+++ b/modules/gui/qt4/res.qrc
@@ -29,6 +29,7 @@
   <file>pixmaps/vlc_play_16px.png</file>
   <file>pixmaps/vlc_network_16px.png</file>
   <file>pixmaps/vlc_quit_16px.png</file>
+  <file>pixmaps/vlc_disc_16px.png</file>
   <file>pixmaps/vlc_file-asym_16px.png</file>
   <file>pixmaps/vlc_file-wide_16px.png</file>
   <file>pixmaps/vlc_folder-grey_16px.png</file>