Commit 890f2e4e authored by Bastien Nocera's avatar Bastien Nocera Committed by Bastien Nocera

patch from Young-Ho Cha <ganadist at chollian net> to add a widget to

2006-06-17  Bastien Nocera  <hadess@hadess.net>

	* data/totem.glade: patch from Young-Ho Cha <ganadist at chollian net>
	to add a widget to select the text subtitles encoding
	* src/backend/bacon-video-widget-xine.c:
	(bacon_video_widget_set_subtitle_encoding):
	really fix build
parent 11cc6328
2006-06-17 Bastien Nocera <hadess@hadess.net>
* data/totem.glade: patch from Young-Ho Cha <ganadist at chollian net>
to add a widget to select the text subtitles encoding
* src/backend/bacon-video-widget-xine.c:
(bacon_video_widget_set_subtitle_encoding):
really fix build
2006-06-17 Bastien Nocera <hadess@hadess.net>
* src/backend/bacon-video-widget-gst-0.10.c:
......
......@@ -456,7 +456,7 @@ Intranet/LAN</property>
<child>
<widget class="GtkLabel" id="tpw__label">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;Subtitles&lt;/b&gt;</property>
<property name="label" translatable="yes">&lt;b&gt;Text Subtitles&lt;/b&gt;</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
......@@ -510,10 +510,13 @@ Intranet/LAN</property>
</child>
<child>
<widget class="GtkHBox" id="hbox24">
<widget class="GtkTable" id="table3">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="spacing">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
<widget class="GtkLabel" id="label32">
......@@ -524,7 +527,7 @@ Intranet/LAN</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
......@@ -535,9 +538,57 @@ Intranet/LAN</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label35">
<property name="visible">True</property>
<property name="label" translatable="yes">_Encoding:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">subtitle_encoding_combo</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkComboBox" id="subtitle_encoding_combo">
<property name="visible">True</property>
<property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
......@@ -552,9 +603,11 @@ Intranet/LAN</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
<property name="y_options"></property>
</packing>
</child>
</widget>
......
......@@ -3063,10 +3063,10 @@ bacon_video_widget_set_subtitle_encoding (BaconVideoWidget *bvw, const char *enc
{
xine_cfg_entry_t entry;
g_return_val_if_fail (bvw != NULL);
g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
g_return_val_if_fail (bvw->priv->xine != NULL);
g_return_val_if_fail (encoding != NULL);
g_return_if_fail (bvw != NULL);
g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
g_return_if_fail (bvw->priv->xine != NULL);
g_return_if_fail (encoding != NULL);
bvw_config_helper_string (bvw->priv->xine,
"subtitles.separate.src_encoding", encoding, &entry);
......
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