summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Steiner <jimmac@gmail.com>2018-10-19 09:01:21 +0200
committerJakub Steiner <jimmac@gmail.com>2018-10-19 09:01:21 +0200
commit8d12f0a2bfe3369ae2932811e4c7035543da8e05 (patch)
tree961999741274261e0b072d20d75d035b18222cc7
parentdfb85283f30fd4ea920240673d874aee4a96b65c (diff)
downloadadwaita-icon-theme-8d12f0a2bfe3369ae2932811e4c7035543da8e05.tar.gz
retire fullcolor action icons
- step1 -- move to legacy context See Issue #15 for more context
-rw-r--r--Adwaita/16x16/actions/application-exit.pngbin659 -> 0 bytes
-rw-r--r--Adwaita/16x16/legacy/application-exit.pngbin0 -> 673 bytes
-rw-r--r--Adwaita/22x22/actions/application-exit.pngbin942 -> 0 bytes
-rw-r--r--Adwaita/22x22/legacy/application-exit.pngbin0 -> 960 bytes
-rw-r--r--Adwaita/24x24/actions/application-exit.pngbin972 -> 0 bytes
-rw-r--r--Adwaita/24x24/legacy/application-exit.pngbin0 -> 977 bytes
-rw-r--r--Adwaita/32x32/actions/application-exit.pngbin1526 -> 0 bytes
-rw-r--r--Adwaita/32x32/legacy/application-exit.pngbin0 -> 1512 bytes
-rw-r--r--Adwaita/48x48/actions/application-exit.pngbin2429 -> 0 bytes
-rw-r--r--Adwaita/48x48/legacy/application-exit.pngbin0 -> 2434 bytes
-rw-r--r--Makefile.am5
-rwxr-xr-xrender-icon-theme.py3
-rw-r--r--src/fullcolor/application-exit.svg49
13 files changed, 31 insertions, 26 deletions
diff --git a/Adwaita/16x16/actions/application-exit.png b/Adwaita/16x16/actions/application-exit.png
deleted file mode 100644
index facee22f6..000000000
--- a/Adwaita/16x16/actions/application-exit.png
+++ /dev/null
Binary files differ
diff --git a/Adwaita/16x16/legacy/application-exit.png b/Adwaita/16x16/legacy/application-exit.png
new file mode 100644
index 000000000..2b74d446b
--- /dev/null
+++ b/Adwaita/16x16/legacy/application-exit.png
Binary files differ
diff --git a/Adwaita/22x22/actions/application-exit.png b/Adwaita/22x22/actions/application-exit.png
deleted file mode 100644
index bef7f76f4..000000000
--- a/Adwaita/22x22/actions/application-exit.png
+++ /dev/null
Binary files differ
diff --git a/Adwaita/22x22/legacy/application-exit.png b/Adwaita/22x22/legacy/application-exit.png
new file mode 100644
index 000000000..90e5c3747
--- /dev/null
+++ b/Adwaita/22x22/legacy/application-exit.png
Binary files differ
diff --git a/Adwaita/24x24/actions/application-exit.png b/Adwaita/24x24/actions/application-exit.png
deleted file mode 100644
index b6c494144..000000000
--- a/Adwaita/24x24/actions/application-exit.png
+++ /dev/null
Binary files differ
diff --git a/Adwaita/24x24/legacy/application-exit.png b/Adwaita/24x24/legacy/application-exit.png
new file mode 100644
index 000000000..c6b5bd5e2
--- /dev/null
+++ b/Adwaita/24x24/legacy/application-exit.png
Binary files differ
diff --git a/Adwaita/32x32/actions/application-exit.png b/Adwaita/32x32/actions/application-exit.png
deleted file mode 100644
index 9512d7e1f..000000000
--- a/Adwaita/32x32/actions/application-exit.png
+++ /dev/null
Binary files differ
diff --git a/Adwaita/32x32/legacy/application-exit.png b/Adwaita/32x32/legacy/application-exit.png
new file mode 100644
index 000000000..7aa0e150e
--- /dev/null
+++ b/Adwaita/32x32/legacy/application-exit.png
Binary files differ
diff --git a/Adwaita/48x48/actions/application-exit.png b/Adwaita/48x48/actions/application-exit.png
deleted file mode 100644
index dd6a47361..000000000
--- a/Adwaita/48x48/actions/application-exit.png
+++ /dev/null
Binary files differ
diff --git a/Adwaita/48x48/legacy/application-exit.png b/Adwaita/48x48/legacy/application-exit.png
new file mode 100644
index 000000000..a97876c90
--- /dev/null
+++ b/Adwaita/48x48/legacy/application-exit.png
Binary files 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 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -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">
<inkscape:grid
enabled="true"
id="grid5883"
- spacingx="1px"
- spacingy="1px"
+ spacingx="1"
+ spacingy="1"
type="xygrid"
- visible="true" />
+ visible="true"
+ originx="0"
+ originy="0" />
</sodipodi:namedview>
<defs
id="defs3">
@@ -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" />
<text
id="context"
inkscape:label="context"
- style="font-size:18.30070686px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;display:inline;enable-background:new;font-family:Bitstream Vera Sans"
+ style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';display:inline;fill:#000000;fill-opacity:1;stroke:none;enable-background:new"
x="20.970737"
xml:space="preserve"
y="21.513618"><tspan
id="tspan2716"
sodipodi:role="line"
x="20.970737"
- y="21.513618">actions</tspan></text>
+ y="21.513618"
+ style="font-size:18.30070686px;line-height:1.25">legacy</tspan></text>
<text
id="icon-name"
inkscape:label="icon-name"
- sodipodi:linespacing="125%"
- style="font-size:18.30070686px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;display:inline;enable-background:new;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;enable-background:new"
x="191.97073"
xml:space="preserve"
y="21.513618"><tspan
id="tspan3023"
sodipodi:role="line"
x="191.97073"
- y="21.513618">application-exit</tspan></text>
+ y="21.513618"
+ style="font-size:18.30070686px;line-height:1.25">application-exit</tspan></text>
</g>
<g
inkscape:groupmode="layer"