GNOME.org
 

[gnome-builder/wip/language-settings] prefs: use a dialog to show the language preferences.

commit 3e1e9aaed1ee7a19a6d7f2810245f019ad2747a3
Author: Christian Hergert <christian hergert me>
Date:   Tue Oct 14 17:27:22 2014 -0700

    prefs: use a dialog to show the language preferences.

 src/editor/gb-editor-settings-widget.c        |    5 -
 src/editor/gb-editor-settings.c               |   78 -----
 src/editor/gb-editor-settings.h               |    6 -
 src/editor/gb-editor-tab.c                    |    2 -
 src/resources/ui/gb-editor-settings-widget.ui |  398 ++++++++++++++++++-------
 src/resources/ui/gb-preferences-window.ui     |   12 +-
 6 files changed, 291 insertions(+), 210 deletions(-)
---
diff --git a/src/editor/gb-editor-settings-widget.c b/src/editor/gb-editor-settings-widget.c
index 0f02e8a..b892804 100644
--- a/src/editor/gb-editor-settings-widget.c
+++ b/src/editor/gb-editor-settings-widget.c
@@ -35,7 +35,6 @@ struct _GbEditorSettingsWidgetPrivate
   GtkCheckButton *show_right_margin;
   GtkCheckButton *smart_home_end;
 
-  GtkSpinButton  *indent_width;
   GtkSpinButton  *right_margin_position;
   GtkSpinButton  *tab_width;
 };
@@ -97,9 +96,6 @@ gb_editor_settings_widget_set_settings (GbEditorSettingsWidget *widget,
   g_object_bind_property (settings, "smart-home-end",
                           priv->smart_home_end, "active",
                           G_BINDING_SYNC_CREATE);
-  g_object_bind_property (settings, "indent-width",
-                          priv->indent_width, "value",
-                          G_BINDING_SYNC_CREATE);
   g_object_bind_property (settings, "right-margin-position",
                           priv->right_margin_position, "value",
                           G_BINDING_SYNC_CREATE);
@@ -173,7 +169,6 @@ gb_editor_settings_widget_class_init (GbEditorSettingsWidgetClass *klass)
   gtk_widget_class_bind_template_child_private (widget_class, GbEditorSettingsWidget, 
highlight_current_line);
   gtk_widget_class_bind_template_child_private (widget_class, GbEditorSettingsWidget, 
highlight_matching_brackets);
   gtk_widget_class_bind_template_child_private (widget_class, GbEditorSettingsWidget, indent_on_tab);
-  gtk_widget_class_bind_template_child_private (widget_class, GbEditorSettingsWidget, indent_width);
   gtk_widget_class_bind_template_child_private (widget_class, GbEditorSettingsWidget, 
insert_spaces_instead_of_tabs);
   gtk_widget_class_bind_template_child_private (widget_class, GbEditorSettingsWidget, right_margin_position);
   gtk_widget_class_bind_template_child_private (widget_class, GbEditorSettingsWidget, show_line_marks);
diff --git a/src/editor/gb-editor-settings.c b/src/editor/gb-editor-settings.c
index aacb469..6decee0 100644
--- a/src/editor/gb-editor-settings.c
+++ b/src/editor/gb-editor-settings.c
@@ -41,14 +41,12 @@ struct _GbEditorSettingsPrivate
   gboolean              auto_indent;
   gboolean              highlight_current_line;
   gboolean              highlight_matching_brackets;
-  gboolean              indent_on_tab;
   gboolean              insert_spaces_instead_of_tabs;
   gboolean              show_line_marks;
   gboolean              show_line_numbers;
   gboolean              show_right_margin;
   gboolean              smart_home_end;
 
-  guint                 indent_width;
   guint                 right_margin_position;
   guint                 tab_width;
 };
@@ -60,7 +58,6 @@ enum {
   PROP_HIGHLIGHT_CURRENT_LINE,
   PROP_HIGHLIGHT_MATCHING_BRACKETS,
   PROP_INDENT_ON_TAB,
-  PROP_INDENT_WIDTH,
   PROP_INSERT_SPACES_INSTEAD_OF_TABS,
   PROP_RIGHT_MARGIN_POSITION,
   PROP_SHOW_LINE_MARKS,
@@ -224,25 +221,6 @@ gb_editor_settings_set_highlight_matching_brackets (GbEditorSettings *settings,
 }
 
 gboolean
-gb_editor_settings_get_indent_on_tab (GbEditorSettings *settings)
-{
-  g_return_val_if_fail (GB_IS_EDITOR_SETTINGS (settings), FALSE);
-
-  return settings->priv->indent_on_tab;
-}
-
-void
-gb_editor_settings_set_indent_on_tab (GbEditorSettings *settings,
-                                      gboolean          indent_on_tab)
-{
-  g_return_if_fail (GB_IS_EDITOR_SETTINGS (settings));
-
-  settings->priv->indent_on_tab = indent_on_tab;
-  g_object_notify_by_pspec (G_OBJECT (settings),
-                            gParamSpecs[PROP_INDENT_ON_TAB]);
-}
-
-gboolean
 gb_editor_settings_get_insert_spaces_instead_of_tabs (GbEditorSettings *settings)
 {
   g_return_val_if_fail (GB_IS_EDITOR_SETTINGS (settings), FALSE);
@@ -338,25 +316,6 @@ gb_editor_settings_set_smart_home_end (GbEditorSettings *settings,
 }
 
 guint
-gb_editor_settings_get_indent_width (GbEditorSettings *settings)
-{
-  g_return_val_if_fail (GB_IS_EDITOR_SETTINGS (settings), 0);
-
-  return settings->priv->indent_width;
-}
-
-void
-gb_editor_settings_set_indent_width (GbEditorSettings *settings,
-                                     guint             indent_width)
-{
-  g_return_if_fail (GB_IS_EDITOR_SETTINGS (settings));
-
-  settings->priv->indent_width = indent_width;
-  g_object_notify_by_pspec (G_OBJECT (settings),
-                            gParamSpecs[PROP_INDENT_WIDTH]);
-}
-
-guint
 gb_editor_settings_get_tab_width (GbEditorSettings *settings)
 {
   g_return_val_if_fail (GB_IS_EDITOR_SETTINGS (settings), 0);
@@ -429,10 +388,6 @@ gb_editor_settings_get_property (GObject    *object,
       g_value_set_boolean (value, gb_editor_settings_get_highlight_matching_brackets (settings));
       break;
 
-    case PROP_INDENT_ON_TAB:
-      g_value_set_boolean (value, gb_editor_settings_get_indent_on_tab (settings));
-      break;
-
     case PROP_INSERT_SPACES_INSTEAD_OF_TABS:
       g_value_set_boolean (value, gb_editor_settings_get_insert_spaces_instead_of_tabs (settings));
       break;
@@ -453,10 +408,6 @@ gb_editor_settings_get_property (GObject    *object,
       g_value_set_boolean (value, gb_editor_settings_get_smart_home_end (settings));
       break;
 
-    case PROP_INDENT_WIDTH:
-      g_value_set_uint (value, gb_editor_settings_get_indent_width (settings));
-      break;
-
     case PROP_TAB_WIDTH:
       g_value_set_uint (value, gb_editor_settings_get_tab_width (settings));
       break;
@@ -504,10 +455,6 @@ gb_editor_settings_set_property (GObject      *object,
       gb_editor_settings_set_highlight_matching_brackets (settings, g_value_get_boolean (value));
       break;
 
-    case PROP_INDENT_ON_TAB:
-      gb_editor_settings_set_indent_on_tab (settings, g_value_get_boolean (value));
-      break;
-
     case PROP_INSERT_SPACES_INSTEAD_OF_TABS:
       gb_editor_settings_set_insert_spaces_instead_of_tabs (settings, g_value_get_boolean (value));
       break;
@@ -528,10 +475,6 @@ gb_editor_settings_set_property (GObject      *object,
       gb_editor_settings_set_smart_home_end (settings, g_value_get_boolean (value));
       break;
 
-    case PROP_INDENT_WIDTH:
-      gb_editor_settings_set_indent_width (settings, g_value_get_uint (value));
-      break;
-
     case PROP_TAB_WIDTH:
       gb_editor_settings_set_tab_width (settings, g_value_get_uint (value));
       break;
@@ -595,15 +538,6 @@ gb_editor_settings_class_init (GbEditorSettingsClass *klass)
   g_object_class_install_property (object_class, PROP_HIGHLIGHT_MATCHING_BRACKETS,
                                    gParamSpecs [PROP_HIGHLIGHT_MATCHING_BRACKETS]);
 
-  gParamSpecs[PROP_INDENT_ON_TAB] =
-    g_param_spec_boolean ("indent-on-tab",
-                          _("indent on tab"),
-                          _("indent on tab"),
-                          FALSE,
-                          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-  g_object_class_install_property (object_class, PROP_INDENT_ON_TAB,
-                                   gParamSpecs[PROP_INDENT_ON_TAB]);
-
   gParamSpecs[PROP_INSERT_SPACES_INSTEAD_OF_TABS] =
     g_param_spec_boolean ("insert-spaces-instead-of-tabs",
                           _("insert spaces instead of tabs"),
@@ -660,17 +594,6 @@ gb_editor_settings_class_init (GbEditorSettingsClass *klass)
   g_object_class_install_property (object_class, PROP_RIGHT_MARGIN_POSITION,
                                    gParamSpecs[PROP_RIGHT_MARGIN_POSITION]);
 
-  gParamSpecs[PROP_INDENT_WIDTH] =
-    g_param_spec_uint ("indent-width",
-                       _("Indent Width"),
-                       _("The indent width."),
-                       1,
-                       100,
-                       2,
-                       (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-  g_object_class_install_property (object_class, PROP_INDENT_WIDTH,
-                                   gParamSpecs[PROP_INDENT_WIDTH]);
-
   gParamSpecs[PROP_TAB_WIDTH] =
     g_param_spec_uint ("tab-width",
                        _("Tab Width"),
@@ -733,7 +656,6 @@ gb_editor_settings_init (GbEditorSettings *settings)
   settings->priv->right_margin_position = 80;
   settings->priv->insert_spaces_instead_of_tabs = TRUE;
   settings->priv->tab_width = 2;
-  settings->priv->indent_width = 2;
   settings->priv->font_desc = font_desc;
   settings->priv->style_scheme = g_object_ref (scheme);
 }
diff --git a/src/editor/gb-editor-settings.h b/src/editor/gb-editor-settings.h
index 810e99c..5fb0a09 100644
--- a/src/editor/gb-editor-settings.h
+++ b/src/editor/gb-editor-settings.h
@@ -77,12 +77,6 @@ void                        gb_editor_settings_set_highlight_current_line
 gboolean                    gb_editor_settings_get_highlight_matching_brackets   (GbEditorSettings           
*settings);
 void                        gb_editor_settings_set_highlight_matching_brackets   (GbEditorSettings           
*settings,
                                                                                   gboolean                   
 highlight_matching_brackets);
-gboolean                    gb_editor_settings_get_indent_on_tab                 (GbEditorSettings           
*settings);
-void                        gb_editor_settings_set_indent_on_tab                 (GbEditorSettings           
*settings,
-                                                                                  gboolean                   
 indent_on_tab);
-guint                       gb_editor_settings_get_indent_width                  (GbEditorSettings           
*settings);
-void                        gb_editor_settings_set_indent_width                  (GbEditorSettings           
*settings,
-                                                                                  guint                      
 indent_width);
 gboolean                    gb_editor_settings_get_insert_spaces_instead_of_tabs (GbEditorSettings           
*settings);
 void                        gb_editor_settings_set_insert_spaces_instead_of_tabs (GbEditorSettings           
*settings,
                                                                                   gboolean                   
 insert_spaces_instead_of_tabs);
diff --git a/src/editor/gb-editor-tab.c b/src/editor/gb-editor-tab.c
index bfa5623..5e4e225 100644
--- a/src/editor/gb-editor-tab.c
+++ b/src/editor/gb-editor-tab.c
@@ -227,8 +227,6 @@ gb_editor_tab_connect_settings (GbEditorTab      *tab,
                priv->show_right_margin_binding);
   ADD_BINDING ("smart-home-end", priv->source_view, "smart-home-end",
                priv->smart_home_end_binding);
-  ADD_BINDING ("indent-width", priv->source_view, "indent-width",
-               priv->indent_width_binding);
   ADD_BINDING ("tab-width", priv->source_view, "tab-width",
                priv->tab_width_binding);
   ADD_BINDING ("right-margin-position", priv->source_view,
diff --git a/src/resources/ui/gb-editor-settings-widget.ui b/src/resources/ui/gb-editor-settings-widget.ui
index c1c3299..02fe957 100644
--- a/src/resources/ui/gb-editor-settings-widget.ui
+++ b/src/resources/ui/gb-editor-settings-widget.ui
@@ -1,139 +1,311 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.8 -->
+  <requires lib="gtk+" version="3.8"/>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="lower">32</property>
+    <property name="upper">500</property>
+    <property name="value">80</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="lower">1</property>
+    <property name="upper">32</property>
+    <property name="value">8</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">4</property>
+  </object>
   <template class="GbEditorSettingsWidget" parent="GtkGrid">
     <property name="visible">True</property>
-    <property name="column-spacing">6</property>
-    <property name="row-spacing">3</property>
-    <property name="can-focus">False</property>
+    <property name="can_focus">False</property>
+    <property name="row_spacing">12</property>
     <child>
-      <object class="GtkCheckButton" id="auto_indent">
+      <object class="GtkBox" id="box2">
         <property name="visible">True</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">Auto-Indent</property>
+        <property name="can_focus">False</property>
+        <property name="margin_left">12</property>
+        <property name="margin_right">12</property>
+        <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="use_underline">True</property>
+            <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</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>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkCheckButton" id="show_right_margin">
+                <property name="label" translatable="yes">Display right _margin at column:</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="valign">baseline</property>
+                <property name="use_underline">True</property>
+                <property name="xalign">0</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="right_margin_position">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="halign">start</property>
+                <property name="valign">baseline</property>
+                <property name="input_purpose">number</property>
+                <property name="adjustment">adjustment1</property>
+                <property name="value">80</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <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="use_underline">True</property>
+            <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</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="xalign">0</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
       </object>
       <packing>
-        <property name="top-attach">0</property>
-        <property name="left-attach">0</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
-      <object class="GtkCheckButton" id="highlight_current_line">
+      <object class="GtkBox" id="box3">
         <property name="visible">True</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">Highlight Current Line</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="xalign">0</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="margin_left">12</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</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="margin_left">12</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
       </object>
       <packing>
-        <property name="top-attach">1</property>
-        <property name="left-attach">0</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">1</property>
       </packing>
     </child>
     <child>
-      <object class="GtkCheckButton" id="highlight_matching_brackets">
+      <object class="GtkBox" id="box4">
         <property name="visible">True</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">Highlight Matching Brackets</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">3</property>
+        <child>
+          <object class="GtkLabel" id="label2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">&lt;b&gt;Indentation&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="GtkBox" id="box5">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="label3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">baseline</property>
+                <property name="margin_left">12</property>
+                <property name="label" translatable="yes">_Tab width:</property>
+                <property name="use_underline">True</property>
+                <property name="ellipsize">end</property>
+                <accessibility>
+                  <relation type="label-for" target="tab_width"/>
+                </accessibility>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="tab_width">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="valign">baseline</property>
+                <property name="adjustment">adjustment2</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="insert_spaces_instead_of_tabs">
+            <property name="label" translatable="yes">Insert _spaces instead of tabs</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="margin_left">12</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="auto_indent">
+            <property name="label" translatable="yes">_Enable automatic indentation</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="margin_left">12</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
       </object>
       <packing>
-        <property name="top-attach">2</property>
-        <property name="left-attach">0</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">2</property>
       </packing>
     </child>
     <child>
-      <object class="GtkCheckButton" id="indent_on_tab">
-        <property name="visible">True</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">Indent on Tab</property>
-      </object>
-      <packing>
-        <property name="top-attach">3</property>
-        <property name="left-attach">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="insert_spaces_instead_of_tabs">
-        <property name="visible">True</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">Insert Spaces Instead of Tabs</property>
-      </object>
-      <packing>
-        <property name="top-attach">4</property>
-        <property name="left-attach">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="show_line_marks">
-        <property name="visible">True</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">Show Line Marks</property>
-      </object>
-      <packing>
-        <property name="top-attach">5</property>
-        <property name="left-attach">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="show_line_numbers">
-        <property name="visible">True</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">Show Line Numbers</property>
-      </object>
-      <packing>
-        <property name="top-attach">6</property>
-        <property name="left-attach">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="show_right_margin">
-        <property name="visible">True</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">Display right margin at position</property>
-      </object>
-      <packing>
-        <property name="top-attach">7</property>
-        <property name="left-attach">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkSpinButton" id="right_margin_position">
-        <property name="visible">True</property>
-        <property name="halign">start</property>
-      </object>
-      <packing>
-        <property name="top-attach">7</property>
-        <property name="left-attach">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="smart_home_end">
-        <property name="visible">True</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">Smart Home and End</property>
-      </object>
-      <packing>
-        <property name="top-attach">8</property>
-        <property name="left-attach">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkSpinButton" id="indent_width">
-        <property name="visible">True</property>
-        <property name="halign">start</property>
-      </object>
-      <packing>
-        <property name="top-attach">9</property>
-        <property name="left-attach">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkSpinButton" id="tab_width">
-        <property name="visible">True</property>
-        <property name="halign">start</property>
-      </object>
-      <packing>
-        <property name="top-attach">11</property>
-        <property name="left-attach">0</property>
-      </packing>
+      <placeholder/>
     </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"/>
+    </widgets>
+  </object>
 </interface>
diff --git a/src/resources/ui/gb-preferences-window.ui b/src/resources/ui/gb-preferences-window.ui
index 4ce9a4b..7cc9c06 100644
--- a/src/resources/ui/gb-preferences-window.ui
+++ b/src/resources/ui/gb-preferences-window.ui
@@ -115,21 +115,21 @@
               </packing>
             </child>
             <child>
-              <object class="GbPreferencesPageGit" id="git_page">
+              <object class="GbPreferencesPageLanguage" id="language_page">
                 <property name="visible">True</property>
               </object>
               <packing>
-                <property name="name">git</property>
-                <property name="title" translatable="yes">Git</property>
+                <property name="name">language</property>
+                <property name="title" translatable="yes">Language Settings</property>
               </packing>
             </child>
             <child>
-              <object class="GbPreferencesPageLanguage" id="language_page">
+              <object class="GbPreferencesPageGit" id="git_page">
                 <property name="visible">True</property>
               </object>
               <packing>
-                <property name="name">language</property>
-                <property name="title" translatable="yes">Language Settings</property>
+                <property name="name">git</property>
+                <property name="title" translatable="yes">Git</property>
               </packing>
             </child>
           </object>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]