[gnome-builder] prefs: modernize preferences a bit
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] prefs: modernize preferences a bit
- Date: Thu, 14 May 2015 08:36:24 +0000 (UTC)
commit 72e0e0b6253ea4eccddf2f3c33643e5476d69bf0
Author: Christian Hergert <christian hergert me>
Date: Thu May 14 01:28:28 2015 -0700
prefs: modernize preferences a bit
I'm no designer, but what we had was bordering on evil. Not saying that
this is considerably better, but I do think it is a bit easier to navigate
without getting completely lost.
Again, I really want someone to sit down and make real preferences designs.
data/ui/gb-editor-settings-widget.ui | 1 +
data/ui/gb-preferences-page-editor.ui | 169 +++++++++++++++------
data/ui/gb-preferences-page-git.ui | 115 +++++++++------
data/ui/gb-preferences-page-keybindings.ui | 54 +++++++-
data/ui/gb-preferences-page-language.ui | 2 +-
data/ui/gb-preferences-window.ui | 14 +-
src/preferences/gb-preferences-page-editor.c | 50 +++---
src/preferences/gb-preferences-page-git.c | 4 +-
src/preferences/gb-preferences-page-keybindings.c | 15 ++
9 files changed, 295 insertions(+), 129 deletions(-)
---
diff --git a/data/ui/gb-editor-settings-widget.ui b/data/ui/gb-editor-settings-widget.ui
index 217244b..58739fd 100644
--- a/data/ui/gb-editor-settings-widget.ui
+++ b/data/ui/gb-editor-settings-widget.ui
@@ -143,6 +143,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Indentation</property>
+ <property name="margin-bottom">6</property>
<attributes>
<attribute name="weight" value="bold" />
</attributes>
diff --git a/data/ui/gb-preferences-page-editor.ui b/data/ui/gb-preferences-page-editor.ui
index c1a3c23..24d02a7 100644
--- a/data/ui/gb-preferences-page-editor.ui
+++ b/data/ui/gb-preferences-page-editor.ui
@@ -14,26 +14,80 @@
<property name="visible">true</property>
<property name="orientation">vertical</property>
<child>
- <object class="GbPreferencesSwitch" id="restore_insert_mark_switch">
- <property name="title" translatable="yes">Restore Cursor Position</property>
- <property name="description" translatable="yes">Restore the insertion cursor to the last
position when reopening a file.</property>
- <property name="settings">editor_settings</property>
- <property name="settings-schema-key">restore-insert-mark</property>
- <property name="size-group">control_group</property>
+ <object class="GtkLabel" id="font_label">
<property name="visible">true</property>
+ <property name="label" translatable="yes">Font</property>
+ <property name="xalign">0.0</property>
+ <property name="margin-bottom">6</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
<child>
- <object class="GbPreferencesSwitch" id="word_completion_switch">
- <property name="title" translatable="yes">Suggest Word Completion</property>
- <property name="description" translatable="yes">Suggest completion of words found within the
current document.</property>
+ <object class="GtkFontButton" id="font_button">
+ <property name="margin">6</property>
+ <property name="visible">true</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="style_scheme_label">
+ <property name="visible">true</property>
+ <property name="label" translatable="yes">Styling</property>
+ <property name="xalign">0.0</property>
+ <property name="margin-top">12</property>
+ <property name="margin-bottom">6</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="style_scheme_container">
+ <property name="margin">6</property>
+ <property name="visible">true</property>
+ <property name="vexpand">true</property>
+ <property name="min-content-height">200</property>
+ <property name="shadow-type">in</property>
+ <child>
+ <object class="GtkSourceStyleSchemeChooserWidget" id="style_scheme_widget">
+ <property name="visible">true</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GbPreferencesSwitch" id="show_grid_lines_switch">
+ <property name="title" translatable="yes">Display Grid Pattern</property>
+ <property name="description" translatable="yes">Display a grid pattern under the source
code.</property>
<property name="settings">editor_settings</property>
- <property name="settings-schema-key">word-completion</property>
+ <property name="settings-schema-key">show-grid-lines</property>
<property name="size-group">control_group</property>
<property name="visible">true</property>
</object>
</child>
<child>
+ <object class="GtkLabel">
+ <property name="visible">true</property>
+ <property name="label" translatable="yes">Highlighting</property>
+ <property name="xalign">0.0</property>
+ <property name="margin-top">12</property>
+ <property name="margin-bottom">6</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ <child>
<object class="GbPreferencesSwitch" id="show_diff_switch">
<property name="title" translatable="yes">Display Document Changes</property>
<property name="description" translatable="yes">Display whether a line has been added or
modified next to the line number.</property>
@@ -45,8 +99,8 @@
</child>
<child>
<object class="GbPreferencesSwitch" id="show_line_numbers_switch">
- <property name="title" translatable="yes">Show Line Numbers</property>
- <property name="description" translatable="yes">Display line numbers in the
document.</property>
+ <property name="title" translatable="yes">Display Line Numbers</property>
+ <property name="description" translatable="yes">Display the line numbers next to each line
of the document.</property>
<property name="settings">editor_settings</property>
<property name="settings-schema-key">show-line-numbers</property>
<property name="size-group">control_group</property>
@@ -74,51 +128,86 @@
</object>
</child>
<child>
- <object class="GbPreferencesSwitch" id="smart_home_end_switch">
- <property name="title" translatable="yes">Smart Home End</property>
- <property name="description" translatable="yes">Home moves to first non-space
character.</property>
- <property name="settings">editor_settings</property>
- <property name="settings-schema-key">smart-home-end</property>
- <property name="size-group">control_group</property>
+ <object class="GtkLabel">
<property name="visible">true</property>
+ <property name="label" translatable="yes">Overview Map</property>
+ <property name="margin-top">12</property>
+ <property name="margin-bottom">6</property>
+ <property name="xalign">0.0</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
<child>
- <object class="GbPreferencesSwitch" id="smart_backspace_switch">
- <property name="title" translatable="yes">Smart Backspace</property>
- <property name="description" translatable="yes">Backspace will remove extra spaces to keep
you aligned with your indentation size.</property>
+ <object class="GbPreferencesSwitch" id="show_map_switch">
+ <property name="title" translatable="yes">Display Overview Map</property>
+ <property name="description" translatable="yes">Display an overview map next to the source
code editor.</property>
<property name="settings">editor_settings</property>
- <property name="settings-schema-key">smart-backspace</property>
+ <property name="settings-schema-key">show-map</property>
<property name="size-group">control_group</property>
<property name="visible">true</property>
</object>
</child>
<child>
- <object class="GbPreferencesSwitch" id="show_grid_lines_switch">
- <property name="title" translatable="yes">Show Grid Lines</property>
- <property name="description" translatable="yes">Display a grid patten in the
document.</property>
+ <object class="GbPreferencesSwitch" id="auto_hide_map_switch">
+ <property name="title" translatable="yes">Auto Hide Overview Map</property>
+ <property name="description" translatable="yes">Automatically hide the overview map during
periods of inactivity.</property>
<property name="settings">editor_settings</property>
- <property name="settings-schema-key">show-grid-lines</property>
+ <property name="settings-schema-key">auto-hide-map</property>
<property name="size-group">control_group</property>
<property name="visible">true</property>
</object>
</child>
<child>
- <object class="GbPreferencesSwitch" id="show_map_switch">
- <property name="title" translatable="yes">Show Overview Map</property>
- <property name="description" translatable="yes">Display an overview map next to the source
code editor.</property>
+ <object class="GtkLabel">
+ <property name="visible">true</property>
+ <property name="label" translatable="yes">Auto Completion</property>
+ <property name="xalign">0.0</property>
+ <property name="margin-top">12</property>
+ <property name="margin-bottom">6</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ <child>
+ <object class="GbPreferencesSwitch" id="word_completion_switch">
+ <property name="title" translatable="yes">Suggest Word Completion</property>
+ <property name="description" translatable="yes">Suggest completion of words found within the
current document.</property>
<property name="settings">editor_settings</property>
- <property name="settings-schema-key">show-map</property>
+ <property name="settings-schema-key">word-completion</property>
<property name="size-group">control_group</property>
<property name="visible">true</property>
</object>
</child>
<child>
- <object class="GbPreferencesSwitch" id="auto_hide_map_switch">
- <property name="title" translatable="yes">Auto Hide Map</property>
- <property name="description" translatable="yes">Automatically hide the overview map during
inactivity.</property>
+ <object class="GtkLabel">
+ <property name="visible">true</property>
+ <property name="label" translatable="yes">Cursor Placement</property>
+ <property name="xalign">0.0</property>
+ <property name="margin-top">12</property>
+ <property name="margin-bottom">6</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ <child>
+ <object class="GbPreferencesSwitch" id="restore_insert_mark_switch">
+ <property name="title" translatable="yes">Restore Cursor Position</property>
+ <property name="description" translatable="yes">Restore the insertion cursor to the last
position when reopening a file.</property>
<property name="settings">editor_settings</property>
- <property name="settings-schema-key">auto-hide-map</property>
+ <property name="settings-schema-key">restore-insert-mark</property>
<property name="size-group">control_group</property>
<property name="visible">true</property>
</object>
@@ -171,18 +260,6 @@
</child>
</object>
</child>
- <child>
- <object class="GtkFontButton" id="font_button">
- <property name="margin">6</property>
- <property name="visible">true</property>
- </object>
- </child>
- <child>
- <object class="GtkSourceStyleSchemeChooserButton" id="style_scheme_button">
- <property name="margin">6</property>
- <property name="visible">true</property>
- </object>
- </child>
</object>
</child>
</object>
diff --git a/data/ui/gb-preferences-page-git.ui b/data/ui/gb-preferences-page-git.ui
index 4beba99..c0384e7 100644
--- a/data/ui/gb-preferences-page-git.ui
+++ b/data/ui/gb-preferences-page-git.ui
@@ -2,64 +2,87 @@
<interface>
<!-- interface-requires gtk+ 3.8 -->
<template class="GbPreferencesPageGit" parent="GbPreferencesPage">
- <property name="title" translatable="yes">Git</property>
+ <property name="title" translatable="yes">Version Control</property>
<child>
- <object class="GtkGrid">
- <property name="visible">True</property>
- <property name="row-spacing">6</property>
- <property name="column-spacing">12</property>
+ <object class="GtkBox">
+ <property name="visible">true</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="name_label">
- <property name="visible">True</property>
- <property name="halign">start</property>
- <property name="hexpand">False</property>
- <property name="label" translatable="yes">Author Name</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="width">1</property>
- <property name="top-attach">0</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="git_author_name_entry">
- <property name="visible">True</property>
- <property name="hexpand">True</property>
+ <object class="GtkLabel">
+ <property name="visible">true</property>
+ <property name="label" translatable="yes">Source Code Attribution</property>
+ <property name="margin-bottom">6</property>
+ <property name="xalign">0.0</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
- <packing>
- <property name="left-attach">1</property>
- <property name="width">1</property>
- <property name="top-attach">0</property>
- <property name="height">1</property>
- </packing>
</child>
<child>
- <object class="GtkLabel" id="email_label">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Author Email</property>
+ <property name="orientation">horizontal</property>
+ <style>
+ <class name="linked"/>
+ </style>
+ <child>
+ <object class="GtkLabel" id="name_label">
+ <property name="visible">True</property>
+ <property name="halign">start</property>
+ <property name="hexpand">False</property>
+ <property name="label" translatable="yes">Name</property>
+ <style>
+ <class name="button"/>
+ <class name="text-button"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkEntry" id="git_author_name_entry">
+ <property name="visible">True</property>
+ <property name="hexpand">True</property>
+ </object>
+ </child>
</object>
- <packing>
- <property name="left-attach">0</property>
- <property name="width">1</property>
- <property name="top-attach">1</property>
- <property name="height">1</property>
- </packing>
</child>
<child>
- <object class="GtkEntry" id="git_author_email_entry">
- <property name="visible">True</property>
- <property name="hexpand">True</property>
+ <object class="GtkBox">
+ <property name="orientation">horizontal</property>
+ <property name="visible">true</property>
+ <style>
+ <class name="linked"/>
+ </style>
+ <child>
+ <object class="GtkLabel" id="email_label">
+ <property name="visible">True</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Email</property>
+ <style>
+ <class name="button"/>
+ <class name="text-button"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkEntry" id="git_author_email_entry">
+ <property name="visible">True</property>
+ <property name="hexpand">True</property>
+ </object>
+ </child>
</object>
- <packing>
- <property name="left-attach">1</property>
- <property name="width">1</property>
- <property name="top-attach">1</property>
- <property name="height">1</property>
- </packing>
</child>
</object>
</child>
</template>
+ <object class="GtkSizeGroup">
+ <property name="mode">horizontal</property>
+ <widgets>
+ <widget name="name_label"/>
+ <widget name="email_label"/>
+ </widgets>
+ </object>
</interface>
diff --git a/data/ui/gb-preferences-page-keybindings.ui b/data/ui/gb-preferences-page-keybindings.ui
index 0cb9eb2..b7fb9e5 100644
--- a/data/ui/gb-preferences-page-keybindings.ui
+++ b/data/ui/gb-preferences-page-keybindings.ui
@@ -2,11 +2,25 @@
<interface>
<!-- interface-requires gtk+ 3.8 -->
<template class="GbPreferencesPageKeybindings" parent="GbPreferencesPage">
- <property name="title" translatable="yes">Keybindings</property>
+ <property name="title" translatable="yes">Keyboard</property>
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<property name="visible">true</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">true</property>
+ <property name="label" translatable="yes">Key Binding Emulation</property>
+ <property name="xalign">0.0</property>
+ <property name="margin-bottom">6</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
<child>
<object class="GbPreferencesSwitch" id="default_switch">
<property name="settings">editor_settings</property>
@@ -40,10 +54,48 @@
<property name="visible">true</property>
</object>
</child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">true</property>
+ <property name="label" translatable="yes">Keyboard Movement</property>
+ <property name="xalign">0.0</property>
+ <property name="margin-top">12</property>
+ <property name="margin-bottom">6</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ <child>
+ <object class="GbPreferencesSwitch" id="smart_home_end_switch">
+ <property name="title" translatable="yes">Smart Home End</property>
+ <property name="description" translatable="yes">Home moves to first non-space
character.</property>
+ <property name="settings">editor_settings</property>
+ <property name="settings-schema-key">smart-home-end</property>
+ <property name="size-group">control_group</property>
+ <property name="visible">true</property>
+ </object>
+ </child>
+ <child>
+ <object class="GbPreferencesSwitch" id="smart_backspace_switch">
+ <property name="title" translatable="yes">Smart Backspace</property>
+ <property name="description" translatable="yes">Backspace will remove extra spaces to keep you
aligned with your indentation width.</property>
+ <property name="settings">editor_settings</property>
+ <property name="settings-schema-key">smart-backspace</property>
+ <property name="size-group">control_group</property>
+ <property name="visible">true</property>
+ </object>
+ </child>
</object>
</child>
</template>
<object class="GSettings" id="editor_settings">
<property name="schema-id">org.gnome.builder.editor</property>
</object>
+ <object class="GtkSizeGroup" id="control_group">
+ <property name="mode">horizontal</property>
+ </object>
</interface>
diff --git a/data/ui/gb-preferences-page-language.ui b/data/ui/gb-preferences-page-language.ui
index 8e2146f..988f112 100644
--- a/data/ui/gb-preferences-page-language.ui
+++ b/data/ui/gb-preferences-page-language.ui
@@ -3,7 +3,7 @@
<!-- interface-requires gtk+ 3.8 -->
<template class="GbPreferencesPageLanguage" parent="GbPreferencesPage">
<property name="can-focus">False</property>
- <property name="title" translatable="yes">Language Settings</property>
+ <property name="title" translatable="yes">Programming Languages</property>
<child internal-child="controls">
<object class="GtkBox">
<property name="visible">true</property>
diff --git a/data/ui/gb-preferences-window.ui b/data/ui/gb-preferences-window.ui
index 3b4d91d..c9bddaf 100644
--- a/data/ui/gb-preferences-window.ui
+++ b/data/ui/gb-preferences-window.ui
@@ -131,27 +131,27 @@
</object>
<packing>
<property name="name">language</property>
- <property name="title" translatable="yes">Language Settings</property>
+ <property name="title" translatable="yes">Programming Languages</property>
</packing>
</child>
<child>
- <object class="GbPreferencesPageGit" id="git_page">
+ <object class="GbPreferencesPageKeybindings" id="keybindings_page">
<property name="visible">True</property>
<property name="border_width">12</property>
</object>
<packing>
- <property name="name">git</property>
- <property name="title" translatable="yes">Git</property>
+ <property name="name">keybindings</property>
+ <property name="title" translatable="yes">Keyboard</property>
</packing>
</child>
<child>
- <object class="GbPreferencesPageKeybindings" id="keybindings_page">
+ <object class="GbPreferencesPageGit" id="git_page">
<property name="visible">True</property>
<property name="border_width">12</property>
</object>
<packing>
- <property name="name">keybindings</property>
- <property name="title" translatable="yes">Keybindings</property>
+ <property name="name">git</property>
+ <property name="title" translatable="yes">Version Control</property>
</packing>
</child>
<child>
diff --git a/src/preferences/gb-preferences-page-editor.c b/src/preferences/gb-preferences-page-editor.c
index dafd6f0..04e9190 100644
--- a/src/preferences/gb-preferences-page-editor.c
+++ b/src/preferences/gb-preferences-page-editor.c
@@ -35,14 +35,15 @@ struct _GbPreferencesPageEditor
GtkSwitch *show_line_numbers_switch;
GtkSwitch *highlight_current_line_switch;
GtkSwitch *highlight_matching_brackets_switch;
- GtkSwitch *smart_backspace_switch;
- GtkSwitch *smart_home_end_switch;
GtkSwitch *show_grid_lines_switch;
GtkSpinButton *scroll_off_spin;
GtkFontButton *font_button;
- GtkSourceStyleSchemeChooserButton *style_scheme_button;
+ GtkSourceStyleSchemeChooserWidget *style_scheme_widget;
+ GtkScrolledWindow *style_scheme_container;
GtkAdjustment *scroll_off_adjustment;
GtkBox *scroll_off_container;
+ GtkWidget *auto_hide_map_switch;
+ GtkWidget *show_map_switch;
};
G_DEFINE_TYPE (GbPreferencesPageEditor, gb_preferences_page_editor, GB_TYPE_PREFERENCES_PAGE)
@@ -92,9 +93,9 @@ gb_preferences_page_editor_constructed (GObject *object)
g_free (scheme_id);
gtk_source_style_scheme_chooser_set_style_scheme (
- GTK_SOURCE_STYLE_SCHEME_CHOOSER (self->style_scheme_button),
+ GTK_SOURCE_STYLE_SCHEME_CHOOSER (self->style_scheme_widget),
scheme);
- g_signal_connect_object (self->style_scheme_button,
+ g_signal_connect_object (self->style_scheme_widget,
"notify::style-scheme",
G_CALLBACK (gb_preferences_page_editor_style_scheme_changed),
self->editor_settings,
@@ -111,21 +112,22 @@ gb_preferences_page_editor_class_init (GbPreferencesPageEditorClass *klass)
GB_WIDGET_CLASS_TEMPLATE (widget_class, "gb-preferences-page-editor.ui");
+ GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, show_map_switch);
GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, editor_settings);
GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, font_button);
- GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, restore_insert_mark_switch);
- GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, show_diff_switch);
- GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, style_scheme_button);
- GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, word_completion_switch);
- GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, show_line_numbers_switch);
GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, highlight_current_line_switch);
GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, highlight_matching_brackets_switch);
- GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, smart_home_end_switch);
- GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, smart_backspace_switch);
- GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, show_grid_lines_switch);
- GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, scroll_off_spin);
+ GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, auto_hide_map_switch);
+ GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, restore_insert_mark_switch);
GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, scroll_off_adjustment);
GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, scroll_off_container);
+ GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, scroll_off_spin);
+ GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, show_diff_switch);
+ GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, show_grid_lines_switch);
+ GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, show_line_numbers_switch);
+ GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, style_scheme_container);
+ GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, style_scheme_widget);
+ GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageEditor, word_completion_switch);
}
static void
@@ -165,16 +167,6 @@ gb_preferences_page_editor_init (GbPreferencesPageEditor *self)
NULL);
gb_preferences_page_set_keywords_for_widget (GB_PREFERENCES_PAGE (self),
/* To translators: This is a list of keywords for the preferences page */
- _("smart home end"),
- self->smart_home_end_switch,
- NULL);
- gb_preferences_page_set_keywords_for_widget (GB_PREFERENCES_PAGE (self),
- /* To translators: This is a list of keywords for the preferences page */
- _("smart back backspace indent align"),
- self->smart_backspace_switch,
- NULL);
- gb_preferences_page_set_keywords_for_widget (GB_PREFERENCES_PAGE (self),
- /* To translators: This is a list of keywords for the preferences page */
_("show grid lines"),
self->show_grid_lines_switch,
NULL);
@@ -191,7 +183,13 @@ gb_preferences_page_editor_init (GbPreferencesPageEditor *self)
NULL);
gb_preferences_page_set_keywords_for_widget (GB_PREFERENCES_PAGE (self),
/* To translators: This is a list of keywords for the preferences page */
- _("source style scheme source tango solarized builder"),
- self->style_scheme_button,
+ _("source style scheme source tango solarized builder
syntax"),
+ self->style_scheme_container,
+ NULL);
+ gb_preferences_page_set_keywords_for_widget (GB_PREFERENCES_PAGE (self),
+ /* To translators: This is a list of keywords for the preferences page */
+ _("minimap mini map overview over view"),
+ self->show_map_switch,
+ self->auto_hide_map_switch,
NULL);
}
diff --git a/src/preferences/gb-preferences-page-git.c b/src/preferences/gb-preferences-page-git.c
index 0443eb9..4ec19f7 100644
--- a/src/preferences/gb-preferences-page-git.c
+++ b/src/preferences/gb-preferences-page-git.c
@@ -124,12 +124,12 @@ gb_preferences_page_git_init (GbPreferencesPageGit *self)
self->config = ggit_config_new_default (NULL);
gb_preferences_page_set_keywords_for_widget (GB_PREFERENCES_PAGE (self),
- _("git author name surname"),
+ _("git author name surname attribution source code"),
self->name_label,
self->git_author_name_entry,
NULL);
gb_preferences_page_set_keywords_for_widget (GB_PREFERENCES_PAGE (self),
- _("git author email mail address"),
+ _("git author email mail address attribute source code"),
self->email_label,
self->git_author_email_entry,
NULL);
diff --git a/src/preferences/gb-preferences-page-keybindings.c
b/src/preferences/gb-preferences-page-keybindings.c
index 84fceb0..75ef060 100644
--- a/src/preferences/gb-preferences-page-keybindings.c
+++ b/src/preferences/gb-preferences-page-keybindings.c
@@ -32,6 +32,8 @@ struct _GbPreferencesPageKeybindings
GtkWidget *default_switch;
GtkWidget *emacs_switch;
GtkWidget *vim_switch;
+ GtkSwitch *smart_backspace_switch;
+ GtkSwitch *smart_home_end_switch;
};
G_DEFINE_TYPE (GbPreferencesPageKeybindings,
@@ -48,6 +50,8 @@ gb_preferences_page_keybindings_class_init (GbPreferencesPageKeybindingsClass *k
GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageKeybindings, vim_switch);
GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageKeybindings, emacs_switch);
GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageKeybindings, default_switch);
+ GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageKeybindings, smart_home_end_switch);
+ GB_WIDGET_CLASS_BIND (widget_class, GbPreferencesPageKeybindings, smart_backspace_switch);
}
static void
@@ -70,4 +74,15 @@ gb_preferences_page_keybindings_init (GbPreferencesPageKeybindings *self)
_("vim keybindings modal"),
self->vim_switch,
NULL);
+
+ gb_preferences_page_set_keywords_for_widget (GB_PREFERENCES_PAGE (self),
+ /* To translators: This is a list of keywords for the preferences page */
+ _("smart home end"),
+ self->smart_home_end_switch,
+ NULL);
+ gb_preferences_page_set_keywords_for_widget (GB_PREFERENCES_PAGE (self),
+ /* To translators: This is a list of keywords for the preferences page */
+ _("smart back backspace indent align"),
+ self->smart_backspace_switch,
+ NULL);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
