From c6ad91bc511f8e55aaf893b52b17b5e2a06efb20 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Sat, 8 Sep 2007 11:10:30 +0000 Subject: [PATCH] Qt4 - Audio/Video order fix in menus. Changes MediaInformation shortcut to Ctrl+I. Will not remove Ctrl+J for codecs since this is one of the most asked question. --- modules/gui/qt4/menus.cpp | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 055534b7e0..a2be35a3ba 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -175,8 +175,8 @@ void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf, } BAR_ADD( ToolsMenu( p_intf, mi, adv_controls_enabled, visual_selector_enabled ), qtr("&Tools") ); - BAR_DADD( VideoMenu( p_intf, NULL ), qtr("&Video"), 1 ); BAR_DADD( AudioMenu( p_intf, NULL ), qtr("&Audio"), 2 ); + BAR_DADD( VideoMenu( p_intf, NULL ), qtr("&Video"), 1 ); BAR_DADD( NavigMenu( p_intf, NULL ), qtr("&Navigation"), 3 ); BAR_ADD( HelpMenu(), qtr("&Help" ) ); @@ -255,9 +255,9 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi, } DP_SADD( menu, qtr( I_MENU_MSG ), "", ":/pixmaps/vlc_messages_16px.png", messagesDialog(), "Ctrl+M" ); - DP_SADD( menu, qtr( I_MENU_INFO ) , "", "", mediaInfoDialog(), "Ctrl+J" ); + DP_SADD( menu, qtr( I_MENU_INFO ) , "", "", mediaInfoDialog(), "Ctrl+I" ); DP_SADD( menu, qtr( I_MENU_CODECINFO ) , "", ":/pixmaps/vlc_info_16px.png", - mediaCodecDialog(), "Ctrl+I" ); + mediaCodecDialog(), "Ctrl+J" ); DP_SADD( menu, qtr( I_MENU_GOTOTIME ), "","", gotoTimeDialog(), "Ctrl+T" ); #if 0 /* Not Implemented yet */ DP_SADD( menu, qtr( I_MENU_BOOKMARK ), "","", bookmarksDialog(), "Ctrl+B" ); @@ -607,7 +607,19 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) { vlc_object_yield( p_input ); InputAutoMenuBuilder( VLC_OBJECT(p_input), objects, varnames ); - + + /* Audio menu */ + PUSH_SEPARATOR + varnames.push_back( "audio-es" ); + objects.push_back( p_input->i_object_id ); + vlc_object_t *p_aout = (vlc_object_t *)vlc_object_find( p_input, + VLC_OBJECT_AOUT, FIND_ANYWHERE ); + if( p_aout ) + { + AudioAutoMenuBuilder( p_aout, objects, varnames ); + vlc_object_release( p_aout ); + } + /* Video menu */ PUSH_SEPARATOR; varnames.push_back( "video-es" ); @@ -621,17 +633,6 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show ) VideoAutoMenuBuilder( p_vout, objects, varnames ); vlc_object_release( p_vout ); } - /* Audio menu */ - PUSH_SEPARATOR - varnames.push_back( "audio-es" ); - objects.push_back( p_input->i_object_id ); - vlc_object_t *p_aout = (vlc_object_t *)vlc_object_find( p_input, - VLC_OBJECT_AOUT, FIND_ANYWHERE ); - if( p_aout ) - { - AudioAutoMenuBuilder( p_aout, objects, varnames ); - vlc_object_release( p_aout ); - } } QMenu *menu = new QMenu(); -- 2.39.2