[gnome-terminal] profile: Change the scrollback UI according to latest designs

[Debarshi Ray <debarshir src gnome org>]

commit 11e2456875dc2fc325a3bce9b25ac25f39693159
Author: Debarshi Ray <debarshir gnome org>
Date:   Wed Jul 9 13:31:25 2014 +0200

    profile: Change the scrollback UI according to latest designs
    
    The check button and spin button are now on the same row, and the
    semantics of the check button has been inverted.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=724110

 src/profile-editor.c       |    6 +++-
 src/profile-preferences.ui |   54 ++++++++++++++++---------------------------
 2 files changed, 24 insertions(+), 36 deletions(-)
---
diff --git a/src/profile-editor.c b/src/profile-editor.c
index 8b8afae..8e5732d 100644
--- a/src/profile-editor.c
+++ b/src/profile-editor.c
@@ -1007,8 +1007,10 @@ terminal_profile_edit (GSettings  *profile,
                    "value", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
   g_settings_bind (profile, TERMINAL_PROFILE_SCROLLBACK_UNLIMITED_KEY,
                    gtk_builder_get_object (builder,
-                                           "scrollback-unlimited-checkbutton"),
-                   "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+                                           "scrollback-limited-checkbutton"),
+                   "active",
+                   G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET |
+                   G_SETTINGS_BIND_INVERT_BOOLEAN);
   g_settings_bind (profile, TERMINAL_PROFILE_SCROLLBACK_UNLIMITED_KEY,
                    gtk_builder_get_object (builder,
                                            "scrollback-box"),
diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui
index f7d0cf2..99d1c84 100644
--- a/src/profile-preferences.ui
+++ b/src/profile-preferences.ui
@@ -1498,23 +1498,6 @@
                   <placeholder/>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="scrollback-label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Scroll_back:</property>
-                    <property name="use_underline">True</property>
-                    <property name="justify">center</property>
-                    <property name="mnemonic_widget">scrollback-lines-spinbutton</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="GtkCheckButton" id="scroll-on-keystroke-checkbutton">
                     <property name="label" translatable="yes">Scroll on _keystroke</property>
                     <property name="visible">True</property>
@@ -1523,9 +1506,10 @@
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">4</property>
-                    <property name="bottom_attach">5</property>
+                    <property name="left_attach">0</property>
+                    <property name="right_attach">1</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
                     <property name="y_options"/>
                   </packing>
                 </child>
@@ -1538,25 +1522,26 @@
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
+                    <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="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="scrollback-unlimited-checkbutton">
-                    <property name="label" translatable="yes">_Unlimited</property>
+                  <object class="GtkCheckButton" id="scrollback-limited-checkbutton">
+                    <property name="label" translatable="yes">_Limit scrollback to:</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
+                    <property name="left_attach">0</property>
+                    <property name="right_attach">1</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
                     <property name="y_options"/>
                   </packing>
                 </child>
@@ -1612,9 +1597,8 @@
                   <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>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
                   </packing>
                 </child>
                 <child>
@@ -1626,8 +1610,10 @@
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
-                    <property name="right_attach">2</property>
-                    <property name="y_options">GTK_FILL</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>
                   </packing>
                 </child>
               </object>