[gnome-builder] Some settings shouldn't be per language



commit 9a9fd5d21fe8ddabc490a90c69594d4915291b78
Author: Dimitris Zenios <dimitris zenios gmail com>
Date:   Fri Jan 9 01:06:05 2015 +0200

    Some settings shouldn't be per language
    
    Move settings
     * Line Numbers
     * Highlight current line
     * Highlight matching brackets
     * Home moves to first non-whitespace character
    from org.gnome.builder.editor.language to org.gnome.builder.editor
    
    Removed setting
     * Show line marks
    
    https://bugzilla.gnome.org/show_bug.cgi?id=742253

 data/org.gnome.builder.editor.gschema.xml.in       |   20 ++
 ...rg.gnome.builder.editor.language.gschema.xml.in |   15 --
 src/editor/gb-editor-settings-widget.c             |   25 ---
 src/editor/gb-source-view.c                        |   26 +--
 src/preferences/gb-preferences-page-editor.c       |   51 +++++-
 src/resources/ui/gb-editor-settings-widget.ui      |  132 +-----------
 src/resources/ui/gb-preferences-page-editor.ui     |  220 ++++++++++++++++++++
 7 files changed, 303 insertions(+), 186 deletions(-)
---
diff --git a/data/org.gnome.builder.editor.gschema.xml.in b/data/org.gnome.builder.editor.gschema.xml.in
index ee91ceb..4900dbf 100644
--- a/data/org.gnome.builder.editor.gschema.xml.in
+++ b/data/org.gnome.builder.editor.gschema.xml.in
@@ -21,6 +21,26 @@
       <summary>Show modified lines.</summary>
       <description>If enabled, the editor will show line additions and changes next to the source 
code.</description>
     </key>
+    <key name="highlight-current-line" type="b">
+      <default>false</default>
+      <summary>Highlight current line.</summary>
+      <description>If enabled, the editor will highlight the line containing the cursor.</description>
+    </key>
+    <key name="highlight-matching-brackets" type="b">
+      <default>false</default>
+      <summary>Highlight matching brackets.</summary>
+      <description>If enabled, the editor will highlight maching brackets.</description>
+    </key>
+    <key name="show-line-numbers" type="b">
+      <default>true</default>
+      <summary>Show line numbers.</summary>
+      <description>If enabled, the editor will show line numbers.</description>
+    </key>
+    <key name="smart-home-end" type="b">
+      <default>true</default>
+      <summary>Smart home end.</summary>
+      <description>Whether or not home moves to first non-space character.</description>
+    </key>
     <key name="font-name" type="s">
       <default>"Monospace 11"</default>
     </key>
diff --git a/data/org.gnome.builder.editor.language.gschema.xml.in 
b/data/org.gnome.builder.editor.language.gschema.xml.in
index 50b8196..cd83e85 100644
--- a/data/org.gnome.builder.editor.language.gschema.xml.in
+++ b/data/org.gnome.builder.editor.language.gschema.xml.in
@@ -3,12 +3,6 @@
     <key name="auto-indent" type="b">
       <default>true</default>
     </key>
-    <key name="highlight-current-line" type="b">
-      <default>false</default>
-    </key>
-    <key name="highlight-matching-brackets" type="b">
-      <default>false</default>
-    </key>
     <key name="insert-spaces-instead-of-tabs" type="b">
       <default>false</default>
     </key>
@@ -18,18 +12,9 @@
     <key name="overwrite-braces" type="b">
       <default>false</default>
     </key>
-    <key name="show-line-marks" type="b">
-      <default>false</default>
-    </key>
-    <key name="show-line-numbers" type="b">
-      <default>true</default>
-    </key>
     <key name="show-right-margin" type="b">
       <default>true</default>
     </key>
-    <key name="smart-home-end" type="b">
-      <default>true</default>
-    </key>
     <key name="right-margin-position" type="i">
       <range min="32" max="500"/>
       <default>80</default>
diff --git a/src/editor/gb-editor-settings-widget.c b/src/editor/gb-editor-settings-widget.c
index 994bff8..e10ad02 100644
--- a/src/editor/gb-editor-settings-widget.c
+++ b/src/editor/gb-editor-settings-widget.c
@@ -27,15 +27,10 @@ struct _GbEditorSettingsWidgetPrivate
   gchar          *language;
 
   GtkCheckButton *auto_indent;
-  GtkCheckButton *highlight_current_line;
-  GtkCheckButton *highlight_matching_brackets;
   GtkCheckButton *insert_matching_brace;
   GtkCheckButton *insert_spaces_instead_of_tabs;
   GtkCheckButton *overwrite_braces;
-  GtkCheckButton *show_line_marks;
-  GtkCheckButton *show_line_numbers;
   GtkCheckButton *show_right_margin;
-  GtkCheckButton *smart_home_end;
   GtkSpinButton  *right_margin_position;
   GtkSpinButton  *tab_width;
   GtkCheckButton *trim_trailing_whitespace;
@@ -88,12 +83,6 @@ gb_editor_settings_widget_set_language (GbEditorSettingsWidget *widget,
       g_settings_bind (priv->settings, "auto-indent",
                        priv->auto_indent, "active",
                        G_SETTINGS_BIND_DEFAULT);
-      g_settings_bind (priv->settings, "highlight-current-line",
-                       priv->highlight_current_line, "active",
-                       G_SETTINGS_BIND_DEFAULT);
-      g_settings_bind (priv->settings, "highlight-matching-brackets",
-                       priv->highlight_matching_brackets, "active",
-                       G_SETTINGS_BIND_DEFAULT);
       g_settings_bind (priv->settings, "insert-matching-brace",
                        priv->insert_matching_brace, "active",
                        G_SETTINGS_BIND_DEFAULT);
@@ -103,18 +92,9 @@ gb_editor_settings_widget_set_language (GbEditorSettingsWidget *widget,
       g_settings_bind (priv->settings, "overwrite-braces",
                        priv->overwrite_braces, "active",
                        G_SETTINGS_BIND_DEFAULT);
-      g_settings_bind (priv->settings, "show-line-marks",
-                       priv->show_line_marks, "active",
-                       G_SETTINGS_BIND_DEFAULT);
-      g_settings_bind (priv->settings, "show-line-numbers",
-                       priv->show_line_numbers, "active",
-                       G_SETTINGS_BIND_DEFAULT);
       g_settings_bind (priv->settings, "show-right-margin",
                        priv->show_right_margin, "active",
                        G_SETTINGS_BIND_DEFAULT);
-      g_settings_bind (priv->settings, "smart-home-end",
-                       priv->smart_home_end, "active",
-                       G_SETTINGS_BIND_DEFAULT);
       g_settings_bind (priv->settings, "right-margin-position",
                        priv->right_margin_position, "value",
                        G_SETTINGS_BIND_DEFAULT);
@@ -189,16 +169,11 @@ gb_editor_settings_widget_class_init (GbEditorSettingsWidgetClass *klass)
 
   GB_WIDGET_CLASS_TEMPLATE (klass, "gb-editor-settings-widget.ui");
   GB_WIDGET_CLASS_BIND (klass, GbEditorSettingsWidget, auto_indent);
-  GB_WIDGET_CLASS_BIND (klass, GbEditorSettingsWidget, highlight_current_line);
-  GB_WIDGET_CLASS_BIND (klass, GbEditorSettingsWidget, highlight_matching_brackets);
   GB_WIDGET_CLASS_BIND (klass, GbEditorSettingsWidget, insert_matching_brace);
   GB_WIDGET_CLASS_BIND (klass, GbEditorSettingsWidget, insert_spaces_instead_of_tabs);
   GB_WIDGET_CLASS_BIND (klass, GbEditorSettingsWidget, right_margin_position);
   GB_WIDGET_CLASS_BIND (klass, GbEditorSettingsWidget, overwrite_braces);
-  GB_WIDGET_CLASS_BIND (klass, GbEditorSettingsWidget, show_line_marks);
-  GB_WIDGET_CLASS_BIND (klass, GbEditorSettingsWidget, show_line_numbers);
   GB_WIDGET_CLASS_BIND (klass, GbEditorSettingsWidget, show_right_margin);
-  GB_WIDGET_CLASS_BIND (klass, GbEditorSettingsWidget, smart_home_end);
   GB_WIDGET_CLASS_BIND (klass, GbEditorSettingsWidget, tab_width);
   GB_WIDGET_CLASS_BIND (klass, GbEditorSettingsWidget, trim_trailing_whitespace);
 
diff --git a/src/editor/gb-source-view.c b/src/editor/gb-source-view.c
index 14047e6..141991a 100644
--- a/src/editor/gb-source-view.c
+++ b/src/editor/gb-source-view.c
@@ -218,7 +218,6 @@ gb_source_view_disconnect_settings (GbSourceView *view)
   g_settings_unbind (view, "highlight-current-line");
   g_settings_unbind (view, "insert-spaces-instead-of-tabs");
   g_settings_unbind (view, "right-margin-position");
-  g_settings_unbind (view, "show-line-marks");
   g_settings_unbind (view, "show-line-numbers");
   g_settings_unbind (view, "show-right-margin");
   g_settings_unbind (view, "tab-width");
@@ -256,14 +255,6 @@ gb_source_view_connect_settings (GbSourceView *view)
 
       g_settings_bind (settings, "auto-indent", view, "auto-indent",
                        G_SETTINGS_BIND_GET);
-      g_settings_bind (settings, "auto-indent", view, "auto-indent",
-                       G_SETTINGS_BIND_GET);
-      g_settings_bind (settings, "highlight-current-line",
-                       view, "highlight-current-line",
-                       G_SETTINGS_BIND_GET);
-      g_settings_bind (settings, "highlight-matching-brackets",
-                       buffer, "highlight-matching-brackets",
-                       G_SETTINGS_BIND_GET);
       g_settings_bind (settings, "insert-matching-brace",
                        view, "insert-matching-brace",
                        G_SETTINGS_BIND_GET);
@@ -276,15 +267,6 @@ gb_source_view_connect_settings (GbSourceView *view)
       g_settings_bind (settings, "right-margin-position",
                        view, "right-margin-position",
                        G_SETTINGS_BIND_GET);
-      g_settings_bind (settings, "smart-home-end",
-                       view, "smart-home-end-simple",
-                       G_SETTINGS_BIND_GET);
-      g_settings_bind (settings, "show-line-marks",
-                       view, "show-line-marks",
-                       G_SETTINGS_BIND_GET);
-      g_settings_bind (settings, "show-line-numbers",
-                       view,"show-line-numbers",
-                       G_SETTINGS_BIND_GET);
       g_settings_bind (settings, "show-right-margin",
                        view, "show-right-margin",
                        G_SETTINGS_BIND_GET);
@@ -309,6 +291,14 @@ gb_source_view_connect_settings (GbSourceView *view)
                    view->priv->vim, "enabled", G_SETTINGS_BIND_GET);
   g_settings_bind (view->priv->editor_settings, "word-completion",
                    view, "enable-word-completion", G_SETTINGS_BIND_GET);
+  g_settings_bind (view->priv->editor_settings, "show-line-numbers",
+                   view, "show-line-numbers",G_SETTINGS_BIND_GET);
+  g_settings_bind (view->priv->editor_settings, "highlight-current-line",
+                   view, "highlight-current-line",G_SETTINGS_BIND_GET);
+  g_settings_bind (view->priv->editor_settings, "highlight-matching-brackets",
+                   buffer, "highlight-matching-brackets",G_SETTINGS_BIND_GET);
+  g_settings_bind (view->priv->editor_settings, "smart-home-end",
+                   view, "smart-home-end-simple",G_SETTINGS_BIND_GET);
 }
 
 void
diff --git a/src/preferences/gb-preferences-page-editor.c b/src/preferences/gb-preferences-page-editor.c
index a4540e3..3d0490c 100644
--- a/src/preferences/gb-preferences-page-editor.c
+++ b/src/preferences/gb-preferences-page-editor.c
@@ -32,6 +32,10 @@ struct _GbPreferencesPageEditorPrivate
   GtkSwitch                 *show_diff_switch;
   GtkSwitch                 *vim_mode_switch;
   GtkSwitch                 *word_completion_switch;
+  GtkSwitch                 *show_line_numbers_switch;
+  GtkSwitch                 *highlight_current_line_switch;
+  GtkSwitch                 *highlight_matching_brackets_switch;
+  GtkSwitch                 *smart_home_end_switch;
   GtkFontButton             *font_button;
   GbSourceStyleSchemeButton *style_scheme_button;
 
@@ -40,6 +44,10 @@ struct _GbPreferencesPageEditorPrivate
   GtkWidget                 *restore_insert_mark_container;
   GtkWidget                 *word_completion_container;
   GtkWidget                 *show_diff_container;
+  GtkWidget                 *show_line_numbers_container;
+  GtkWidget                 *highlight_current_line_container;
+  GtkWidget                 *highlight_matching_brackets_container;
+  GtkWidget                 *smart_home_end_container;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (GbPreferencesPageEditor, gb_preferences_page_editor,
@@ -57,7 +65,8 @@ gb_preferences_page_editor_constructed (GObject *object)
 
   priv->settings = g_settings_new ("org.gnome.builder.editor");
 
-  g_settings_bind (priv->settings, "vim-mode", priv->vim_mode_switch, "active",
+  g_settings_bind (priv->settings, "vim-mode",
+                   priv->vim_mode_switch, "active",
                    G_SETTINGS_BIND_DEFAULT);
   g_settings_bind (priv->settings, "restore-insert-mark",
                    priv->restore_insert_mark_switch, "active",
@@ -68,6 +77,18 @@ gb_preferences_page_editor_constructed (GObject *object)
   g_settings_bind (priv->settings, "word-completion",
                    priv->word_completion_switch, "active",
                    G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (priv->settings, "show-line-numbers",
+                   priv->show_line_numbers_switch, "active",
+                   G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (priv->settings, "highlight-current-line",
+                   priv->highlight_current_line_switch, "active",
+                   G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (priv->settings, "highlight-matching-brackets",
+                   priv->highlight_matching_brackets_switch, "active",
+                   G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (priv->settings, "smart-home-end",
+                   priv->smart_home_end_switch, "active",
+                   G_SETTINGS_BIND_DEFAULT);
   g_settings_bind (priv->settings, "font-name",
                    priv->font_button, "font-name",
                    G_SETTINGS_BIND_DEFAULT);
@@ -106,11 +127,19 @@ gb_preferences_page_editor_class_init (GbPreferencesPageEditorClass *klass)
   gtk_widget_class_bind_template_child_private (widget_class, GbPreferencesPageEditor, style_scheme_button);
   gtk_widget_class_bind_template_child_private (widget_class, GbPreferencesPageEditor, vim_mode_switch);
   gtk_widget_class_bind_template_child_private (widget_class, GbPreferencesPageEditor, 
word_completion_switch);
+  gtk_widget_class_bind_template_child_private (widget_class, GbPreferencesPageEditor, 
show_line_numbers_switch);
+  gtk_widget_class_bind_template_child_private (widget_class, GbPreferencesPageEditor, 
highlight_current_line_switch);
+  gtk_widget_class_bind_template_child_private (widget_class, GbPreferencesPageEditor, 
highlight_matching_brackets_switch);
+  gtk_widget_class_bind_template_child_private (widget_class, GbPreferencesPageEditor, 
smart_home_end_switch);
 
   gtk_widget_class_bind_template_child_private (widget_class, GbPreferencesPageEditor, vim_container);
   gtk_widget_class_bind_template_child_private (widget_class, GbPreferencesPageEditor, 
restore_insert_mark_container);
   gtk_widget_class_bind_template_child_private (widget_class, GbPreferencesPageEditor, 
word_completion_container);
   gtk_widget_class_bind_template_child_private (widget_class, GbPreferencesPageEditor, show_diff_container);
+  gtk_widget_class_bind_template_child_private (widget_class, GbPreferencesPageEditor, 
show_line_numbers_container);
+  gtk_widget_class_bind_template_child_private (widget_class, GbPreferencesPageEditor, 
highlight_current_line_container);
+  gtk_widget_class_bind_template_child_private (widget_class, GbPreferencesPageEditor, 
highlight_matching_brackets_container);
+  gtk_widget_class_bind_template_child_private (widget_class, GbPreferencesPageEditor, 
smart_home_end_container);
 
   g_type_ensure (GB_TYPE_SOURCE_STYLE_SCHEME_BUTTON);
 }
@@ -143,6 +172,26 @@ gb_preferences_page_editor_init (GbPreferencesPageEditor *self)
                                                self->priv->show_diff_switch,
                                                NULL);
   gb_preferences_page_set_keywords_for_widget (GB_PREFERENCES_PAGE (self),
+                                               _("line numbers"),
+                                               self->priv->show_line_numbers_container,
+                                               self->priv->show_line_numbers_switch,
+                                               NULL);
+  gb_preferences_page_set_keywords_for_widget (GB_PREFERENCES_PAGE (self),
+                                               _("line lines highlight current"),
+                                               self->priv->highlight_current_line_container,
+                                               self->priv->highlight_current_line_switch,
+                                               NULL);
+  gb_preferences_page_set_keywords_for_widget (GB_PREFERENCES_PAGE (self),
+                                               _("bracket brackets highlight matching"),
+                                               self->priv->highlight_matching_brackets_container,
+                                               self->priv->highlight_matching_brackets_switch,
+                                               NULL);
+  gb_preferences_page_set_keywords_for_widget (GB_PREFERENCES_PAGE (self),
+                                               _("smart home end"),
+                                               self->priv->smart_home_end_container,
+                                               self->priv->smart_home_end_switch,
+                                               NULL);
+  gb_preferences_page_set_keywords_for_widget (GB_PREFERENCES_PAGE (self),
                                                _("font document editor monospace"),
                                                GTK_WIDGET (self->priv->font_button),
                                                NULL);
diff --git a/src/resources/ui/gb-editor-settings-widget.ui b/src/resources/ui/gb-editor-settings-widget.ui
index 6fe5c2c..3f0bdcc 100644
--- a/src/resources/ui/gb-editor-settings-widget.ui
+++ b/src/resources/ui/gb-editor-settings-widget.ui
@@ -29,24 +29,6 @@
         <property name="orientation">vertical</property>
         <property name="homogeneous">True</property>
         <child>
-          <object class="GtkCheckButton" id="show_line_numbers">
-            <property name="label" translatable="yes">_Display line numbers</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="halign">start</property>
-            <property name="valign">center</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">0</property>
-          </packing>
-        </child>
-        <child>
           <object class="GtkBox" id="box1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -89,42 +71,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="show_line_marks">
-            <property name="label" translatable="yes">Display line mar_ks</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="halign">start</property>
-            <property name="valign">center</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">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="smart_home_end">
-            <property name="label" translatable="yes">Home moves to first non-space character</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="halign">start</property>
-            <property name="valign">center</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">3</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -141,7 +88,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="position">4</property>
+            <property name="position">1</property>
           </packing>
         </child>
         <child>
@@ -158,7 +105,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="position">5</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
@@ -175,7 +122,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="position">6</property>
+            <property name="position">3</property>
           </packing>
         </child>
       </object>
@@ -185,70 +132,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkBox" id="box3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">3</property>
-        <child>
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">start</property>
-            <property name="label" translatable="yes">&lt;b&gt;Highlighting&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="highlight_current_line">
-            <property name="label" translatable="yes">Highlight current _line</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="halign">start</property>
-            <property name="valign">center</property>
-            <property name="margin_start">12</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="GtkCheckButton" id="highlight_matching_brackets">
-            <property name="label" translatable="yes">Highlight matching _brackets</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="halign">start</property>
-            <property name="valign">center</property>
-            <property name="margin_start">12</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">2</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkBox" id="box4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -353,19 +236,14 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">2</property>
+        <property name="top_attach">1</property>
       </packing>
     </child>
   </template>
   <object class="GtkSizeGroup" id="sizegroup1">
     <property name="mode">vertical</property>
     <widgets>
-      <widget name="show_line_numbers"/>
       <widget name="box1"/>
-      <widget name="show_line_marks"/>
-      <widget name="smart_home_end"/>
-      <widget name="highlight_current_line"/>
-      <widget name="highlight_matching_brackets"/>
       <widget name="box5"/>
       <widget name="insert_spaces_instead_of_tabs"/>
       <widget name="auto_indent"/>
diff --git a/src/resources/ui/gb-preferences-page-editor.ui b/src/resources/ui/gb-preferences-page-editor.ui
index 9ef3eb9..c0881de 100644
--- a/src/resources/ui/gb-preferences-page-editor.ui
+++ b/src/resources/ui/gb-preferences-page-editor.ui
@@ -59,6 +59,50 @@
               </packing>
             </child>
             <child>
+              <object class="GtkSwitch" id="show_line_numbers_switch">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="valign">center</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSwitch" id="highlight_current_line_switch">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="valign">center</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">5</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSwitch" id="highlight_matching_brackets_switch">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="valign">center</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">6</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSwitch" id="smart_home_end_switch">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="valign">center</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">7</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkBox" id="vim_container">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -234,6 +278,182 @@
                 <property name="top_attach">3</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkBox" id="show_line_numbers_container">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Show Line Numbers&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">Display line numbers in the 
document.</property>
+                    <property name="xalign">0</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="highlight_current_line_container">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Hightlight Current 
Line&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">Highlight the line containing the 
cursor.</property>
+                    <property name="xalign">0</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">5</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="highlight_matching_brackets_container">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Hightlight Matching 
Brackets&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">Whether or not matching brackets should be 
highlighted.</property>
+                    <property name="xalign">0</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">6</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="smart_home_end_container">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Smart Home End&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">Home moves to first non-space 
character.</property>
+                    <property name="xalign">0</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">7</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>


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