[recipes] Stop including cuisine pictures are resources



commit 58520195ede0099a58b8bb9a2849ee32ec8410fe
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Feb 16 20:08:20 2017 -0500

    Stop including cuisine pictures are resources
    
    This unnecessarily bloats the binary.

 data/Makefile.am                           |   17 ++++++++++++-
 {src => data/images}/american.png          |  Bin 308426 -> 308426 bytes
 {src => data/images}/big-american.png      |  Bin 575726 -> 575726 bytes
 {src => data/images}/big-chinese.png       |  Bin 606235 -> 606235 bytes
 {src => data/images}/big-french.jpg        |  Bin 805774 -> 805774 bytes
 {src => data/images}/big-indian.jpg        |  Bin 546273 -> 546273 bytes
 {src => data/images}/big-italian.png       |  Bin 698885 -> 698885 bytes
 {src => data/images}/big-mediterranean.png |  Bin 785687 -> 785687 bytes
 {src => data/images}/big-turkish.png       |  Bin 665958 -> 665958 bytes
 {src => data/images}/chinese.png           |  Bin 665835 -> 665835 bytes
 {src => data/images}/french.jpg            |  Bin 443733 -> 443733 bytes
 {src => data/images}/indian.jpg            |  Bin 250565 -> 250565 bytes
 {src => data/images}/italian.png           |  Bin 640323 -> 640323 bytes
 {src => data/images}/mediterranean.png     |  Bin 404005 -> 404005 bytes
 {src => data/images}/turkish.png           |  Bin 569719 -> 569719 bytes
 src/Makefile.am                            |    3 ++
 src/{cuisine.css => cuisine.css.in}        |   36 ++++++++++++++--------------
 17 files changed, 37 insertions(+), 19 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 6a5a9e3..6ea1be2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -138,7 +138,22 @@ dist_images_DATA = \
        images/whitefish1.jpg           \
        images/whitefish2.jpg           \
        images/whitefish3.jpg           \
-       images/whitefish4.jpg
+       images/whitefish4.jpg           \
+       images/american.png             \
+       images/chinese.png              \
+       images/french.jpg               \
+       images/indian.jpg               \
+       images/italian.png              \
+       images/mediterranean.png        \
+       images/turkish.png              \
+       images/big-american.png         \
+       images/big-chinese.png          \
+       images/big-french.jpg           \
+       images/big-indian.jpg           \
+       images/big-italian.png          \
+       images/big-mediterranean.png    \
+       images/big-turkish.png
+
 
 dist_pkgdata_DATA = \
        chefs.db        \
diff --git a/src/Makefile.am b/src/Makefile.am
index 025502a..486449c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -201,6 +201,9 @@ gr-shell-search-provider-dbus.h gr-shell-search-provider-dbus.c: Makefile.am $(s
 searchproviderdir = $(datadir)/gnome-shell/search-providers
 dist_searchprovider_DATA = org.gnome.Recipes-search-provider.ini
 
+cuisine.css: cuisine.css.in
+       $(AM_V_GEN) sed -e "s|\@pkgdatadir\@|$(pkgdatadir)|" $< > $@
+
 EXTRA_DIST = \
        shell-search-provider-dbus-interfaces.xml       \
        recipes-ui.gresource.xml                        \
diff --git a/src/cuisine.css b/src/cuisine.css.in
similarity index 60%
rename from src/cuisine.css
rename to src/cuisine.css.in
index 847b1b9..51059b7 100644
--- a/src/cuisine.css
+++ b/src/cuisine.css.in
@@ -33,49 +33,49 @@ label.cuisine.mediterranean {
 
 .cuisine.view.tile.american {
   background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.8)),
-              url('resource:/org/gnome/Recipes/american.png');
+              url('file://@pkgdatadir@/images/american.png');
 }
 
 .cuisine.view.tile.chinese {
   background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.8)),
-              url('resource:/org/gnome/Recipes/chinese.png');
+              url('file://@pkgdatadir@/images/chinese.png');
 }
 .cuisine.view.tile.indian {
   background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.8)),
-  url('resource:/org/gnome/Recipes/indian.jpg');
+  url('file://@pkgdatadir@/images/indian.jpg');
 }
 .cuisine.view.tile.italian {
   background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.8)),
-              url('resource:/org/gnome/Recipes/italian.png');
+              url('file://@pkgdatadir@/images/italian.png');
 }
 .cuisine.view.tile.french {
   background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.8)),
-              url('resource:/org/gnome/Recipes/french.jpg');
+              url('file://@pkgdatadir@/images/french.jpg');
 }
 .cuisine.view.tile.greek {
   background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.8)),
-              url('resource:/org/gnome/Recipes/greek.png');
+              url('file://@pkgdatadir@/images/greek.png');
 }
 .cuisine.view.tile.mexican {
   background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.8)),
-              url('resource:/org/gnome/Recipes/mexican.png');
+              url('file://@pkgdatadir@/images/mexican.png');
 }
 .cuisine.view.tile.mediterranean {
   background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.8)),
-              url('resource:/org/gnome/Recipes/mediterranean.png');
+              url('file://@pkgdatadir@/images/mediterranean.png');
 }
 .cuisine.view.tile.turkish {
   background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.8)),
-              url('resource:/org/gnome/Recipes/turkish.png');
+              url('file://@pkgdatadir@/images/turkish.png');
 }
 
-.cuisine.big.view.tile.american { background: linear-gradient(to bottom, transparent, 
rgba(0,0,0,0.5)),url('resource:/org/gnome/Recipes/big-american.png'); }
-.cuisine.big.view.tile.chinese { background: linear-gradient(to bottom, transparent, 
rgba(0,0,0,0.5)),url('resource:/org/gnome/Recipes/big-chinese.png'); }
-.cuisine.big.view.tile.indian { background: linear-gradient(to bottom, transparent, 
rgba(0,0,0,0.5)),url('resource:/org/gnome/Recipes/big-indian.jpg'); }
-.cuisine.big.view.tile.italian { background: linear-gradient(to bottom, transparent, 
rgba(0,0,0,0.5)),url('resource:/org/gnome/Recipes/big-italian.png'); }
-.cuisine.big.view.tile.french { background: linear-gradient(to bottom, transparent, 
rgba(0,0,0,0.5)),url('resource:/org/gnome/Recipes/big-french.jpg'); }
-.cuisine.big.view.tile.greek { background: linear-gradient(to bottom, transparent, 
rgba(0,0,0,0.5)),url('resource:/org/gnome/Recipes/big-greek.png'); }
-.cuisine.big.view.tile.mexican { background: linear-gradient(to bottom, transparent, 
rgba(0,0,0,0.5)),url('resource:/org/gnome/Recipes/big-mexican.png'); }
-.cuisine.big.view.tile.mediterranean { background: linear-gradient(to bottom, transparent, 
rgba(0,0,0,0.5)),url('resource:/org/gnome/Recipes/big-mediterranean.png'); }
-.cuisine.big.view.tile.turkish { background: linear-gradient(to bottom, transparent, 
rgba(0,0,0,0.5)),url('resource:/org/gnome/Recipes/big-turkish.png'); }
+.cuisine.big.view.tile.american { background: linear-gradient(to bottom, transparent, 
rgba(0,0,0,0.5)),url('file://@pkgdatadir@/images/big-american.png'); }
+.cuisine.big.view.tile.chinese { background: linear-gradient(to bottom, transparent, 
rgba(0,0,0,0.5)),url('file://@pkgdatadir@/images/big-chinese.png'); }
+.cuisine.big.view.tile.indian { background: linear-gradient(to bottom, transparent, 
rgba(0,0,0,0.5)),url('file://@pkgdatadir@/images/big-indian.jpg'); }
+.cuisine.big.view.tile.italian { background: linear-gradient(to bottom, transparent, 
rgba(0,0,0,0.5)),url('file://@pkgdatadir@/images/big-italian.png'); }
+.cuisine.big.view.tile.french { background: linear-gradient(to bottom, transparent, 
rgba(0,0,0,0.5)),url('file://@pkgdatadir@/images/big-french.jpg'); }
+.cuisine.big.view.tile.greek { background: linear-gradient(to bottom, transparent, 
rgba(0,0,0,0.5)),url('file://@pkgdatadir@/images/big-greek.png'); }
+.cuisine.big.view.tile.mexican { background: linear-gradient(to bottom, transparent, 
rgba(0,0,0,0.5)),url('file://@pkgdatadir@/images/big-mexican.png'); }
+.cuisine.big.view.tile.mediterranean { background: linear-gradient(to bottom, transparent, 
rgba(0,0,0,0.5)),url('file://@pkgdatadir@/images/big-mediterranean.png'); }
+.cuisine.big.view.tile.turkish { background: linear-gradient(to bottom, transparent, 
rgba(0,0,0,0.5)),url('file://@pkgdatadir@/images/big-turkish.png'); }
 


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