[gnome-builder/wip/chergert/shortcut-editing] plugins/shortcutui: elevate keyboard theme to shortcuts page

[Christian Hergert <chergert src gnome org>]

commit f8c53370a815eb82ba628b1374921badb3b07912
Author: Christian Hergert <chergert redhat com>
Date:   Tue Oct 4 13:06:23 2022 -0700

    plugins/shortcutui: elevate keyboard theme to shortcuts page
    
    We will eventually move the items in the old page to behavior as well.

 src/plugins/editorui/tweaks.ui   | 23 -----------------------
 src/plugins/shortcutui/tweaks.ui | 24 +++++++++++++++++++++++-
 src/plugins/vim/tweaks.ui        | 26 +++++++++-----------------
 src/plugins/vim/vim.plugin       |  2 +-
 4 files changed, 33 insertions(+), 42 deletions(-)
---
diff --git a/src/plugins/editorui/tweaks.ui b/src/plugins/editorui/tweaks.ui
index 53ebeb53f..6d5b5a0ce 100644
--- a/src/plugins/editorui/tweaks.ui
+++ b/src/plugins/editorui/tweaks.ui
@@ -463,29 +463,6 @@
                   <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="shortcut_theme_group">
-                        <property name="title" translatable="yes">Keyboard Theme</property>
-                        <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="binding">
-                              <object class="IdeTweaksSetting">
-                                <property name="schema-id">org.gnome.builder.editor</property>
-                                <property name="schema-key">keybindings</property>
-                              </object>
-                            </property>
-                            <child>
-                              <object class="IdeTweaksChoice">
-                                <property name="title" translatable="yes">Builder</property>
-                                <property name="value">'default'</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
                     <child>
                       <object class="IdeTweaksGroup" id="editor_keyboard_smart_group">
                         <property name="title" translatable="yes">Movements</property>
diff --git a/src/plugins/shortcutui/tweaks.ui b/src/plugins/shortcutui/tweaks.ui
index 27950a4b4..f74683105 100644
--- a/src/plugins/shortcutui/tweaks.ui
+++ b/src/plugins/shortcutui/tweaks.ui
@@ -8,8 +8,30 @@
             <property name="title" translatable="yes">Keyboard Shortcuts</property>
             <property name="icon-name">preferences-desktop-keyboard-shortcuts-symbolic</property>
             <child>
-              <object class="IdeTweaksGroup">
+              <object class="IdeTweaksGroup" id="shortcut_theme_group">
                 <property name="title" translatable="yes">Keyboard Shortcuts</property>
+                <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="binding">
+                      <object class="IdeTweaksSetting">
+                        <property name="schema-id">org.gnome.builder.editor</property>
+                        <property name="schema-key">keybindings</property>
+                      </object>
+                    </property>
+                    <child>
+                      <object class="IdeTweaksChoice">
+                        <property name="title" translatable="yes">Builder</property>
+                        <property name="value">'default'</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="IdeTweaksGroup">
                 <child>
                   <object class="IdeTweaksWidget">
                     <signal name="create-for-item" handler="shortcutui_create_shortcuts_cb" 
object="GbpShortcutuiTweaksAddin" swapped="true"/>
diff --git a/src/plugins/vim/tweaks.ui b/src/plugins/vim/tweaks.ui
index 327a95dd5..e064f9a89 100644
--- a/src/plugins/vim/tweaks.ui
+++ b/src/plugins/vim/tweaks.ui
@@ -3,24 +3,16 @@
   <template class="IdeTweaks">
     <child internal-child="visual_section">
       <object class="IdeTweaksSection">
-        <child internal-child="editor_page">
+        <child internal-child="shortcuts_page">
           <object class="IdeTweaksPage">
-            <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="value">'vim'</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
+            <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="value">'vim'</property>
                       </object>
                     </child>
                   </object>
diff --git a/src/plugins/vim/vim.plugin b/src/plugins/vim/vim.plugin
index 081c7b970..818b53651 100644
--- a/src/plugins/vim/vim.plugin
+++ b/src/plugins/vim/vim.plugin
@@ -2,7 +2,7 @@
 Authors=Christian Hergert <christian hergert me>
 Builtin=true
 Copyright=Copyright © 2015-2022 Christian Hergert
-Depends=editorui;
+Depends=editorui;shortcutui;
 Description=Emulation of various VIM features
 Embedded=_gbp_vim_register_types
 Module=vim