[gtk/wip/jimmac/app-icons] app icons: use new style
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/jimmac/app-icons] app icons: use new style
- Date: Wed, 6 Feb 2019 15:01:55 +0000 (UTC)
commit 786322426abbdffcd8543fd48d2f9195ef04ba91
Author: Jakub Steiner <jimmac gmail com>
Date: Wed Feb 6 15:37:25 2019 +0100
app icons: use new style
- update symbolic and fullcolor icons to use the new style
See https://gitlab.gnome.org/GNOME/Initiatives/issues/2 for more info.
Fixes issue #1658
demos/gtk-demo/application.c | 2 +-
.../data/16x16/gtk4-demo-symbolic.symbolic.png | Bin 324 -> 0 bytes
demos/gtk-demo/data/16x16/gtk4-demo.png | Bin 874 -> 0 bytes
.../data/22x22/gtk4-demo-symbolic.symbolic.png | Bin 437 -> 0 bytes
demos/gtk-demo/data/22x22/gtk4-demo.png | Bin 1281 -> 0 bytes
.../data/24x24/gtk4-demo-symbolic.symbolic.png | Bin 465 -> 0 bytes
demos/gtk-demo/data/24x24/gtk4-demo.png | Bin 1374 -> 0 bytes
.../data/256x256/gtk4-demo-symbolic.symbolic.png | Bin 3937 -> 0 bytes
demos/gtk-demo/data/256x256/gtk4-demo.png | Bin 18667 -> 0 bytes
.../data/32x32/gtk4-demo-symbolic.symbolic.png | Bin 581 -> 0 bytes
demos/gtk-demo/data/32x32/gtk4-demo.png | Bin 1748 -> 0 bytes
.../data/48x48/gtk4-demo-symbolic.symbolic.png | Bin 854 -> 0 bytes
demos/gtk-demo/data/48x48/gtk4-demo.png | Bin 2640 -> 0 bytes
.../data/512x512/gtk4-demo-symbolic.symbolic.png | Bin 7594 -> 0 bytes
demos/gtk-demo/data/512x512/gtk4-demo.png | Bin 42374 -> 0 bytes
demos/gtk-demo/data/scalable/org.gtk.Demo.svg | 1 +
demos/gtk-demo/data/source.svg | 2886 ------------
demos/gtk-demo/data/symbolic-source.svg | 29 -
.../data/symbolic/org.gtk.Demo-symbolic.svg | 114 +
demos/gtk-demo/main.c | 2 +-
demos/gtk-demo/meson.build | 10 +-
demos/gtk-demo/org.gtk.Demo.desktop | 2 +-
.../data/scalable/org.gnome.IconBrowser.svg | 1 +
.../data/symbolic/org.gtk.IconBrowser-symbolic.svg | 136 +
demos/icon-browser/org.gtk.IconBrowser.desktop | 2 +-
.../gtk4-widget-factory-symbolic.symbolic.png | Bin 237 -> 0 bytes
.../data/16x16/gtk4-widget-factory.png | Bin 550 -> 0 bytes
.../gtk4-widget-factory-symbolic.symbolic.png | Bin 332 -> 0 bytes
.../data/22x22/gtk4-widget-factory.png | Bin 685 -> 0 bytes
.../gtk4-widget-factory-symbolic.symbolic.png | Bin 336 -> 0 bytes
.../data/24x24/gtk4-widget-factory.png | Bin 750 -> 0 bytes
.../gtk4-widget-factory-symbolic.symbolic.png | Bin 2950 -> 0 bytes
.../data/256x256/gtk4-widget-factory.png | Bin 10864 -> 0 bytes
.../gtk4-widget-factory-symbolic.symbolic.png | Bin 369 -> 0 bytes
.../data/32x32/gtk4-widget-factory.png | Bin 963 -> 0 bytes
.../gtk4-widget-factory-symbolic.symbolic.png | Bin 495 -> 0 bytes
.../data/48x48/gtk4-widget-factory.png | Bin 1260 -> 0 bytes
.../data/512x512/gtk4-widget-factory.png | Bin 24446 -> 0 bytes
.../data/scalable/org.gtk.WidgetFactory.svg | 1 +
demos/widget-factory/data/source.svg | 4854 --------------------
.../org.gtk.WidgetFactory-symbolic.svg} | 0
demos/widget-factory/meson.build | 12 +-
demos/widget-factory/org.gtk.WidgetFactory.desktop | 2 +-
demos/widget-factory/widget-factory.c | 2 +-
44 files changed, 268 insertions(+), 7788 deletions(-)
---
diff --git a/demos/gtk-demo/application.c b/demos/gtk-demo/application.c
index 767e351d96..e1e2d881c6 100644
--- a/demos/gtk-demo/application.c
+++ b/demos/gtk-demo/application.c
@@ -212,7 +212,7 @@ activate_about (GSimpleAction *action,
"comments", "Program to demonstrate GTK functions.",
"authors", authors,
"documenters", documentors,
- "logo-icon-name", "gtk4-demo",
+ "logo-icon-name", "org.gtk.Demo",
"title", "About GTK Code Demos",
NULL);
}
diff --git a/demos/gtk-demo/data/scalable/org.gtk.Demo.svg b/demos/gtk-demo/data/scalable/org.gtk.Demo.svg
new file mode 100644
index 0000000000..5773821eba
--- /dev/null
+++ b/demos/gtk-demo/data/scalable/org.gtk.Demo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; width="128" height="128"
version="1.0"><defs><linearGradient id="f"><stop offset="0" stop-color="#ff7800"/><stop offset="1"
stop-color="#ed333b"/></linearGradient><linearGradient id="e"><stop offset="0" stop-color="#f5c211"/><stop
offset="1" stop-color="#33d17a" stop-opacity=".899"/></linearGradient><linearGradient id="d"><stop offset="0"
stop-color="#c0bfbc"/><stop offset=".036" stop-color="#fafaf9"/><stop offset=".088"
stop-color="#c0bfbc"/><stop offset=".399" stop-color="#d5d5d3"/><stop offset=".491"
stop-color="#eaeae9"/><stop offset=".569" stop-color="#a7a5a1"/><stop offset=".966"
stop-color="#a9a7a3"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="a"><stop
offset="0" stop-color="#d5d3cf"/><stop offset="1" stop-color="#f6f5f4"/></linearGradient><linearGradient
id="b"><stop offset="0" stop-color="#d5d3cf"/><stop offset="1" stop-color="#949390"/></linearGradient><l
inearGra
dient id="c"><stop offset="0" stop-color="#9a9996"/><stop offset="1"
stop-color="#77767b"/></linearGradient><linearGradient xlink:href="#d" id="g" x1="-142.049" y1="236.001"
x2="-9.951" y2="236.001" gradientUnits="userSpaceOnUse"/><radialGradient xlink:href="#e" id="h" cx="90.974"
cy="263.479" fx="90.974" fy="263.479" r="22.703" gradientTransform="matrix(1.90297 -.05506 .0501 1.73133
-89.25 -176.863)" gradientUnits="userSpaceOnUse"/><radialGradient xlink:href="#f" id="i" cx="61.718"
cy="270.719" fx="61.718" fy="270.719" r="22.703" gradientTransform="matrix(2.49049 0 0 2.92132 -91.99
-503.52)" gradientUnits="userSpaceOnUse"/></defs><path transform="translate(123.265 -118.118) scale(.7798)"
d="M-75.74 161.438a10.997 10.997 0 0 0-5.758 1.468l-55.053 31.785a10.997 10.997 0 0 0-5.498
9.524v63.57a10.997 10.997 0 0 0 5.498 9.524l55.053 31.785a10.997 10.997 0 0 0 10.996 0l55.053-31.785a10.997
10.997 0 0 0 5.498-9.524v-63.57a10.997 10.997 0 0 0-5.498-9.524l-55.053-31.785a10.997 10.99
7 0 0 0-
5.238-1.469z" style="marker:none" fill="url(#g)"/><path style="marker:none" d="M64.203 3.77a8.575 8.575 0 0
0-4.49 1.146l-42.93 24.786a8.575 8.575 0 0 0-4.288 7.427V86.7a8.575 8.575 0 0 0 4.287 7.426l42.93
24.786a8.575 8.575 0 0 0 8.575 0l42.93-24.786a8.575 8.575 0 0 0 4.288-7.426V37.129a8.575 8.575 0 0
0-4.287-7.427L68.288 4.916a8.575 8.575 0 0 0-4.085-1.145z" fill="#fff"/><path style="marker:none" d="M109.869
33.297L64 59.779 18.131 33.297 64 6.814z" fill="#98c1f1"/><path style="marker:none" d="M66.263
287.505l45.35-25.884.056-52.762-45.406 26.215z" fill="url(#h)" transform="translate(0 -172)"/><path
d="M61.718 287.34l-45.35-25.885-.056-52.761 45.406 26.215z" style="marker:none" fill="url(#i)"
transform="translate(0 -172)"/></svg>
\ No newline at end of file
diff --git a/demos/gtk-demo/data/symbolic/org.gtk.Demo-symbolic.svg
b/demos/gtk-demo/data/symbolic/org.gtk.Demo-symbolic.svg
new file mode 100644
index 0000000000..033dae5ebd
--- /dev/null
+++ b/demos/gtk-demo/data/symbolic/org.gtk.Demo-symbolic.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:osb="http://www.openswatchbook.org/uri/2009/osb";
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ sodipodi:docname="org.gtk.Demo-symbolic.svg"
+ height="16.03125"
+ id="svg7384"
+ inkscape:version="0.92.4 5da689c313, 2019-01-14"
+ version="1.1"
+ width="16">
+ <metadata
+ id="metadata90">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title>Gnome Symbolic Icon Theme</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ inkscape:bbox-paths="true"
+ bordercolor="#666666"
+ borderopacity="1"
+ inkscape:current-layer="layer9"
+ inkscape:cx="0.53203442"
+ inkscape:cy="9.1822592"
+ gridtolerance="10"
+ inkscape:guide-bbox="true"
+ guidetolerance="10"
+ id="namedview88"
+ inkscape:object-nodes="false"
+ inkscape:object-paths="false"
+ objecttolerance="10"
+ pagecolor="#555753"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ showborder="true"
+ showgrid="false"
+ showguides="true"
+ inkscape:snap-bbox="true"
+ inkscape:snap-bbox-midpoints="false"
+ inkscape:snap-global="true"
+ inkscape:snap-grids="true"
+ inkscape:snap-nodes="true"
+ inkscape:snap-others="false"
+ inkscape:snap-to-guides="true"
+ inkscape:window-height="1375"
+ inkscape:window-maximized="1"
+ inkscape:window-width="2560"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:zoom="1">
+ <inkscape:grid
+ empspacing="2"
+ enabled="true"
+ id="grid4866"
+ originx="-203"
+ originy="-251.96875"
+ snapvisiblegridlinesonly="true"
+ spacingx="1"
+ spacingy="1"
+ type="xygrid"
+ visible="true" />
+ </sodipodi:namedview>
+ <title
+ id="title9167">Gnome Symbolic Icon Theme</title>
+ <defs
+ id="defs7386">
+ <linearGradient
+ id="linearGradient7212"
+ osb:paint="solid">
+ <stop
+ id="stop7214"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ </linearGradient>
+ </defs>
+ <g
+ inkscape:groupmode="layer"
+ id="layer9"
+ inkscape:label="apps"
+ style="display:inline"
+ transform="translate(-444.0002,35)">
+ <path
+
style="display:inline;opacity:0.3;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+ d="m 457.97232,-31.569556 -5.96212,3.44224 -5.96215,-3.44224 v 0 l 5.96215,-3.44226 z"
+ id="path870-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ sodipodi:nodetypes="cccccc"
+ inkscape:connector-curvature="0"
+ id="path886-9"
+ d="m 450.98519,-19.648086 -5.99273,-3.42041 -0.007,-6.97219 v 0 l 6.00018,3.4642 z"
+
style="display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
/>
+ <path
+
style="display:inline;opacity:0.60100002;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+ d="m 452.98577,-19.648086 5.99273,-3.42041 0.007,-6.97219 v 0 l -6.00018,3.4642 z"
+ id="path931"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ </g>
+</svg>
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index c4ae6312a0..bf5f32e0b8 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -58,7 +58,7 @@ activate_about (GSimpleAction *action,
"website", "http://www.gtk.org";,
"comments", "Program to demonstrate GTK widgets",
"authors", authors,
- "logo-icon-name", "gtk4-demo",
+ "logo-icon-name", "org.gtk.Demo",
"title", "About GTK Demo",
NULL);
}
diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index df8db17414..29efa1d290 100644
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -119,12 +119,10 @@ executable('gtk4-demo-application',
# icons
icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
-foreach icon_size: [ '16x16', '22x22', '24x24', '32x32', '48x48', '256x256', ]
- gtk_demo_icons_dir = join_paths(icontheme_dir, '@0@/apps'.format(icon_size))
- install_data('data/@0@/gtk4-demo.png'.format(icon_size),
- install_dir: gtk_demo_icons_dir)
- install_data('data/@0@/gtk4-demo-symbolic.symbolic.png'.format(icon_size),
- install_dir: gtk_demo_icons_dir)
+foreach size: ['scalable', 'symbolic']
+ install_subdir('hicolor/' + size,
+ install_dir: icontheme_dir
+ )
endforeach
# desktop file
diff --git a/demos/gtk-demo/org.gtk.Demo.desktop b/demos/gtk-demo/org.gtk.Demo.desktop
index 021a92f710..e9078dfe30 100644
--- a/demos/gtk-demo/org.gtk.Demo.desktop
+++ b/demos/gtk-demo/org.gtk.Demo.desktop
@@ -2,7 +2,7 @@
Name=GTK Demo
Comment=GTK code examples and demonstrations
Exec=gtk4-demo
-Icon=gtk4-demo
+Icon=org.gtk.Demo
Terminal=false
Type=Application
StartupNotify=true
diff --git a/demos/icon-browser/data/scalable/org.gnome.IconBrowser.svg
b/demos/icon-browser/data/scalable/org.gnome.IconBrowser.svg
new file mode 100644
index 0000000000..ff312e407e
--- /dev/null
+++ b/demos/icon-browser/data/scalable/org.gnome.IconBrowser.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; width="128" height="128"
version="1.0"><defs><linearGradient xlink:href="#a" id="b" x1="384" y1="120" x2="416" y2="120"
gradientUnits="userSpaceOnUse" gradientTransform="matrix(.25 0 0 .25 12 221)"/><linearGradient id="a"><stop
offset="0" stop-color="#e8e7e4"/><stop offset=".511" stop-color="#fff"/><stop offset="1"
stop-color="#c2bfba"/></linearGradient></defs><path d="M12 32v84h96c4.432 0 8-3.568
8-8V40c0-4.432-3.568-8-8-8z" fill="#63452c"/><path d="M14 216v70h94c4.432 0 8-3.568
8-8v-54c0-4.432-3.568-8-8-8z" style="marker:none" fill="url(#b)" transform="translate(0 -172)"/><path d="M12
34v74h96c4.432 0 8-3.568 8-8V42c0-4.432-3.568-8-8-8z" fill="#63452c"/><path d="M12 12v94h96c4.432 0 8-3.568
8-8V20c0-4.432-3.568-8-8-8z" fill="#865e3c"/><g fill="#63452c"><path
style="isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1" d="M39 26.008a5 5 0 0 0 0
10c.892 0 1.712-.278 2.438-.688
l3.937 3
.688-3.938 3.687c-.725-.41-1.545-.687-2.437-.687a5 5 0 1 0 5 5c0-.459-.072-.891-.187-1.313l4.25-4.125L57
50.008h3v-2L43.812 32.32A4.92 4.92 0 0 0 44 31.008a5 5 0 0 0-5-5zm0 3a2 2 0 1 1 0 4 2 2 0 0 1
0-4zm18-1l-7.875 7.437 2.625 2.563 8.25-8v-2zm-18 17a2 2 0 1 1 0 4 2 2 0 0 1 0-4z" color="#000"
overflow="visible"/><path d="M92 63.994v2.961c2.53 3.039 4 6.439 4 11.039s-1.559 8-4
11.038v2.962h2.763c2.931-3.281 5.237-8.372 5.237-14 0-5.629-2-10.344-5.17-14zm-11.094 2l-5.937
5.999H70v11.999h4.969l6.08 6.001.951-.002V65.993zm7.094 2v4c1.213 1.577 2 3.518 2 6s-.787 4.439-2
6v4h2c2.446-1.99 4-5.747 4-10 0-4.334-1.478-8.04-4-10zm-4 4v12h2c1.344-1.674 2-3.486 2-6
0-2.515-.623-4.432-2-6z" style="marker:none" color="#bebebe" overflow="visible"/><path d="M86.021
24.038a1.997 1.997 0 0 0-1.197.37l-13.98 9.986a1.998 1.998 0 0 0-.835 1.626v1.997h1.948a1.998 1.998 0 0 0
.023 0h.024a1.998 1.998 0 0 0 1.162-.37L74 37.05v10.953A1.997 1.997 0 0 0 75.998 50h19.971a1.997 1.997 0 0 0
1.997-1.997V37
.048l.83
8.599a1.998 1.998 0 0 0 1.16.37h1.997v-1.97a1.998 1.998 0 0 0-.836-1.653l-13.98-9.986a1.997 1.997 0 0
0-1.123-.37zm-.038 4.45l7.988 5.707v11.81h-5.99v-7.988h-5.992v7.989h-3.995v-11.81z"
style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1"
color="#000" font-weight="400" font-family="sans-serif" overflow="visible"/><path d="M56.063 64A1.93 1.93 0
0 1 58 65.937v.125C57.966 79.288 47.234 90 34 90h-.062C32.848 90 32 89.108 32 88v-6c0-1.108.892-2 2-2h4c1.108
0 2 .892 2 2v.937A17.935 17.935 0 0 0 50.938 72H50c-1.108 0-2-.892-2-2v-4c0-1.108.892-2
2-2h6.062z"/></g><path style="marker:n
one" d="
M92 65.994v2.961c2.53 3.039 4 6.439 4 11.039s-1.56 8-4 11.038v2.962h2.763c2.931-3.281 5.237-8.372 5.237-14
0-5.629-2-10.344-5.17-14zm-11.094 2l-5.937 5.999H70v11.999h4.969l6.08 6.001.951-.002V67.993zm7.094 2v4c1.213
1.577 2 3.518 2 6s-.787 4.439-2 6v4h2c2.446-1.99 4-5.747 4-10 0-4.334-1.478-8.04-4-10zm-4 4v12h2c1.344-1.674
2-3.486 2-6 0-2.515-.623-4.432-2-6z" color="#bebebe" overflow="visible" fill="#f6f5f4"/><path d="M56.063
66A1.93 1.93 0 0 1 58 67.937v.125C57.966 81.288 47.234 92 34 92h-.062C32.848 92 32 91.108 32
90v-6c0-1.108.892-2 2-2h4c1.108 0 2 .892 2 2v.937A17.935 17.935 0 0 0 50.938 74H50c-1.108
0-2-.892-2-2v-4c0-1.108.892-2 2-2h6.062z" fill="#f6f5f4"/><path
style="isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1" d="M39 28.008a5 5 0 0 0 0
10c.892 0 1.712-.278 2.438-.688l3.937 3.688-3.938 3.687c-.725-.41-1.545-.687-2.437-.687a5 5 0 1 0 5
5c0-.459-.072-.891-.187-1.313l4.25-4.125L57 52.008h3v-2L43.812 34.32A4.92 4.92 0 0 0 44 33.008a5 5 0 0 0-5-5
zm0 3a2
2 0 1 1 0 4 2 2 0 0 1 0-4zm18-1l-7.875 7.437 2.625 2.563 8.25-8v-2zm-18 17a2 2 0 1 1 0 4 2 2 0 0 1 0-4z"
color="#000" overflow="visible" fill="#f6f5f4"/><g fill="#f6f5f4"><path
style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1"
d="M86.02 26.038a1.997 1.997 0 0 0-1.196.37l-13.98 9.986a1.998 1.998 0 0 0-.835
1.626h-.002v1.997h1.947a1.998 1.998 0 0 0 .025 0h.025a1.998 1.998 0 0 0 1.162-.37L74 39.05v10.953A1.997 1.997
0 0 0 75.998 52h19.971a1.997 1.997 0 0 0 1.997-1.997V39.048l.838.599a1.998 1.998 0 0 0
1.16.37h1.997v-1.97a1.998 1.998 0 0 0-.836-1.653l-13.98-9.986a1.997 1.997 0
0 0-1.12
3-.37zm-.038 4.45l7.989 5.707v11.81H87.98v-7.988h-5.992v7.989h-3.994v-11.81z" color="#000" font-weight="400"
font-family="sans-serif" overflow="visible"/></g><path fill="#3d3846" d="M12 12h8v94h-8z"/><path d="M12
106v10h8v-2h-6v-6h6v-2z" fill="#241f31"/><path d="M15 106V12" opacity=".15" fill="none" stroke="#fff"
stroke-width="2"/></svg>
\ No newline at end of file
diff --git a/demos/icon-browser/data/symbolic/org.gtk.IconBrowser-symbolic.svg
b/demos/icon-browser/data/symbolic/org.gtk.IconBrowser-symbolic.svg
new file mode 100644
index 0000000000..0e05a2e076
--- /dev/null
+++ b/demos/icon-browser/data/symbolic/org.gtk.IconBrowser-symbolic.svg
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:osb="http://www.openswatchbook.org/uri/2009/osb";
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ sodipodi:docname="org.gtk.IconBrowser-symbolic.svg"
+ height="16.03125"
+ id="svg7384"
+ inkscape:version="0.92.4 5da689c313, 2019-01-14"
+ version="1.1"
+ width="16">
+ <metadata
+ id="metadata90">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title>Gnome Symbolic Icon Theme</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ inkscape:bbox-paths="true"
+ bordercolor="#666666"
+ borderopacity="1"
+ inkscape:current-layer="layer9"
+ inkscape:cx="-2.5662459"
+ inkscape:cy="11.558672"
+ gridtolerance="10"
+ inkscape:guide-bbox="true"
+ guidetolerance="10"
+ id="namedview88"
+ inkscape:object-nodes="false"
+ inkscape:object-paths="false"
+ objecttolerance="10"
+ pagecolor="#555753"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ showborder="true"
+ showgrid="false"
+ showguides="true"
+ inkscape:snap-bbox="true"
+ inkscape:snap-bbox-midpoints="false"
+ inkscape:snap-global="true"
+ inkscape:snap-grids="true"
+ inkscape:snap-nodes="true"
+ inkscape:snap-others="false"
+ inkscape:snap-to-guides="true"
+ inkscape:window-height="1375"
+ inkscape:window-maximized="1"
+ inkscape:window-width="2560"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:zoom="1">
+ <inkscape:grid
+ empspacing="2"
+ enabled="true"
+ id="grid4866"
+ originx="-203"
+ originy="-251.96875"
+ snapvisiblegridlinesonly="true"
+ spacingx="1"
+ spacingy="1"
+ type="xygrid"
+ visible="true" />
+ </sodipodi:namedview>
+ <title
+ id="title9167">Gnome Symbolic Icon Theme</title>
+ <defs
+ id="defs7386">
+ <linearGradient
+ id="linearGradient7212"
+ osb:paint="solid">
+ <stop
+ id="stop7214"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ </linearGradient>
+ </defs>
+ <g
+ inkscape:groupmode="layer"
+ id="layer9"
+ inkscape:label="apps"
+ style="display:inline"
+ transform="translate(-444.0002,35)">
+ <path
+
style="display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+ d="m 457.9846,-27.96875 v -3 h 1 l -3,-3 -3,3 h 1 v 3 z"
+ id="path2809"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccc" />
+ <path
+
style="display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+ d="m 451.9846,-23.96875 v 2 h 1 l 2,2 v -6 l -2,2 z"
+ id="path2811"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+
style="display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+ d="m 455.9846,-24.96875 v 4 c 0,0 1,-1 1,-2 0,-1.31515 -1,-2 -1,-2 z"
+ id="path2813"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccsc" />
+ <path
+
style="display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+ d="m 457.9846,-25.96875 v 6 c 0,0 1,-1.94591 1,-3 0,-1.05409 -1,-3 -1,-3 z"
+ id="path2815"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccsc" />
+ <path
+ inkscape:connector-curvature="0"
+
style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;enable-background:new"
+ d="m 450.53751,-25.96846 c 0.24647,0 0.44708,0.19694 0.44708,0.44708 v 0.0289 c -0.008,3.05189
-2.48438,5.5237 -5.53812,5.5237 h -0.0148 c -0.25145,0 -0.44711,-0.20581 -0.44711,-0.4615 v -0.46152 -0.92302
c 0,-0.25567 0.20581,-0.4615 0.4615,-0.4615 h 0.92302 c 0.25569,0 0.46152,0.20581 0.46152,0.4615 v 0.21634 c
1.18002,-0.41715 2.10674,-1.34386 2.52389,-2.52388 h -0.21635 c -0.25566,0 -0.4615,-0.20581 -0.4615,-0.46152
v -0.92302 c 0,-0.25567 0.20581,-0.4615 0.4615,-0.4615 h 0.46152 0.4615 0.44709 0.0148 0.0148 z"
+ id="rect5922-7-3" />
+ <g
+ id="g904-6"
+ transform="matrix(0.26785369,0,0,0.26785369,436.44908,-87.00581)"
+ style="display:inline;fill:#000000;fill-opacity:1;stroke-width:3.73338151;enable-background:new">
+ <path
+ sodipodi:nodetypes="csscccssssccccccsccsssssccccccsssss"
+ inkscape:connector-curvature="0"
+
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.46676302;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+ d="m 37,198.00759 c -2.76142,0 -5,2.23858 -5,5 0,2.76142 2.23858,5 5,5 0.89216,0 1.71236,-0.27804
2.4375,-0.6875 l 3.9375,3.6875 -3.9375,3.6875 c -0.72514,-0.40946 -1.54534,-0.6875 -2.4375,-0.6875 -2.76142,0
-5,2.23858 -5,5 0,2.76142 2.23858,5 5,5 2.76142,0 5,-2.23858 5,-5 0,-0.45832 -0.072,-0.89082 -0.1874,-1.3125
l 4.25,-4.125 8.9374,8.4375 h 3 v -2 l -16.1875,-15.6875 c 0.1156,-0.42168 0.1874,-0.85418 0.1874,-1.3125
0,-2.76142 -2.23858,-5 -5,-5 z m 0,3 c 1.10456,0 2,0.89544 2,2 0,1.10456 -0.89544,2 -2,2 -1.10456,0
-2,-0.89544 -2,-2 0,-1.10456 0.89544,-2 2,-2 z m 18,-1 -7.875,7.4375 2.625,2.5625 8.25,-8 v -2 z m -18,17 c
1.10456,0 2,0.89544 2,2 0,1.10456 -0.89544,2 -2,2 -1.10456,0 -2,-0.89544 -2,-2 0,-1.10456 0.89544,-2 2,-2 z"
+ id="path1079-7" />
+ </g>
+ </g>
+</svg>
diff --git a/demos/icon-browser/org.gtk.IconBrowser.desktop b/demos/icon-browser/org.gtk.IconBrowser.desktop
index 844de8cdd8..64f69e3056 100644
--- a/demos/icon-browser/org.gtk.IconBrowser.desktop
+++ b/demos/icon-browser/org.gtk.IconBrowser.desktop
@@ -2,7 +2,7 @@
Name=Icon Browser
Comment=An application that shows themed icons
Exec=gtk4-icon-browser
-Icon=gtk4-icon-browser
+Icon=org.gtk.IconBrowser
Terminal=false
Type=Application
StartupNotify=true
diff --git a/demos/widget-factory/data/scalable/org.gtk.WidgetFactory.svg
b/demos/widget-factory/data/scalable/org.gtk.WidgetFactory.svg
new file mode 100644
index 0000000000..e3bccac4aa
--- /dev/null
+++ b/demos/widget-factory/data/scalable/org.gtk.WidgetFactory.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; width="128" height="128"
version="1.0"><defs><linearGradient id="a"><stop offset="0" stop-color="#7a1521"/><stop offset=".042"
stop-color="#c01c28"/><stop offset=".083" stop-color="#7a1521"/><stop offset=".917"
stop-color="#7a1521"/><stop offset=".958" stop-color="#c01c28"/><stop offset="1"
stop-color="#7a1521"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#babdb6"/><stop
offset=".042" stop-color="#f6f5f4"/><stop offset=".083" stop-color="#d5d3cf"/><stop offset=".917"
stop-color="#deddda"/><stop offset=".958" stop-color="#f6f5f4"/><stop offset="1"
stop-color="#babdb6"/></linearGradient><linearGradient xlink:href="#b" id="c" gradientUnits="userSpaceOnUse"
gradientTransform="matrix(.25 0 0 .25 0 225)" x1="48" y1="44" x2="464" y2="44"/></defs><g
transform="translate(0 -172)"><rect ry="8" rx="8" y="204" x="12" height="84" width="104" style="marker:none"
fill="url(#c)"/><rec
t style=
"marker:none" width="104" height="100" x="12" y="184" rx="8" ry="8" fill="#f6f5f4"/><rect rx="5.345"
width="92" height="26" x="18" y="-278.048" ry="5.345" transform="scale(1 -1)" fill="#3584e4"/><path
d="M23.346 278.048A5.335 5.335 0 0 1 18 272.702v-2a5.335 5.335 0 0 0 5.346 5.346h81.308a5.335 5.335 0 0 0
5.346-5.346v2a5.335 5.335 0 0 1-5.346 5.346z" fill="#1a5fb4"/><rect transform="scale(1 -1)" ry="5.345"
y="-245" x="19" height="24" width="90" rx="5.345" fill="#fff" stroke="#deddda" stroke-width="2"
stroke-linecap="round" stroke-linejoin="round"/><rect rx="5.345" width="90" height="24" x="19" y="-215"
ry="5.345" transform="scale(1 -1)" fill="#fff" stroke="#deddda" stroke-width="2" stroke-linecap="round"
stroke-linejoin="round"/><path style="marker:none" d="M99 228.948v8.23M103.167 233h-8.334M83.333 233H75"
fill="#fff" stroke="#000" stroke-width="2" stroke-linecap="square" stroke-linejoin="round"/><path
style="marker:none" d="M89 221.125V245M69 221.125V245" fill="#fff" strok
e="#dedd
da" stroke-width="2" stroke-linecap="square" stroke-linejoin="round"/><path d="M24.406 222a5.335 5.335 0 0
0-5.345 5.346v2A5.335 5.335 0 0 1 24.406 224h79.276a5.335 5.335 0 0 1 5.346 5.346v-2a5.335 5.335 0 0
0-5.346-5.346zM24.406 192a5.335 5.335 0 0 0-5.345 5.346v2A5.335 5.335 0 0 1 24.406 194h79.276a5.335 5.335 0 0
1 5.346 5.346v-2a5.335 5.335 0 0 0-5.346-5.346z" opacity=".3" fill="#deddda"/><path style="marker:none"
d="M95.106 201.846l3.8 3.8 3.934-3.933" fill="none" stroke="#000" stroke-width="2" stroke-linecap="square"
stroke-linejoin="round"/><path style="marker:none" fill="#deddda" d="M26.02 228h36.583v10H26.02zM26
197.974h59.979V208H26z"/><path style="marker:none" fill="#98c1f1" d="M44 260h36v8H44z"/></g></svg>
\ No newline at end of file
diff --git a/demos/widget-factory/data/symbolic-source.svg
b/demos/widget-factory/data/symbolic/org.gtk.WidgetFactory-symbolic.svg
similarity index 100%
rename from demos/widget-factory/data/symbolic-source.svg
rename to demos/widget-factory/data/symbolic/org.gtk.WidgetFactory-symbolic.svg
diff --git a/demos/widget-factory/meson.build b/demos/widget-factory/meson.build
index be7b5db57a..50aff7f1c7 100644
--- a/demos/widget-factory/meson.build
+++ b/demos/widget-factory/meson.build
@@ -18,13 +18,11 @@ install_data('org.gtk.WidgetFactory.desktop', install_dir: gtk_applicationsdir)
# icons
icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
-foreach icon_size : ['16x16', '22x22', '24x24', '32x32', '48x48', '256x256', ]
- icons_dir = join_paths(icontheme_dir, '@0@/apps'.format(icon_size))
- install_data('data/@0@/gtk4-widget-factory.png'.format(icon_size),
- install_dir: icons_dir)
- install_data('data/@0@/gtk4-widget-factory-symbolic.symbolic.png'.format(icon_size),
- install_dir: icons_dir)
+foreach size: ['scalable', 'symbolic']
+ install_subdir('hicolor/' + size,
+ install_dir: icontheme_dir
+ )
endforeach
# appdata
-install_data('org.gtk.WidgetFactory.appdata.xml', install_dir: gtk_appdatadir)
\ No newline at end of file
+install_data('org.gtk.WidgetFactory.appdata.xml', install_dir: gtk_appdatadir)
diff --git a/demos/widget-factory/org.gtk.WidgetFactory.desktop
b/demos/widget-factory/org.gtk.WidgetFactory.desktop
index fa7218e593..8590e68a5e 100644
--- a/demos/widget-factory/org.gtk.WidgetFactory.desktop
+++ b/demos/widget-factory/org.gtk.WidgetFactory.desktop
@@ -2,7 +2,7 @@
Name=Widget Factory
Comment=A showcase for GTK widgets, designed for testing themes.
Exec=gtk4-widget-factory
-Icon=gtk4-widget-factory
+Icon=org.gtk.WidgetFactory
Terminal=false
Type=Application
StartupNotify=true
diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c
index e9cd3c3a7d..eb34d9d638 100644
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -232,7 +232,7 @@ activate_about (GSimpleAction *action,
"website", "http://www.gtk.org";,
"comments", "Program to demonstrate GTK themes and widgets",
"authors", authors,
- "logo-icon-name", "gtk4-widget-factory",
+ "logo-icon-name", "org.gtk.WidgetFactory",
"title", "About GTK Widget Factory",
"system-information", s->str,
NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
