Qt4 - More icons for the menus.

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index a06a4c11646de00b932281076d2c9714d65a9b02..0766020abd0cc143ad11f7f72d3756874a29179e 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -238,8 +238,9 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
         menu->addMenu( intfmenu );
         menu->addSeparator();
     }
-    DP_SADD( menu, qtr(I_MENU_MSG), "", "", messagesDialog(), "Ctrl+M" );
-    DP_SADD( menu, qtr(I_MENU_INFO) , "", ":/pixmaps/vlc_info_16px.png", 
+    DP_SADD( menu, qtr(I_MENU_MSG), "", ":/pixmaps/vlc_messages_16px.png",
+             messagesDialog(), "Ctrl+M" );
+    DP_SADD( menu, qtr(I_MENU_INFO) , "", ":/pixmaps/vlc_info_16px.png",
              mediaInfoDialog(), "Ctrl+J" );
     DP_SADD( menu, qtr(I_MENU_CODECINFO) , "", "", mediaCodecDialog(), "Ctrl+I" );
     DP_SADD( menu, qtr(I_MENU_GOTOTIME), "","", gotoTimeDialog(), "Ctrl+T" );
@@ -430,14 +431,17 @@ QMenu *QVLCMenu::HelpMenu()
     { \
         var_Get( p_input, "state", &val ); \
         if( val.i_int == PLAYING_S ) \
-            MIM_SADD( menu, qtr("Pause"), "", "", togglePlayPause() ) \
+            MIM_SADD( menu, qtr("Pause"), "", ":/pixmaps/vlc_pause_16px.png", \
+                    togglePlayPause() ) \
         else \
-            MIM_SADD( menu, qtr("Play"), "", "", togglePlayPause() ) \
+            MIM_SADD( menu, qtr("Play"), "", ":/pixmaps/vlc_play_16px.png", \
+                    togglePlayPause() ) \
     } \
     else if( THEPL->items.i_size && THEPL->i_enabled ) \
-        MIM_SADD( menu, qtr("Play"), "", "", togglePlayPause() ); \
+        MIM_SADD( menu, qtr("Play"), "", ":/pixmaps/vlc_play_16px.png", \
+                togglePlayPause() ); \
     \
-    MIM_SADD( menu, qtr("Stop"), "", "", stop() ); \
+    MIM_SADD( menu, qtr("Stop"), "", ":/pixmaps/vlc_stop_16px.png", stop() ); \
     MIM_SADD( menu, qtr("Previous"), "", ":/pixmaps/vlc_previous_16px.png", \
             prev() ); \
     MIM_SADD( menu, qtr("Next"), "", ":/pixmaps/vlc_next_16px.png", next() );

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

diff --git a/modules/gui/qt4/pixmaps/vlc_next_16px.png b/modules/gui/qt4/pixmaps/vlc_next_16px.png
index dfcfddd1ee110ae37ad71c81bec5618af4691bba..7d3d2fa565b061f2e58c23ae66cec2d8fab0dea1 100644 (file)
Binary files a/modules/gui/qt4/pixmaps/vlc_next_16px.png and b/modules/gui/qt4/pixmaps/vlc_next_16px.png differ

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

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

diff --git a/modules/gui/qt4/pixmaps/vlc_previous_16px.png b/modules/gui/qt4/pixmaps/vlc_previous_16px.png
index 553123359374f654231d32b761908d4373a436f0..f975c9bc288e11cb7935a80fcdafc34a5b860784 100644 (file)
Binary files a/modules/gui/qt4/pixmaps/vlc_previous_16px.png and b/modules/gui/qt4/pixmaps/vlc_previous_16px.png differ

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

diff --git a/modules/gui/qt4/res.qrc b/modules/gui/qt4/res.qrc
index d6c50739173dc9dc0312099b16aaf308b5554690..9970cfb43d588b4537fcd9ba267bbfe699c9aa4d 100644 (file)
--- a/modules/gui/qt4/res.qrc
+++ b/modules/gui/qt4/res.qrc
@@ -22,5 +22,9 @@
   <file>pixmaps/vlc_info_16px.png</file>
   <file>pixmaps/vlc_next_16px.png</file>
   <file>pixmaps/vlc_previous_16px.png</file>
+  <file>pixmaps/vlc_stop_16px.png</file>
+  <file>pixmaps/vlc_pause_16px.png</file>
+  <file>pixmaps/vlc_messages_16px.png</file>
+  <file>pixmaps/vlc_play_16px.png</file>
  </qresource>
 </RCC>