Qt4 - Yet another icon from Danko: Preferences.

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index bf5a90e9e3f57c2683fc57de4f40826f407be2ab..2f109306a4bc659b539f1c0fa04b9e59dd5f95dc 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -195,6 +195,7 @@ EXTRA_DIST += \
        pixmaps/vlc_quit_16px.png \
        pixmaps/vlc_network_16px.png \
        pixmaps/vlc_capture-card_16px.png \
+       pixmaps/vlc_preferences_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 660a3df4fa4843ec8f9a79768219df7db78c8383..4ea62c352fd743ea5da9f7f3cdf8f3adda7e0e48 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -269,7 +269,8 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
     DP_SADD( menu, qtr( I_MENU_EXT ), "","",extendedDialog(), "Ctrl+E" );
     DP_SADD( menu, qtr( "Hide Menus..." ), "","",hideMenus(), "Ctrl+H" );
     menu->addSeparator();
-    DP_SADD( menu, qtr("Preferences"), "", "", prefsDialog(), "Ctrl+P" );
+    DP_SADD( menu, qtr("Preferences"), "", ":/pixmaps/vlc_preferences_16px.png",
+             prefsDialog(), "Ctrl+P" );
     return menu;
 }
 

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

diff --git a/modules/gui/qt4/res.qrc b/modules/gui/qt4/res.qrc
index c9cd1e46853c83ea610a870db68855444f13d192..7633f2bf4dd18137455546337b6a8e455d4e4e9b 100644 (file)
--- a/modules/gui/qt4/res.qrc
+++ b/modules/gui/qt4/res.qrc
@@ -32,6 +32,7 @@
   <file>pixmaps/vlc_file-asym_16px.png</file>
   <file>pixmaps/vlc_file-wide_16px.png</file>
   <file>pixmaps/vlc_capture-card_16px.png</file>
+  <file>pixmaps/vlc_preferences_16px.png</file>
   <file>pixmaps/vlc_stream_16px.png</file>
  </qresource>
 </RCC>