[epiphany] encoding-dialog.ui: Ensure headerbar use and kill a level of GtkBox.

[Arnaud Bonatti <arnaudb src gnome org>]

commit 7bfed0ec57412bb4206e536761dc1b24a801422a
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Sun Nov 1 03:40:37 2015 +0100

    encoding-dialog.ui: Ensure headerbar use and kill a level of GtkBox.

 src/resources/encoding-dialog.ui |  110 ++++++++++++++++---------------------
 1 files changed, 48 insertions(+), 62 deletions(-)
---
diff --git a/src/resources/encoding-dialog.ui b/src/resources/encoding-dialog.ui
index 1c855d0..7165cf7 100644
--- a/src/resources/encoding-dialog.ui
+++ b/src/resources/encoding-dialog.ui
@@ -2,96 +2,82 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="encoding_dialog">
-    <property name="border_width">0</property>
+    <property name="border_width">5</property>
     <property name="role">epiphany-encoding-chooser</property>
     <property name="modal">True</property>
     <property name="default_width">400</property>
     <property name="default_height">420</property>
     <property name="type_hint">dialog</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar">
-        <property name="title" translatable="yes">Text Encoding</property>
-        <property name="visible">True</property>
-        <property name="show-close-button">True</property>
-      </object>
-    </child>
+    <property name="use_header_bar">1</property>
+    <property name="title" translatable="yes">Text Encoding</property>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
+        <property name="spacing">18</property>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="border_width">5</property>
             <property name="orientation">vertical</property>
-            <property name="spacing">18</property>
+            <property name="spacing">6</property>
             <child>
-              <object class="GtkBox">
+              <object class="GtkRadioButton" id="automatic_button">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkRadioButton" id="automatic_button">
-                    <property name="visible">True</property>
-                    <property name="use_underline">True</property>
-                    <property name="halign">start</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Automatic</property>
-                        <property name="use_underline">True</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                <property name="use_underline">True</property>
+                <property name="halign">start</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="halign">start</property>
-                    <property name="margin_start">5</property>
-                    <property name="label" translatable="yes">Use the encoding specified by the 
document</property>
-                    <property name="wrap">True</property>
+                    <property name="label" translatable="yes">_Automatic</property>
+                    <property name="use_underline">True</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                 </child>
               </object>
             </child>
             <child>
-              <object class="GtkBox">
+              <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">6</property>
+                <property name="halign">start</property>
+                <property name="margin_start">5</property>
+                <property name="label" translatable="yes">Use the encoding specified by the 
document</property>
+                <property name="wrap">True</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkRadioButton" id="manual_button">
+                <property name="visible">True</property>
+                <property name="use_underline">True</property>
+                <property name="halign">start</property>
+                <property name="group">automatic_button</property>
                 <child>
-                  <object class="GtkRadioButton" id="manual_button">
+                  <object class="GtkLabel">
                     <property name="visible">True</property>
+                    <property name="label" translatable="yes">_Use a different encoding:</property>
                     <property name="use_underline">True</property>
-                    <property name="halign">start</property>
-                    <property name="group">automatic_button</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Use a different encoding:</property>
-                        <property name="use_underline">True</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                    </child>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                 </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolled_window">
+                <property name="visible">True</property>
+                <property name="expand">True</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="shadow_type">in</property>
+                <property name="min_content_height">300</property>
                 <child>
-                  <object class="GtkScrolledWindow" id="scrolled_window">
-                    <property name="visible">True</property>
-                    <property name="expand">True</property>
-                    <property name="hscrollbar_policy">never</property>
-                    <property name="shadow_type">in</property>
-                    <property name="min_content_height">300</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
+                  <placeholder/>
                 </child>
               </object>
             </child>