Qt4 - Add Icons to the systray Menu bar.

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 92ac30dcab8aeafd2a8ea594eb8867d5b9d67e6d..fea20fde14c16a93706d56ecf9c294bef5ee4f86 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -207,10 +207,10 @@ QMenu *QVLCMenu::FileMenu()
     menu->addSeparator();
     DP_SADD( menu, qtr("&Streaming..."), "", ":/pixmaps/vlc_stream_16px.png",
             openThenStreamingDialogs(), "Ctrl+S" );
-    DP_SADD( menu, qtr("Conve&rt / Save..."), "", "", openThenTranscodingDialogs(), 
-            "Ctrl+R" );
+    DP_SADD( menu, qtr("Conve&rt / Save..."), "", "",
+            openThenTranscodingDialogs(), "Ctrl+R" );
     menu->addSeparator();
-    DP_SADD( menu, qtr("&Quit") , "", ":/pixmaps/vlc_quit_16px.png", quit(), 
+    DP_SADD( menu, qtr("&Quit") , "", ":/pixmaps/vlc_quit_16px.png", quit(),
             "Ctrl+Q");
     return menu;
 }
@@ -608,19 +608,22 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, intf_thread_t *p_intf,
     sysMenu->clear();
     if( mi->isVisible() || b_force_visible )
     {
-        sysMenu->addAction( qtr("Hide VLC media player"), mi,
+        sysMenu->addAction( QIcon( ":/vlc16.png" ),
+                qtr("Hide VLC media player"), mi,
                 SLOT( toggleUpdateSystrayMenu() ) );
     }
     else
     {
-        sysMenu->addAction( qtr("Show VLC media player"), mi,
+        sysMenu->addAction( QIcon( ":/vlc16.png" ),
+                qtr("Show VLC media player"), mi,
                 SLOT( toggleUpdateSystrayMenu() ) );
     }
     sysMenu->addSeparator();
     POPUP_PLAY_ENTRIES( sysMenu );
     sysMenu->addSeparator();
     DP_SADD( sysMenu, qtr("&Open Media" ), "", "", openFileDialog(), "" );
-    DP_SADD( sysMenu, qtr("&Quit") , "", "", quit(), "" );
+    DP_SADD( sysMenu, qtr("&Quit") , "", ":/pixmaps/vlc_quit_16px.png",
+             quit(), "" );
 
     mi->getSysTray()->setContextMenu( sysMenu );
 }

diff --git a/modules/gui/qt4/res.qrc b/modules/gui/qt4/res.qrc
index 73ea5f82883b74202057a12c58197162ea0f502b..e82493dc8ecfc7aeb603646c6f37087cdda1a70e 100644 (file)
--- a/modules/gui/qt4/res.qrc
+++ b/modules/gui/qt4/res.qrc
@@ -10,6 +10,7 @@
   <file>pixmaps/go-next.png</file>
   <file alias="vlc128.png">../../../share/vlc128x128.png</file>
   <file alias="vlc48.png">../../../share/vlc48x48.png</file>
+  <file alias="vlc16.png">../../../share/vlc16x16.png</file>
   <file alias="noart.png">pixmaps/noart.png</file>
   <file>pixmaps/playlist_icon.png</file>
   <file>pixmaps/spref_cone_Audio_64.png</file>