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

[Debarshi Ray <debarshir src gnome org>]

commit b75b6ef6e84e53934a823d5756374fbb06d7eba0
Author: Debarshi Ray <debarshir gnome org>
Date:   Fri May 2 13:30:52 2014 +0200

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

 src/profile-editor.c       |    8 ++-
 src/profile-preferences.ui |   98 +++++++++++++++-----------------------------
 2 files changed, 38 insertions(+), 68 deletions(-)
---
diff --git a/src/profile-editor.c b/src/profile-editor.c
index c3bc959..8b8afae 100644
--- a/src/profile-editor.c
+++ b/src/profile-editor.c
@@ -1035,8 +1035,10 @@ terminal_profile_edit (GSettings  *profile,
                    "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
   g_settings_bind (profile, TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY,
                    gtk_builder_get_object (builder,
-                                           "system-font-checkbutton"),
-                   "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+                                           "custom-font-checkbutton"),
+                   "active",
+                   G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET |
+                   G_SETTINGS_BIND_INVERT_BOOLEAN);
   g_settings_bind (profile, TERMINAL_PROFILE_UPDATE_RECORDS_KEY,
                    gtk_builder_get_object (builder,
                                            "update-records-checkbutton"),
@@ -1061,7 +1063,7 @@ terminal_profile_edit (GSettings  *profile,
                    G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY);
   g_settings_bind (profile,
                    TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY,
-                   gtk_builder_get_object (builder, "font-hbox"),
+                   gtk_builder_get_object (builder, "font-selector"),
                    "sensitive",
                    G_SETTINGS_BIND_GET | G_SETTINGS_BIND_INVERT_BOOLEAN |
                    G_SETTINGS_BIND_NO_SENSITIVITY);
diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui
index 29359b0..1eff130 100644
--- a/src/profile-preferences.ui
+++ b/src/profile-preferences.ui
@@ -216,7 +216,7 @@
                   <object class="GtkTable" id="general-table">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="n_rows">5</property>
+                    <property name="n_rows">6</property>
                     <property name="n_columns">4</property>
                     <property name="column_spacing">12</property>
                     <property name="row_spacing">6</property>
@@ -435,77 +435,45 @@
                         <property name="bottom_attach">5</property>
                       </packing>
                     </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="system-font-checkbutton">
-                    <property name="label" translatable="yes">_Use the system fixed width font</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.5</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkAlignment" id="alignment10109">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkHBox" id="font-hbox">
+                      <object class="GtkCheckButton" id="custom-font-checkbutton">
+                        <property name="label" translatable="yes">_Custom font</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkLabel" id="font-selector-label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Font:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">font-selector</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkFontButton" id="font-selector">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="title" translatable="yes">Choose A Terminal Font</property>
-                            <property name="use_font">True</property>
-                            <property name="use_size">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0.5</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="right_attach">1</property>
+                        <property name="top_attach">5</property>
+                        <property name="bottom_attach">6</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFontButton" id="font-selector">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="focus_on_click">False</property>
+                        <property name="title" translatable="yes">Choose A Terminal Font</property>
+                        <property name="use_font">True</property>
+                        <property name="use_size">True</property>
                       </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">4</property>
+                        <property name="top_attach">5</property>
+                        <property name="bottom_attach">6</property>
+                      </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>