[adwaita-icon-theme] make spinners scalable up till 32
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [adwaita-icon-theme] make spinners scalable up till 32
- Date: Mon, 23 Jun 2014 21:36:31 +0000 (UTC)
commit d15c9c68e07197c4cdb5fbaa8197a2712c40b71c
Author: Jakub Steiner <jimmac gmail com>
Date: Mon Jun 23 20:32:25 2014 +0200
make spinners scalable up till 32
- introduce a new size
.../status/process-working-symbolic.svg | 0
Makefile.am | 8 +++-
configure.ac | 1 +
src/Makefile.am | 2 +-
src/spinner/Makefile.am | 49 ++++++++++++++++++++
5 files changed, 58 insertions(+), 2 deletions(-)
---
diff --git a/Adwaita/scalable/status/process-working-symbolic.svg
b/Adwaita/scalable-up-to-32/status/process-working-symbolic.svg
similarity index 100%
rename from Adwaita/scalable/status/process-working-symbolic.svg
rename to Adwaita/scalable-up-to-32/status/process-working-symbolic.svg
diff --git a/Makefile.am b/Makefile.am
index b1333e9..fc7a8b5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ cursor_DATA = $(wildcard $(srcdir)/Adwaita/cursors/*)
theme_in_files = index.theme.in.in
theme_DATA = $(theme_in_files:.theme.in.in=.theme)
-THEME_DIRS=$(shell SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `find
$(srcdir)/$(SVGOUTDIR)/$$size/* -type d`; do printf "$$dir,"; done; done; echo
"scalable/actions,scalable/apps,scalable/categories,scalable/devices,scalable/emblems,scalable/emotes,scalable/mimetypes,scalable/places,scalable/status")
+THEME_DIRS=$(shell SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `find
$(srcdir)/$(SVGOUTDIR)/$$size/* -type d`; do printf "$$dir,"; done; done; echo
"scalable/actions,scalable/apps,scalable/categories,scalable/devices,scalable/emblems,scalable/emotes,scalable/mimetypes,scalable/places,scalable/status,
scalable-up-to-32/status")
%.theme.in: %.theme.in.in $(SVGOUTDIR) Makefile
dirs="`echo $(THEME_DIRS) | sed -e 's#$(srcdir)/Adwaita/##g'`"; \
@@ -19,6 +19,8 @@ THEME_DIRS=$(shell SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `
sizefull="`dirname $$dir`"; \
if test "$$sizefull" = "scalable"; then \
size="16"; \
+ elif test "$$sizefull" = "scalable-up-to-32"; then \
+ size="16"; \
else \
size="`echo $$sizefull | sed -e 's/x.*$$//g'`"; \
fi; \
@@ -65,7 +67,11 @@ THEME_DIRS=$(shell SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `
elif test "$$size" = "256"; then \
echo "MinSize=56" >> $@; \
echo "MaxSize=512" >> $@; \
+ elif test "$$size" = "scalable-up-to-32"; then \
+ echo "MinSize=8" >> $@; \
+ echo "MaxSize=32" >> $@; \
echo "Type=Scalable" >> $@; \
+ echo "Type=Scalable" >> $@; \
else \
echo "Type=Fixed" >> $@; \
fi; \
diff --git a/configure.ac b/configure.ac
index 13547d6..861020c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,7 @@ po/Makefile.in
src/Makefile
src/fullcolor/Makefile
src/symbolic/Makefile
+src/spinner/Makefile
])
AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 1a59418..60e5ffa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = fullcolor symbolic
+SUBDIRS = fullcolor symbolic spinner
-include $(top_srcdir)/git.mk
diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am
new file mode 100644
index 0000000..86cd85f
--- /dev/null
+++ b/src/spinner/Makefile.am
@@ -0,0 +1,49 @@
+
+icon_in_files = $(shell SRCDIR="$(srcdir)"; for i in `find $$SRCDIR -name "*.svg"`; do printf "$$i "; done)
+
+if ALLOW_RENDERING
+render-png: $(icon_in_files) Makefile
+ for file in $(icon_in_files); do \
+ size='scalable-up-to-32'
+ $(ICONTOOL_RENDER) -s $$size -o $(top_builddir)/$(SVGOUTDIR) $$file >/dev/null;
+ done
+
+else
+render-png: $(icon_in_files) Makefile
+
+endif
+
+$(symbolic_render_sizes): Makefile
+
+render: render-png
+
+all-local: render
+
+install-data-local:
+ size='scalable-up-to-32'
+ for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \
+ context="`dirname $$file`"; \
+ $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file
$(DESTDIR)$(themedir)/$$size/$$file; \
+ done; \
+ for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \
+ context="`dirname $$file`"; \
+ $(mkdir_p) $(DESTDIR)$(themedir)/scalable-up-to-32/$$context; \
+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file
$(DESTDIR)$(themedir)/scalable-up-to-32/$$file; \
+ done
+
+uninstall-local:
+ size='scalable-up-to-32'
+ for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \
+ rm -f $(DESTDIR)$(themedir)/$$size/$$file;
+
+EXTRA_DIST = \
+ $(icon_in_files)
+
+
+MAINTAINERCLEANFILES = \
+ *~ \
+ Makefile.in \
+ $(icon_cache)
+
+-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]