[gnome-screenshot/wip/exalm/cleanups: 1/6] Move gresources to data/

[Alexander Mikhaylenko <alexm src gnome org>]

commit b0045406d30dde261652f869fe369834f94a02a7
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Tue Mar 10 17:21:59 2020 +0500

    Move gresources to data/
    
    Put icons into data/icons, ui files into data/ui/.

 data/gnome-screenshot.gresource.xml        | 11 +++++++++++
 {src => data/icons}/display-symbolic.svg   |  0
 {src => data/icons}/selection-symbolic.svg |  0
 {src => data/icons}/window-symbolic.svg    |  0
 data/meson.build                           |  9 +++++++++
 {src => data/ui}/screenshot-app-menu.ui    |  0
 {src => data/ui}/screenshot-dialog.ui      |  0
 {src => data/ui}/screenshot-interactive.ui |  0
 src/gnome-screenshot.gresource.xml         | 11 -----------
 src/meson.build                            |  7 -------
 src/screenshot-dialog.c                    |  2 +-
 src/screenshot-interactive-dialog.c        |  4 ++--
 12 files changed, 23 insertions(+), 21 deletions(-)
---
diff --git a/data/gnome-screenshot.gresource.xml b/data/gnome-screenshot.gresource.xml
new file mode 100644
index 0000000..82da126
--- /dev/null
+++ b/data/gnome-screenshot.gresource.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/screenshot">
+    <file preprocess="xml-stripblanks">icons/display-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">icons/selection-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">icons/window-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">ui/screenshot-app-menu.ui</file>
+    <file preprocess="xml-stripblanks">ui/screenshot-interactive.ui</file>
+    <file preprocess="xml-stripblanks">ui/screenshot-dialog.ui</file>
+  </gresource>
+</gresources>
diff --git a/src/display-symbolic.svg b/data/icons/display-symbolic.svg
similarity index 100%
rename from src/display-symbolic.svg
rename to data/icons/display-symbolic.svg
diff --git a/src/selection-symbolic.svg b/data/icons/selection-symbolic.svg
similarity index 100%
rename from src/selection-symbolic.svg
rename to data/icons/selection-symbolic.svg
diff --git a/src/window-symbolic.svg b/data/icons/window-symbolic.svg
similarity index 100%
rename from src/window-symbolic.svg
rename to data/icons/window-symbolic.svg
diff --git a/data/meson.build b/data/meson.build
index d2082b7..9f5eff6 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,3 +1,5 @@
+gnome = import('gnome')
+
 desktop_file = i18n.merge_file('desktop',
                 type: 'desktop',
                 input: 'org.gnome.Screenshot.desktop.in',
@@ -60,6 +62,13 @@ if glib_compile_schemas.found()
   )
 endif
 
+
+resources = gnome.compile_resources('screenshot-resources',
+                                    'gnome-screenshot.gresource.xml',
+                                    source_dir: '.',
+                                    c_name: 'screenshot')
+
+
 install_data('gnome-screenshot.1',
              install_dir: join_paths(get_option('mandir'), 'man1'))
 
diff --git a/src/screenshot-app-menu.ui b/data/ui/screenshot-app-menu.ui
similarity index 100%
rename from src/screenshot-app-menu.ui
rename to data/ui/screenshot-app-menu.ui
diff --git a/src/screenshot-dialog.ui b/data/ui/screenshot-dialog.ui
similarity index 100%
rename from src/screenshot-dialog.ui
rename to data/ui/screenshot-dialog.ui
diff --git a/src/screenshot-interactive.ui b/data/ui/screenshot-interactive.ui
similarity index 100%
rename from src/screenshot-interactive.ui
rename to data/ui/screenshot-interactive.ui
diff --git a/src/meson.build b/src/meson.build
index bfe89d6..6335614 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,5 +1,3 @@
-gnome = import('gnome')
-
 sources = [
   'gnome-screenshot.c',
 
@@ -15,11 +13,6 @@ sources = [
   'screenshot-utils.c',
 ]
 
-resources = gnome.compile_resources('screenshot-resources',
-                                    'gnome-screenshot.gresource.xml',
-                                    source_dir: '.',
-                                    c_name: 'screenshot')
-
 executable('gnome-screenshot', sources + resources,
            include_directories: [ root_inc, include_directories('.') ],
            dependencies: [ mathlib_dep, x11_dep, glib_dep, gtk_dep, canberra_dep ],
diff --git a/src/screenshot-dialog.c b/src/screenshot-dialog.c
index d674584..a91b305 100644
--- a/src/screenshot-dialog.c
+++ b/src/screenshot-dialog.c
@@ -215,7 +215,7 @@ screenshot_dialog_new (GdkPixbuf              *screenshot,
   dialog->user_data = user_data;
 
   ui = gtk_builder_new ();
-  res = gtk_builder_add_from_resource (ui, "/org/gnome/screenshot/screenshot-dialog.ui", NULL);
+  res = gtk_builder_add_from_resource (ui, "/org/gnome/screenshot/ui/screenshot-dialog.ui", NULL);
   g_assert (res != 0);
 
   dialog->dialog = GTK_WIDGET (gtk_builder_get_object (ui, "toplevel"));
diff --git a/src/screenshot-interactive-dialog.c b/src/screenshot-interactive-dialog.c
index 9888f90..7ba971e 100644
--- a/src/screenshot-interactive-dialog.c
+++ b/src/screenshot-interactive-dialog.c
@@ -232,8 +232,8 @@ screenshot_interactive_dialog_new (CaptureClickedCallback f, gpointer user_data)
   CaptureData *data;
   guint res;
 
-  ui = gtk_builder_new_from_resource ("/org/gnome/screenshot/screenshot-interactive.ui");
-  res = gtk_builder_add_from_resource (ui, "/org/gnome/screenshot/screenshot-app-menu.ui", NULL);
+  ui = gtk_builder_new_from_resource ("/org/gnome/screenshot/ui/screenshot-interactive.ui");
+  res = gtk_builder_add_from_resource (ui, "/org/gnome/screenshot/ui/screenshot-app-menu.ui", NULL);
   g_assert (res != 0);
 
   dialog = GTK_WIDGET (gtk_builder_get_object (ui, "screenshot_window"));