Skip to content

V
vlc-2-2
Commit 26773c45 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt4 - Systray menu order adjustement.

parent 06bb9077
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
modules/gui/qt4/dialogs_provider.cpp
View file @ 26773c45
...@@ -216,7 +216,6 @@ void DialogsProvider::openDialog( int i_tab ) ...@@ -216,7 +216,6 @@ void DialogsProvider::openDialog( int i_tab )
void DialogsProvider::PLAppendDialog() void DialogsProvider::PLAppendDialog()
{ {
OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, ENQUEUE ) OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, ENQUEUE )
->showTab(0); ->showTab(0);
} }
......
modules/gui/qt4/menus.cpp
View file @ 26773c45
...@@ -597,8 +597,13 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, intf_thread_t *p_intf, ...@@ -597,8 +597,13 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, intf_thread_t *p_intf,
POPUP_BOILERPLATE; POPUP_BOILERPLATE;
QMenu *sysMenu = mi->getSysTrayMenu(); QMenu *sysMenu = mi->getSysTrayMenu();
sysMenu->clear(); sysMenu->clear();
DP_SADD( sysMenu, qtr("&About VLC media player" ), "", "",
aboutDialog(), "" );
sysMenu->addSeparator();
POPUP_PLAY_ENTRIES( sysMenu ); POPUP_PLAY_ENTRIES( sysMenu );
sysMenu->addSeparator(); sysMenu->addSeparator();
DP_SADD( sysMenu, qtr("&Open" ), "", "", openFileDialog(), "" );
sysMenu->addSeparator();
if( !mi->isVisible() || b_force_visible ) if( !mi->isVisible() || b_force_visible )
{ {
...@@ -610,7 +615,6 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, intf_thread_t *p_intf, ...@@ -610,7 +615,6 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi, intf_thread_t *p_intf,
sysMenu->addAction( qtr("Show Interface"), mi, sysMenu->addAction( qtr("Show Interface"), mi,
SLOT( toggleUpdateSystrayMenu() ) ); SLOT( toggleUpdateSystrayMenu() ) );
} }
DP_SADD( sysMenu, qtr("&Open" ), "", "", openFileDialog(), "" );
DP_SADD( sysMenu, qtr("&Quit") , "", "", quit(), "" ); DP_SADD( sysMenu, qtr("&Quit") , "", "", quit(), "" );
mi->getSysTray()->setContextMenu( sysMenu ); mi->getSysTray()->setContextMenu( sysMenu );
......
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