Skip to content

V
vlc-1.1
Commit 1bc9a658 authored by Stéphane Borel's avatar Stéphane Borel
Browse files
Options

Port of the interface menus to gnome plugin. 

Note that two sorts of navigation menus are implemented : in the
menubar, one menu for title and one the chapter in current title ; and
in the popup, a cascaded version with all chapters for all menus.

The same issues as gtk plugin apply.
parent ec126885
Expand all Show whitespace changes
Inline Side-by-side
Showing with 585 additions and 135 deletions
plugins/gnome/gnome_callbacks.c
View file @ 1bc9a658
......@@ -585,54 +585,6 @@ on_intf_window_drag_data_received (GtkWidget *widget,
}
void
on_menubar_audio_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
}
void
on_menubar_subtitles_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
}
void
on_popup_title_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
}
void
on_popup_chapter_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
}
void
on_popup_audio_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
}
void
on_popup_subtitle_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
}
void
on_menubar_disc_activate (GtkMenuItem *menuitem,
gpointer user_data)
......@@ -769,3 +721,100 @@ on_popup_disc_activate (GtkMenuItem *menuitem,
gdk_window_raise( p_intf->p_sys->p_disc->window );
}
void
on_popup_audio_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
intf_thread_t *p_intf = GetIntf( GTK_WIDGET(menuitem), "intf_popup" );
es_descriptor_t * p_es;
p_es = (es_descriptor_t*)user_data;
input_ChangeES( p_intf->p_input, p_es, 1 );
}
void
on_popup_subtitle_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
intf_thread_t *p_intf = GetIntf( GTK_WIDGET(menuitem), "intf_popup" );
es_descriptor_t * p_es;
p_es = (es_descriptor_t*)user_data;
input_ChangeES( p_intf->p_input, p_es, 2 );
}
void
on_menubar_audio_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
intf_thread_t *p_intf = GetIntf( GTK_WIDGET(menuitem), "intf_window" );
es_descriptor_t * p_es;
p_es = (es_descriptor_t*)user_data;
input_ChangeES( p_intf->p_input, p_es, 1 );
}
void
on_menubar_subtitle_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
intf_thread_t *p_intf = GetIntf( GTK_WIDGET(menuitem), "intf_window" );
es_descriptor_t * p_es;
p_es = (es_descriptor_t*)user_data;
input_ChangeES( p_intf->p_input, p_es, 2 );
}
void
on_popup_navigation_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
intf_thread_t * p_intf = GetIntf( GTK_WIDGET(menuitem), "intf_popup" );
input_area_t * p_area;
gint i_title;
gint i_chapter;
i_title = (gint)(user_data) / 100 ;
i_chapter = (gint)(user_data) - ( 100 * i_title );
p_area = p_intf->p_input->stream.pp_areas[i_title];
p_area->i_part = i_chapter;
p_intf->p_input->pf_set_area( p_intf->p_input, (input_area_t*)p_area );
input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
}
void
on_menubar_title_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
intf_thread_t *p_intf = GetIntf( GTK_WIDGET(menuitem), "intf_window" );
p_intf->p_input->pf_set_area( p_intf->p_input, (input_area_t*)user_data );
p_intf->p_sys->b_menus_update = 1;
input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
}
void
on_menubar_chapter_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
intf_thread_t * p_intf = GetIntf( GTK_WIDGET(menuitem), "intf_window" );
input_area_t * p_area = p_intf->p_input->stream.p_selected_area;
gint i_chapter = (gint)user_data;
p_area->i_part = i_chapter;
p_intf->p_input->pf_set_area( p_intf->p_input, (input_area_t*)p_area );
input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
}
plugins/gnome/gnome_callbacks.h
View file @ 1bc9a658
......@@ -203,49 +203,57 @@ on_menubar_audio_activate (GtkMenuItem *menuitem,
gpointer user_data);
void
on_menubar_subtitles_activate (GtkMenuItem *menuitem,
on_menubar_disc_activate (GtkMenuItem *menuitem,
gpointer user_data);
void
on_popup_title_activate (GtkMenuItem *menuitem,
on_toolbar_disc_clicked (GtkButton *button,
gpointer user_data);
void
on_popup_chapter_activate (GtkMenuItem *menuitem,
on_disc_ok_clicked (GtkButton *button,
gpointer user_data);
void
on_popup_audio_activate (GtkMenuItem *menuitem,
on_disc_cancel_clicked (GtkButton *button,
gpointer user_data);
void
on_popup_subtitle_activate (GtkMenuItem *menuitem,
on_disc_dvd_toggled (GtkToggleButton *togglebutton,
gpointer user_data);
void
on_menubar_disc_activate (GtkMenuItem *menuitem,
on_disc_vcd_toggled (GtkToggleButton *togglebutton,
gpointer user_data);
void
on_toolbar_disc_clicked (GtkButton *button,
on_popup_disc_activate (GtkMenuItem *menuitem,
gpointer user_data);
void
on_disc_ok_clicked (GtkButton *button,
on_popup_audio_activate (GtkMenuItem *menuitem,
gpointer user_data);
void
on_disc_cancel_clicked (GtkButton *button,
on_popup_subtitle_activate (GtkMenuItem *menuitem,
gpointer user_data);
void
on_disc_dvd_toggled (GtkToggleButton *togglebutton,
on_menubar_audio_activate (GtkMenuItem *menuitem,
gpointer user_data);
void
on_disc_vcd_toggled (GtkToggleButton *togglebutton,
on_menubar_subtitle_activate (GtkMenuItem *menuitem,
gpointer user_data);
void
on_popup_disc_activate (GtkMenuItem *menuitem,
on_popup_navigation_activate (GtkMenuItem *menuitem,
gpointer user_data);
void
on_menubar_title_activate (GtkMenuItem *menuitem,
gpointer user_data);
void
on_menubar_chapter_activate (GtkMenuItem *menuitem,
gpointer user_data);
plugins/gnome/gnome_interface.c
View file @ 1bc9a658
......@@ -40,6 +40,21 @@ static GnomeUIInfo menubar_file_menu_uiinfo[] =
static GnomeUIInfo menubar_view_menu_uiinfo[] =
{
{
GNOME_APP_UI_ITEM, N_("_Title"),
NULL,
(gpointer) NULL, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
},
{
GNOME_APP_UI_ITEM, N_("_Chapter"),
NULL,
(gpointer) NULL, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
},
GNOMEUIINFO_SEPARATOR,
{
GNOME_APP_UI_ITEM, N_("_Playlist..."),
N_("Open the playlist window"),
......@@ -62,14 +77,14 @@ static GnomeUIInfo menubar_settings_menu_uiinfo[] =
{
GNOME_APP_UI_ITEM, N_("_Audio"),
N_("Select audio channel"),
(gpointer) on_menubar_audio_activate, NULL, NULL,
(gpointer) NULL, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
},
{
GNOME_APP_UI_ITEM, N_("_Subtitles"),
GNOME_APP_UI_ITEM, N_("_Subtitle"),
N_("Select subtitle unit"),
(gpointer) on_menubar_subtitles_activate, NULL, NULL,
(gpointer) NULL, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
},
......@@ -160,17 +175,34 @@ create_intf_window (void)
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_ref (menubar_view_menu_uiinfo[0].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_playlist",
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_title",
menubar_view_menu_uiinfo[0].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_set_sensitive (menubar_view_menu_uiinfo[0].widget, FALSE);
gtk_widget_ref (menubar_view_menu_uiinfo[1].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_modules",
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_chapter",
menubar_view_menu_uiinfo[1].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_set_sensitive (menubar_view_menu_uiinfo[1].widget, FALSE);
gtk_widget_ref (menubar_view_menu_uiinfo[2].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator7",
menubar_view_menu_uiinfo[2].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_ref (menubar_view_menu_uiinfo[3].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_playlist",
menubar_view_menu_uiinfo[3].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_set_sensitive (menubar_view_menu_uiinfo[3].widget, FALSE);
gtk_widget_ref (menubar_view_menu_uiinfo[4].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_modules",
menubar_view_menu_uiinfo[4].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_set_sensitive (menubar_view_menu_uiinfo[4].widget, FALSE);
gtk_widget_ref (menubar_uiinfo[2].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_settings",
menubar_uiinfo[2].widget,
......@@ -180,11 +212,13 @@ create_intf_window (void)
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_audio",
menubar_settings_menu_uiinfo[0].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_set_sensitive (menubar_settings_menu_uiinfo[0].widget, FALSE);
gtk_widget_ref (menubar_settings_menu_uiinfo[1].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_subtitles",
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_subtitle",
menubar_settings_menu_uiinfo[1].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_set_sensitive (menubar_settings_menu_uiinfo[1].widget, FALSE);
gtk_widget_ref (menubar_settings_menu_uiinfo[2].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator5",
......@@ -458,18 +492,6 @@ create_intf_window (void)
return intf_window;
}
static GnomeUIInfo popup_title_menu_uiinfo[] =
{
{
GNOME_APP_UI_ITEM, N_("_Chapter"),
NULL,
(gpointer) on_popup_chapter_activate, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
},
GNOMEUIINFO_END
};
static GnomeUIInfo intf_popup_uiinfo[] =
{
{
......@@ -517,12 +539,13 @@ static GnomeUIInfo intf_popup_uiinfo[] =
},
GNOMEUIINFO_SEPARATOR,
{
GNOME_APP_UI_SUBTREE, N_("_Title"),
N_("Select Title"),
popup_title_menu_uiinfo, NULL, NULL,
GNOME_APP_UI_ITEM, N_("_Navigation"),
NULL,
(gpointer) NULL, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
},
GNOMEUIINFO_SEPARATOR,
{
GNOME_APP_UI_ITEM, N_("Audio"),
N_("Select audio channel"),
......@@ -594,40 +617,43 @@ create_intf_popup (void)
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_ref (intf_popup_uiinfo[8].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_title",
gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_navigation",
intf_popup_uiinfo[8].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_ref (popup_title_menu_uiinfo[0].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_chapter",
popup_title_menu_uiinfo[0].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_set_sensitive (intf_popup_uiinfo[8].widget, FALSE);
gtk_widget_ref (intf_popup_uiinfo[9].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_audio",
gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator8",
intf_popup_uiinfo[9].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_ref (intf_popup_uiinfo[10].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_subtitle",
gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_audio",
intf_popup_uiinfo[10].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_set_sensitive (intf_popup_uiinfo[10].widget, FALSE);
gtk_widget_ref (intf_popup_uiinfo[11].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator4",
gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_subtitle",
intf_popup_uiinfo[11].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_set_sensitive (intf_popup_uiinfo[11].widget, FALSE);
gtk_widget_ref (intf_popup_uiinfo[12].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_about",
gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator4",
intf_popup_uiinfo[12].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_ref (intf_popup_uiinfo[13].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_exit",
gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_about",
intf_popup_uiinfo[13].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_ref (intf_popup_uiinfo[14].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_exit",
intf_popup_uiinfo[14].widget,
(GtkDestroyNotify) gtk_widget_unref);
return intf_popup;
}
......
plugins/gnome/gnome_sys.h
View file @ 1bc9a658
......@@ -2,7 +2,7 @@
* gnome_sys.h: private Gnome interface description
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: gnome_sys.h,v 1.6 2001/03/04 03:12:00 sam Exp $
* $Id: gnome_sys.h,v 1.7 2001/03/07 11:56:33 stef Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -39,6 +39,7 @@ typedef struct intf_sys_s
boolean_t b_window_changed; /* window display toggled ? */
boolean_t b_playlist_changed; /* playlist display toggled ? */
boolean_t b_scale_isfree; /* user isn't dragging scale ? */
boolean_t b_menus_update;
/* intf_Manage callback timeout */
int i_timeout;
......
plugins/gnome/intf_gnome.c
View file @ 1bc9a658
This diff is collapsed.
plugins/gnome/intf_gnome.glade
View file @ 1bc9a658
......@@ -138,6 +138,28 @@
<class>GtkMenu</class>
<name>menubar_view_menu</name>
<widget>
<class>GtkMenuItem</class>
<name>menubar_title</name>
<sensitive>False</sensitive>
<label>_Title</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>menubar_chapter</name>
<sensitive>False</sensitive>
<label>_Chapter</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator7</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>menubar_playlist</name>
......@@ -182,26 +204,18 @@
<widget>
<class>GtkMenuItem</class>
<name>menubar_audio</name>
<sensitive>False</sensitive>
<tooltip>Select audio channel</tooltip>
<signal>
<name>activate</name>
<handler>on_menubar_audio_activate</handler>
<last_modification_time>Thu, 22 Feb 2001 05:42:43 GMT</last_modification_time>
</signal>
<label>_Audio</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>menubar_subtitles</name>
<name>menubar_subtitle</name>
<sensitive>False</sensitive>
<tooltip>Select subtitle unit</tooltip>
<signal>
<name>activate</name>
<handler>on_menubar_subtitles_activate</handler>
<last_modification_time>Thu, 22 Feb 2001 05:42:43 GMT</last_modification_time>
</signal>
<label>_Subtitles</label>
<label>_Subtitle</label>
<right_justify>False</right_justify>
</widget>
......@@ -641,37 +655,22 @@
<widget>
<class>GtkMenuItem</class>
<name>popup_title</name>
<tooltip>Select Title</tooltip>
<signal>
<name>activate</name>
<handler>on_popup_title_activate</handler>
<last_modification_time>Thu, 22 Feb 2001 05:35:57 GMT</last_modification_time>
</signal>
<label>_Title</label>
<name>popup_navigation</name>
<sensitive>False</sensitive>
<label>_Navigation</label>
<right_justify>False</right_justify>
<widget>
<class>GtkMenu</class>
<name>popup_title_menu</name>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_chapter</name>
<signal>
<name>activate</name>
<handler>on_popup_chapter_activate</handler>
<last_modification_time>Thu, 22 Feb 2001 05:48:48 GMT</last_modification_time>
</signal>
<label>_Chapter</label>
<name>separator8</name>
<right_justify>False</right_justify>
</widget>
</widget>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_audio</name>
<sensitive>False</sensitive>
<tooltip>Select audio channel</tooltip>
<signal>
<name>activate</name>
......@@ -685,6 +684,7 @@
<widget>
<class>GtkMenuItem</class>
<name>popup_subtitle</name>
<sensitive>False</sensitive>
<signal>
<name>activate</name>
<handler>on_popup_subtitle_activate</handler>
......
plugins/gtk/gtk_callbacks.c
View file @ 1bc9a658
......@@ -798,7 +798,6 @@ on_popup_navigation_activate (GtkMenuItem *menuitem,
i_title = (gint)(user_data) / 100 ;
i_chapter = (gint)(user_data) - ( 100 * i_title );
fprintf(stderr, "title %d chapter %d\n", i_title, i_chapter );
p_area = p_intf->p_input->stream.pp_areas[i_title];
p_area->i_part = i_chapter;
......
plugins/gtk/intf_gtk.c
View file @ 1bc9a658
......@@ -2,7 +2,7 @@
* intf_gtk.c: Gtk+ interface
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: intf_gtk.c,v 1.4 2001/03/07 10:31:10 stef Exp $
* $Id: intf_gtk.c,v 1.5 2001/03/07 11:56:33 stef Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
......@@ -442,8 +442,8 @@ static GtkWidget * GtkMenuRadioItem( GtkWidget * p_menu,
p_item = gtk_menu_item_new_with_label( psz_name );
gtk_menu_append( GTK_MENU( p_menu ), p_item );
gtk_widget_show( p_item );
#endif
return p_item;
}
......@@ -535,7 +535,7 @@ static gint GtkLanguageMenus( gpointer p_data,
}
/*****************************************************************************
* GtkChapterMenu: generate chapter menu foir current title
* GtkChapterMenu: generate chapter menu for current title
*****************************************************************************/
static gint GtkChapterMenu( gpointer p_data, GtkWidget * p_chapter,
void(*pf_activate )( GtkMenuItem *, gpointer ) )
......@@ -585,7 +585,7 @@ static gint GtkChapterMenu( gpointer p_data, GtkWidget * p_chapter,
/*****************************************************************************
* GtkTitleMenu: sets menus for titles and chapters selection
* ---
*****************************************************************************
* Generates two type of menus:
* -simple list of titles
* -cascaded lists of chapters for each title
......
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