[gnome-builder/wip/chergert/layout] editor: incremental work on editor properties



commit 9c5d13390c11e1a84a82df463d72d67627a842d2
Author: Christian Hergert <chergert redhat com>
Date:   Fri Jul 7 01:53:12 2017 -0700

    editor: incremental work on editor properties

 data/themes/shared/shared-editor.css    |    3 +++
 libide/editor/ide-editor-properties.ui  |   30 ++++++++----------------------
 libide/editor/ide-editor-view-actions.c |    6 +++++-
 3 files changed, 16 insertions(+), 23 deletions(-)
---
diff --git a/data/themes/shared/shared-editor.css b/data/themes/shared/shared-editor.css
index 1eb079b..ff9933b 100644
--- a/data/themes/shared/shared-editor.css
+++ b/data/themes/shared/shared-editor.css
@@ -66,3 +66,6 @@ ideeditorsidebar label.error:backdrop {
 ideeditorproperties modelbutton {
   padding: 0;
 }
+ideeditorproperties button {
+  padding: 2px 12px;
+}
diff --git a/libide/editor/ide-editor-properties.ui b/libide/editor/ide-editor-properties.ui
index 575ca34..a2f0bf3 100644
--- a/libide/editor/ide-editor-properties.ui
+++ b/libide/editor/ide-editor-properties.ui
@@ -55,7 +55,7 @@
             <child>
               <object class="GtkLabel">
                 <property name="visible">true</property>
-                <property name="label" translatable="yes">Behavior</property>
+                <property name="label" translatable="yes">Indentation</property>
                 <property name="margin-top">12</property>
                 <property name="xalign">0</property>
                 <style>
@@ -84,21 +84,6 @@
               </object>
             </child>
             <child>
-              <object class="GtkLabel">
-                <property name="visible">true</property>
-                <property name="label" translatable="yes">Indentation</property>
-                <property name="margin-top">12</property>
-                <property name="xalign">0</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-                <attributes>
-                  <attribute name="scale" value="0.8333"/>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-            </child>
-            <child>
               <object class="GtkBox">
                 <property name="visible">true</property>
                 <property name="orientation">vertical</property>
@@ -109,6 +94,7 @@
                 </style>
                 <child>
                   <object class="GtkBox">
+                    <property name="margin-top">12</property>
                     <property name="visible">true</property>
                     <property name="orientation">horizontal</property>
                     <property name="halign">center</property>
@@ -121,7 +107,7 @@
                         <property name="label" translatable="yes">Spaces</property>
                         <property name="focus-on-click">false</property>
                         <property name="halign">fill</property>
-                        <property name="action-name">editor-view.use-spaces</property>
+                        <property name="action-name">editor-view.insert-spaces-instead-of-tabs</property>
                         <property name="action-target">true</property>
                       </object>
                     </child>
@@ -131,7 +117,7 @@
                         <property name="label" translatable="yes">Tabs</property>
                         <property name="focus-on-click">false</property>
                         <property name="halign">fill</property>
-                        <property name="action-name">editor-view.use-spaces</property>
+                        <property name="action-name">editor-view.insert-spaces-instead-of-tabs</property>
                         <property name="action-target">false</property>
                       </object>
                     </child>
@@ -152,7 +138,7 @@
                         <property name="focus-on-click">false</property>
                         <property name="halign">fill</property>
                         <property name="action-name">editor-view.tab-width</property>
-                        <property name="action-target">2</property>
+                        <property name="action-target">uint32 2</property>
                       </object>
                     </child>
                     <child>
@@ -162,7 +148,7 @@
                         <property name="focus-on-click">false</property>
                         <property name="halign">fill</property>
                         <property name="action-name">editor-view.tab-width</property>
-                        <property name="action-target">3</property>
+                        <property name="action-target">uint32 3</property>
                       </object>
                     </child>
                     <child>
@@ -172,7 +158,7 @@
                         <property name="focus-on-click">false</property>
                         <property name="halign">fill</property>
                         <property name="action-name">editor-view.tab-width</property>
-                        <property name="action-target">4</property>
+                        <property name="action-target">uint32 4</property>
                       </object>
                     </child>
                     <child>
@@ -182,7 +168,7 @@
                         <property name="focus-on-click">false</property>
                         <property name="halign">fill</property>
                         <property name="action-name">editor-view.tab-width</property>
-                        <property name="action-target">8</property>
+                        <property name="action-target">uint32 8</property>
                       </object>
                     </child>
                   </object>
diff --git a/libide/editor/ide-editor-view-actions.c b/libide/editor/ide-editor-view-actions.c
index 2afa300..047269b 100644
--- a/libide/editor/ide-editor-view-actions.c
+++ b/libide/editor/ide-editor-view-actions.c
@@ -383,9 +383,13 @@ static const GActionEntry editor_view_entries[] = {
 };
 
 static const gchar *source_view_property_actions[] = {
+  "auto-indent",
+  "smart-backspace",
+  "highlight-current-line",
+  "insert-spaces-instead-of-tabs",
   "show-line-numbers",
   "show-right-margin",
-  "highlight-current-line",
+  "tab-width",
 };
 
 void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]