[rhythmbox] replaygain: simplify config dialog a bit

[Jonathan Matthew <jmatthew src gnome org>]

commit 8bc4971dd8e79bb3f6dbc6fc00789e896b223eea
Author: Jonathan Matthew <jonathan d14n org>
Date:   Sun Apr 17 13:46:21 2016 +1000

    replaygain: simplify config dialog a bit

 plugins/replaygain/config.py           |    4 -
 plugins/replaygain/replaygain-prefs.ui |  158 +++++++++++++-------------------
 2 files changed, 65 insertions(+), 97 deletions(-)
---
diff --git a/plugins/replaygain/config.py b/plugins/replaygain/config.py
index 2a1cfc7..0e99e77 100644
--- a/plugins/replaygain/config.py
+++ b/plugins/replaygain/config.py
@@ -53,10 +53,6 @@ class ReplayGainConfig(GObject.Object, PeasGtk.Configurable):
 
                content = self.builder.get_object("replaygain-prefs")
 
-               label = self.builder.get_object("headerlabel")
-               label.set_markup("<b>%s</b>" % label.get_text())
-               label.set_use_markup(True)
-
                combo = self.builder.get_object("replaygainmode")
                combo.props.id_column = 1
                self.settings.bind("mode", combo, "active-id", Gio.SettingsBindFlags.DEFAULT)
diff --git a/plugins/replaygain/replaygain-prefs.ui b/plugins/replaygain/replaygain-prefs.ui
index e5a9dd3..07063fe 100644
--- a/plugins/replaygain/replaygain-prefs.ui
+++ b/plugins/replaygain/replaygain-prefs.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.19.0 -->
 <interface>
-  <requires lib="gtk+" version="3.6"/>
+  <requires lib="gtk+" version="3.12"/>
   <object class="GtkAdjustment" id="preampadjustment">
     <property name="lower">-15</property>
     <property name="upper">25</property>
@@ -38,6 +38,9 @@
         <property name="can_focus">False</property>
         <property name="label" translatable="yes">ReplayGain preferences</property>
         <property name="xalign">0</property>
+        <attributes>
+          <attribute name="weight" value="bold"/>
+        </attributes>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -46,113 +49,82 @@
       </packing>
     </child>
     <child>
-      <object class="GtkBox" id="hbox2">
+      <object class="GtkGrid" id="grid1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="margin_left">8</property>
+        <property name="margin_right">8</property>
+        <property name="row_spacing">6</property>
+        <property name="column_spacing">6</property>
         <child>
-          <object class="GtkLabel" id="label4">
+          <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">8</property>
-            <property name="margin_right">8</property>
+            <property name="label" translatable="yes">ReplayGain _mode:</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkTable" id="table1">
+          <object class="GtkLabel" id="preamplabel">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="n_rows">3</property>
-            <property name="n_columns">2</property>
-            <property name="column_spacing">12</property>
-            <property name="row_spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">ReplayGain _mode:</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-              </object>
-              <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBox" id="replaygainmode">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="model">replaygainmodemodel</property>
-                <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext2"/>
-                  <attributes>
-                    <attribute name="text">0</attribute>
-                  </attributes>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="preamplabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Pre-amp:</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-              </object>
-              <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScale" id="preamp">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="adjustment">preampadjustment</property>
-              </object>
-              <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="y_options">GTK_FILL</property>
-              </packing>
-            </child>
+            <property name="label" translatable="yes">_Pre-amp:</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="limiter">
+            <property name="label" translatable="yes">_Apply compression to prevent clipping</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
+            <property name="width">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkComboBox" id="replaygainmode">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="model">replaygainmodemodel</property>
             <child>
-              <object class="GtkCheckButton" id="limiter">
-                <property name="label" translatable="yes">_Apply compression to prevent clipping</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"/>
-              </packing>
+              <object class="GtkCellRendererText" id="cellrenderertext2"/>
+              <attributes>
+                <attribute name="text">0</attribute>
+              </attributes>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScale" id="preamp">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
+            <property name="adjustment">preampadjustment</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
           </packing>
         </child>
       </object>