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

[Alexander Mikhaylenko <alexm src gnome org>]

commit 054671a6cc9263f7ecc3a0011215f81104e50797
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Thu Dec 10 23:34:30 2020 +0500

    ui: Move gamepad-specific files to gamepad/

 src/{ui => gamepad}/gamepad-mapper.ui   | 0
 src/{ui => gamepad}/gamepad-mapper.vala | 2 +-
 src/{ui => gamepad}/gamepad-tester.ui   | 0
 src/{ui => gamepad}/gamepad-tester.vala | 2 +-
 src/meson.build                         | 4 ++--
 src/org.gnome.Games.gresource.xml       | 7 +++++--
 6 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/src/ui/gamepad-mapper.ui b/src/gamepad/gamepad-mapper.ui
similarity index 100%
rename from src/ui/gamepad-mapper.ui
rename to src/gamepad/gamepad-mapper.ui
diff --git a/src/ui/gamepad-mapper.vala b/src/gamepad/gamepad-mapper.vala
similarity index 98%
rename from src/ui/gamepad-mapper.vala
rename to src/gamepad/gamepad-mapper.vala
index d9ccb340..eaac6a1d 100644
--- a/src/ui/gamepad-mapper.vala
+++ b/src/gamepad/gamepad-mapper.vala
@@ -1,6 +1,6 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
-[GtkTemplate (ui = "/org/gnome/Games/ui/gamepad-mapper.ui")]
+[GtkTemplate (ui = "/org/gnome/Games/gamepad/gamepad-mapper.ui")]
 private class Games.GamepadMapper : Gtk.Bin {
        private const double ANALOG_ANIMATION_SPEED = 166660.0;
 
diff --git a/src/ui/gamepad-tester.ui b/src/gamepad/gamepad-tester.ui
similarity index 100%
rename from src/ui/gamepad-tester.ui
rename to src/gamepad/gamepad-tester.ui
diff --git a/src/ui/gamepad-tester.vala b/src/gamepad/gamepad-tester.vala
similarity index 97%
rename from src/ui/gamepad-tester.vala
rename to src/gamepad/gamepad-tester.vala
index ce2a2d8a..59d052db 100644
--- a/src/ui/gamepad-tester.vala
+++ b/src/gamepad/gamepad-tester.vala
@@ -1,6 +1,6 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
-[GtkTemplate (ui = "/org/gnome/Games/ui/gamepad-tester.ui")]
+[GtkTemplate (ui = "/org/gnome/Games/gamepad/gamepad-tester.ui")]
 private class Games.GamepadTester : Gtk.Bin {
        [GtkChild]
        private GamepadView gamepad_view;
diff --git a/src/meson.build b/src/meson.build
index 08361b87..d21ca070 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -74,7 +74,9 @@ vala_sources = [
 
   'gamepad/gamepad-dpad.vala',
   'gamepad/gamepad-input.vala',
+  'gamepad/gamepad-mapper.vala',
   'gamepad/gamepad-mapping-builder.vala',
+  'gamepad/gamepad-tester.vala',
 
   'generic/generic-game-uri-adapter.vala',
   'generic/generic-input-capabilities.vala',
@@ -130,8 +132,6 @@ vala_sources = [
   'ui/flash-box.vala',
   'ui/fullscreen-box.vala',
   'ui/gamepad-browse.vala',
-  'ui/gamepad-mapper.vala',
-  'ui/gamepad-tester.vala',
   'ui/gamepad-view.vala',
   'ui/games-page.vala',
   'ui/game-icon-view.vala',
diff --git a/src/org.gnome.Games.gresource.xml b/src/org.gnome.Games.gresource.xml
index 84afe313..79ec611b 100644
--- a/src/org.gnome.Games.gresource.xml
+++ b/src/org.gnome.Games.gresource.xml
@@ -2,7 +2,11 @@
 <gresources>
   <gresource prefix="/org/gnome/Games">
     <file>gtk-style.css</file>
+
     <file>gamepad/standard-gamepad.svg</file>
+    <file preprocess="xml-stripblanks">gamepad/gamepad-mapper.ui</file>
+    <file preprocess="xml-stripblanks">gamepad/gamepad-tester.ui</file>
+
     <file preprocess="xml-stripblanks">gesture/button-east-symbolic.svg</file>
     <file preprocess="xml-stripblanks">gesture/button-home-symbolic.svg</file>
     <file preprocess="xml-stripblanks">gesture/button-south-symbolic.svg</file>
@@ -10,6 +14,7 @@
     <file preprocess="xml-stripblanks">gesture/dpad-symbolic.svg</file>
     <file preprocess="xml-stripblanks">gesture/shoulders-front-symbolic.svg</file>
     <file preprocess="xml-stripblanks">gesture/stick-symbolic.svg</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>
@@ -26,8 +31,6 @@
     <file preprocess="xml-stripblanks">ui/error-display.ui</file>
     <file preprocess="xml-stripblanks">ui/error-info-bar.ui</file>
     <file preprocess="xml-stripblanks">ui/fullscreen-box.ui</file>
-    <file preprocess="xml-stripblanks">ui/gamepad-mapper.ui</file>
-    <file preprocess="xml-stripblanks">ui/gamepad-tester.ui</file>
     <file preprocess="xml-stripblanks">ui/games-page.ui</file>
     <file preprocess="xml-stripblanks">ui/game-icon-view.ui</file>
     <file preprocess="xml-stripblanks">ui/help-overlay.ui</file>