[gnome-builder] editor: tweaks to the editor properties

[Christian Hergert <chergert src gnome org>]

commit ac3073a213a3f7d87a15093e125a1a797a5b4f58
Author: Christian Hergert <chergert redhat com>
Date:   Fri Jul 7 17:30:51 2017 -0700

    editor: tweaks to the editor properties
    
    We can't really use ModelButton here like we did in the tweak
    widget because those don't want to work as well when not inside
    of popovers.

 data/themes/shared/shared-editor.css   |   10 ++++--
 libide/editor/ide-editor-properties.ui |   61 ++++++++++++++++---------------
 2 files changed, 38 insertions(+), 33 deletions(-)
---
diff --git a/data/themes/shared/shared-editor.css b/data/themes/shared/shared-editor.css
index ff9933b..722a16c 100644
--- a/data/themes/shared/shared-editor.css
+++ b/data/themes/shared/shared-editor.css
@@ -63,9 +63,13 @@ ideeditorsidebar label.error {
 ideeditorsidebar label.error:backdrop {
   font-weight: normal;
 }
-ideeditorproperties modelbutton {
-  padding: 0;
-}
 ideeditorproperties button {
   padding: 2px 12px;
 }
+ideeditorproperties checkbutton {
+ padding: 0;
+ margin: 8px 0 0 0;
+}
+ideeditorproperties checkbutton check {
+ margin: 0 8px 0 0;
+}
diff --git a/libide/editor/ide-editor-properties.ui b/libide/editor/ide-editor-properties.ui
index f20b6ae..3429d8b 100644
--- a/libide/editor/ide-editor-properties.ui
+++ b/libide/editor/ide-editor-properties.ui
@@ -9,7 +9,6 @@
           <object class="GtkBox">
             <property name="visible">true</property>
             <property name="margin">12</property>
-            <property name="spacing">0</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkLabel">
@@ -26,28 +25,25 @@
               </object>
             </child>
             <child>
-              <object class="GtkModelButton">
+              <object class="GtkCheckButton">
                 <property name="visible">true</property>
-                <property name="text" translatable="yes">Show line numbers</property>
-                <property name="role">check</property>
+                <property name="label" translatable="yes">Show line numbers</property>
                 <property name="halign">fill</property>
                 <property name="action-name">source-view.show-line-numbers</property>
               </object>
             </child>
             <child>
-              <object class="GtkModelButton">
+              <object class="GtkCheckButton">
                 <property name="visible">true</property>
-                <property name="text" translatable="yes">Show right margin</property>
-                <property name="role">check</property>
+                <property name="label" translatable="yes">Show right margin</property>
                 <property name="halign">fill</property>
                 <property name="action-name">source-view.show-right-margin</property>
               </object>
             </child>
             <child>
-              <object class="GtkModelButton">
+              <object class="GtkCheckButton">
                 <property name="visible">true</property>
-                <property name="text" translatable="yes">Highlight current line</property>
-                <property name="role">check</property>
+                <property name="label" translatable="yes">Highlight current line</property>
                 <property name="halign">fill</property>
                 <property name="action-name">source-view.highlight-current-line</property>
               </object>
@@ -68,30 +64,10 @@
               </object>
             </child>
             <child>
-              <object class="GtkModelButton">
-                <property name="visible">true</property>
-                <property name="text" translatable="yes">Auto indent</property>
-                <property name="halign">fill</property>
-                <property name="action-name">source-view.auto-indent</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkModelButton">
-                <property name="visible">true</property>
-                <property name="text" translatable="yes">Smart Backspace</property>
-                <property name="halign">fill</property>
-                <property name="action-name">source-view.smart-backspace</property>
-              </object>
-            </child>
-            <child>
               <object class="GtkBox">
                 <property name="visible">true</property>
                 <property name="orientation">vertical</property>
                 <property name="halign">center</property>
-                <property name="spacing">12</property>
-                <style>
-                  <class name="indentation"/>
-                </style>
                 <child>
                   <object class="GtkBox">
                     <property name="margin-top">12</property>
@@ -127,6 +103,7 @@
                 </child>
                 <child>
                   <object class="GtkBox">
+                    <property name="margin-top">6</property>
                     <property name="visible">true</property>
                     <property name="orientation">horizontal</property>
                     <property name="halign">center</property>
@@ -177,6 +154,23 @@
                 </child>
               </object>
             </child>
+            <child>
+              <object class="GtkCheckButton">
+                <property name="margin-top">6</property>
+                <property name="visible">true</property>
+                <property name="label" translatable="yes">Auto indent</property>
+                <property name="halign">fill</property>
+                <property name="action-name">source-view.auto-indent</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkCheckButton">
+                <property name="visible">true</property>
+                <property name="label" translatable="yes">Smart Backspace</property>
+                <property name="halign">fill</property>
+                <property name="action-name">source-view.smart-backspace</property>
+              </object>
+            </child>
           </object>
         </child>
         <child>
@@ -197,7 +191,14 @@
               </object>
             </child>
             <child>
+              <object class="GtkSeparator">
+                <property name="orientation">horizontal</property>
+                <property name="visible">true</property>
+              </object>
+            </child>
+            <child>
               <object class="GtkSearchEntry" id="entry">
+                <property name="has-frame">false</property>
                 <property name="visible">true</property>
                 <property name="placeholder-text" translatable="yes">Search highlight mode…</property>
               </object>