GNOME.org
 

[gnome-todo] Split plugin resources

commit b9e1bd0817cd5d69dbc83a41042e0154bfb4ee9f
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Fri May 1 22:39:19 2020 -0300

    Split plugin resources

 .../all-tasks-panel/all-tasks-panel.gresource.xml  |  6 ++
 src/plugins/all-tasks-panel/meson.build            |  8 ++-
 src/plugins/background/background.gresource.xml    |  7 ++
 src/plugins/background/gtd-plugin-background.c     |  2 +-
 src/plugins/background/meson.build                 |  6 ++
 src/plugins/dark-theme/dark-theme.gresource.xml    |  6 ++
 src/plugins/dark-theme/meson.build                 |  6 ++
 src/plugins/eds/eds.gresource.xml                  |  6 ++
 src/plugins/eds/meson.build                        |  6 ++
 src/plugins/inbox-panel/inbox-panel.gresource.xml  |  6 ++
 src/plugins/inbox-panel/meson.build                |  6 ++
 src/plugins/meson.build                            |  8 ---
 src/plugins/next-week-panel/gtd-next-week-panel.c  |  2 +-
 src/plugins/next-week-panel/meson.build            |  6 ++
 .../next-week-panel/next-week-panel.gresource.xml  |  7 ++
 src/plugins/night-light/meson.build                |  6 ++
 src/plugins/night-light/night-light.gresource.xml  |  6 ++
 src/plugins/peace/meson.build                      |  6 ++
 src/plugins/peace/peace.gresource.xml              |  6 ++
 src/plugins/plugins.gresource.xml                  | 76 ----------------------
 .../scheduled-panel/gtd-plugin-scheduled-panel.c   |  2 +-
 .../scheduled-panel/scheduled-panel.gresource.xml  |  7 ++
 .../task-lists-workspace.gresource.xml             |  1 +
 src/plugins/today-panel/gtd-panel-today.c          |  2 +-
 src/plugins/today-panel/meson.build                |  9 ++-
 src/plugins/today-panel/today-panel.gresource.xml  |  7 ++
 26 files changed, 124 insertions(+), 92 deletions(-)
---
diff --git a/src/plugins/all-tasks-panel/all-tasks-panel.gresource.xml 
b/src/plugins/all-tasks-panel/all-tasks-panel.gresource.xml
new file mode 100644
index 0000000..608338f
--- /dev/null
+++ b/src/plugins/all-tasks-panel/all-tasks-panel.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/todo/plugins/all-tasks-panel">
+    <file>all-tasks-panel.plugin</file>
+  </gresource>
+</gresources>
diff --git a/src/plugins/all-tasks-panel/meson.build b/src/plugins/all-tasks-panel/meson.build
index a89535c..9b4954f 100644
--- a/src/plugins/all-tasks-panel/meson.build
+++ b/src/plugins/all-tasks-panel/meson.build
@@ -1,8 +1,12 @@
 plugins_ldflags += ['-Wl,--undefined=all_tasks_panel_plugin_register_types']
 
-all_tasks_panel_sources = files(
+plugins_sources += files(
   'all-tasks-panel-plugin.c',
   'gtd-all-tasks-panel.c'
 )
 
-plugins_sources += all_tasks_panel_sources
+plugins_sources += gnome.compile_resources(
+  'all-tasks-panel-resources',
+  'all-tasks-panel.gresource.xml',
+  c_name: 'all_tasks_panel_plugin',
+)
diff --git a/src/plugins/background/background.gresource.xml b/src/plugins/background/background.gresource.xml
new file mode 100644
index 0000000..e0b6a5b
--- /dev/null
+++ b/src/plugins/background/background.gresource.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/todo/plugins/background">
+    <file>background.plugin</file>
+    <file>ui/preferences.ui</file>
+  </gresource>
+</gresources>
diff --git a/src/plugins/background/gtd-plugin-background.c b/src/plugins/background/gtd-plugin-background.c
index 15eb2d1..d84bcf5 100644
--- a/src/plugins/background/gtd-plugin-background.c
+++ b/src/plugins/background/gtd-plugin-background.c
@@ -575,7 +575,7 @@ gtd_plugin_background_init (GtdPluginBackground *self)
   self->settings = g_settings_new ("org.gnome.todo.plugins.background");
 
   /* And the preferences panel */
-  builder = gtk_builder_new_from_resource ("/org/gnome/todo/ui/background/preferences.ui");
+  builder = gtk_builder_new_from_resource ("/org/gnome/todo/plugins/background/ui/preferences.ui");
 
   self->preferences_panel = GTK_WIDGET (gtk_builder_get_object (builder, "main_box"));
   self->portal = xdp_portal_new ();
diff --git a/src/plugins/background/meson.build b/src/plugins/background/meson.build
index 5acd0fc..a671a4f 100644
--- a/src/plugins/background/meson.build
+++ b/src/plugins/background/meson.build
@@ -8,6 +8,12 @@ plugins_sources += files(
   'gtd-plugin-background.c',
 )
 
+plugins_sources += gnome.compile_resources(
+  'background-resources',
+  'background.gresource.xml',
+  c_name: 'background_plugin',
+)
+
 install_data(
   'org.gnome.todo.background.gschema.xml',
   install_dir: gnome_todo_schemadir
diff --git a/src/plugins/dark-theme/dark-theme.gresource.xml b/src/plugins/dark-theme/dark-theme.gresource.xml
new file mode 100644
index 0000000..2d54262
--- /dev/null
+++ b/src/plugins/dark-theme/dark-theme.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/todo/plugins/dark-theme/">
+    <file>dark-theme.plugin</file>
+  </gresource>
+</gresources>
diff --git a/src/plugins/dark-theme/meson.build b/src/plugins/dark-theme/meson.build
index 2330d3b..89a33c5 100644
--- a/src/plugins/dark-theme/meson.build
+++ b/src/plugins/dark-theme/meson.build
@@ -3,3 +3,9 @@ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_dark_theme_register_types']
 plugins_sources += files(
   'gtd-plugin-dark-theme.c'
 )
+
+plugins_sources += gnome.compile_resources(
+  'dark-theme-resources',
+  'dark-theme.gresource.xml',
+  c_name: 'dark_theme_plugin',
+)
diff --git a/src/plugins/eds/eds.gresource.xml b/src/plugins/eds/eds.gresource.xml
new file mode 100644
index 0000000..4b578f9
--- /dev/null
+++ b/src/plugins/eds/eds.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/todo/plugins/eds">
+    <file>eds.plugin</file>
+  </gresource>
+</gresources>
diff --git a/src/plugins/eds/meson.build b/src/plugins/eds/meson.build
index bbcae42..a57021d 100644
--- a/src/plugins/eds/meson.build
+++ b/src/plugins/eds/meson.build
@@ -18,3 +18,9 @@ plugins_sources += files(
   'gtd-task-eds.c',
   'gtd-task-list-eds.c',
 )
+
+plugins_sources += gnome.compile_resources(
+  'eds-resources',
+  'eds.gresource.xml',
+  c_name: 'eds_plugin',
+)
diff --git a/src/plugins/inbox-panel/inbox-panel.gresource.xml 
b/src/plugins/inbox-panel/inbox-panel.gresource.xml
new file mode 100644
index 0000000..b8e9454
--- /dev/null
+++ b/src/plugins/inbox-panel/inbox-panel.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/todo/plugins/inbox-panel">
+    <file>inbox-panel.plugin</file>
+  </gresource>
+</gresources>
diff --git a/src/plugins/inbox-panel/meson.build b/src/plugins/inbox-panel/meson.build
index 6bbc2ea..06c2463 100644
--- a/src/plugins/inbox-panel/meson.build
+++ b/src/plugins/inbox-panel/meson.build
@@ -4,3 +4,9 @@ plugins_sources += files(
   'gtd-inbox-panel.c',
   'inbox-panel-plugin.c'
 )
+
+plugins_sources += gnome.compile_resources(
+  'inbox-panel-resources',
+  'inbox-panel.gresource.xml',
+  c_name: 'inbox_panel_plugin',
+)
diff --git a/src/plugins/meson.build b/src/plugins/meson.build
index 96a3a52..39ee21b 100644
--- a/src/plugins/meson.build
+++ b/src/plugins/meson.build
@@ -36,14 +36,6 @@ subdir('today-panel')
   #subdir('todoist')
 #endif
 
-plugins_sources += gnome.compile_resources(
-  'gtd-plugin-resources',
-  'plugins.gresource.xml',
-        c_name: 'todo_plugins',
-  dependencies: plugins_confs,
-        export: true,
-)
-
 plugins_lib = static_library(
             'plugins',
       plugins_sources,
diff --git a/src/plugins/next-week-panel/gtd-next-week-panel.c 
b/src/plugins/next-week-panel/gtd-next-week-panel.c
index 9a4ea4a..35d65b4 100644
--- a/src/plugins/next-week-panel/gtd-next-week-panel.c
+++ b/src/plugins/next-week-panel/gtd-next-week-panel.c
@@ -81,7 +81,7 @@ load_css_provider (GtdNextWeekPanel *self)
   /* Load CSS provider */
   settings = g_settings_new ("org.gnome.desktop.interface");
   theme_name = g_settings_get_string (settings, "gtk-theme");
-  theme_uri = g_build_filename ("resource:///org/gnome/todo/theme/next-week-panel", theme_name, ".css", 
NULL);
+  theme_uri = g_build_filename ("resource:///org/gnome/todo/plugins/next-week-panel/theme", theme_name, 
".css", NULL);
   css_file = g_file_new_for_uri (theme_uri);
 
   self->css_provider = gtk_css_provider_new ();
diff --git a/src/plugins/next-week-panel/meson.build b/src/plugins/next-week-panel/meson.build
index 3dc865d..618c266 100644
--- a/src/plugins/next-week-panel/meson.build
+++ b/src/plugins/next-week-panel/meson.build
@@ -4,3 +4,9 @@ plugins_sources += files(
   'gtd-next-week-panel.c',
   'next-week-panel-plugin.c'
 )
+
+plugins_sources += gnome.compile_resources(
+  'next-week-panel-resources',
+  'next-week-panel.gresource.xml',
+  c_name: 'next_week_panel_plugin',
+)
diff --git a/src/plugins/next-week-panel/next-week-panel.gresource.xml 
b/src/plugins/next-week-panel/next-week-panel.gresource.xml
new file mode 100644
index 0000000..86d42c8
--- /dev/null
+++ b/src/plugins/next-week-panel/next-week-panel.gresource.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/todo/plugins/next-week-panel">
+    <file>next-week-panel.plugin</file>
+    <file>theme/Adwaita.css</file>
+  </gresource>
+</gresources>
diff --git a/src/plugins/night-light/meson.build b/src/plugins/night-light/meson.build
index 84aeace..5fb980b 100644
--- a/src/plugins/night-light/meson.build
+++ b/src/plugins/night-light/meson.build
@@ -3,3 +3,9 @@ plugins_ldflags += ['-Wl,--undefined=gtd_night_light_plugin_register_types']
 plugins_sources += files(
   'gtd-night-light-plugin.c',
 )
+
+plugins_sources += gnome.compile_resources(
+  'night-light-resources',
+  'night-light.gresource.xml',
+  c_name: 'night_light_plugin',
+)
diff --git a/src/plugins/night-light/night-light.gresource.xml 
b/src/plugins/night-light/night-light.gresource.xml
new file mode 100644
index 0000000..39c17e8
--- /dev/null
+++ b/src/plugins/night-light/night-light.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/todo/plugins/night-light">
+    <file>night-light.plugin</file>
+  </gresource>
+</gresources>
diff --git a/src/plugins/peace/meson.build b/src/plugins/peace/meson.build
index ad1cb20..3cba81b 100644
--- a/src/plugins/peace/meson.build
+++ b/src/plugins/peace/meson.build
@@ -4,3 +4,9 @@ plugins_sources += files(
   'gtd-peace-omni-area-addin.c',
   'peace-plugin.c',
 )
+
+plugins_sources += gnome.compile_resources(
+  'peace-resources',
+  'peace.gresource.xml',
+  c_name: 'peace_plugin',
+)
diff --git a/src/plugins/peace/peace.gresource.xml b/src/plugins/peace/peace.gresource.xml
new file mode 100644
index 0000000..13132ed
--- /dev/null
+++ b/src/plugins/peace/peace.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/todo/plugins/peace">
+    <file>peace.plugin</file>
+  </gresource>
+</gresources>
diff --git a/src/plugins/scheduled-panel/gtd-plugin-scheduled-panel.c 
b/src/plugins/scheduled-panel/gtd-plugin-scheduled-panel.c
index 38e03e9..1e70fc8 100644
--- a/src/plugins/scheduled-panel/gtd-plugin-scheduled-panel.c
+++ b/src/plugins/scheduled-panel/gtd-plugin-scheduled-panel.c
@@ -132,7 +132,7 @@ gtd_plugin_scheduled_panel_init (GtdPluginScheduledPanel *self)
   if (g_file_query_exists (css_file, NULL))
     gtk_css_provider_load_from_file (self->css_provider, css_file);
   else
-    gtk_css_provider_load_from_resource (self->css_provider, 
"/org/gnome/todo/theme/scheduled-panel/Adwaita.css");
+    gtk_css_provider_load_from_resource (self->css_provider, 
"/org/gnome/todo/plugins/scheduled-panel/theme/Adwaita.css");
 
   g_object_unref (settings);
   g_object_unref (css_file);
diff --git a/src/plugins/scheduled-panel/scheduled-panel.gresource.xml 
b/src/plugins/scheduled-panel/scheduled-panel.gresource.xml
new file mode 100644
index 0000000..21b04ae
--- /dev/null
+++ b/src/plugins/scheduled-panel/scheduled-panel.gresource.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/todo/plugins/scheduled-panel">
+    <file>scheduled-panel.plugin</file>
+    <file>theme/Adwaita.css</file>
+  </gresource>
+</gresources>
diff --git a/src/plugins/task-lists-workspace/task-lists-workspace.gresource.xml 
b/src/plugins/task-lists-workspace/task-lists-workspace.gresource.xml
index 895ac77..9add680 100644
--- a/src/plugins/task-lists-workspace/task-lists-workspace.gresource.xml
+++ b/src/plugins/task-lists-workspace/task-lists-workspace.gresource.xml
@@ -7,5 +7,6 @@
     <file>sidebar/gtd-sidebar-provider-row.ui</file>
     <file>gtd-task-list-panel.ui</file>
     <file>gtd-task-lists-workspace.ui</file>
+    <file>task-lists-workspace.plugin</file>
   </gresource>
 </gresources>
diff --git a/src/plugins/today-panel/gtd-panel-today.c b/src/plugins/today-panel/gtd-panel-today.c
index 9cc861d..ca5c065 100644
--- a/src/plugins/today-panel/gtd-panel-today.c
+++ b/src/plugins/today-panel/gtd-panel-today.c
@@ -91,7 +91,7 @@ load_css_provider (GtdPanelToday *self)
   if (g_file_query_exists (css_file, NULL))
     gtk_css_provider_load_from_file (self->css_provider, css_file);
   else
-    gtk_css_provider_load_from_resource (self->css_provider, 
"/org/gnome/todo/theme/today-panel/Adwaita.css");
+    gtk_css_provider_load_from_resource (self->css_provider, 
"/org/gnome/todo/plugins/today-panel/theme/Adwaita.css");
 }
 
 static gboolean
diff --git a/src/plugins/today-panel/meson.build b/src/plugins/today-panel/meson.build
index b37b748..baf173b 100644
--- a/src/plugins/today-panel/meson.build
+++ b/src/plugins/today-panel/meson.build
@@ -1,9 +1,14 @@
 plugins_ldflags += ['-Wl,--undefined=today_panel_plugin_register_types']
 
-today_panel_sources = files(
+plugins_sources += files(
   'gtd-panel-today.c',
   'gtd-today-omni-area-addin.c',
   'today-panel-plugin.c'
 )
 
-plugins_sources += today_panel_sources
+
+plugins_sources += gnome.compile_resources(
+  'today-panel-resources',
+  'today-panel.gresource.xml',
+  c_name: 'today_panel_plugin',
+)
diff --git a/src/plugins/today-panel/today-panel.gresource.xml 
b/src/plugins/today-panel/today-panel.gresource.xml
new file mode 100644
index 0000000..1b84499
--- /dev/null
+++ b/src/plugins/today-panel/today-panel.gresource.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/todo/plugins/today-panel">
+    <file>today-panel.plugin</file>
+    <file>theme/Adwaita.css</file>
+  </gresource>
+</gresources>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]