preferences-dialog: Remove GtkAlignment alignment3

Same as previous commits.

1 files changed, 103 insertions, 116 deletions

diff --git a/data/totem-preferences-dialog.ui b/data/totem-preferences-dialog.ui
index 117275209..e7696cb50 100644
--- a/data/totem-preferences-dialog.ui
+++ b/data/totem-preferences-dialog.ui
@@ -143,129 +143,116 @@
 		  </child>
 
 		  <child>
-		    <object class="GtkAlignment" id="alignment3">
+		    <object class="GtkGrid">
 		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
+		      <property name="margin-start">12</property>
+		      <property name="row_spacing">6</property>
+		      <property name="column_spacing">12</property>
 
 		      <child>
-			<object class="GtkGrid">
-			  <property name="visible">True</property>
-			  <property name="row_spacing">6</property>
-			  <property name="column_spacing">12</property>
-
-			  <child>
-			    <object class="GtkCheckButton" id="tpw_auto_subtitles_checkbutton">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Load subtitle files when movie is loaded</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-		            </object>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="width">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="height">1</property>
-		            </packing>
-		          </child>
-
-			  <child>
-			    <object class="GtkLabel" id="label32">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Font:</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="mnemonic_widget">font_sel_button</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>
-			    </object>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="width">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="height">1</property>
-			    </packing>
-			  </child>
+		        <object class="GtkCheckButton" id="tpw_auto_subtitles_checkbutton">
+		          <property name="visible">True</property>
+		          <property name="can_focus">True</property>
+		          <property name="label" translatable="yes">_Load subtitle files when movie is loaded</property>
+		          <property name="use_underline">True</property>
+		          <property name="relief">GTK_RELIEF_NORMAL</property>
+		          <property name="focus_on_click">True</property>
+		          <property name="active">False</property>
+		          <property name="inconsistent">False</property>
+		          <property name="draw_indicator">True</property>
+                        </object>
+		        <packing>
+		          <property name="left_attach">0</property>
+		          <property name="width">2</property>
+		          <property name="top_attach">0</property>
+		          <property name="height">1</property>
+		        </packing>
+		      </child>
 
-			  <child>
-			    <object 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="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>
-			    </object>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="width">1</property>
-			      <property name="top_attach">2</property>
-			      <property name="height">1</property>
-			    </packing>
-			  </child>
+		      <child>
+		        <object class="GtkLabel" id="label32">
+		          <property name="visible">True</property>
+		          <property name="label" translatable="yes">_Font:</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="mnemonic_widget">font_sel_button</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>
+		        </object>
+		        <packing>
+		          <property name="left_attach">0</property>
+		          <property name="width">1</property>
+		          <property name="top_attach">1</property>
+		          <property name="height">1</property>
+		        </packing>
+		      </child>
 
-			  <child>
-			    <object class="GtkComboBox" id="subtitle_encoding_combo">
-			      <property name="visible">True</property>
-			      <property name="focus_on_click">True</property>
-			      <signal name="changed" handler="encoding_set_cb" object="TotemPreferencesDialog" swapped="no"/>
-			    </object>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="width">1</property>
-			      <property name="top_attach">2</property>
-			      <property name="height">1</property>
-			    </packing>
-			  </child>
+		      <child>
+		        <object 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="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>
+		        </object>
+		        <packing>
+		          <property name="left_attach">0</property>
+		          <property name="width">1</property>
+		          <property name="top_attach">2</property>
+		          <property name="height">1</property>
+		        </packing>
+		      </child>
 
-			  <child>
-			    <object class="GtkFontButton" id="font_sel_button">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Select Subtitle Font</property>
-			      <property name="can_focus">True</property>
-			      <property name="show_style">True</property>
-			      <property name="show_size">True</property>
-			      <property name="use_font">False</property>
-			      <property name="use_size">False</property>
-			      <property name="focus_on_click">True</property>
-			      <signal name="font-set" handler="font_set_cb" object="TotemPreferencesDialog" swapped="no"/>
-			    </object>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="width">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="height">1</property>
-			    </packing>
-			  </child>
-			</object>
+		      <child>
+		        <object class="GtkComboBox" id="subtitle_encoding_combo">
+		          <property name="visible">True</property>
+		          <property name="focus_on_click">True</property>
+		          <signal name="changed" handler="encoding_set_cb" object="TotemPreferencesDialog" swapped="no"/>
+		        </object>
+		        <packing>
+		          <property name="left_attach">1</property>
+		          <property name="width">1</property>
+		          <property name="top_attach">2</property>
+		          <property name="height">1</property>
+		        </packing>
 		      </child>
-		    </object>
+
+		      <child>
+		        <object class="GtkFontButton" id="font_sel_button">
+		          <property name="visible">True</property>
+		          <property name="label" translatable="yes">Select Subtitle Font</property>
+		          <property name="can_focus">True</property>
+		          <property name="show_style">True</property>
+		          <property name="show_size">True</property>
+		          <property name="use_font">False</property>
+		          <property name="use_size">False</property>
+		          <property name="focus_on_click">True</property>
+		          <signal name="font-set" handler="font_set_cb" object="TotemPreferencesDialog" swapped="no"/>
+		        </object>
+		        <packing>
+		          <property name="left_attach">1</property>
+		          <property name="width">1</property>
+		          <property name="top_attach">1</property>
+		          <property name="height">1</property>
+		        </packing>
+                      </child>
+                    </object>
 		    <packing>
 		      <property name="padding">0</property>
 		      <property name="expand">False</property>