diff options
| author | Bastien Nocera <hadess@hadess.net> | 2006-06-17 10:01:37 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2006-06-17 10:01:37 +0000 |
| commit | 890f2e4efedae49e97c9476d478777fbb0270dda (patch) | |
| tree | da06b17e91ddfb3a92ddc9c68fbd05204be5272e /data | |
| parent | 11cc632892f3b3355fe48aa3485e1006895f38e8 (diff) | |
| download | totem-890f2e4efedae49e97c9476d478777fbb0270dda.tar.gz | |
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
Diffstat (limited to 'data')
| -rw-r--r-- | data/totem.glade | 73 |
1 files changed, 63 insertions, 10 deletions
diff --git a/data/totem.glade b/data/totem.glade index 6e7c70b7c..14afd5bd6 100644 --- a/data/totem.glade +++ b/data/totem.glade @@ -456,7 +456,7 @@ Intranet/LAN</property> <child> <widget class="GtkLabel" id="tpw__label"> <property name="visible">True</property> - <property name="label" translatable="yes"><b>Subtitles</b></property> + <property name="label" translatable="yes"><b>Text Subtitles</b></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> |