Commit d8d83737 authored by Sam Hocevar's avatar Sam Hocevar
Browse files

* ./modules/gui/gtk/gnome.glade, ./modules/gui/gtk/gtk.glade: moved the

    Audio and Subtitles submenus into the Audio and Video menus.
parent 05422a3f
......@@ -197,18 +197,6 @@
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>menubar_fullscreen</name>
<signal>
<name>activate</name>
<handler>GtkFullscreen</handler>
<last_modification_time>Sat, 19 May 2001 16:28:15 GMT</last_modification_time>
</signal>
<label>_Fullscreen</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator9</name>
......@@ -301,30 +289,6 @@
<class>GtkMenu</class>
<name>menubar_settings_menu</name>
<widget>
<class>GtkMenuItem</class>
<name>menubar_audio</name>
<sensitive>False</sensitive>
<tooltip>Select audio channel</tooltip>
<label>_Audio</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>menubar_subpictures</name>
<sensitive>False</sensitive>
<tooltip>Select subtitles channel</tooltip>
<label>_Subtitles</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator5</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>menubar_preferences</name>
......@@ -348,6 +312,21 @@
<class>GtkMenu</class>
<name>menubar_config_audio_menu</name>
<widget>
<class>GtkMenuItem</class>
<name>menubar_audio</name>
<sensitive>False</sensitive>
<tooltip>Select audio channel</tooltip>
<label>_Language</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator25</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>menubar_volume_up</name>
......@@ -418,8 +397,34 @@
<widget>
<class>GtkMenuItem</class>
<name>menubar_video_device</name>
<label>Screen</label>
<name>menubar_subpictures</name>
<sensitive>False</sensitive>
<tooltip>Select subtitles channel</tooltip>
<label>_Subtitles</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator23</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>menubar_fullscreen</name>
<signal>
<name>activate</name>
<handler>GtkFullscreen</handler>
<last_modification_time>Sat, 19 May 2001 16:28:15 GMT</last_modification_time>
</signal>
<label>_Fullscreen</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator24</name>
<right_justify>False</right_justify>
</widget>
......@@ -429,6 +434,13 @@
<label>Deinterlace</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>menubar_video_device</name>
<label>Screen</label>
<right_justify>False</right_justify>
</widget>
</widget>
</widget>
......@@ -1182,107 +1194,6 @@
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_interface_toggle</name>
<signal>
<name>activate</name>
<handler>GtkWindowToggle</handler>
<last_modification_time>Sat, 19 May 2001 16:18:51 GMT</last_modification_time>
</signal>
<label>Toggle _Interface</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_fullscreen</name>
<tooltip>Toggle fullscreen mode</tooltip>
<signal>
<name>activate</name>
<handler>GtkFullscreen</handler>
<last_modification_time>Sat, 19 May 2001 16:19:07 GMT</last_modification_time>
</signal>
<label>_Fullscreen</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_video_device</name>
<label>Screen</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_deinterlace</name>
<label>Deinterlace</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator8</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_volume_up</name>
<signal>
<name>activate</name>
<handler>GtkVolumeUp</handler>
<last_modification_time>Mon, 20 Jan 2003 16:33:43 GMT</last_modification_time>
</signal>
<label>Volume Up</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_volume_down</name>
<signal>
<name>activate</name>
<handler>GtkVolumeDown</handler>
<last_modification_time>Mon, 20 Jan 2003 16:33:43 GMT</last_modification_time>
</signal>
<label>Volume Down</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_volume_mute</name>
<signal>
<name>activate</name>
<handler>GtkVolumeMute</handler>
<last_modification_time>Mon, 20 Jan 2003 16:33:43 GMT</last_modification_time>
</signal>
<label>Mute</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_audio_channels</name>
<label>Channels</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_audio_device</name>
<label>Device</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator17</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_next</name>
......@@ -1321,6 +1232,12 @@
<stock_icon>GNOME_STOCK_MENU_JUMP_TO</stock_icon>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator17</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_program</name>
......@@ -1341,23 +1258,148 @@
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>popup_audio</name>
<sensitive>False</sensitive>
<tooltip>Select audio channel</tooltip>
<label>_Audio</label>
<class>GtkMenuItem</class>
<name>audio1</name>
<label>Audio</label>
<right_justify>False</right_justify>
<stock_icon>GNOME_STOCK_MENU_VOLUME</stock_icon>
<widget>
<class>GtkMenu</class>
<name>audio1_menu</name>
<widget>
<class>GtkPixmapMenuItem</class>
<name>popup_audio</name>
<sensitive>False</sensitive>
<tooltip>Select audio channel</tooltip>
<label>_Language</label>
<right_justify>False</right_justify>
<stock_icon>GNOME_STOCK_MENU_VOLUME</stock_icon>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator20</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_volume_up</name>
<signal>
<name>activate</name>
<handler>GtkVolumeUp</handler>
<last_modification_time>Mon, 20 Jan 2003 16:33:43 GMT</last_modification_time>
</signal>
<label>Volume Up</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_volume_down</name>
<signal>
<name>activate</name>
<handler>GtkVolumeDown</handler>
<last_modification_time>Mon, 20 Jan 2003 16:33:43 GMT</last_modification_time>
</signal>
<label>Volume Down</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_volume_mute</name>
<signal>
<name>activate</name>
<handler>GtkVolumeMute</handler>
<last_modification_time>Mon, 20 Jan 2003 16:33:43 GMT</last_modification_time>
</signal>
<label>Mute</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator21</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_audio_channels</name>
<label>Channels</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_audio_device</name>
<label>Device</label>
<right_justify>False</right_justify>
</widget>
</widget>
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>popup_subpictures</name>
<sensitive>False</sensitive>
<tooltip>Select subtitles channel</tooltip>
<label>_Subtitles</label>
<class>GtkMenuItem</class>
<name>video1</name>
<label>Video</label>
<right_justify>False</right_justify>
<stock_icon>GNOME_STOCK_MENU_FONT</stock_icon>
<widget>
<class>GtkMenu</class>
<name>video1_menu</name>
<widget>
<class>GtkPixmapMenuItem</class>
<name>popup_subpictures</name>
<sensitive>False</sensitive>
<tooltip>Select subtitles channel</tooltip>
<label>_Subtitles</label>
<right_justify>False</right_justify>
<stock_icon>GNOME_STOCK_MENU_FONT</stock_icon>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator18</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_fullscreen</name>
<tooltip>Toggle fullscreen mode</tooltip>
<signal>
<name>activate</name>
<handler>GtkFullscreen</handler>
<last_modification_time>Sat, 19 May 2001 16:19:07 GMT</last_modification_time>
</signal>
<label>_Fullscreen</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator19</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_deinterlace</name>
<label>Deinterlace</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_video_device</name>
<label>Screen</label>
<right_justify>False</right_justify>
</widget>
</widget>
</widget>
<widget>
......@@ -1436,6 +1478,18 @@
</widget>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_interface_toggle</name>
<signal>
<name>activate</name>
<handler>GtkWindowToggle</handler>
<last_modification_time>Sat, 19 May 2001 16:18:51 GMT</last_modification_time>
</signal>
<label>Toggle _Interface</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_playlist</name>
......
......@@ -59,13 +59,6 @@ static GnomeUIInfo menubar_view_menu_uiinfo[] =
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
},
{
GNOME_APP_UI_ITEM, N_("_Fullscreen"),
NULL,
(gpointer) GtkFullscreen, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
},
GNOMEUIINFO_SEPARATOR,
{
GNOME_APP_UI_ITEM, N_("Progr_am"),
......@@ -114,28 +107,21 @@ static GnomeUIInfo menubar_view_menu_uiinfo[] =
};
static GnomeUIInfo menubar_settings_menu_uiinfo[] =
{
GNOMEUIINFO_MENU_PREFERENCES_ITEM (GtkPreferencesShow, NULL),
GNOMEUIINFO_END
};
static GnomeUIInfo menubar_config_audio_menu_uiinfo[] =
{
{
GNOME_APP_UI_ITEM, N_("_Audio"),
GNOME_APP_UI_ITEM, N_("_Language"),
N_("Select audio channel"),
(gpointer) NULL, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
},
{
GNOME_APP_UI_ITEM, N_("_Subtitles"),
N_("Select subtitles channel"),
(gpointer) NULL, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
},
GNOMEUIINFO_SEPARATOR,
GNOMEUIINFO_MENU_PREFERENCES_ITEM (GtkPreferencesShow, NULL),
GNOMEUIINFO_END
};
static GnomeUIInfo menubar_config_audio_menu_uiinfo[] =
{
{
GNOME_APP_UI_ITEM, N_("Volume Up"),
NULL,
......@@ -178,12 +164,21 @@ static GnomeUIInfo menubar_config_audio_menu_uiinfo[] =
static GnomeUIInfo menubar_config_video_menu_menu_uiinfo[] =
{
{
GNOME_APP_UI_ITEM, N_("Screen"),
NULL,
GNOME_APP_UI_ITEM, N_("_Subtitles"),
N_("Select subtitles channel"),
(gpointer) NULL, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
},
GNOMEUIINFO_SEPARATOR,
{
GNOME_APP_UI_ITEM, N_("_Fullscreen"),
NULL,
(gpointer) GtkFullscreen, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
},
GNOMEUIINFO_SEPARATOR,
{
GNOME_APP_UI_ITEM, N_("Deinterlace"),
NULL,
......@@ -191,6 +186,13 @@ static GnomeUIInfo menubar_config_video_menu_menu_uiinfo[] =
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
},
{
GNOME_APP_UI_ITEM, N_("Screen"),
NULL,
(gpointer) NULL, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
},
GNOMEUIINFO_END
};
......@@ -342,52 +344,47 @@ create_intf_window (void)
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_ref (menubar_view_menu_uiinfo[1].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_fullscreen",
gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator9",
menubar_view_menu_uiinfo[1].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_ref (menubar_view_menu_uiinfo[2].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator9",
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_program",
menubar_view_menu_uiinfo[2].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_set_sensitive (menubar_view_menu_uiinfo[2].widget, FALSE);
gtk_widget_ref (menubar_view_menu_uiinfo[3].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_program",
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_title",
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_title",
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_chapter",
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_view_menu_uiinfo[5].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_chapter",
gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator7",
menubar_view_menu_uiinfo[5].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_set_sensitive (menubar_view_menu_uiinfo[5].widget, FALSE);
gtk_widget_ref (menubar_view_menu_uiinfo[6].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator7",
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_playlist",
menubar_view_menu_uiinfo[6].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_ref (menubar_view_menu_uiinfo[7].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_playlist",
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_modules",
menubar_view_menu_uiinfo[7].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_set_sensitive (menubar_view_menu_uiinfo[7].widget, FALSE);
gtk_widget_ref (menubar_view_menu_uiinfo[8].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_modules",
menubar_view_menu_uiinfo[8].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_set_sensitive (menubar_view_menu_uiinfo[8].widget, FALSE);
gtk_widget_ref (menubar_view_menu_uiinfo[9].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_messages",
menubar_view_menu_uiinfo[9].widget,
menubar_view_menu_uiinfo[8].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_ref (menubar_uiinfo[2].widget);
......@@ -396,25 +393,8 @@ create_intf_window (void)
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_ref (menubar_settings_menu_uiinfo[0].widget);
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_subpictures",
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",
menubar_settings_menu_uiinfo[2].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_ref (menubar_settings_menu_uiinfo[3].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_preferences",
menubar_settings_menu_uiinfo[3].widget,
menubar_settings_menu_uiinfo[0].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_ref (menubar_uiinfo[3].widget);
......@@ -423,50 +403,82 @@ create_intf_window (void)
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_ref (menubar_config_audio_menu_uiinfo[0].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_volume_up",
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_audio",
menubar_config_audio_menu_uiinfo[0].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_set_sensitive (menubar_config_audio_menu_uiinfo[0].widget, FALSE);
gtk_widget_ref (menubar_config_audio_menu_uiinfo[1].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_volume_down",
gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator25",
menubar_config_audio_menu_uiinfo[1].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_ref (menubar_config_audio_menu_uiinfo[2].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_volume_mute",
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_volume_up",
menubar_config_audio_menu_uiinfo[2].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_ref (menubar_config_audio_menu_uiinfo[3].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator16",
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_volume_down",
menubar_config_audio_menu_uiinfo[3].widget,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_ref (menubar_config_audio_menu_uiinfo[4].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_audio_channels",
gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_volume_mute",
menubar_config_audio_