[gnome-games/wip/exalm/reorganize] ui: Move preferences files to preferences/

[Alexander Mikhaylenko <alexm src gnome org>]

commit 5df0fc502825407d7d9a1ff1ea74d5a253e6c5cd
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Thu Dec 10 23:46:11 2020 +0500

    ui: Move preferences files to preferences/

 src/meson.build                                     | 21 +++++++++++----------
 src/org.gnome.Games.gresource.xml                   | 17 +++++++++--------
 .../preferences-page-controllers.ui                 |  0
 .../preferences-page-controllers.vala               |  2 +-
 .../preferences-page-import-export.ui               |  0
 .../preferences-page-import-export.vala             |  2 +-
 .../preferences-page-platforms-retro-row.vala       |  0
 .../preferences-page-platforms.ui                   |  0
 .../preferences-page-platforms.vala                 |  2 +-
 src/{ui => preferences}/preferences-page-video.ui   |  0
 src/{ui => preferences}/preferences-page-video.vala |  2 +-
 src/{ui => preferences}/preferences-page.ui         |  0
 src/{ui => preferences}/preferences-page.vala       |  2 +-
 .../preferences-subpage-gamepad.ui                  |  0
 .../preferences-subpage-gamepad.vala                |  2 +-
 .../preferences-subpage-keyboard.ui                 |  0
 .../preferences-subpage-keyboard.vala               |  2 +-
 src/{ui => preferences}/preferences-subpage.vala    |  0
 src/{ui => preferences}/preferences-window.ui       |  0
 src/{ui => preferences}/preferences-window.vala     |  2 +-
 20 files changed, 28 insertions(+), 26 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index a754dba3..2548533c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -93,6 +93,17 @@ vala_sources = [
   'keyboard/keyboard-mapping-manager.vala',
   'keyboard/keyboard-tester.vala',
 
+  'preferences/preferences-page.vala',
+  'preferences/preferences-page-controllers.vala',
+  'preferences/preferences-page-import-export.vala',
+  'preferences/preferences-page-platforms.vala',
+  'preferences/preferences-page-platforms-retro-row.vala',
+  'preferences/preferences-page-video.vala',
+  'preferences/preferences-subpage.vala',
+  'preferences/preferences-subpage-gamepad.vala',
+  'preferences/preferences-subpage-keyboard.vala',
+  'preferences/preferences-window.vala',
+
   'retro/retro-core.vala',
   'retro/retro-core-manager.vala',
   'retro/retro-core-source.vala',
@@ -145,16 +156,6 @@ vala_sources = [
   'ui/media-menu-button.vala',
   'ui/platform-list-item.vala',
   'ui/platforms-page.vala',
-  'ui/preferences-page.vala',
-  'ui/preferences-page-controllers.vala',
-  'ui/preferences-page-import-export.vala',
-  'ui/preferences-page-platforms.vala',
-  'ui/preferences-page-platforms-retro-row.vala',
-  'ui/preferences-page-video.vala',
-  'ui/preferences-subpage.vala',
-  'ui/preferences-subpage-gamepad.vala',
-  'ui/preferences-subpage-keyboard.vala',
-  'ui/preferences-window.vala',
   'ui/remote-display.vala',
   'ui/search-bar.vala',
   'ui/selection-action-bar.vala',
diff --git a/src/org.gnome.Games.gresource.xml b/src/org.gnome.Games.gresource.xml
index a30d0410..58b1031c 100644
--- a/src/org.gnome.Games.gresource.xml
+++ b/src/org.gnome.Games.gresource.xml
@@ -18,6 +18,15 @@
     <file preprocess="xml-stripblanks">keyboard/keyboard-mapper.ui</file>
     <file preprocess="xml-stripblanks">keyboard/keyboard-tester.ui</file>
 
+    <file preprocess="xml-stripblanks">preferences/preferences-page.ui</file>
+    <file preprocess="xml-stripblanks">preferences/preferences-page-controllers.ui</file>
+    <file preprocess="xml-stripblanks">preferences/preferences-page-import-export.ui</file>
+    <file preprocess="xml-stripblanks">preferences/preferences-page-platforms.ui</file>
+    <file preprocess="xml-stripblanks">preferences/preferences-page-video.ui</file>
+    <file preprocess="xml-stripblanks">preferences/preferences-subpage-gamepad.ui</file>
+    <file preprocess="xml-stripblanks">preferences/preferences-subpage-keyboard.ui</file>
+    <file preprocess="xml-stripblanks">preferences/preferences-window.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>
@@ -41,14 +50,6 @@
     <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>
-    <file preprocess="xml-stripblanks">ui/preferences-page.ui</file>
-    <file preprocess="xml-stripblanks">ui/preferences-page-controllers.ui</file>
-    <file preprocess="xml-stripblanks">ui/preferences-page-import-export.ui</file>
-    <file preprocess="xml-stripblanks">ui/preferences-page-platforms.ui</file>
-    <file preprocess="xml-stripblanks">ui/preferences-page-video.ui</file>
-    <file preprocess="xml-stripblanks">ui/preferences-subpage-gamepad.ui</file>
-    <file preprocess="xml-stripblanks">ui/preferences-subpage-keyboard.ui</file>
-    <file preprocess="xml-stripblanks">ui/preferences-window.ui</file>
     <file preprocess="xml-stripblanks">ui/remote-display.ui</file>
     <file preprocess="xml-stripblanks">ui/search-bar.ui</file>
     <file preprocess="xml-stripblanks">ui/selection-action-bar.ui</file>
diff --git a/src/ui/preferences-page-controllers.ui b/src/preferences/preferences-page-controllers.ui
similarity index 100%
rename from src/ui/preferences-page-controllers.ui
rename to src/preferences/preferences-page-controllers.ui
diff --git a/src/ui/preferences-page-controllers.vala b/src/preferences/preferences-page-controllers.vala
similarity index 95%
rename from src/ui/preferences-page-controllers.vala
rename to src/preferences/preferences-page-controllers.vala
index 208301fd..f0a4aca6 100644
--- a/src/ui/preferences-page-controllers.vala
+++ b/src/preferences/preferences-page-controllers.vala
@@ -1,6 +1,6 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
-[GtkTemplate (ui = "/org/gnome/Games/ui/preferences-page-controllers.ui")]
+[GtkTemplate (ui = "/org/gnome/Games/preferences/preferences-page-controllers.ui")]
 private class Games.PreferencesPageControllers : PreferencesPage {
        [GtkChild]
        private Hdy.PreferencesGroup gamepads_group;
diff --git a/src/ui/preferences-page-import-export.ui b/src/preferences/preferences-page-import-export.ui
similarity index 100%
rename from src/ui/preferences-page-import-export.ui
rename to src/preferences/preferences-page-import-export.ui
diff --git a/src/ui/preferences-page-import-export.vala b/src/preferences/preferences-page-import-export.vala
similarity index 95%
rename from src/ui/preferences-page-import-export.vala
rename to src/preferences/preferences-page-import-export.vala
index b252cf2b..f3940ef3 100644
--- a/src/ui/preferences-page-import-export.vala
+++ b/src/preferences/preferences-page-import-export.vala
@@ -1,6 +1,6 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
-[GtkTemplate (ui = "/org/gnome/Games/ui/preferences-page-import-export.ui")]
+[GtkTemplate (ui = "/org/gnome/Games/preferences/preferences-page-import-export.ui")]
 private class Games.PreferencesPageImportExport : PreferencesPage {
        [GtkCallback]
        private void on_import_clicked () {
diff --git a/src/ui/preferences-page-platforms-retro-row.vala 
b/src/preferences/preferences-page-platforms-retro-row.vala
similarity index 100%
rename from src/ui/preferences-page-platforms-retro-row.vala
rename to src/preferences/preferences-page-platforms-retro-row.vala
diff --git a/src/ui/preferences-page-platforms.ui b/src/preferences/preferences-page-platforms.ui
similarity index 100%
rename from src/ui/preferences-page-platforms.ui
rename to src/preferences/preferences-page-platforms.ui
diff --git a/src/ui/preferences-page-platforms.vala b/src/preferences/preferences-page-platforms.vala
similarity index 83%
rename from src/ui/preferences-page-platforms.vala
rename to src/preferences/preferences-page-platforms.vala
index 02bcd27b..058ac53b 100644
--- a/src/ui/preferences-page-platforms.vala
+++ b/src/preferences/preferences-page-platforms.vala
@@ -1,6 +1,6 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
-[GtkTemplate (ui = "/org/gnome/Games/ui/preferences-page-platforms.ui")]
+[GtkTemplate (ui = "/org/gnome/Games/preferences/preferences-page-platforms.ui")]
 private class Games.PreferencesPagePlatforms : PreferencesPage {
        [GtkChild]
        private Hdy.PreferencesGroup platforms_group;
diff --git a/src/ui/preferences-page-video.ui b/src/preferences/preferences-page-video.ui
similarity index 100%
rename from src/ui/preferences-page-video.ui
rename to src/preferences/preferences-page-video.ui
diff --git a/src/ui/preferences-page-video.vala b/src/preferences/preferences-page-video.vala
similarity index 95%
rename from src/ui/preferences-page-video.vala
rename to src/preferences/preferences-page-video.vala
index 929ac7d5..2901812f 100644
--- a/src/ui/preferences-page-video.vala
+++ b/src/preferences/preferences-page-video.vala
@@ -1,6 +1,6 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
-[GtkTemplate (ui = "/org/gnome/Games/ui/preferences-page-video.ui")]
+[GtkTemplate (ui = "/org/gnome/Games/preferences/preferences-page-video.ui")]
 private class Games.PreferencesPageVideo : PreferencesPage {
        private string _filter_active;
        public string filter_active {
diff --git a/src/ui/preferences-page.ui b/src/preferences/preferences-page.ui
similarity index 100%
rename from src/ui/preferences-page.ui
rename to src/preferences/preferences-page.ui
diff --git a/src/ui/preferences-page.vala b/src/preferences/preferences-page.vala
similarity index 91%
rename from src/ui/preferences-page.vala
rename to src/preferences/preferences-page.vala
index 98c1d0c9..d131fec0 100644
--- a/src/ui/preferences-page.vala
+++ b/src/preferences/preferences-page.vala
@@ -1,6 +1,6 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
-[GtkTemplate (ui = "/org/gnome/Games/ui/preferences-page.ui")]
+[GtkTemplate (ui = "/org/gnome/Games/preferences/preferences-page.ui")]
 private class Games.PreferencesPage : Gtk.Bin, Gtk.Buildable {
        public PreferencesWindow window { get; construct; }
 
diff --git a/src/ui/preferences-subpage-gamepad.ui b/src/preferences/preferences-subpage-gamepad.ui
similarity index 100%
rename from src/ui/preferences-subpage-gamepad.ui
rename to src/preferences/preferences-subpage-gamepad.ui
diff --git a/src/ui/preferences-subpage-gamepad.vala b/src/preferences/preferences-subpage-gamepad.vala
similarity index 98%
rename from src/ui/preferences-subpage-gamepad.vala
rename to src/preferences/preferences-subpage-gamepad.vala
index 24c5d1ca..61bf7fa2 100644
--- a/src/ui/preferences-subpage-gamepad.vala
+++ b/src/preferences/preferences-subpage-gamepad.vala
@@ -1,6 +1,6 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
-[GtkTemplate (ui = "/org/gnome/Games/ui/preferences-subpage-gamepad.ui")]
+[GtkTemplate (ui = "/org/gnome/Games/preferences/preferences-subpage-gamepad.ui")]
 private class Games.PreferencesSubpageGamepad : Gtk.Bin, PreferencesSubpage {
        private const GamepadInput[] STANDARD_GAMEPAD_INPUTS = {
                { EventCode.EV_KEY, EventCode.BTN_EAST },
diff --git a/src/ui/preferences-subpage-keyboard.ui b/src/preferences/preferences-subpage-keyboard.ui
similarity index 100%
rename from src/ui/preferences-subpage-keyboard.ui
rename to src/preferences/preferences-subpage-keyboard.ui
diff --git a/src/ui/preferences-subpage-keyboard.vala b/src/preferences/preferences-subpage-keyboard.vala
similarity index 97%
rename from src/ui/preferences-subpage-keyboard.vala
rename to src/preferences/preferences-subpage-keyboard.vala
index d3831fb5..8782d8b3 100644
--- a/src/ui/preferences-subpage-keyboard.vala
+++ b/src/preferences/preferences-subpage-keyboard.vala
@@ -1,6 +1,6 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
-[GtkTemplate (ui = "/org/gnome/Games/ui/preferences-subpage-keyboard.ui")]
+[GtkTemplate (ui = "/org/gnome/Games/preferences/preferences-subpage-keyboard.ui")]
 private class Games.PreferencesSubpageKeyboard : Gtk.Bin, PreferencesSubpage {
        private const GamepadInput[] KEYBOARD_GAMEPAD_INPUTS = {
                { EventCode.EV_KEY, EventCode.BTN_EAST },
diff --git a/src/ui/preferences-subpage.vala b/src/preferences/preferences-subpage.vala
similarity index 100%
rename from src/ui/preferences-subpage.vala
rename to src/preferences/preferences-subpage.vala
diff --git a/src/ui/preferences-window.ui b/src/preferences/preferences-window.ui
similarity index 100%
rename from src/ui/preferences-window.ui
rename to src/preferences/preferences-window.ui
diff --git a/src/ui/preferences-window.vala b/src/preferences/preferences-window.vala
similarity index 93%
rename from src/ui/preferences-window.vala
rename to src/preferences/preferences-window.vala
index 04c78bac..ff646177 100644
--- a/src/ui/preferences-window.vala
+++ b/src/preferences/preferences-window.vala
@@ -1,6 +1,6 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
-[GtkTemplate (ui = "/org/gnome/Games/ui/preferences-window.ui")]
+[GtkTemplate (ui = "/org/gnome/Games/preferences/preferences-window.ui")]
 private class Games.PreferencesWindow : Hdy.Window {
        [GtkChild]
        private Hdy.Deck deck;