[recipes] Embed the app-specific icons as resources



commit 03850c20d591476d6f7045909dfeaab3c8920cd6
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Dec 16 06:58:45 2016 -0500

    Embed the app-specific icons as resources
    
    They won't get exported from a flatpak since they don't have
    the right prefix. So embed them, since that is the current
    best practice for application-specific icon theme extensions.

 data/Makefile.am                                   |   20 +++++---------------
 .../apps}/garlic-content-symbolic.symbolic.png     |  Bin 387 -> 387 bytes
 .../apps}/spicy-content-symbolic.symbolic.png      |  Bin 290 -> 290 bytes
 .../apps}/garlic-content-symbolic.symbolic.png     |  Bin 564 -> 564 bytes
 .../apps}/spicy-content-symbolic.symbolic.png      |  Bin 377 -> 377 bytes
 .../apps}/garlic-content-symbolic.symbolic.png     |  Bin 754 -> 754 bytes
 .../apps}/spicy-content-symbolic.symbolic.png      |  Bin 451 -> 451 bytes
 .../apps}/garlic-content-symbolic.symbolic.png     |  Bin 1144 -> 1144 bytes
 .../apps}/spicy-content-symbolic.symbolic.png      |  Bin 705 -> 705 bytes
 .../symbolic/apps}/garlic-content-symbolic.svg     |    0
 .../symbolic/apps}/spicy-content-symbolic.svg      |    0
 src/recipes-images.gresource.xml                   |   10 ++++++++++
 12 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 24d5cdb..6ee1e3f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -67,36 +67,26 @@ appsiconsymbolicdir = $(iconthemedir)/symbolic/apps
 
 dist_appsicon16_DATA = \
        icons/16x16/org.gnome.Recipes.png                       \
-       icons/16x16/org.gnome.Recipes-symbolic.symbolic.png     \
-       icons/16x16/garlic-content-symbolic.symbolic.png        \
-       icons/16x16/spicy-content-symbolic.symbolic.png
+       icons/16x16/org.gnome.Recipes-symbolic.symbolic.png
 
 dist_appsicon24_DATA = \
        icons/24x24/org.gnome.Recipes.png                       \
-       icons/24x24/org.gnome.Recipes-symbolic.symbolic.png     \
-       icons/24x24/garlic-content-symbolic.symbolic.png        \
-       icons/24x24/spicy-content-symbolic.symbolic.png
+       icons/24x24/org.gnome.Recipes-symbolic.symbolic.png
 
 dist_appsicon32_DATA = \
        icons/32x32/org.gnome.Recipes.png                       \
-       icons/32x32/org.gnome.Recipes-symbolic.symbolic.png     \
-       icons/32x32/garlic-content-symbolic.symbolic.png        \
-       icons/32x32/spicy-content-symbolic.symbolic.png
+       icons/32x32/org.gnome.Recipes-symbolic.symbolic.png
 
 dist_appsicon48_DATA = \
        icons/48x48/org.gnome.Recipes.png                       \
-       icons/48x48/org.gnome.Recipes-symbolic.symbolic.png     \
-       icons/48x48/garlic-content-symbolic.symbolic.png        \
-       icons/48x48/spicy-content-symbolic.symbolic.png
+       icons/48x48/org.gnome.Recipes-symbolic.symbolic.png
 
 dist_appsicon512_DATA = \
        icons/512x512/org.gnome.Recipes.png                     \
        icons/512x512/org.gnome.Recipes-symbolic.symbolic.png
 
 dist_appsiconsymbolic_DATA = \
-       icons/symbolic/org.gnome.Recipes-symbolic.svg   \
-       icons/symbolic/garlic-content-symbolic.svg      \
-       icons/symbolic/spicy-content-symbolic.svg
+       icons/symbolic/org.gnome.Recipes-symbolic.svg
 
 update_icon_cache = gtk-update-icon-cache --ignore-theme-index --force
 
diff --git a/data/icons/symbolic/garlic-content-symbolic.svg 
b/src/icons/symbolic/apps/garlic-content-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/garlic-content-symbolic.svg
rename to src/icons/symbolic/apps/garlic-content-symbolic.svg
diff --git a/data/icons/symbolic/spicy-content-symbolic.svg 
b/src/icons/symbolic/apps/spicy-content-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/spicy-content-symbolic.svg
rename to src/icons/symbolic/apps/spicy-content-symbolic.svg
diff --git a/src/recipes-images.gresource.xml b/src/recipes-images.gresource.xml
index 3512d02..bf642a7 100644
--- a/src/recipes-images.gresource.xml
+++ b/src/recipes-images.gresource.xml
@@ -14,5 +14,15 @@
     <file>big-italian.png</file>
     <file>big-mediterranean.png</file>
     <file>big-turkish.png</file>
+    <file>icons/16x16/apps/garlic-content-symbolic.symbolic.png</file>
+    <file>icons/24x24/apps/garlic-content-symbolic.symbolic.png</file>
+    <file>icons/32x32/apps/garlic-content-symbolic.symbolic.png</file>
+    <file>icons/48x48/apps/garlic-content-symbolic.symbolic.png</file>
+    <file>icons/symbolic/apps/garlic-content-symbolic.svg</file>
+    <file>icons/16x16/apps/spicy-content-symbolic.symbolic.png</file>
+    <file>icons/24x24/apps/spicy-content-symbolic.symbolic.png</file>
+    <file>icons/32x32/apps/spicy-content-symbolic.symbolic.png</file>
+    <file>icons/48x48/apps/spicy-content-symbolic.symbolic.png</file>
+    <file>icons/symbolic/apps/spicy-content-symbolic.svg</file>
   </gresource>
 </gresources>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]