[gnome-games/wip/exalm/reorganize: 1/11] Move resources from data/ to src/

[Alexander Mikhaylenko <alexm src gnome org>]

commit 004d03b0311dd405596e5b81c8bf16f1df801261
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Thu Dec 10 23:06:15 2020 +0500

    Move resources from data/ to src/

 data/meson.build                                    | 6 ------
 {data/gamepads => src/gamepad}/standard-gamepad.svg | 0
 {data => src}/gesture/button-east-symbolic.svg      | 0
 {data => src}/gesture/button-home-symbolic.svg      | 0
 {data => src}/gesture/button-south-symbolic.svg     | 0
 {data => src}/gesture/button-start-symbolic.svg     | 0
 {data => src}/gesture/dpad-symbolic.svg             | 0
 {data => src}/gesture/shoulders-front-symbolic.svg  | 0
 {data => src}/gesture/stick-symbolic.svg            | 0
 {data => src}/gtk-style.css                         | 0
 src/meson.build                                     | 6 ++++++
 {data => src}/org.gnome.Games.gresource.xml         | 4 ++--
 {data => src}/ui/application-window.ui              | 0
 src/ui/application-window.vala                      | 2 +-
 {data => src}/ui/checkmark-item.ui                  | 0
 {data => src}/ui/collection-action-window.ui        | 0
 {data => src}/ui/collection-empty.ui                | 0
 {data => src}/ui/collection-icon-view.ui            | 0
 {data => src}/ui/collection-list-item.ui            | 0
 {data => src}/ui/collection-thumbnail.ui            | 0
 {data => src}/ui/collection-view.ui                 | 0
 {data => src}/ui/collections-main-page.ui           | 0
 {data => src}/ui/collections-page.ui                | 0
 {data => src}/ui/display-view.ui                    | 0
 {data => src}/ui/empty-collection.ui                | 0
 {data => src}/ui/empty-search.ui                    | 0
 {data => src}/ui/error-display.ui                   | 0
 {data => src}/ui/error-info-bar.ui                  | 0
 {data => src}/ui/fullscreen-box.ui                  | 0
 {data => src}/ui/game-icon-view.ui                  | 0
 {data => src}/ui/gamepad-mapper.ui                  | 0
 {data => src}/ui/gamepad-tester.ui                  | 0
 src/ui/gamepad-view-configuration.vala              | 2 +-
 {data => src}/ui/games-page.ui                      | 0
 {data/gtk => src/ui}/help-overlay.ui                | 0
 {data => src}/ui/input-mode-switcher.ui             | 0
 {data => src}/ui/keyboard-mapper.ui                 | 0
 {data => src}/ui/keyboard-tester.ui                 | 0
 {data => src}/ui/media-menu-button.ui               | 0
 {data => src}/ui/platform-list-item.ui              | 0
 {data => src}/ui/platforms-page.ui                  | 0
 {data => src}/ui/preferences-page-controllers.ui    | 0
 {data => src}/ui/preferences-page-import-export.ui  | 0
 {data => src}/ui/preferences-page-platforms.ui      | 0
 {data => src}/ui/preferences-page-video.ui          | 0
 {data => src}/ui/preferences-page.ui                | 0
 {data => src}/ui/preferences-subpage-gamepad.ui     | 0
 {data => src}/ui/preferences-subpage-keyboard.ui    | 0
 {data => src}/ui/preferences-window.ui              | 0
 {data => src}/ui/remote-display.ui                  | 0
 {data => src}/ui/search-bar.ui                      | 0
 {data => src}/ui/selection-action-bar.ui            | 0
 {data => src}/ui/snapshot-row.ui                    | 0
 {data => src}/ui/snapshots-list.ui                  | 0
 {data => src}/ui/undo-notification.ui               | 0
 55 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 8dfb2156..e84d863d 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,9 +1,3 @@
-resources = gnome.compile_resources(
-  'org.gnome.Games',
-  'org.gnome.Games.gresource.xml',
-  c_name: 'resources'
-)
-
 desktop_conf = configuration_data()
 desktop_conf.set('icon', application_id)
 desktop_file = i18n.merge_file ('desktop-file',
diff --git a/data/gamepads/standard-gamepad.svg b/src/gamepad/standard-gamepad.svg
similarity index 100%
rename from data/gamepads/standard-gamepad.svg
rename to src/gamepad/standard-gamepad.svg
diff --git a/data/gesture/button-east-symbolic.svg b/src/gesture/button-east-symbolic.svg
similarity index 100%
rename from data/gesture/button-east-symbolic.svg
rename to src/gesture/button-east-symbolic.svg
diff --git a/data/gesture/button-home-symbolic.svg b/src/gesture/button-home-symbolic.svg
similarity index 100%
rename from data/gesture/button-home-symbolic.svg
rename to src/gesture/button-home-symbolic.svg
diff --git a/data/gesture/button-south-symbolic.svg b/src/gesture/button-south-symbolic.svg
similarity index 100%
rename from data/gesture/button-south-symbolic.svg
rename to src/gesture/button-south-symbolic.svg
diff --git a/data/gesture/button-start-symbolic.svg b/src/gesture/button-start-symbolic.svg
similarity index 100%
rename from data/gesture/button-start-symbolic.svg
rename to src/gesture/button-start-symbolic.svg
diff --git a/data/gesture/dpad-symbolic.svg b/src/gesture/dpad-symbolic.svg
similarity index 100%
rename from data/gesture/dpad-symbolic.svg
rename to src/gesture/dpad-symbolic.svg
diff --git a/data/gesture/shoulders-front-symbolic.svg b/src/gesture/shoulders-front-symbolic.svg
similarity index 100%
rename from data/gesture/shoulders-front-symbolic.svg
rename to src/gesture/shoulders-front-symbolic.svg
diff --git a/data/gesture/stick-symbolic.svg b/src/gesture/stick-symbolic.svg
similarity index 100%
rename from data/gesture/stick-symbolic.svg
rename to src/gesture/stick-symbolic.svg
diff --git a/data/gtk-style.css b/src/gtk-style.css
similarity index 100%
rename from data/gtk-style.css
rename to src/gtk-style.css
diff --git a/src/meson.build b/src/meson.build
index a53d9859..08361b87 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -190,6 +190,12 @@ vala_sources = [
   'main.vala',
 ]
 
+resources = gnome.compile_resources(
+  'org.gnome.Games',
+  'org.gnome.Games.gresource.xml',
+  c_name: 'resources'
+)
+
 event_codes_dep = valac.find_library ('event-codes', dirs: gamepad_dir)
 
 dependencies = [
diff --git a/data/org.gnome.Games.gresource.xml b/src/org.gnome.Games.gresource.xml
similarity index 96%
rename from data/org.gnome.Games.gresource.xml
rename to src/org.gnome.Games.gresource.xml
index 0256b22c..84afe313 100644
--- a/data/org.gnome.Games.gresource.xml
+++ b/src/org.gnome.Games.gresource.xml
@@ -2,7 +2,7 @@
 <gresources>
   <gresource prefix="/org/gnome/Games">
     <file>gtk-style.css</file>
-    <file>gamepads/standard-gamepad.svg</file>
+    <file>gamepad/standard-gamepad.svg</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,7 +10,6 @@
     <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">gtk/help-overlay.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>
@@ -31,6 +30,7 @@
     <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>
     <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>
diff --git a/data/ui/application-window.ui b/src/ui/application-window.ui
similarity index 100%
rename from data/ui/application-window.ui
rename to src/ui/application-window.ui
diff --git a/src/ui/application-window.vala b/src/ui/application-window.vala
index 8bf68f1d..514315a8 100644
--- a/src/ui/application-window.vala
+++ b/src/ui/application-window.vala
@@ -97,7 +97,7 @@ private class Games.ApplicationWindow : Hdy.ApplicationWindow {
        }
 
        private void init_help_overlay () {
-               var builder = new Gtk.Builder.from_resource ("/org/gnome/Games/gtk/help-overlay.ui");
+               var builder = new Gtk.Builder.from_resource ("/org/gnome/Games/ui/help-overlay.ui");
                var shortcuts_window = builder.get_object ("help_overlay") as Gtk.ShortcutsWindow;
                var shortcut = builder.get_object ("general_shortcut_alt_left") as Gtk.ShortcutsShortcut;
 
diff --git a/data/ui/checkmark-item.ui b/src/ui/checkmark-item.ui
similarity index 100%
rename from data/ui/checkmark-item.ui
rename to src/ui/checkmark-item.ui
diff --git a/data/ui/collection-action-window.ui b/src/ui/collection-action-window.ui
similarity index 100%
rename from data/ui/collection-action-window.ui
rename to src/ui/collection-action-window.ui
diff --git a/data/ui/collection-empty.ui b/src/ui/collection-empty.ui
similarity index 100%
rename from data/ui/collection-empty.ui
rename to src/ui/collection-empty.ui
diff --git a/data/ui/collection-icon-view.ui b/src/ui/collection-icon-view.ui
similarity index 100%
rename from data/ui/collection-icon-view.ui
rename to src/ui/collection-icon-view.ui
diff --git a/data/ui/collection-list-item.ui b/src/ui/collection-list-item.ui
similarity index 100%
rename from data/ui/collection-list-item.ui
rename to src/ui/collection-list-item.ui
diff --git a/data/ui/collection-thumbnail.ui b/src/ui/collection-thumbnail.ui
similarity index 100%
rename from data/ui/collection-thumbnail.ui
rename to src/ui/collection-thumbnail.ui
diff --git a/data/ui/collection-view.ui b/src/ui/collection-view.ui
similarity index 100%
rename from data/ui/collection-view.ui
rename to src/ui/collection-view.ui
diff --git a/data/ui/collections-main-page.ui b/src/ui/collections-main-page.ui
similarity index 100%
rename from data/ui/collections-main-page.ui
rename to src/ui/collections-main-page.ui
diff --git a/data/ui/collections-page.ui b/src/ui/collections-page.ui
similarity index 100%
rename from data/ui/collections-page.ui
rename to src/ui/collections-page.ui
diff --git a/data/ui/display-view.ui b/src/ui/display-view.ui
similarity index 100%
rename from data/ui/display-view.ui
rename to src/ui/display-view.ui
diff --git a/data/ui/empty-collection.ui b/src/ui/empty-collection.ui
similarity index 100%
rename from data/ui/empty-collection.ui
rename to src/ui/empty-collection.ui
diff --git a/data/ui/empty-search.ui b/src/ui/empty-search.ui
similarity index 100%
rename from data/ui/empty-search.ui
rename to src/ui/empty-search.ui
diff --git a/data/ui/error-display.ui b/src/ui/error-display.ui
similarity index 100%
rename from data/ui/error-display.ui
rename to src/ui/error-display.ui
diff --git a/data/ui/error-info-bar.ui b/src/ui/error-info-bar.ui
similarity index 100%
rename from data/ui/error-info-bar.ui
rename to src/ui/error-info-bar.ui
diff --git a/data/ui/fullscreen-box.ui b/src/ui/fullscreen-box.ui
similarity index 100%
rename from data/ui/fullscreen-box.ui
rename to src/ui/fullscreen-box.ui
diff --git a/data/ui/game-icon-view.ui b/src/ui/game-icon-view.ui
similarity index 100%
rename from data/ui/game-icon-view.ui
rename to src/ui/game-icon-view.ui
diff --git a/data/ui/gamepad-mapper.ui b/src/ui/gamepad-mapper.ui
similarity index 100%
rename from data/ui/gamepad-mapper.ui
rename to src/ui/gamepad-mapper.ui
diff --git a/data/ui/gamepad-tester.ui b/src/ui/gamepad-tester.ui
similarity index 100%
rename from data/ui/gamepad-tester.ui
rename to src/ui/gamepad-tester.ui
diff --git a/src/ui/gamepad-view-configuration.vala b/src/ui/gamepad-view-configuration.vala
index 3c27959c..89398260 100644
--- a/src/ui/gamepad-view-configuration.vala
+++ b/src/ui/gamepad-view-configuration.vala
@@ -60,7 +60,7 @@ namespace Games {
                public static GamepadViewConfiguration get_default () {
                        GamepadViewConfiguration conf = {};
 
-                       conf.svg_path = "/org/gnome/Games/gamepads/standard-gamepad.svg";
+                       conf.svg_path = "/org/gnome/Games/gamepad/standard-gamepad.svg";
                        conf.button_paths = STANDARD_GAMEPAD_BUTTON_PATHS;
                        conf.analog_paths = STANDARD_GAMEPAD_ANALOG_PATHS;
                        conf.background_paths = BACKGROUND_PATHS;
diff --git a/data/ui/games-page.ui b/src/ui/games-page.ui
similarity index 100%
rename from data/ui/games-page.ui
rename to src/ui/games-page.ui
diff --git a/data/gtk/help-overlay.ui b/src/ui/help-overlay.ui
similarity index 100%
rename from data/gtk/help-overlay.ui
rename to src/ui/help-overlay.ui
diff --git a/data/ui/input-mode-switcher.ui b/src/ui/input-mode-switcher.ui
similarity index 100%
rename from data/ui/input-mode-switcher.ui
rename to src/ui/input-mode-switcher.ui
diff --git a/data/ui/keyboard-mapper.ui b/src/ui/keyboard-mapper.ui
similarity index 100%
rename from data/ui/keyboard-mapper.ui
rename to src/ui/keyboard-mapper.ui
diff --git a/data/ui/keyboard-tester.ui b/src/ui/keyboard-tester.ui
similarity index 100%
rename from data/ui/keyboard-tester.ui
rename to src/ui/keyboard-tester.ui
diff --git a/data/ui/media-menu-button.ui b/src/ui/media-menu-button.ui
similarity index 100%
rename from data/ui/media-menu-button.ui
rename to src/ui/media-menu-button.ui
diff --git a/data/ui/platform-list-item.ui b/src/ui/platform-list-item.ui
similarity index 100%
rename from data/ui/platform-list-item.ui
rename to src/ui/platform-list-item.ui
diff --git a/data/ui/platforms-page.ui b/src/ui/platforms-page.ui
similarity index 100%
rename from data/ui/platforms-page.ui
rename to src/ui/platforms-page.ui
diff --git a/data/ui/preferences-page-controllers.ui b/src/ui/preferences-page-controllers.ui
similarity index 100%
rename from data/ui/preferences-page-controllers.ui
rename to src/ui/preferences-page-controllers.ui
diff --git a/data/ui/preferences-page-import-export.ui b/src/ui/preferences-page-import-export.ui
similarity index 100%
rename from data/ui/preferences-page-import-export.ui
rename to src/ui/preferences-page-import-export.ui
diff --git a/data/ui/preferences-page-platforms.ui b/src/ui/preferences-page-platforms.ui
similarity index 100%
rename from data/ui/preferences-page-platforms.ui
rename to src/ui/preferences-page-platforms.ui
diff --git a/data/ui/preferences-page-video.ui b/src/ui/preferences-page-video.ui
similarity index 100%
rename from data/ui/preferences-page-video.ui
rename to src/ui/preferences-page-video.ui
diff --git a/data/ui/preferences-page.ui b/src/ui/preferences-page.ui
similarity index 100%
rename from data/ui/preferences-page.ui
rename to src/ui/preferences-page.ui
diff --git a/data/ui/preferences-subpage-gamepad.ui b/src/ui/preferences-subpage-gamepad.ui
similarity index 100%
rename from data/ui/preferences-subpage-gamepad.ui
rename to src/ui/preferences-subpage-gamepad.ui
diff --git a/data/ui/preferences-subpage-keyboard.ui b/src/ui/preferences-subpage-keyboard.ui
similarity index 100%
rename from data/ui/preferences-subpage-keyboard.ui
rename to src/ui/preferences-subpage-keyboard.ui
diff --git a/data/ui/preferences-window.ui b/src/ui/preferences-window.ui
similarity index 100%
rename from data/ui/preferences-window.ui
rename to src/ui/preferences-window.ui
diff --git a/data/ui/remote-display.ui b/src/ui/remote-display.ui
similarity index 100%
rename from data/ui/remote-display.ui
rename to src/ui/remote-display.ui
diff --git a/data/ui/search-bar.ui b/src/ui/search-bar.ui
similarity index 100%
rename from data/ui/search-bar.ui
rename to src/ui/search-bar.ui
diff --git a/data/ui/selection-action-bar.ui b/src/ui/selection-action-bar.ui
similarity index 100%
rename from data/ui/selection-action-bar.ui
rename to src/ui/selection-action-bar.ui
diff --git a/data/ui/snapshot-row.ui b/src/ui/snapshot-row.ui
similarity index 100%
rename from data/ui/snapshot-row.ui
rename to src/ui/snapshot-row.ui
diff --git a/data/ui/snapshots-list.ui b/src/ui/snapshots-list.ui
similarity index 100%
rename from data/ui/snapshots-list.ui
rename to src/ui/snapshots-list.ui
diff --git a/data/ui/undo-notification.ui b/src/ui/undo-notification.ui
similarity index 100%
rename from data/ui/undo-notification.ui
rename to src/ui/undo-notification.ui