[gnome-builder] plugins: adjust pages, sections, and groupings for tweaks
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] plugins: adjust pages, sections, and groupings for tweaks
- Date: Fri, 19 Aug 2022 19:55:43 +0000 (UTC)
commit 01dd734c0fe48fc31f8bfc19e01d2df160f63021
Author: Christian Hergert <chergert redhat com>
Date: Fri Aug 19 12:55:39 2022 -0700
plugins: adjust pages, sections, and groupings for tweaks
src/libide/gui/tweaks.ui | 10 --
src/plugins/clang/tweaks.ui | 9 +-
src/plugins/ctags/tweaks.ui | 11 +-
src/plugins/editorui/tweaks.ui | 266 ++++++++++++++++++++++-------------------
src/plugins/vim/tweaks.ui | 26 ++--
5 files changed, 169 insertions(+), 153 deletions(-)
---
diff --git a/src/libide/gui/tweaks.ui b/src/libide/gui/tweaks.ui
index d96d550d0..cbbbfec4c 100644
--- a/src/libide/gui/tweaks.ui
+++ b/src/libide/gui/tweaks.ui
@@ -22,16 +22,6 @@
<property name="title" translatable="yes">Terminal</property>
</object>
</child>
- <child>
- <object class="IdeTweaksPage" id="shortcuts_page">
- <property name="icon-name">preferences-desktop-keyboard-shortcuts-symbolic</property>
- <property name="title" translatable="yes">Keyboard Shortcuts</property>
- <child>
- <object class="IdeTweaksGroup" id="shorcut_theme_group">
- </object>
- </child>
- </object>
- </child>
</object>
</child>
<child>
diff --git a/src/plugins/clang/tweaks.ui b/src/plugins/clang/tweaks.ui
index 0acc371f6..06767401c 100644
--- a/src/plugins/clang/tweaks.ui
+++ b/src/plugins/clang/tweaks.ui
@@ -5,11 +5,10 @@
<object class="IdeTweaksSection">
<child internal-child="editor_page">
<object class="IdeTweaksPage">
- <child internal-child="editor_plugins_section">
+ <child internal-child="editor_page_internal_section">
<object class="IdeTweaksSection">
- <child>
- <object class="IdeTweaksPage" id="editor_plugins_clang_page">
- <property name="title" translatable="yes">Clang</property>
+ <child internal-child="editor_code_completion_page">
+ <object class="IdeTweaksPage">
<child>
<object class="IdeTweaksSettings" id="settings_org_gnome_builder_clang">
<property name="schema-id">org.gnome.builder.clang</property>
@@ -18,7 +17,7 @@
</child>
<child>
<object class="IdeTweaksGroup">
- <property name="title" translatable="yes">Code Completion</property>
+ <property name="title" translatable="yes">Clang</property>
<child>
<object class="IdeTweaksSwitch">
<property name="title" translatable="yes">Complete Parentheses</property>
diff --git a/src/plugins/ctags/tweaks.ui b/src/plugins/ctags/tweaks.ui
index 93ebe755a..ee76dda99 100644
--- a/src/plugins/ctags/tweaks.ui
+++ b/src/plugins/ctags/tweaks.ui
@@ -5,17 +5,16 @@
<object class="IdeTweaksSection">
<child internal-child="editor_page">
<object class="IdeTweaksPage">
- <child internal-child="editor_plugins_section">
+ <child internal-child="editor_page_internal_section">
<object class="IdeTweaksSection">
- <child>
- <object class="IdeTweaksPage" id="editor_plugins_ctags_page">
- <property name="title" translatable="yes">CTags</property>
+ <child internal-child="editor_code_completion_page">
+ <object class="IdeTweaksPage">
<child>
<object class="IdeTweaksGroup">
- <property name="title" translatable="yes">Code Completion</property>
+ <property name="title" translatable="yes">CTags</property>
<child>
<object class="IdeTweaksSwitch">
- <property name="title" translatable="yes">CTags Proposals</property>
+ <property name="title" translatable="yes">Suggest Completions</property>
<property name="subtitle" translatable="yes">Use CTags to suggest code
completion proposals</property>
<property
name="action-name">settings.org.gnome.builder.code-insight.ctags-autocompletion</property>
</object>
diff --git a/src/plugins/editorui/tweaks.ui b/src/plugins/editorui/tweaks.ui
index f83a09ed7..0ebbbb68c 100644
--- a/src/plugins/editorui/tweaks.ui
+++ b/src/plugins/editorui/tweaks.ui
@@ -48,6 +48,7 @@
<child>
<object class="IdeTweaksPage" id="editor_fonts_and_styling_page">
<property name="title" translatable="yes">Fonts & Styling</property>
+ <property name="icon-name">font-select-symbolic</property>
<child>
<object class="IdeTweaksGroup" id="editor_page_preview">
<property name="title" translatable="yes">Preview</property>
@@ -78,31 +79,6 @@
</child>
</object>
</child>
- <child>
- <object class="IdeTweaksGroup" id="editor_page_lines_group">
- <child>
- <object class="IdeTweaksSwitch" id="editor_show_lines">
- <property name="title" translatable="yes">Show Line Numbers</property>
- <property name="subtitle" translatable="yes">Display line numbers next to each
line of code</property>
- <property
name="action-name">settings.org.gnome.builder.editor.show-line-numbers</property>
- </object>
- </child>
- <child>
- <object class="IdeTweaksSwitch" id="editor_show_relative_lines">
- <property name="title" translatable="yes">Use Relative Line Numbers</property>
- <property name="subtitle" translatable="yes">Show line numbers relative to the
current line</property>
- <property
name="action-name">settings.org.gnome.builder.editor.show-relative-line-numbers</property>
- </object>
- </child>
- <child>
- <object class="IdeTweaksSwitch" id="editor_show_diagnostics">
- <property name="title" translatable="yes">Show Line Diagnostics</property>
- <property name="subtitle" translatable="yes">Display diagnostics next to the
line number</property>
- <property
name="action-name">settings.org.gnome.builder.editor.show-line-diagnostics</property>
- </object>
- </child>
- </object>
- </child>
<child>
<object class="IdeTweaksGroup">
<child>
@@ -133,31 +109,6 @@
</child>
</object>
</child>
- <child>
- <object class="IdeTweaksGroup" id="editor_page_highlight_group">
- <child>
- <object class="IdeTweaksSwitch" id="editor_highlight_line">
- <property name="title" translatable="yes">Highlight Current Line</property>
- <property name="subtitle" translatable="yes">Make the current line stand out
with highlights</property>
- <property
name="action-name">settings.org.gnome.builder.editor.highlight-current-line</property>
- </object>
- </child>
- <child>
- <object class="IdeTweaksSwitch" id="editor_highlight_brackets">
- <property name="title" translatable="yes">Highlight Matching Brackets</property>
- <property name="subtitle" translatable="yes">Use cursor position to highlight
matching brackets, braces, parenthesis, and more</property>
- <property
name="action-name">settings.org.gnome.builder.editor.highlight-matching-brackets</property>
- </object>
- </child>
- <child>
- <object class="IdeTweaksSwitch" id="editor_semantic_highlight">
- <property name="title" translatable="yes">Semantic Highlighting</property>
- <property name="subtitle" translatable="yes">Use symbol information to highlight
namespaces, functions, and variables within source code</property>
- <property
name="action-name">settings.org.gnome.builder.code-insight.semantic-highlighting</property>
- </object>
- </child>
- </object>
- </child>
<child>
<object class="IdeTweaksGroup" id="editor_page_style_group">
<child>
@@ -184,6 +135,7 @@
</child>
<child>
<object class="IdeTweaksGroup" id="editor_page_map_group">
+ <property name="title" translatable="yes">Scrollbars</property>
<child>
<object class="IdeTweaksCombo" id="editor_map">
<property name="title" translatable="yes">Source Code Overview</property>
@@ -212,53 +164,64 @@
</child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="IdeTweaksPage" id="editor_behavior_page">
- <property name="title" translatable="yes">Behavior</property>
<child>
- <object class="IdeTweaksGroup">
- <property name="title" translatable="yes">Save & Restore</property>
+ <object class="IdeTweaksGroup" id="editor_page_lines_group">
+ <property name="title" translatable="yes">Line Numbers</property>
<child>
- <object class="IdeTweaksSwitch">
- <property name="title" translatable="yes">Auto-Save</property>
- <property name="subtitle" translatable="yes">Regularly save the document as you
type</property>
- <property
name="action-name">settings.org.gnome.builder.editor.auto-save</property>
+ <object class="IdeTweaksSwitch" id="editor_show_lines">
+ <property name="title" translatable="yes">Show Line Numbers</property>
+ <property name="subtitle" translatable="yes">Display line numbers next to each
line of code</property>
+ <property
name="action-name">settings.org.gnome.builder.editor.show-line-numbers</property>
</object>
</child>
<child>
- <object class="IdeTweaksSpin">
- <property name="title" translatable="yes">Auto-Save Delay</property>
- <property name="subtitle" translatable="yes">The delay in seconds to wait before
auto-saving the document</property>
- <property name="settings">settings_org_gnome_builder_editor</property>
- <property name="key">auto-save-timeout</property>
+ <object class="IdeTweaksSwitch" id="editor_show_relative_lines">
+ <property name="title" translatable="yes">Use Relative Line Numbers</property>
+ <property name="subtitle" translatable="yes">Show line numbers relative to the
current line</property>
+ <property
name="action-name">settings.org.gnome.builder.editor.show-relative-line-numbers</property>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="IdeTweaksGroup">
<child>
- <object class="IdeTweaksSwitch">
- <property name="title" translatable="yes">Format on Save</property>
- <property name="subtitle" translatable="yes">Reformat sources when saving to
disk</property>
- <property name="action-name">settings.org.gnome.builder.format-on-save</property>
+ <object class="IdeTweaksSwitch" id="editor_show_diagnostics">
+ <property name="title" translatable="yes">Show Diagnostics</property>
+ <property name="subtitle" translatable="yes">Display diagnostics next to the
line number</property>
+ <property
name="action-name">settings.org.gnome.builder.editor.show-line-diagnostics</property>
</object>
</child>
</object>
</child>
<child>
- <object class="IdeTweaksGroup">
+ <object class="IdeTweaksGroup" id="editor_page_highlight_group">
+ <property name="title" translatable="yes">Syntax Highlighting</property>
<child>
- <object class="IdeTweaksSwitch">
- <property name="title" translatable="yes">Restore Cursor Position</property>
- <property name="subtitle" translatable="yes">Jump to the last position when
re-opening a file</property>
- <property
name="action-name">settings.org.gnome.builder.editor.restore-insert-mark</property>
+ <object class="IdeTweaksSwitch" id="editor_highlight_line">
+ <property name="title" translatable="yes">Highlight Current Line</property>
+ <property name="subtitle" translatable="yes">Make the current line stand out
with highlights</property>
+ <property
name="action-name">settings.org.gnome.builder.editor.highlight-current-line</property>
+ </object>
+ </child>
+ <child>
+ <object class="IdeTweaksSwitch" id="editor_highlight_brackets">
+ <property name="title" translatable="yes">Highlight Matching Brackets</property>
+ <property name="subtitle" translatable="yes">Use cursor position to highlight
matching brackets, braces, parenthesis, and more</property>
+ <property
name="action-name">settings.org.gnome.builder.editor.highlight-matching-brackets</property>
+ </object>
+ </child>
+ <child>
+ <object class="IdeTweaksSwitch" id="editor_semantic_highlight">
+ <property name="title" translatable="yes">Semantic Highlighting</property>
+ <property name="subtitle" translatable="yes">Use symbol information to highlight
namespaces, functions, and variables within source code</property>
+ <property
name="action-name">settings.org.gnome.builder.code-insight.semantic-highlighting</property>
</object>
</child>
</object>
</child>
+ </object>
+ </child>
+ <child>
+ <object class="IdeTweaksPage" id="editor_behavior_page">
+ <property name="title" translatable="yes">Behavior</property>
+ <property name="icon-name">tools-check-spelling-symbolic</property>
<child>
<object class="IdeTweaksGroup">
<property name="title" translatable="yes">Spelling</property>
@@ -272,27 +235,39 @@
</object>
</child>
<child>
- <object class="IdeTweaksGroup" id="editor_behavior_keyboard_group">
- <property name="title" translatable="yes">Keyboard</property>
+ <object class="IdeTweaksGroup" id="editor_selections_group">
+ <property name="title" translatable="yes">Selections</property>
<child>
- <object class="IdeTweaksSwitch" id="smart_backspace">
- <property name="title" translatable="yes">Smart Backspace</property>
- <property name="subtitle" translatable="yes">Backspace will remove extra space
to keep you aligned with your indentation</property>
- <property
name="action-name">settings.org.gnome.builder.editor.smart-backspace</property>
+ <object class="IdeTweaksSpin">
+ <property name="title" translatable="yes">Minimum Characters to
Highlight</property>
+ <property name="subtitle" translatable="yes">The mininum selection length before
highlighting matches</property>
+ <property name="settings">settings_org_gnome_builder_editor</property>
+ <property name="key">min-char-selected</property>
</object>
</child>
+ </object>
+ </child>
+ <child>
+ <object class="IdeTweaksGroup" id="editor_snippets_general_group">
+ <property name="title" translatable="yes">Snippets</property>
<child>
- <object class="IdeTweaksSwitch" id="smart_home_end">
- <property name="title" translatable="yes">Smart Home/End</property>
- <property name="subtitle" translatable="yes">Moves to first non-whitespace
character before line edges</property>
- <property
name="action-name">settings.org.gnome.builder.editor.smart-home-end</property>
+ <object class="IdeTweaksSwitch" id="enable_snippets">
+ <property name="title" translatable="yes">Expand Snippets</property>
+ <property name="subtitle" translatable="yes">Use “Tab” to expand configured
snippets in the editor</property>
+ <property
name="action-name">settings.org.gnome.builder.editor.enable-snippets</property>
</object>
</child>
</object>
</child>
+ </object>
+ </child>
+ <child>
+ <object class="IdeTweaksPage" id="editor_code_completion_page">
+ <property name="title" translatable="yes">Code Completion</property>
+ <property name="icon-name" translatable="yes">lang-function-symbolic</property>
<child>
<object class="IdeTweaksGroup" id="editor_completion_general_group">
- <property name="title" translatable="yes">Code Completion</property>
+ <property name="title" translatable="yes">Completion Proposals</property>
<child>
<object class="IdeTweaksSwitch" id="suggest_code_completions">
<property name="title" translatable="yes">Suggest Code Completions</property>
@@ -321,62 +296,107 @@
</child>
</object>
</child>
+ </object>
+ </child>
+ <child>
+ <object class="IdeTweaksPage" id="editor_keyboard_page">
+ <property name="title" translatable="yes">Keyboard Shortcuts</property>
+ <property name="icon-name">preferences-desktop-keyboard-shortcuts-symbolic</property>
<child>
- <object class="IdeTweaksGroup" id="editor_selections_group">
- <property name="title" translatable="yes">Selections</property>
+ <object class="IdeTweaksGroup" id="shortcut_theme_group">
+ <property name="title" translatable="yes">Keyboard Theme</property>
<child>
- <object class="IdeTweaksSpin">
- <property name="title" translatable="yes">Minimum Characters to
Highlight</property>
- <property name="subtitle" translatable="yes">The mininum selection length before
highlighting matches</property>
+ <object class="IdeTweaksCombo" id="shortcut_theme_combo">
+ <property name="title" translatable="yes">Keyboard Theme</property>
+ <property name="subtitle" translatable="yes">Shortcut themes provide a keyboard
experience similar to other IDEs and editors</property>
<property name="settings">settings_org_gnome_builder_editor</property>
- <property name="key">min-char-selected</property>
+ <property name="key">keybindings</property>
+ <child>
+ <object class="IdeTweaksChoice">
+ <property name="title" translatable="yes">Builder</property>
+ <property name="action-target">'default'</property>
+ </object>
+ </child>
</object>
</child>
</object>
</child>
<child>
- <object class="IdeTweaksGroup" id="editor_snippets_general_group">
- <property name="title" translatable="yes">Snippets</property>
+ <object class="IdeTweaksGroup" id="editor_keyboard_smart_group">
+ <property name="title" translatable="yes">Movements</property>
<child>
- <object class="IdeTweaksSwitch" id="enable_snippets">
- <property name="title" translatable="yes">Expand Snippets</property>
- <property name="subtitle" translatable="yes">Use “Tab” to expand configured
snippets in the editor</property>
- <property
name="action-name">settings.org.gnome.builder.editor.enable-snippets</property>
+ <object class="IdeTweaksSwitch" id="smart_backspace">
+ <property name="title" translatable="yes">Smart Backspace</property>
+ <property name="subtitle" translatable="yes">Backspace will remove extra space
to keep you aligned with your indentation</property>
+ <property
name="action-name">settings.org.gnome.builder.editor.smart-backspace</property>
+ </object>
+ </child>
+ <child>
+ <object class="IdeTweaksSwitch" id="smart_home_end">
+ <property name="title" translatable="yes">Smart Home/End</property>
+ <property name="subtitle" translatable="yes">Moves to first non-whitespace
character before line edges</property>
+ <property
name="action-name">settings.org.gnome.builder.editor.smart-home-end</property>
</object>
</child>
</object>
</child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="IdeTweaksSection" id="editor_plugins_section">
- <property name="title">plugins</property>
- </object>
- </child>
- </object>
- </child>
- <child internal-child="shortcuts_page">
- <object class="IdeTweaksPage">
- <child internal-child="shorcut_theme_group">
- <object class="IdeTweaksGroup">
<child>
- <object class="IdeTweaksCombo" id="shortcut_theme_combo">
- <property name="title" translatable="yes">Keyboard Theme</property>
- <property name="subtitle" translatable="yes">Shortcut themes provide a keyboard
experience similar to other IDEs and editors</property>
- <property name="settings">settings_org_gnome_builder_editor</property>
- <property name="key">keybindings</property>
+ <object class="IdeTweaksPage" id="editor_session_page">
+ <property name="title" translatable="yes">Session Management</property>
+ <property name="icon-name">folder-symbolic</property>
+ <child>
+ <object class="IdeTweaksGroup">
+ <property name="title" translatable="yes">Save & Restore</property>
+ <child>
+ <object class="IdeTweaksSwitch">
+ <property name="title" translatable="yes">Auto-Save</property>
+ <property name="subtitle" translatable="yes">Regularly save the document as you
type</property>
+ <property
name="action-name">settings.org.gnome.builder.editor.auto-save</property>
+ </object>
+ </child>
+ <child>
+ <object class="IdeTweaksSpin">
+ <property name="title" translatable="yes">Auto-Save Delay</property>
+ <property name="subtitle" translatable="yes">The delay in seconds to wait before
auto-saving the document</property>
+ <property name="settings">settings_org_gnome_builder_editor</property>
+ <property name="key">auto-save-timeout</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="IdeTweaksGroup">
+ <child>
+ <object class="IdeTweaksSwitch">
+ <property name="title" translatable="yes">Format on Save</property>
+ <property name="subtitle" translatable="yes">Reformat sources when saving to
disk</property>
+ <property name="action-name">settings.org.gnome.builder.format-on-save</property>
+ </object>
+ </child>
+ </object>
+ </child>
<child>
- <object class="IdeTweaksChoice">
- <property name="title" translatable="yes">Builder</property>
- <property name="action-target">'default'</property>
+ <object class="IdeTweaksGroup">
+ <child>
+ <object class="IdeTweaksSwitch">
+ <property name="title" translatable="yes">Restore Cursor Position</property>
+ <property name="subtitle" translatable="yes">Jump to the last position when
re-opening a file</property>
+ <property
name="action-name">settings.org.gnome.builder.editor.restore-insert-mark</property>
+ </object>
+ </child>
</object>
</child>
</object>
</child>
</object>
</child>
+ <child>
+ <object class="IdeTweaksSection" id="editor_plugins_section">
+ <property name="title">plugins</property>
+ </object>
+ </child>
</object>
</child>
</object>
diff --git a/src/plugins/vim/tweaks.ui b/src/plugins/vim/tweaks.ui
index 4847e1579..e5787fe09 100644
--- a/src/plugins/vim/tweaks.ui
+++ b/src/plugins/vim/tweaks.ui
@@ -3,16 +3,24 @@
<template class="IdeTweaks">
<child internal-child="visual_section">
<object class="IdeTweaksSection">
- <child internal-child="shortcuts_page">
+ <child internal-child="editor_page">
<object class="IdeTweaksPage">
- <child internal-child="shorcut_theme_group">
- <object class="IdeTweaksGroup">
- <child internal-child="shortcut_theme_combo">
- <object class="IdeTweaksCombo">
- <child>
- <object class="IdeTweaksChoice">
- <property name="title" translatable="yes">Vim</property>
- <property name="action-target">'vim'</property>
+ <child internal-child="editor_page_internal_section">
+ <object class="IdeTweaksSection">
+ <child internal-child="editor_keyboard_page">
+ <object class="IdeTweaksPage">
+ <child internal-child="shortcut_theme_group">
+ <object class="IdeTweaksGroup">
+ <child internal-child="shortcut_theme_combo">
+ <object class="IdeTweaksCombo">
+ <child>
+ <object class="IdeTweaksChoice">
+ <property name="title" translatable="yes">Vim</property>
+ <property name="action-target">'vim'</property>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
