[gedit] Reorganize gresources usage

From: Paolo Borelli <pborelli src gnome org>
To: commits-list gnome org
Cc:
Subject: [gedit] Reorganize gresources usage
Date: Mon, 28 Jul 2014 15:33:24 +0000 (UTC)
commit fb73ace54c2c3c5cfa20a3ed97d6fb94113a8631
Author: Paolo Borelli <pborelli gnome org>
Date:   Mon Jul 28 17:30:45 2014 +0200

    Reorganize gresources usage

 gedit/Makefile.am                                  |    2 +-
 gedit/gedit-app.c                                  |    4 +-
 gedit/gedit.gresource.xml                          |   22 --------------------
 gedit/{ => resources/css}/gedit-style.css          |    0
 gedit/{ => resources/css}/gedit.adwaita.css        |    0
 gedit/resources/gedit.gresource.xml                |   22 ++++++++++++++++++++
 gedit/{ => resources/ui}/gedit-encodings-dialog.ui |    0
 .../ui}/gedit-highlight-mode-dialog.ui             |    0
 .../ui}/gedit-highlight-mode-selector.ui           |    0
 gedit/{ => resources/ui}/gedit-menu.ui             |    0
 .../ui}/gedit-open-document-selector.ui            |    0
 .../{ => resources/ui}/gedit-preferences-dialog.ui |    0
 .../{ => resources/ui}/gedit-print-preferences.ui  |    0
 gedit/{ => resources/ui}/gedit-print-preview.ui    |    0
 .../{ => resources/ui}/gedit-progress-info-bar.ui  |    0
 gedit/{ => resources/ui}/gedit-replace-dialog.ui   |    0
 .../{ => resources/ui}/gedit-status-menu-button.ui |    0
 gedit/{ => resources/ui}/gedit-statusbar.ui        |    0
 gedit/{ => resources/ui}/gedit-tab-label.ui        |    0
 gedit/{ => resources/ui}/gedit-view-frame.ui       |    0
 gedit/{ => resources/ui}/gedit-window.ui           |    0
 plugins/docinfo/Makefile.am                        |    2 +-
 plugins/docinfo/gedit-docinfo.gresource.xml        |    6 -----
 .../docinfo/resources/gedit-docinfo.gresource.xml  |    6 +++++
 .../{ => resources/ui}/gedit-docinfo-plugin.ui     |    0
 plugins/filebrowser/Makefile.am                    |    2 +-
 .../filebrowser/gedit-file-browser.gresource.xml   |    7 ------
 .../resources/gedit-file-browser.gresource.xml     |    7 ++++++
 .../{ => resources/ui}/gedit-file-browser-menus.ui |    0
 .../ui}/gedit-file-browser-widget.ui               |    0
 plugins/sort/Makefile.am                           |    2 +-
 plugins/sort/gedit-sort.gresource.xml              |    6 -----
 plugins/sort/resources/gedit-sort.gresource.xml    |    6 +++++
 .../sort/{ => resources/ui}/gedit-sort-plugin.ui   |    0
 plugins/spell/Makefile.am                          |    2 +-
 plugins/spell/gedit-spell.gresource.xml            |    7 ------
 plugins/spell/resources/gedit-spell.gresource.xml  |    7 ++++++
 .../spell/{ => resources/ui}/languages-dialog.ui   |    0
 plugins/spell/{ => resources/ui}/spell-checker.ui  |    0
 plugins/time/Makefile.am                           |    2 +-
 plugins/time/gedit-time.gresource.xml              |    7 ------
 plugins/time/resources/gedit-time.gresource.xml    |    7 ++++++
 .../time/{ => resources/ui}/gedit-time-dialog.ui   |    0
 .../{ => resources/ui}/gedit-time-setup-dialog.ui  |    0
 44 files changed, 63 insertions(+), 63 deletions(-)
---
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index 2ac5d24..4c8a998 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -230,7 +230,7 @@ gedit/gedit-marshal.c: gedit/gedit-marshal.list $(GLIB_GENMARSHAL)
        $(AM_V_GEN) echo "#include \"gedit-marshal.h\"" > $@ && \
        $(GLIB_GENMARSHAL) $< --body --prefix=gedit_marshal >> $@
 
-gedit_resource_deps = $(call GRESDEPS,gedit/gedit.gresource.xml)
+gedit_resource_deps = $(call GRESDEPS,gedit/resources/gedit.gresource.xml)
 gedit/gedit-resources.c: $(gedit_resource_deps)
        $(GRESGEN)
 
diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c
index 1e3c45c..ef43d5a 100644
--- a/gedit/gedit-app.c
+++ b/gedit/gedit-app.c
@@ -460,7 +460,7 @@ theme_changed (GtkSettings *settings,
                                GFile *file;
 
                                provider = gtk_css_provider_new ();
-                               file = g_file_new_for_uri 
("resource:///org/gnome/gedit/ui/gedit.adwaita.css");
+                               file = g_file_new_for_uri 
("resource:///org/gnome/gedit/css/gedit.adwaita.css");
                                gtk_css_provider_load_from_file (provider, file, NULL);
                                g_object_unref (file);
                        }
@@ -641,7 +641,7 @@ gedit_app_startup (GApplication *application)
 
        /* Load custom css */
        error = NULL;
-       css_file = g_file_new_for_uri ("resource:///org/gnome/gedit/ui/gedit-style.css");
+       css_file = g_file_new_for_uri ("resource:///org/gnome/gedit/css/gedit-style.css");
        provider = gtk_css_provider_new ();
        if (gtk_css_provider_load_from_file (provider, css_file, &error))
        {
diff --git a/gedit/gedit-style.css b/gedit/resources/css/gedit-style.css
similarity index 100%
rename from gedit/gedit-style.css
rename to gedit/resources/css/gedit-style.css
diff --git a/gedit/gedit.adwaita.css b/gedit/resources/css/gedit.adwaita.css
similarity index 100%
rename from gedit/gedit.adwaita.css
rename to gedit/resources/css/gedit.adwaita.css
diff --git a/gedit/resources/gedit.gresource.xml b/gedit/resources/gedit.gresource.xml
new file mode 100644
index 0000000..83c2806
--- /dev/null
+++ b/gedit/resources/gedit.gresource.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/gedit">
+    <file preprocess="xml-stripblanks">ui/gedit-menu.ui</file>
+    <file preprocess="xml-stripblanks">ui/gedit-encodings-dialog.ui</file>
+    <file preprocess="xml-stripblanks">ui/gedit-preferences-dialog.ui</file>
+    <file preprocess="xml-stripblanks">ui/gedit-replace-dialog.ui</file>
+    <file preprocess="xml-stripblanks">ui/gedit-print-preview.ui</file>
+    <file preprocess="xml-stripblanks">ui/gedit-print-preferences.ui</file>
+    <file preprocess="xml-stripblanks">ui/gedit-progress-info-bar.ui</file>
+    <file preprocess="xml-stripblanks">ui/gedit-status-menu-button.ui</file>
+    <file preprocess="xml-stripblanks">ui/gedit-tab-label.ui</file>
+    <file preprocess="xml-stripblanks">ui/gedit-view-frame.ui</file>
+    <file preprocess="xml-stripblanks">ui/gedit-highlight-mode-dialog.ui</file>
+    <file preprocess="xml-stripblanks">ui/gedit-highlight-mode-selector.ui</file>
+    <file preprocess="xml-stripblanks">ui/gedit-window.ui</file>
+    <file preprocess="xml-stripblanks">ui/gedit-open-document-selector.ui</file>
+    <file preprocess="xml-stripblanks">ui/gedit-statusbar.ui</file>
+    <file>css/gedit-style.css</file>
+    <file>css/gedit.adwaita.css</file>
+  </gresource>
+</gresources>
diff --git a/gedit/gedit-encodings-dialog.ui b/gedit/resources/ui/gedit-encodings-dialog.ui
similarity index 100%
rename from gedit/gedit-encodings-dialog.ui
rename to gedit/resources/ui/gedit-encodings-dialog.ui
diff --git a/gedit/gedit-highlight-mode-dialog.ui b/gedit/resources/ui/gedit-highlight-mode-dialog.ui
similarity index 100%
rename from gedit/gedit-highlight-mode-dialog.ui
rename to gedit/resources/ui/gedit-highlight-mode-dialog.ui
diff --git a/gedit/gedit-highlight-mode-selector.ui b/gedit/resources/ui/gedit-highlight-mode-selector.ui
similarity index 100%
rename from gedit/gedit-highlight-mode-selector.ui
rename to gedit/resources/ui/gedit-highlight-mode-selector.ui
diff --git a/gedit/gedit-menu.ui b/gedit/resources/ui/gedit-menu.ui
similarity index 100%
rename from gedit/gedit-menu.ui
rename to gedit/resources/ui/gedit-menu.ui
diff --git a/gedit/gedit-open-document-selector.ui b/gedit/resources/ui/gedit-open-document-selector.ui
similarity index 100%
rename from gedit/gedit-open-document-selector.ui
rename to gedit/resources/ui/gedit-open-document-selector.ui
diff --git a/gedit/gedit-preferences-dialog.ui b/gedit/resources/ui/gedit-preferences-dialog.ui
similarity index 100%
rename from gedit/gedit-preferences-dialog.ui
rename to gedit/resources/ui/gedit-preferences-dialog.ui
diff --git a/gedit/gedit-print-preferences.ui b/gedit/resources/ui/gedit-print-preferences.ui
similarity index 100%
rename from gedit/gedit-print-preferences.ui
rename to gedit/resources/ui/gedit-print-preferences.ui
diff --git a/gedit/gedit-print-preview.ui b/gedit/resources/ui/gedit-print-preview.ui
similarity index 100%
rename from gedit/gedit-print-preview.ui
rename to gedit/resources/ui/gedit-print-preview.ui
diff --git a/gedit/gedit-progress-info-bar.ui b/gedit/resources/ui/gedit-progress-info-bar.ui
similarity index 100%
rename from gedit/gedit-progress-info-bar.ui
rename to gedit/resources/ui/gedit-progress-info-bar.ui
diff --git a/gedit/gedit-replace-dialog.ui b/gedit/resources/ui/gedit-replace-dialog.ui
similarity index 100%
rename from gedit/gedit-replace-dialog.ui
rename to gedit/resources/ui/gedit-replace-dialog.ui
diff --git a/gedit/gedit-status-menu-button.ui b/gedit/resources/ui/gedit-status-menu-button.ui
similarity index 100%
rename from gedit/gedit-status-menu-button.ui
rename to gedit/resources/ui/gedit-status-menu-button.ui
diff --git a/gedit/gedit-statusbar.ui b/gedit/resources/ui/gedit-statusbar.ui
similarity index 100%
rename from gedit/gedit-statusbar.ui
rename to gedit/resources/ui/gedit-statusbar.ui
diff --git a/gedit/gedit-tab-label.ui b/gedit/resources/ui/gedit-tab-label.ui
similarity index 100%
rename from gedit/gedit-tab-label.ui
rename to gedit/resources/ui/gedit-tab-label.ui
diff --git a/gedit/gedit-view-frame.ui b/gedit/resources/ui/gedit-view-frame.ui
similarity index 100%
rename from gedit/gedit-view-frame.ui
rename to gedit/resources/ui/gedit-view-frame.ui
diff --git a/gedit/gedit-window.ui b/gedit/resources/ui/gedit-window.ui
similarity index 100%
rename from gedit/gedit-window.ui
rename to gedit/resources/ui/gedit-window.ui
diff --git a/plugins/docinfo/Makefile.am b/plugins/docinfo/Makefile.am
index f704fc2..a45d114 100644
--- a/plugins/docinfo/Makefile.am
+++ b/plugins/docinfo/Makefile.am
@@ -15,7 +15,7 @@ plugins_docinfo_libdocinfo_la_CFLAGS   =              \
        $(WARN_CFLAGS)                                  \
        $(DISABLE_DEPRECATED_CFLAGS)
 
-docinfo_resources_deps = $(call GRESDEPS,plugins/docinfo/gedit-docinfo.gresource.xml)
+docinfo_resources_deps = $(call GRESDEPS,plugins/docinfo/resources/gedit-docinfo.gresource.xml)
 plugins/docinfo/gedit-docinfo-resources.c: $(docinfo_resources_deps)
        $(GRESGEN)
 
diff --git a/plugins/docinfo/resources/gedit-docinfo.gresource.xml 
b/plugins/docinfo/resources/gedit-docinfo.gresource.xml
new file mode 100644
index 0000000..9d61659
--- /dev/null
+++ b/plugins/docinfo/resources/gedit-docinfo.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/gedit/plugins/docinfo">
+    <file preprocess="xml-stripblanks">ui/gedit-docinfo-plugin.ui</file>
+  </gresource>
+</gresources>
diff --git a/plugins/docinfo/gedit-docinfo-plugin.ui b/plugins/docinfo/resources/ui/gedit-docinfo-plugin.ui
similarity index 100%
rename from plugins/docinfo/gedit-docinfo-plugin.ui
rename to plugins/docinfo/resources/ui/gedit-docinfo-plugin.ui
diff --git a/plugins/filebrowser/Makefile.am b/plugins/filebrowser/Makefile.am
index 578f3eb..d4d4fc1 100644
--- a/plugins/filebrowser/Makefile.am
+++ b/plugins/filebrowser/Makefile.am
@@ -70,7 +70,7 @@ plugins_filebrowser_libfilebrowser_la_SOURCES =                       \
 
 plugin_in_files += plugins/filebrowser/filebrowser.plugin.desktop.in
 
-filebrowser_resources_deps = $(call GRESDEPS,plugins/filebrowser/gedit-file-browser.gresource.xml)
+filebrowser_resources_deps = $(call GRESDEPS,plugins/filebrowser/resources/gedit-file-browser.gresource.xml)
 plugins/filebrowser/gedit-file-browser-resources.c: $(filebrowser_resources_deps)
        $(GRESGEN)
 
diff --git a/plugins/filebrowser/resources/gedit-file-browser.gresource.xml 
b/plugins/filebrowser/resources/gedit-file-browser.gresource.xml
new file mode 100644
index 0000000..273bd26
--- /dev/null
+++ b/plugins/filebrowser/resources/gedit-file-browser.gresource.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/gedit/plugins/file-browser">
+    <file preprocess="xml-stripblanks">ui/gedit-file-browser-menus.ui</file>
+    <file preprocess="xml-stripblanks">ui/gedit-file-browser-widget.ui</file>
+  </gresource>
+</gresources>
diff --git a/plugins/filebrowser/gedit-file-browser-menus.ui 
b/plugins/filebrowser/resources/ui/gedit-file-browser-menus.ui
similarity index 100%
rename from plugins/filebrowser/gedit-file-browser-menus.ui
rename to plugins/filebrowser/resources/ui/gedit-file-browser-menus.ui
diff --git a/plugins/filebrowser/gedit-file-browser-widget.ui 
b/plugins/filebrowser/resources/ui/gedit-file-browser-widget.ui
similarity index 100%
rename from plugins/filebrowser/gedit-file-browser-widget.ui
rename to plugins/filebrowser/resources/ui/gedit-file-browser-widget.ui
diff --git a/plugins/sort/Makefile.am b/plugins/sort/Makefile.am
index ddc6bde..b55ca44 100644
--- a/plugins/sort/Makefile.am
+++ b/plugins/sort/Makefile.am
@@ -10,7 +10,7 @@ plugins_sort_libsort_la_CFLAGS =                      \
        $(WARN_CFLAGS)                                  \
        $(DISABLE_DEPRECATED_CFLAGS)
 
-sort_resource_deps = $(call GRESDEPS,plugins/sort/gedit-sort.gresource.xml)
+sort_resource_deps = $(call GRESDEPS,plugins/sort/resources/gedit-sort.gresource.xml)
 plugins/sort/gedit-sort-resources.c: $(sort_resource_deps)
        $(GRESGEN)
 
diff --git a/plugins/sort/resources/gedit-sort.gresource.xml b/plugins/sort/resources/gedit-sort.gresource.xml
new file mode 100644
index 0000000..3855c8f
--- /dev/null
+++ b/plugins/sort/resources/gedit-sort.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/gedit/plugins/sort">
+    <file preprocess="xml-stripblanks">ui/gedit-sort-plugin.ui</file>
+  </gresource>
+</gresources>
diff --git a/plugins/sort/gedit-sort-plugin.ui b/plugins/sort/resources/ui/gedit-sort-plugin.ui
similarity index 100%
rename from plugins/sort/gedit-sort-plugin.ui
rename to plugins/sort/resources/ui/gedit-sort-plugin.ui
diff --git a/plugins/spell/Makefile.am b/plugins/spell/Makefile.am
index a9c910b..ce710ce 100644
--- a/plugins/spell/Makefile.am
+++ b/plugins/spell/Makefile.am
@@ -66,7 +66,7 @@ plugins/spell/gedit-spell-marshal.c: plugins/spell/gedit-spell-marshal.list $(GL
        $(AM_V_GEN) echo "#include \"gedit-spell-marshal.h\"" > $@ && \
        $(GLIB_GENMARSHAL) $< --body --prefix=gedit_marshal >> $@
 
-spell_resource_deps = $(call GRESDEPS,plugins/spell/gedit-spell.gresource.xml)
+spell_resource_deps = $(call GRESDEPS,plugins/spell/resources/gedit-spell.gresource.xml)
 plugins/spell/gedit-spell-resources.c: $(spell_resource_deps)
        $(GRESGEN)
 
diff --git a/plugins/spell/resources/gedit-spell.gresource.xml 
b/plugins/spell/resources/gedit-spell.gresource.xml
new file mode 100644
index 0000000..ba4fd29
--- /dev/null
+++ b/plugins/spell/resources/gedit-spell.gresource.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/gedit/plugins/spell">
+    <file preprocess="xml-stripblanks">ui/spell-checker.ui</file>
+    <file preprocess="xml-stripblanks">ui/languages-dialog.ui</file>
+  </gresource>
+</gresources>
diff --git a/plugins/spell/languages-dialog.ui b/plugins/spell/resources/ui/languages-dialog.ui
similarity index 100%
rename from plugins/spell/languages-dialog.ui
rename to plugins/spell/resources/ui/languages-dialog.ui
diff --git a/plugins/spell/spell-checker.ui b/plugins/spell/resources/ui/spell-checker.ui
similarity index 100%
rename from plugins/spell/spell-checker.ui
rename to plugins/spell/resources/ui/spell-checker.ui
diff --git a/plugins/time/Makefile.am b/plugins/time/Makefile.am
index 65b4cf2..b908a4f 100644
--- a/plugins/time/Makefile.am
+++ b/plugins/time/Makefile.am
@@ -10,7 +10,7 @@ plugins_time_libtime_la_CFLAGS =                      \
        $(WARN_CFLAGS)                                  \
        $(DISABLE_DEPRECATED_CFLAGS)
 
-time_resource_deps = $(call GRESDEPS,plugins/time/gedit-time.gresource.xml)
+time_resource_deps = $(call GRESDEPS,plugins/time/resources/gedit-time.gresource.xml)
 plugins/time/gedit-time-resources.c: $(time_resource_deps)
        $(GRESGEN)
 
diff --git a/plugins/time/resources/gedit-time.gresource.xml b/plugins/time/resources/gedit-time.gresource.xml
new file mode 100644
index 0000000..c7cf490
--- /dev/null
+++ b/plugins/time/resources/gedit-time.gresource.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/gedit/plugins/time">
+    <file preprocess="xml-stripblanks">ui/gedit-time-dialog.ui</file>
+    <file preprocess="xml-stripblanks">ui/gedit-time-setup-dialog.ui</file>
+  </gresource>
+</gresources>
diff --git a/plugins/time/gedit-time-dialog.ui b/plugins/time/resources/ui/gedit-time-dialog.ui
similarity index 100%
rename from plugins/time/gedit-time-dialog.ui
rename to plugins/time/resources/ui/gedit-time-dialog.ui
diff --git a/plugins/time/gedit-time-setup-dialog.ui b/plugins/time/resources/ui/gedit-time-setup-dialog.ui
similarity index 100%
rename from plugins/time/gedit-time-setup-dialog.ui
rename to plugins/time/resources/ui/gedit-time-setup-dialog.ui
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]