Commit dd3e4632 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Qt4 - Add Icons to the systray Menu bar.

parent 7d72c079
...@@ -207,10 +207,10 @@ QMenu *QVLCMenu::FileMenu() ...@@ -207,10 +207,10 @@ QMenu *QVLCMenu::FileMenu()
menu->addSeparator(); menu->addSeparator();
DP_SADD( menu, qtr("&Streaming..."), "", ":/pixmaps/vlc_stream_16px.png", DP_SADD( menu, qtr("&Streaming..."), "", ":/pixmaps/vlc_stream_16px.png",
openThenStreamingDialogs(), "Ctrl+S" ); openThenStreamingDialogs(), "Ctrl+S" );
DP_SADD( menu, qtr("Conve&rt / Save..."), "", "", openThenTranscodingDialogs(), DP_SADD( menu, qtr("Conve&rt / Save..."), "", "",
"Ctrl+R" ); openThenTranscodingDialogs(), "Ctrl+R" );
menu->addSeparator(); 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"); "Ctrl+Q");
return menu; return menu;
} }
...@@ -608,19 +608,22 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, intf_thread_t *p_intf, ...@@ -608,19 +608,22 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, intf_thread_t *p_intf,
sysMenu->clear(); sysMenu->clear();
if( mi->isVisible() || b_force_visible ) 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() ) ); SLOT( toggleUpdateSystrayMenu() ) );
} }
else else
{ {
sysMenu->addAction( qtr("Show VLC media player"), mi, sysMenu->addAction( QIcon( ":/vlc16.png" ),
qtr("Show VLC media player"), mi,
SLOT( toggleUpdateSystrayMenu() ) ); SLOT( toggleUpdateSystrayMenu() ) );
} }
sysMenu->addSeparator(); sysMenu->addSeparator();
POPUP_PLAY_ENTRIES( sysMenu ); POPUP_PLAY_ENTRIES( sysMenu );
sysMenu->addSeparator(); sysMenu->addSeparator();
DP_SADD( sysMenu, qtr("&Open Media" ), "", "", openFileDialog(), "" ); 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 ); mi->getSysTray()->setContextMenu( sysMenu );
} }
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<file>pixmaps/go-next.png</file> <file>pixmaps/go-next.png</file>
<file alias="vlc128.png">../../../share/vlc128x128.png</file> <file alias="vlc128.png">../../../share/vlc128x128.png</file>
<file alias="vlc48.png">../../../share/vlc48x48.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 alias="noart.png">pixmaps/noart.png</file>
<file>pixmaps/playlist_icon.png</file> <file>pixmaps/playlist_icon.png</file>
<file>pixmaps/spref_cone_Audio_64.png</file> <file>pixmaps/spref_cone_Audio_64.png</file>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment