Qt4 - Menus and new icons. Remove the isCheckable option from extended/playlist.

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index a92cab1803ff22d6d489e43a9bcb821096d59270..e4b8e25cd63a65936c379814a5f9338bfe80aabf 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -197,6 +197,8 @@ EXTRA_DIST += \
        pixmaps/vlc_network_16px.png \
        pixmaps/vlc_capture-card_16px.png \
        pixmaps/vlc_preferences_16px.png \
+       pixmaps/vlc_settings_16px.png \
+       pixmaps/vlc_playlist_16px.png \
        pixmaps/vlc_folder-grey_16px.png \
        pixmaps/vlc_folder-blue_16px.png \
        pixmaps/vlc_tape_16px.png \

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index f4c17d6bdfcde28698602030fa8a262108d93ce3..e9de26e3c3b3742d1ffaac3823c65b58cad9f896 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -286,22 +286,21 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
                 mi, SLOT( advanced() ) );
         adv->setCheckable( true );
         if( adv_controls_enabled ) adv->setChecked( true );
+
+       DP_SADD( menu, qtr( "Hide Menus..." ), "","",hideMenus(), "Ctrl+H" );
+       menu->addSeparator();
+
 #if 0 /* For Visualisations. Not yet working */
         adv = menu->addAction( qtr("Visualizations selector" ),
                 mi, SLOT( visual() ) );
         adv->setCheckable( true );
         if( visual_selector_enabled ) adv->setChecked( true );
 #endif
-        QAction *plAction = menu->addAction ( qtr( "Playlist"), mi,
-                SLOT( playlist() ) );
-        plAction->setCheckable( true );
-
+       menu->addAction ( QIcon(":/pixmaps/vlc_playlist_16px.png"),
+                         qtr( "Playlist"), mi, SLOT( playlist() ) );
     }
-    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" );
+    DP_SADD( menu, qtr( I_MENU_EXT ), "", ":/pixmaps/vlc_settings_16px.png",
+                 extendedDialog() ,  "Ctrl+E"  );
 
     menu->addSeparator();
     DP_SADD( menu, qtr("Preferences"), "", ":/pixmaps/vlc_preferences_16px.png",

diff --git a/modules/gui/qt4/pixmaps/vlc_folder-grey_16px.png b/modules/gui/qt4/pixmaps/vlc_folder-grey_16px.png
index c336dce88648f870ea2bef7254d3097e5a1a7ad6..babe513db7743113fedb3169df69a745a3755c2c 100644 (file)
Binary files a/modules/gui/qt4/pixmaps/vlc_folder-grey_16px.png and b/modules/gui/qt4/pixmaps/vlc_folder-grey_16px.png differ

diff --git a/modules/gui/qt4/pixmaps/vlc_playlist_16px.png b/modules/gui/qt4/pixmaps/vlc_playlist_16px.png
new file mode 100644 (file)
index 0000000..8b7dbc1
Binary files /dev/null and b/modules/gui/qt4/pixmaps/vlc_playlist_16px.png differ

diff --git a/modules/gui/qt4/pixmaps/vlc_settings_16px.png b/modules/gui/qt4/pixmaps/vlc_settings_16px.png
new file mode 100644 (file)
index 0000000..1a35dfd
Binary files /dev/null and b/modules/gui/qt4/pixmaps/vlc_settings_16px.png differ

diff --git a/modules/gui/qt4/res.qrc b/modules/gui/qt4/res.qrc
index bdc18b5ab6e13c816e226e4aa000724abe15e2b3..4353868b48089f4b1f3e931e83f1d1a123f8f24d 100644 (file)
--- a/modules/gui/qt4/res.qrc
+++ b/modules/gui/qt4/res.qrc
@@ -35,6 +35,8 @@
   <file>pixmaps/vlc_folder-grey_16px.png</file>
   <file>pixmaps/vlc_capture-card_16px.png</file>
   <file>pixmaps/vlc_preferences_16px.png</file>
+  <file>pixmaps/vlc_playlist_16px.png</file>
+  <file>pixmaps/vlc_settings_16px.png</file>
   <file>pixmaps/vlc_stream_16px.png</file>
  </qresource>
 </RCC>