[gnome-games/wip/exalm/reorganize: 5/6] ui: Move keyboard-specific files to keyboard/

[Alexander Mikhaylenko <alexm src gnome org>]

commit d445ee8026609f5ded6187dea4d214fce90261c8
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Thu Dec 10 23:37:25 2020 +0500

    ui: Move keyboard-specific files to keyboard/

 src/{ui => keyboard}/keyboard-mapper.ui   | 0
 src/{ui => keyboard}/keyboard-mapper.vala | 2 +-
 src/{ui => keyboard}/keyboard-tester.ui   | 0
 src/{ui => keyboard}/keyboard-tester.vala | 2 +-
 src/meson.build                           | 4 ++--
 src/org.gnome.Games.gresource.xml         | 5 +++--
 6 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/src/ui/keyboard-mapper.ui b/src/keyboard/keyboard-mapper.ui
similarity index 100%
rename from src/ui/keyboard-mapper.ui
rename to src/keyboard/keyboard-mapper.ui
diff --git a/src/ui/keyboard-mapper.vala b/src/keyboard/keyboard-mapper.vala
similarity index 96%
rename from src/ui/keyboard-mapper.vala
rename to src/keyboard/keyboard-mapper.vala
index 74bd0a1d..5b320d1d 100644
--- a/src/ui/keyboard-mapper.vala
+++ b/src/keyboard/keyboard-mapper.vala
@@ -1,6 +1,6 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
-[GtkTemplate (ui = "/org/gnome/Games/ui/keyboard-mapper.ui")]
+[GtkTemplate (ui = "/org/gnome/Games/keyboard/keyboard-mapper.ui")]
 private class Games.KeyboardMapper : Gtk.Bin {
        public signal void finished (Retro.KeyJoypadMapping mapping);
 
diff --git a/src/ui/keyboard-tester.ui b/src/keyboard/keyboard-tester.ui
similarity index 100%
rename from src/ui/keyboard-tester.ui
rename to src/keyboard/keyboard-tester.ui
diff --git a/src/ui/keyboard-tester.vala b/src/keyboard/keyboard-tester.vala
similarity index 96%
rename from src/ui/keyboard-tester.vala
rename to src/keyboard/keyboard-tester.vala
index f41b01b1..3ec09cec 100644
--- a/src/ui/keyboard-tester.vala
+++ b/src/keyboard/keyboard-tester.vala
@@ -1,6 +1,6 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
-[GtkTemplate (ui = "/org/gnome/Games/ui/keyboard-tester.ui")]
+[GtkTemplate (ui = "/org/gnome/Games/keyboard/keyboard-tester.ui")]
 private class Games.KeyboardTester : Gtk.Bin {
        [GtkChild]
        private GamepadView gamepad_view;
diff --git a/src/meson.build b/src/meson.build
index d21ca070..a754dba3 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -88,8 +88,10 @@ vala_sources = [
   'grilo/grilo-cover.vala',
   'grilo/grilo-media.vala',
 
+  'keyboard/keyboard-mapper.vala',
   'keyboard/keyboard-mapping-builder.vala',
   'keyboard/keyboard-mapping-manager.vala',
+  'keyboard/keyboard-tester.vala',
 
   'retro/retro-core.vala',
   'retro/retro-core-manager.vala',
@@ -139,8 +141,6 @@ vala_sources = [
   'ui/gamepad-view-configuration.vala',
   'ui/header-bar-widget.vala',
   'ui/input-mode-switcher.vala',
-  'ui/keyboard-mapper.vala',
-  'ui/keyboard-tester.vala',
   'ui/konami-code.vala',
   'ui/media-menu-button.vala',
   'ui/platform-list-item.vala',
diff --git a/src/org.gnome.Games.gresource.xml b/src/org.gnome.Games.gresource.xml
index 79ec611b..a30d0410 100644
--- a/src/org.gnome.Games.gresource.xml
+++ b/src/org.gnome.Games.gresource.xml
@@ -15,6 +15,9 @@
     <file preprocess="xml-stripblanks">gesture/shoulders-front-symbolic.svg</file>
     <file preprocess="xml-stripblanks">gesture/stick-symbolic.svg</file>
 
+    <file preprocess="xml-stripblanks">keyboard/keyboard-mapper.ui</file>
+    <file preprocess="xml-stripblanks">keyboard/keyboard-tester.ui</file>
+
     <file preprocess="xml-stripblanks">ui/application-window.ui</file>
     <file preprocess="xml-stripblanks">ui/checkmark-item.ui</file>
     <file preprocess="xml-stripblanks">ui/collection-action-window.ui</file>
@@ -35,8 +38,6 @@
     <file preprocess="xml-stripblanks">ui/game-icon-view.ui</file>
     <file preprocess="xml-stripblanks">ui/help-overlay.ui</file>
     <file preprocess="xml-stripblanks">ui/input-mode-switcher.ui</file>
-    <file preprocess="xml-stripblanks">ui/keyboard-mapper.ui</file>
-    <file preprocess="xml-stripblanks">ui/keyboard-tester.ui</file>
     <file preprocess="xml-stripblanks">ui/media-menu-button.ui</file>
     <file preprocess="xml-stripblanks">ui/platforms-page.ui</file>
     <file preprocess="xml-stripblanks">ui/platform-list-item.ui</file>