* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "menus.hpp"
-#include "dialogs_provider.hpp"
#include <QMenu>
+#include <QMenuBar>
#include <QAction>
#include <QActionGroup>
#include <QSignalMapper>
+#include <vlc_intf_strings.h>
+
+#include "main_interface.hpp"
+#include "menus.hpp"
+#include "dialogs_provider.hpp"
+#include "input_manager.hpp"
+
enum
{
ITEM_NORMAL,
static QActionGroup *currentGroup;
-/*****************************************************************************
- * Static menu helpers
- * These create already mapped and connected menus
- *****************************************************************************/
-
-#define STATIC_ADD( text, help, icon, slot ) { QAction *action = menu->addAction( text, THEDP, SLOT( slot ) ); }
-
-QMenu *QVLCMenu::FileMenu()
-{
- QMenu *menu = new QMenu();
-
- STATIC_ADD( _("Quick &Open File...") , "", NULL, simpleOpenDialog() );
- STATIC_ADD( _("&Advanced Open..." ), "", NULL, openDialog() );
- menu->addSeparator();
- STATIC_ADD( _("Streaming..."), "", NULL, streamingDialog() );
- menu->addSeparator();
- STATIC_ADD( _("&Quit") , "", NULL, quit() );
-
- return menu;
-}
-
-#if 0
-QMenu *OpenStreamMenu( intf_thread_t *p_intf )
-{
- QMenu *menu = new QMenu;
- menu->Append( OpenFileSimple_Event, wxU(_("Quick &Open File...")) );
- menu->Append( OpenFile_Event, wxU(_("Open &File...")) );
- menu->Append( OpenDirectory_Event, wxU(_("Open D&irectory...")) );
- menu->Append( OpenDisc_Event, wxU(_("Open &Disc...")) );
- menu->Append( OpenNet_Event, wxU(_("Open &Network Stream...")) );
- menu->Append( OpenCapture_Event, wxU(_("Open &Capture Device...")) );
- return menu;
-}
-
-wxMenu *MiscMenu( intf_thread_t *p_intf )
-{
- wxMenu *menu = new wxMenu;
- menu->Append( MediaInfo_Event, wxU(_("Media &Info...")) );
- menu->Append( Messages_Event, wxU(_("&Messages...")) );
- menu->Append( Preferences_Event, wxU(_("&Preferences...")) );
- return menu;
-}
+// Add static entries to menus
+#define DP_SADD( text, help, icon, slot ) { if( strlen(icon) > 0 ) { QAction *action = menu->addAction( text, THEDP, SLOT( slot ) ); action->setIcon(QIcon(icon));} else { menu->addAction( text, THEDP, SLOT( slot ) ); } }
+#define MIM_SADD( text, help, icon, slot ) { if( strlen(icon) > 0 ) { QAction *action = menu->addAction( text, THEMIM, SLOT( slot ) ); action->setIcon(QIcon(icon));} else { menu->addAction( text, THEMIM, SLOT( slot ) ); } }
+#define PL_SADD
-#endif
/*****************************************************************************
- * Builders for the dynamic menus
+ * Definitions of variables for the dynamic menus
*****************************************************************************/
-#define PUSH_VAR( var ) rs_varnames.push_back( var ); \
- ri_objects.push_back( p_object->i_object_id )
+#define PUSH_VAR( var ) varnames.push_back( var ); \
+ objects.push_back( p_object->i_object_id )
+
+#define PUSH_SEPARATOR if( objects.size() != i_last_separator ) { \
+ objects.push_back( 0 ); varnames.push_back( "" ); \
+ i_last_separator = objects.size(); }
static int InputAutoMenuBuilder( vlc_object_t *p_object,
- vector<int> &ri_objects,
- vector<const char *> &rs_varnames )
+ vector<int> &objects,
+ vector<const char *> &varnames )
{
PUSH_VAR( "bookmark");
PUSH_VAR( "title" );
return VLC_SUCCESS;
}
-static int VideoAutoMenuBuilder( vlc_object_t *p_object,
- vector<int> &ri_objects,
- vector<const char *> &rs_varnames )
+static int VideoAutoMenuBuilder( vlc_object_t *p_object,
+ vector<int> &objects,
+ vector<const char *> &varnames )
{
PUSH_VAR( "fullscreen" );
PUSH_VAR( "zoom" );
FIND_PARENT );
if( p_dec_obj != NULL )
{
+ vlc_object_t *p_object = p_dec_obj;
PUSH_VAR( "ffmpeg-pp-q" );
vlc_object_release( p_dec_obj );
}
}
static int AudioAutoMenuBuilder( vlc_object_t *p_object,
- vector<int> &ri_objects,
- vector<const char *> &rs_varnames )
+ vector<int> &objects,
+ vector<const char *> &varnames )
{
PUSH_VAR( "audio-device" );
PUSH_VAR( "audio-channels" );
return VLC_SUCCESS;
}
-static int IntfAutoMenuBuilder( intf_thread_t *p_intf, vector<int> &ri_objects,
- vector<const char *> &rs_varnames, bool is_popup )
+/*****************************************************************************
+ * All normal menus
+ *****************************************************************************/
+
+#define BAR_ADD( func, title ) { \
+ QMenu *menu = func; menu->setTitle( title ); bar->addMenu( menu ); }
+
+#define BAR_DADD( func, title, id ) { \
+ QMenu *menu = func; menu->setTitle( title ); bar->addMenu( menu ); \
+ MenuFunc *f = new MenuFunc( menu, id ); \
+ CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() ); \
+ THEDP->menusUpdateMapper->setMapping( menu, f ); }
+
+void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf,
+ bool playlist, bool adv_controls_enabled,
+ bool visual_selector_enabled )
+{
+ QMenuBar *bar = mi->menuBar();
+ BAR_ADD( FileMenu(), qtr("Media") );
+ if( playlist )
+ {
+ BAR_ADD( PlaylistMenu( mi,p_intf ), qtr("Playlist" ) );
+ }
+ 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( NavigMenu( p_intf, NULL ), qtr("Navigation"), 3 );
+
+ BAR_ADD( HelpMenu(), qtr("Help" ) );
+}
+QMenu *QVLCMenu::FileMenu()
+{
+ QMenu *menu = new QMenu();
+/* DP_SADD( qtr("Quick &Open File...") , "", "", simpleOpenDialog() );*/
+ DP_SADD( qtr("Open &File..." ), "", "", openFileDialog() );
+ DP_SADD( qtr("Open &Disc..." ), "", "", openDiscDialog());
+ DP_SADD( qtr("Open &Network..." ), "", "", openNetDialog());
+ DP_SADD( qtr("Open &Capture Device..." ), "", "", openCaptureDialog());
+ menu->addSeparator();
+ DP_SADD( qtr("&Streaming..."), "", "", streamingDialog() );
+ menu->addSeparator();
+ DP_SADD( qtr("&Quit") , "", "", quit() );
+ return menu;
+}
+
+QMenu *QVLCMenu::PlaylistMenu( MainInterface *mi, intf_thread_t *p_intf )
+{
+ QMenu *menu = new QMenu();
+ menu->addMenu( SDMenu( p_intf ) );
+ menu->addSeparator();
+
+ DP_SADD( qtr(I_PL_LOAD), "", "", openPlaylist() );
+ DP_SADD( qtr(I_PL_SAVE), "", "", savePlaylist() );
+ menu->addSeparator();
+ menu->addAction( qtr("Undock from interface"), mi,
+ SLOT( undockPlaylist() ) );
+ return menu;
+}
+
+QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
+ bool adv_controls_enabled,
+ bool visual_selector_enabled, bool with_intf )
+{
+ QMenu *menu = new QMenu();
+ if( with_intf )
+ {
+ QMenu *intfmenu = InterfacesMenu( p_intf, NULL );
+ intfmenu->setTitle( qtr("Interfaces" ) );
+ menu->addMenu( intfmenu );
+ menu->addSeparator();
+ }
+ DP_SADD( qtr(I_MENU_MSG), "", "", messagesDialog() );
+ DP_SADD( qtr(I_MENU_INFO) , "", "", mediaInfoDialog() );
+ DP_SADD( qtr(I_MENU_EXT), "","",extendedDialog() );
+ if( mi )
+ {
+ menu->addSeparator();
+ QAction *adv = menu->addAction( qtr("Advanced controls" ),
+ mi, SLOT( advanced() ) );
+ adv->setCheckable( true );
+ if( adv_controls_enabled ) adv->setChecked( true );
+#if 0
+ adv = menu->addAction( qtr("Visualizations selector" ),
+ mi, SLOT( visual() ) );
+ adv->setCheckable( true );
+ if( visual_selector_enabled ) adv->setChecked( true );
+#endif
+ }
+ menu->addSeparator();
+ DP_SADD( qtr("Preferences"), "", "", prefsDialog() );
+ return menu;
+}
+
+QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current )
+{
+ vector<int> objects;
+ vector<const char *> varnames;
+ /** \todo add "switch to XXX" */
+ varnames.push_back( "intf-add" );
+ objects.push_back( p_intf->i_object_id );
+
+ QMenu *menu = Populate( p_intf, current, varnames, objects );
+
+ if( !p_intf->pf_show_dialog )
+ {
+ menu->addSeparator();
+ menu->addAction( qtr("Switch to skins"), THEDP, SLOT(switchToSkins()) );
+ }
+
+ CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() );
+ THEDP->menusUpdateMapper->setMapping( menu, 4 );
+ return menu;
+}
+
+QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current )
+{
+ vector<int> objects;
+ vector<const char *> varnames;
+
+ vlc_object_t *p_object = (vlc_object_t *)vlc_object_find( p_intf,
+ VLC_OBJECT_INPUT, FIND_ANYWHERE );
+ if( p_object != NULL )
+ {
+ PUSH_VAR( "audio-es" );
+ vlc_object_release( p_object );
+ }
+
+ p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_AOUT,
+ FIND_ANYWHERE );
+ if( p_object )
+ {
+ AudioAutoMenuBuilder( p_object, objects, varnames );
+ vlc_object_release( p_object );
+ }
+ return Populate( p_intf, current, varnames, objects );
+}
+
+
+QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current )
{
- /* vlc_object_find is needed because of the dialogs provider case */
vlc_object_t *p_object;
- p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_INTF,
- FIND_PARENT );
+ vector<int> objects;
+ vector<const char *> varnames;
+
+ p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
+ FIND_ANYWHERE );
if( p_object != NULL )
{
- if( is_popup )
- {
- PUSH_VAR( "intf-switch" );
- }
- else
+ PUSH_VAR( "video-es" );
+ PUSH_VAR( "spu-es" );
+ vlc_object_release( p_object );
+ }
+
+ p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT,
+ FIND_ANYWHERE );
+ if( p_object != NULL )
+ {
+ VideoAutoMenuBuilder( p_object, objects, varnames );
+ vlc_object_release( p_object );
+ }
+ return Populate( p_intf, current, varnames, objects );
+}
+
+QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *current )
+{
+ vlc_object_t *p_object;
+ vector<int> objects;
+ vector<const char *> varnames;
+
+ /* FIXME */
+ p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
+ FIND_ANYWHERE );
+ if( p_object != NULL )
+ {
+ InputAutoMenuBuilder( p_object, objects, varnames );
+ PUSH_VAR( "prev-title"); PUSH_VAR ( "next-title" );
+ PUSH_VAR( "prev-chapter"); PUSH_VAR( "next-chapter" );
+ vlc_object_release( p_object );
+ }
+ return Populate( p_intf, current, varnames, objects );
+}
+
+QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf )
+{
+ QMenu *menu = new QMenu();
+ menu->setTitle( qtr(I_PL_SD) );
+ vlc_list_t *p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE,
+ FIND_ANYWHERE );
+ int i_num = 0;
+ for( int i_index = 0 ; i_index < p_list->i_count; i_index++ )
+ {
+ module_t * p_parser = (module_t *)p_list->p_values[i_index].p_object ;
+ if( !strcmp( p_parser->psz_capability, "services_discovery" ) )
+ i_num++;
+ }
+ for( int i_index = 0 ; i_index < p_list->i_count; i_index++ )
+ {
+ module_t * p_parser = (module_t *)p_list->p_values[i_index].p_object;
+ if( !strcmp( p_parser->psz_capability, "services_discovery" ) )
{
- PUSH_VAR( "intf-switch" );
+ QAction *a = new QAction( qfu( p_parser->psz_longname ), menu );
+ a->setCheckable( true );
+ /* hack to handle submodules properly */
+ int i = -1;
+ while( p_parser->pp_shortcuts[++i] != NULL );
+ i--;
+ if( playlist_IsServicesDiscoveryLoaded( THEPL,
+ i>=0?p_parser->pp_shortcuts[i] : p_parser->psz_object_name ) )
+ {
+ a->setChecked( true );
+ }
+ CONNECT( a , triggered(), THEDP->SDMapper, map() );
+ THEDP->SDMapper->setMapping( a, i>=0? p_parser->pp_shortcuts[i] :
+ p_parser->psz_object_name );
+ menu->addAction( a );
}
- PUSH_VAR( "intf-add" );
- PUSH_VAR( "intf-skins" );
- vlc_object_release( p_object );
}
- return VLC_SUCCESS;
+ vlc_list_release( p_list );
+ return menu;
}
-#undef PUSH_VAR
+QMenu *QVLCMenu::HelpMenu()
+{
+ QMenu *menu = new QMenu();
+ DP_SADD( qtr("Help") , "", "", helpDialog() );
+ menu->addSeparator();
+ DP_SADD( qtr(I_MENU_ABOUT), "", "", aboutDialog() );
+ return menu;
+}
+
+
/*****************************************************************************
* Popup menus
*****************************************************************************/
-
-#define PUSH_VAR( var ) as_varnames.push_back( var ); \
- ai_objects.push_back( p_object->i_object_id )
-
-#define PUSH_SEPARATOR if( ai_objects.size() != i_last_separator ) { \
- ai_objects.push_back( 0 ); \
- as_varnames.push_back( "" ); \
- i_last_separator = ai_objects.size(); }
-
#define POPUP_BOILERPLATE \
unsigned int i_last_separator = 0; \
- vector<int> ai_objects; \
- vector<const char *> as_varnames; \
- playlist_t *p_playlist = (playlist_t *) vlc_object_find( p_intf, \
- VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\
- if( !p_playlist ) \
- return; \
- input_thread_t *p_input = p_playlist->p_input
-
-#define CREATE_POPUP \
- QMenu *popupmenu = new QMenu(); \
- QVLCMenu::Populate( popupmenu, as_varnames, ai_objects ); \
- p_intf->p_sys->p_popup_menu = &popupmenu; \
+ vector<int> objects; \
+ vector<const char *> varnames; \
+ input_thread_t *p_input = THEMIM->getInput();
+
+#define CREATE_POPUP \
+ QMenu *menu = new QMenu(); \
+ Populate( p_intf, menu, varnames, objects ); \
+ p_intf->p_sys->p_popup_menu = menu; \
+ menu->popup( QCursor::pos() ); \
p_intf->p_sys->p_popup_menu = NULL; \
- i_last_separator = 0 // stop compiler warning
-/// p_parent->PopupMenu( &popupmenu, pos.x, pos.y ); \ /// TODO
+ i_last_separator = 0;
#define POPUP_STATIC_ENTRIES \
- if( p_input != NULL ) \
+ vlc_value_t val; \
+ MIM_SADD( qtr("Stop"), "", "", stop() ); \
+ MIM_SADD( qtr("Previous"), "", "", prev() ); \
+ MIM_SADD( qtr("Next"), "", "", next() ); \
+ if( p_input ) \
{ \
- vlc_value_t val; \
- popupmenu.InsertSeparator( 0 ); \
- popupmenu.Insert( 0, Stop_Event, wxU(_("Stop")) ); \
- popupmenu.Insert( 0, Previous_Event, wxU(_("Previous")) ); \
- popupmenu.Insert( 0, Next_Event, wxU(_("Next")) ); \
var_Get( p_input, "state", &val ); \
if( val.i_int == PAUSE_S ) \
- popupmenu.Insert( 0, Play_Event, wxU(_("Play")) ); \
+ MIM_SADD( qtr("Play"), "", "", togglePlayPause() ) \
else \
- popupmenu.Insert( 0, Pause_Event, wxU(_("Pause")) ); \
- \
- vlc_object_release( p_input ); \
- } \
- else \
- { \
- if( p_playlist && p_playlist->i_size ) \
- { \
- popupmenu.InsertSeparator( 0 ); \
- popupmenu.Insert( 0, Play_Event, wxU(_("Play")) ); \
- } \
- if( p_playlist ) vlc_object_release( p_playlist ); \
+ MIM_SADD( qtr("Pause"), "", "", togglePlayPause() ) \
} \
+ else if( THEPL->items.i_size && THEPL->i_enabled ) \
+ MIM_SADD( qtr("Play"), "", "", togglePlayPause() ) \
+ \
+ QMenu *intfmenu = InterfacesMenu( p_intf, NULL ); \
+ intfmenu->setTitle( qtr("Interfaces" ) ); \
+ menu->addMenu( intfmenu ); \
\
- popupmenu.Append( MenuDummy_Event, wxU(_("Miscellaneous")), \
- MiscMenu( p_intf ), wxT("") )
+ QMenu *toolsmenu = ToolsMenu( p_intf, NULL, false, false ); \
+ toolsmenu->setTitle( qtr("Tools" ) ); \
+ menu->addMenu( toolsmenu ); \
-void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf, const QPoint &pos )
+void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf )
{
POPUP_BOILERPLATE;
if( p_input )
{
vlc_object_yield( p_input );
- as_varnames.push_back( "video-es" );
- ai_objects.push_back( p_input->i_object_id );
- as_varnames.push_back( "spu-es" );
- ai_objects.push_back( p_input->i_object_id );
+ varnames.push_back( "video-es" );
+ objects.push_back( p_input->i_object_id );
+ varnames.push_back( "spu-es" );
+ objects.push_back( p_input->i_object_id );
vlc_object_t *p_vout = (vlc_object_t *)vlc_object_find( p_input,
VLC_OBJECT_VOUT, FIND_CHILD );
if( p_vout )
{
- VideoAutoMenuBuilder( p_vout, ai_objects, as_varnames );
+ VideoAutoMenuBuilder( p_vout, objects, varnames );
vlc_object_release( p_vout );
}
vlc_object_release( p_input );
}
- vlc_object_release( p_playlist );
- //CREATE_POPUP;
+ CREATE_POPUP;
}
-void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf, const QPoint &pos )
+void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf )
{
POPUP_BOILERPLATE;
if( p_input )
{
vlc_object_yield( p_input );
- as_varnames.push_back( "audio-es" );
- ai_objects.push_back( p_input->i_object_id );
+ 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, ai_objects, as_varnames );
+ AudioAutoMenuBuilder( p_aout, objects, varnames );
vlc_object_release( p_aout );
}
vlc_object_release( p_input );
}
- vlc_object_release( p_playlist );
- //CREATE_POPUP;
+ CREATE_POPUP;
}
-#if 0
/* Navigation stuff, and general */
-static void MiscPopupMenu( intf_thread_t *p_intf, const QPoint &pos )
+void QVLCMenu::MiscPopupMenu( intf_thread_t *p_intf )
{
POPUP_BOILERPLATE;
if( p_input )
{
vlc_object_yield( p_input );
- as_varnames.push_back( "audio-es" );
- InputAutoMenuBuilder( VLC_OBJECT(p_input), ai_objects, as_varnames );
+ varnames.push_back( "audio-es" );
+ InputAutoMenuBuilder( VLC_OBJECT(p_input), objects, varnames );
PUSH_SEPARATOR;
}
- IntfAutoMenuBuilder( p_intf, ai_objects, as_varnames, true );
-
- Menu popupmenu( p_intf, PopupMenu_Events );
- popupmenu.Populate( as_varnames, ai_objects );
+ QMenu *menu = new QMenu();
+ Populate( p_intf, menu, varnames, objects );
+ menu->addSeparator();
POPUP_STATIC_ENTRIES;
- popupmenu.Append( MenuDummy_Event, wxU(_("Open")),
- OpenStreamMenu( p_intf ), wxT("") );
- p_intf->p_sys->p_popup_menu = &popupmenu;
- p_parent->PopupMenu( &popupmenu, pos.x, pos.y );
+ p_intf->p_sys->p_popup_menu = menu;
+ menu->popup( QCursor::pos() );
p_intf->p_sys->p_popup_menu = NULL;
- vlc_object_release( p_playlist );
}
-void PopupMenu( intf_thread_t *p_intf, wxWindow *p_parent,
- const wxPoint& pos )
+void QVLCMenu::PopupMenu( intf_thread_t *p_intf )
{
POPUP_BOILERPLATE;
if( p_input )
{
vlc_object_yield( p_input );
- InputAutoMenuBuilder( VLC_OBJECT(p_input), ai_objects, as_varnames );
+ InputAutoMenuBuilder( VLC_OBJECT(p_input), objects, varnames );
/* Video menu */
PUSH_SEPARATOR;
- as_varnames.push_back( "video-es" );
- ai_objects.push_back( p_input->i_object_id );
- as_varnames.push_back( "spu-es" );
- ai_objects.push_back( p_input->i_object_id );
+ varnames.push_back( "video-es" );
+ objects.push_back( p_input->i_object_id );
+ varnames.push_back( "spu-es" );
+ objects.push_back( p_input->i_object_id );
vlc_object_t *p_vout = (vlc_object_t *)vlc_object_find( p_input,
VLC_OBJECT_VOUT, FIND_CHILD );
if( p_vout )
{
- VideoAutoMenuBuilder( p_vout, ai_objects, as_varnames );
+ VideoAutoMenuBuilder( p_vout, objects, varnames );
vlc_object_release( p_vout );
}
/* Audio menu */
PUSH_SEPARATOR
- as_varnames.push_back( "audio-es" );
- ai_objects.push_back( p_input->i_object_id );
+ 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, ai_objects, as_varnames );
+ AudioAutoMenuBuilder( p_aout, objects, varnames );
vlc_object_release( p_aout );
}
}
- /* Interface menu */
- PUSH_SEPARATOR
- IntfAutoMenuBuilder( p_intf, ai_objects, as_varnames, true );
-
- /* Build menu */
- Menu popupmenu( p_intf, PopupMenu_Events );
- popupmenu.Populate( as_varnames, ai_objects );
+ QMenu *menu = new QMenu();
+ Populate( p_intf, menu, varnames, objects );
+ menu->addSeparator();
POPUP_STATIC_ENTRIES;
- popupmenu.Append( MenuDummy_Event, wxU(_("Open")),
- OpenStreamMenu( p_intf ), wxT("") );
- p_intf->p_sys->p_popup_menu = &popupmenu;
- p_parent->PopupMenu( &popupmenu, pos.x, pos.y );
+ p_intf->p_sys->p_popup_menu = menu;
+ menu->popup( QCursor::pos() );
p_intf->p_sys->p_popup_menu = NULL;
- vlc_object_release( p_playlist );
-}
-#endif
-
-/*****************************************************************************
- * Auto menus
- *****************************************************************************/
-QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current )
-{
- vector<int> ai_objects;
- vector<const char *> as_varnames;
-
- vlc_object_t *p_object = (vlc_object_t *)vlc_object_find( p_intf,
- VLC_OBJECT_INPUT, FIND_ANYWHERE );
- if( p_object != NULL )
- {
- PUSH_VAR( "audio-es" );
- vlc_object_release( p_object );
- }
-
- p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
- if( p_object )
- {
- AudioAutoMenuBuilder( p_object, ai_objects, as_varnames );
- vlc_object_release( p_object );
- }
- return Populate( p_intf, current, as_varnames, ai_objects );
-}
-
-
-QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current )
-{
- vlc_object_t *p_object;
- vector<int> ai_objects;
- vector<const char *> as_varnames;
-
- p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
- if( p_object != NULL )
- {
- PUSH_VAR( "video-es" );
- PUSH_VAR( "spu-es" );
- vlc_object_release( p_object );
- }
-
- p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
- if( p_object != NULL )
- {
- VideoAutoMenuBuilder( p_object, ai_objects, as_varnames );
- vlc_object_release( p_object );
- }
- return Populate( p_intf, current, as_varnames, ai_objects );
-}
-
-QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *current )
-{
- vlc_object_t *p_object;
- vector<int> ai_objects;
- vector<const char *> as_varnames;
-
- p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
- if( p_object != NULL )
- {
- InputAutoMenuBuilder( p_object, ai_objects, as_varnames );
- PUSH_VAR( "prev-title"); PUSH_VAR ( "next-title" );
- PUSH_VAR( "prev-chapter"); PUSH_VAR( "next-chapter" );
- vlc_object_release( p_object );
- }
- return Populate( p_intf, current, as_varnames, ai_objects );
}
-#if 0
-wxMenu *SettingsMenu( intf_thread_t *_p_intf, wxWindow *p_parent,
- wxMenu *p_menu )
-{
- vlc_object_t *p_object;
- vector<int> ai_objects;
- vector<const char *> as_varnames;
-
- p_object = (vlc_object_t *)vlc_object_find( _p_intf, VLC_OBJECT_INTF,
- FIND_PARENT );
- if( p_object != NULL )
- {
- PUSH_VAR( "intf-switch" );
- PUSH_VAR( "intf-add" );
- vlc_object_release( p_object );
- }
-
- /* Build menu */
- Menu *p_vlc_menu = (Menu *)p_menu;
- if( !p_vlc_menu )
- p_vlc_menu = new Menu( _p_intf, SettingsMenu_Events );
- else
- p_vlc_menu->Clear();
- p_vlc_menu->Populate( as_varnames, ai_objects );
-
- return p_vlc_menu;
-}
-#endif
+#undef PUSH_VAR
+#undef PUSH_SEPARATOR
+/*************************************************************************
+ * Builders for automenus
+ *************************************************************************/
QMenu * QVLCMenu::Populate( intf_thread_t *p_intf, QMenu *current,
- vector< const char *> & ras_varnames,
- vector<int> & rai_objects )
+ vector< const char *> & varnames,
+ vector<int> & objects, bool append )
{
QMenu *menu = current;
if( !menu )
menu = new QMenu();
- else
+ else if( !append )
menu->clear();
currentGroup = NULL;
vlc_bool_t b_section_empty = VLC_FALSE;
int i;
-#define APPEND_EMPTY { QAction *action = menu->addAction( _("Empty" ) ); \
+#define APPEND_EMPTY { QAction *action = menu->addAction( qtr("Empty" ) ); \
action->setEnabled( false ); }
- for( i = 0; i < (int)rai_objects.size() ; i++ )
+ for( i = 0; i < (int)objects.size() ; i++ )
{
- if( !ras_varnames[i] || !*ras_varnames[i] )
+ if( !varnames[i] || !*varnames[i] )
{
if( b_section_empty )
APPEND_EMPTY;
continue;
}
- if( rai_objects[i] == 0 )
+ if( objects[i] == 0 )
{
/// \bug What is this ?
- // Append( menu, ras_varnames[i], NULL );
+ // Append( menu, varnames[i], NULL );
b_section_empty = VLC_FALSE;
continue;
}
p_object = (vlc_object_t *)vlc_object_get( p_intf,
- rai_objects[i] );
+ objects[i] );
if( p_object == NULL ) continue;
b_section_empty = VLC_FALSE;
- CreateItem( menu, ras_varnames[i], p_object );
+ /* Ugly specific stuff */
+ if( strstr(varnames[i], "intf-add" ) )
+ CreateItem( menu, varnames[i], p_object, false );
+ else
+ CreateItem( menu, varnames[i], p_object, true );
vlc_object_release( p_object );
}
* Private methods.
*****************************************************************************/
-#define FREE(x) if(x) { free(x);x=NULL;}
-
static bool IsMenuEmpty( const char *psz_var, vlc_object_t *p_object,
bool b_root = TRUE )
{
if( (i_type & VLC_VAR_TYPE) != VLC_VAR_VARIABLE )
{
- /* Very evil hack ! intf-switch can have only one value */
+ /* Very evil hack ! intf-switch can have only one value */
if( !strcmp( psz_var, "intf-switch" ) ) return FALSE;
if( val.i_int == 1 && b_root ) return TRUE;
else return FALSE;
}
void QVLCMenu::CreateItem( QMenu *menu, const char *psz_var,
- vlc_object_t *p_object )
+ vlc_object_t *p_object, bool b_submenu )
{
- QAction *action;
vlc_value_t val, text;
int i_type;
if( i_type & VLC_VAR_HASCHOICE )
{
/* Append choices menu */
- QMenu *submenu = CreateChoicesMenu( psz_var, p_object, true );
- submenu->setTitle( text.psz_string ? text.psz_string : psz_var );
- menu->addMenu( submenu );
- FREE( text.psz_string );
+ if( b_submenu )
+ {
+ QMenu *submenu = new QMenu();
+ submenu->setTitle( qfu( text.psz_string ?
+ text.psz_string : psz_var ) );
+ if( CreateChoicesMenu( submenu, psz_var, p_object, true ) == 0)
+ menu->addMenu( submenu );
+ }
+ else
+ CreateChoicesMenu( menu, psz_var, p_object, true );
+ FREENULL( text.psz_string );
return;
}
-#define TEXT_OR_VAR text.psz_string ? text.psz_string : psz_var
+#define TEXT_OR_VAR qfu ( text.psz_string ? text.psz_string : psz_var )
switch( i_type & VLC_VAR_TYPE )
{
case VLC_VAR_BOOL:
var_Get( p_object, psz_var, &val );
- val.b_bool = !val.b_bool;
CreateAndConnect( menu, psz_var, TEXT_OR_VAR, "", ITEM_CHECK,
p_object->i_object_id, val, i_type, val.b_bool );
break;
}
- FREE( text.psz_string );
+ FREENULL( text.psz_string );
}
-QMenu *QVLCMenu::CreateChoicesMenu( const char *psz_var,
- vlc_object_t *p_object, bool b_root )
+int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var,
+ vlc_object_t *p_object, bool b_root )
{
vlc_value_t val, val_list, text_list;
int i_type, i;
i_type = var_Type( p_object, psz_var );
/* Make sure we want to display the variable */
- if( IsMenuEmpty( psz_var, p_object, b_root ) ) return NULL;
+ if( IsMenuEmpty( psz_var, p_object, b_root ) ) return VLC_EGENERIC;
switch( i_type & VLC_VAR_TYPE )
{
break;
default:
/* Variable doesn't exist or isn't handled */
- return NULL;
+ return VLC_EGENERIC;
}
if( var_Change( p_object, psz_var, VLC_VAR_GETLIST,
&val_list, &text_list ) < 0 )
{
- return NULL;
+ return VLC_EGENERIC;
}
#define NORMAL_OR_RADIO i_type & VLC_VAR_ISCOMMAND ? ITEM_NORMAL: ITEM_RADIO
-#define NOTCOMMAND !(i_type & VLC_VAR_ISCOMMAND)
+#define NOTCOMMAND !(i_type & VLC_VAR_ISCOMMAND)
#define CURVAL val_list.p_list->p_values[i]
#define CURTEXT text_list.p_list->p_values[i].psz_string
- QMenu *submenu = new QMenu();
for( i = 0; i < val_list.p_list->i_count; i++ )
{
vlc_value_t another_val;
QString menutext;
- QMenu *subsubmenu;
+ QMenu *subsubmenu = new QMenu();
switch( i_type & VLC_VAR_TYPE )
{
case VLC_VAR_VARIABLE:
- subsubmenu = CreateChoicesMenu( CURVAL.psz_string,
- p_object, false );
- subsubmenu->setTitle( CURTEXT ? CURTEXT : CURVAL.psz_string );
+ CreateChoicesMenu( subsubmenu, CURVAL.psz_string, p_object, false );
+ subsubmenu->setTitle( qfu( CURTEXT ? CURTEXT :CURVAL.psz_string ) );
submenu->addMenu( subsubmenu );
break;
case VLC_VAR_STRING:
var_Get( p_object, psz_var, &val );
another_val.psz_string = strdup( CURVAL.psz_string );
-
- menutext = CURTEXT ? CURTEXT : another_val.psz_string;
+ menutext = qfu( CURTEXT ? CURTEXT : another_val.psz_string );
CreateAndConnect( submenu, psz_var, menutext, "", NORMAL_OR_RADIO,
- p_object->i_object_id, another_val, i_type,
+ p_object->i_object_id, another_val, i_type,
NOTCOMMAND && val.psz_string &&
!strcmp( val.psz_string, CURVAL.psz_string ) );
case VLC_VAR_INTEGER:
var_Get( p_object, psz_var, &val );
- if( CURTEXT ) menutext = CURTEXT;
+ if( CURTEXT ) menutext = qfu( CURTEXT );
else menutext.sprintf( "%d", CURVAL.i_int);
CreateAndConnect( submenu, psz_var, menutext, "", NORMAL_OR_RADIO,
p_object->i_object_id, CURVAL, i_type,
case VLC_VAR_FLOAT:
var_Get( p_object, psz_var, &val );
- if( CURTEXT ) menutext = CURTEXT ;
+ if( CURTEXT ) menutext = qfu( CURTEXT );
else menutext.sprintf( "%.2f", CURVAL.f_float );
CreateAndConnect( submenu, psz_var, menutext, "", NORMAL_OR_RADIO,
p_object->i_object_id, CURVAL, i_type,
break;
}
}
+ currentGroup = NULL;
/* clean up everything */
var_Change( p_object, psz_var, VLC_VAR_FREELIST, &val_list, &text_list );
#undef NOTCOMMAND
#undef CURVAL
#undef CURTEXT
- return submenu;
+ return VLC_SUCCESS;
}
void QVLCMenu::CreateAndConnect( QMenu *menu, const char *psz_var,
QString text, QString help,
- int i_item_type, int i_object_id,
+ int i_item_type, int i_object_id,
vlc_value_t val, int i_val_type,
bool checked )
{
if( i_item_type == ITEM_CHECK )
{
action->setCheckable( true );
- currentGroup = NULL;
}
else if( i_item_type == ITEM_RADIO )
{
currentGroup = new QActionGroup(menu);
currentGroup->addAction( action );
}
- else
- currentGroup = NULL;
- if( checked ) action->setChecked( true );
+ if( checked )
+ {
+ action->setChecked( true );
+ }
MenuItemData *itemData = new MenuItemData( i_object_id, i_val_type,
val, psz_var );
- connect( action, SIGNAL(triggered()), THEDP->menusMapper, SLOT(map()) );
+ CONNECT( action, triggered(), THEDP->menusMapper, map() );
THEDP->menusMapper->setMapping( action, itemData );
-
menu->addAction( action );
}
void QVLCMenu::DoAction( intf_thread_t *p_intf, QObject *data )
{
MenuItemData *itemData = qobject_cast<MenuItemData *>(data);
-
vlc_object_t *p_object = (vlc_object_t *)vlc_object_get( p_intf,
itemData->i_object_id );
if( p_object == NULL ) return;
var_Set( p_object, itemData->psz_var, itemData->val );
vlc_object_release( p_object );
}
-
-
-#if 0
-void MenuEvtHandler::OnMenuEvent( wxCommandEvent& event )
-{
- wxMenuItem *p_menuitem = NULL;
- int i_hotkey_event = p_intf->p_sys->i_first_hotkey_event;
- int i_hotkeys = p_intf->p_sys->i_hotkeys;
-
- if( event.GetId() >= Play_Event && event.GetId() <= Stop_Event )
- {
- input_thread_t *p_input;
- playlist_t * p_playlist =
- (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( !p_playlist ) return;
-
- switch( event.GetId() )
- {
- case Play_Event:
- case Pause_Event:
- p_input =
- (input_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
- if( !p_input ) playlist_Play( p_playlist );
- else
- {
- vlc_value_t val;
- var_Get( p_input, "state", &val );
- if( val.i_int != PAUSE_S ) val.i_int = PAUSE_S;
- else val.i_int = PLAYING_S;
- var_Set( p_input, "state", val );
- vlc_object_release( p_input );
- }
- break;
- case Stop_Event:
- playlist_Stop( p_playlist );
- break;
- case Previous_Event:
- playlist_Prev( p_playlist );
- break;
- case Next_Event:
- playlist_Next( p_playlist );
- break;
- }
-
- vlc_object_release( p_playlist );
- return;
- }
-
- /* Check if this is an auto generated menu item */
- if( event.GetId() < FirstAutoGenerated_Event )
- {
- event.Skip();
- return;
- }
-
- /* Check if this is an hotkey event */
- if( event.GetId() >= i_hotkey_event &&
- event.GetId() < i_hotkey_event + i_hotkeys )
- {
- vlc_value_t val;
-
- val.i_int =
- p_intf->p_vlc->p_hotkeys[event.GetId() - i_hotkey_event].i_key;
-
- /* Get the key combination and send it to the hotkey handler */
- var_Set( p_intf->p_vlc, "key-pressed", val );
- return;
- }
-
- if( !p_main_interface ||
- (p_menuitem = p_main_interface->GetMenuBar()->FindItem(event.GetId()))
- == NULL )
- {
- if( p_intf->p_sys->p_popup_menu )
- {
- p_menuitem =
- p_intf->p_sys->p_popup_menu->FindItem( event.GetId() );
- }
- }
-
- if( p_menuitem )
- {
- wxMenuItemExt *p_menuitemext = (wxMenuItemExt *)p_menuitem;
- vlc_object_t *p_object;
-
- p_object = (vlc_object_t *)vlc_object_get( p_intf,
- p_menuitemext->i_object_id );
- if( p_object == NULL ) return;
-
- wxMutexGuiLeave(); // We don't want deadlocks
- var_Set( p_object, p_menuitemext->psz_var, p_menuitemext->val );
- //wxMutexGuiEnter();
-
- vlc_object_release( p_object );
- }
- else
- event.Skip();
-}
-#endif
projects / vlc / blobdiff