From 8d12f0a2bfe3369ae2932811e4c7035543da8e05 Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Fri, 19 Oct 2018 09:01:21 +0200 Subject: retire fullcolor action icons - step1 -- move to legacy context See Issue #15 for more context --- Adwaita/16x16/actions/application-exit.png | Bin 659 -> 0 bytes Adwaita/16x16/legacy/application-exit.png | Bin 0 -> 673 bytes Adwaita/22x22/actions/application-exit.png | Bin 942 -> 0 bytes Adwaita/22x22/legacy/application-exit.png | Bin 0 -> 960 bytes Adwaita/24x24/actions/application-exit.png | Bin 972 -> 0 bytes Adwaita/24x24/legacy/application-exit.png | Bin 0 -> 977 bytes Adwaita/32x32/actions/application-exit.png | Bin 1526 -> 0 bytes Adwaita/32x32/legacy/application-exit.png | Bin 0 -> 1512 bytes Adwaita/48x48/actions/application-exit.png | Bin 2429 -> 0 bytes Adwaita/48x48/legacy/application-exit.png | Bin 0 -> 2434 bytes Makefile.am | 5 ++- render-icon-theme.py | 3 +- src/fullcolor/application-exit.svg | 49 +++++++++++++++-------------- 13 files changed, 31 insertions(+), 26 deletions(-) delete mode 100644 Adwaita/16x16/actions/application-exit.png create mode 100644 Adwaita/16x16/legacy/application-exit.png delete mode 100644 Adwaita/22x22/actions/application-exit.png create mode 100644 Adwaita/22x22/legacy/application-exit.png delete mode 100644 Adwaita/24x24/actions/application-exit.png create mode 100644 Adwaita/24x24/legacy/application-exit.png delete mode 100644 Adwaita/32x32/actions/application-exit.png create mode 100644 Adwaita/32x32/legacy/application-exit.png delete mode 100644 Adwaita/48x48/actions/application-exit.png create mode 100644 Adwaita/48x48/legacy/application-exit.png diff --git a/Adwaita/16x16/actions/application-exit.png b/Adwaita/16x16/actions/application-exit.png deleted file mode 100644 index facee22f6..000000000 Binary files a/Adwaita/16x16/actions/application-exit.png and /dev/null differ diff --git a/Adwaita/16x16/legacy/application-exit.png b/Adwaita/16x16/legacy/application-exit.png new file mode 100644 index 000000000..2b74d446b Binary files /dev/null and b/Adwaita/16x16/legacy/application-exit.png differ diff --git a/Adwaita/22x22/actions/application-exit.png b/Adwaita/22x22/actions/application-exit.png deleted file mode 100644 index bef7f76f4..000000000 Binary files a/Adwaita/22x22/actions/application-exit.png and /dev/null differ diff --git a/Adwaita/22x22/legacy/application-exit.png b/Adwaita/22x22/legacy/application-exit.png new file mode 100644 index 000000000..90e5c3747 Binary files /dev/null and b/Adwaita/22x22/legacy/application-exit.png differ diff --git a/Adwaita/24x24/actions/application-exit.png b/Adwaita/24x24/actions/application-exit.png deleted file mode 100644 index b6c494144..000000000 Binary files a/Adwaita/24x24/actions/application-exit.png and /dev/null differ diff --git a/Adwaita/24x24/legacy/application-exit.png b/Adwaita/24x24/legacy/application-exit.png new file mode 100644 index 000000000..c6b5bd5e2 Binary files /dev/null and b/Adwaita/24x24/legacy/application-exit.png differ diff --git a/Adwaita/32x32/actions/application-exit.png b/Adwaita/32x32/actions/application-exit.png deleted file mode 100644 index 9512d7e1f..000000000 Binary files a/Adwaita/32x32/actions/application-exit.png and /dev/null differ diff --git a/Adwaita/32x32/legacy/application-exit.png b/Adwaita/32x32/legacy/application-exit.png new file mode 100644 index 000000000..7aa0e150e Binary files /dev/null and b/Adwaita/32x32/legacy/application-exit.png differ diff --git a/Adwaita/48x48/actions/application-exit.png b/Adwaita/48x48/actions/application-exit.png deleted file mode 100644 index dd6a47361..000000000 Binary files a/Adwaita/48x48/actions/application-exit.png and /dev/null differ diff --git a/Adwaita/48x48/legacy/application-exit.png b/Adwaita/48x48/legacy/application-exit.png new file mode 100644 index 000000000..a97876c90 Binary files /dev/null and b/Adwaita/48x48/legacy/application-exit.png differ diff --git a/Makefile.am b/Makefile.am index 73f4482ce..103f6d0fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,7 @@ endif theme_in_files = index.theme.in theme_DATA = $(theme_in_files:.theme.in=.theme) -THEME_DIRS=$(shell SIZES="$(install_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_DIRS=$(shell SIZES="$(install_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/legacy,scalable-up-to-32/status,") %.theme: %.theme.in $(SVGOUTDIR) Makefile dirs="`echo $(THEME_DIRS) | sed -e 's#$(srcdir)/Adwaita/##g'`"; \ @@ -78,6 +78,9 @@ THEME_DIRS=$(shell SIZES="$(install_sizes)"; for size in $$SIZES; do for dir in if test "$$context" = "status"; then \ echo "Context=Status" >> $@; \ fi; \ + if test "$$context" = "legacy"; then \ + echo "Context=Legacy" >> $@; \ + fi; \ echo "Size=$$size" >> $@; \ if test "$$sizefull" = "scalable"; then \ echo "MinSize=8" >> $@; \ diff --git a/render-icon-theme.py b/render-icon-theme.py index 5badaeba6..1fcf949ae 100755 --- a/render-icon-theme.py +++ b/render-icon-theme.py @@ -5,7 +5,6 @@ import sys import xml.sax import subprocess -INKSCAPE = '/usr/bin/inkscape' OPTIPNG = '/usr/bin/optipng' ZOPFLIPNG = '/usr/bin/zopflipng' SRC = os.path.join('.', 'src', 'fullcolor') @@ -36,7 +35,7 @@ def wait_for_prompt(process, command=None): output = output[1:] def start_inkscape(): - process = subprocess.Popen([INKSCAPE, '--shell'], bufsize=0, stdin=subprocess.PIPE, stdout=subprocess.PIPE) + process = subprocess.Popen(['flatpak','run','org.inkscape.Inkscape','--shell'], bufsize=0, stdin=subprocess.PIPE, stdout=subprocess.PIPE) wait_for_prompt(process) return process diff --git a/src/fullcolor/application-exit.svg b/src/fullcolor/application-exit.svg index b8752c3b5..d97c1c9f7 100644 --- a/src/fullcolor/application-exit.svg +++ b/src/fullcolor/application-exit.svg @@ -16,7 +16,7 @@ inkscape:export-xdpi="90.000000" inkscape:export-ydpi="90.000000" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:version="0.47pre4 r22446" + inkscape:version="0.92.2 2405546, 2018-03-11" sodipodi:docname="application-exit.svg" sodipodi:version="0.32" style="display:inline;enable-background:new" @@ -30,7 +30,7 @@ image/svg+xml - + @@ -42,9 +42,9 @@ guidetolerance="13" height="300px" id="base" - inkscape:current-layer="layer2" - inkscape:cx="325.39293" - inkscape:cy="221.53894" + inkscape:current-layer="layer6" + inkscape:cx="110.89293" + inkscape:cy="213.53894" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:pageopacity="0.0" @@ -52,24 +52,26 @@ inkscape:showpageshadow="false" inkscape:snap-bbox="true" inkscape:snap-nodes="false" - inkscape:window-height="879" - inkscape:window-width="1440" - inkscape:window-x="0" - inkscape:window-y="25" + inkscape:window-height="1403" + inkscape:window-width="2560" + inkscape:window-x="3440" + inkscape:window-y="0" inkscape:zoom="1" objecttolerance="7" pagecolor="#ffffff" showgrid="false" stroke="#ef2929" width="400px" - inkscape:window-maximized="0"> + inkscape:window-maximized="1"> + visible="true" + originx="0" + originy="0" /> @@ -529,7 +531,7 @@ height="48" id="rect6284" inkscape:label="48x48" - style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="display:inline;overflow:visible;visibility:visible;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" width="48" x="296" y="50" /> @@ -537,7 +539,7 @@ height="32" id="rect6592" inkscape:label="32x32" - style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="display:inline;overflow:visible;visibility:visible;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" width="32" x="303" y="126" /> @@ -545,7 +547,7 @@ height="22" id="rect6749" inkscape:label="22x22" - style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="display:inline;overflow:visible;visibility:visible;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" width="22" x="303" y="177" /> @@ -553,7 +555,7 @@ height="16" id="rect6833" inkscape:label="16x16" - style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="display:inline;overflow:visible;visibility:visible;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" width="16" x="303" y="219" /> @@ -561,33 +563,34 @@ height="24" id="rect8104" inkscape:label="24x24" - style="fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="display:inline;overflow:visible;visibility:visible;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" width="24" x="302" y="176" /> actions + y="21.513618" + style="font-size:18.30070686px;line-height:1.25">legacy application-exit + y="21.513618" + style="font-size:18.30070686px;line-height:1.25">application-exit