[evince/wip/jimmac/app-icon-redesign] icon: update app icon

From: Iñigo Martínez <inigomartinez src gnome org>
To: commits-list gnome org
Cc:
Subject: [evince/wip/jimmac/app-icon-redesign] icon: update app icon
Date: Tue, 29 Jan 2019 11:47:08 +0000 (UTC)
commit 867205580191cfe1c96b2e9b945e136f38a7ca69
Author: Jakub Steiner <jimmac gmail com>
Date:   Fri Jul 20 18:35:02 2018 +0200

    icon: update app icon
    
    - GNOME 3.30 redesign of app icons.
      See https://gitlab.gnome.org/GNOME/Initiatives/issues/2
      for more info.
    
    /label ~"9. Initiative: AppIconRedesign"

 configure.ac                                    |    7 +-
 data/icons/16x16/Makefile.am                    |    2 +-
 data/icons/16x16/apps/org.gnome.Evince.png      |  Bin 861 -> 0 bytes
 data/icons/22x22/Makefile.am                    |    2 +-
 data/icons/22x22/apps/Makefile.am               |   16 -
 data/icons/22x22/apps/org.gnome.Evince.png      |  Bin 1244 -> 0 bytes
 data/icons/24x24/Makefile.am                    |    2 +-
 data/icons/24x24/apps/Makefile.am               |   16 -
 data/icons/24x24/apps/org.gnome.Evince.png      |  Bin 1304 -> 0 bytes
 data/icons/256x256/Makefile.am                  |    3 -
 data/icons/256x256/apps/Makefile.am             |   16 -
 data/icons/256x256/apps/org.gnome.Evince.png    |  Bin 26368 -> 0 bytes
 data/icons/48x48/Makefile.am                    |    3 +-
 data/icons/48x48/apps/Makefile.am               |   16 -
 data/icons/48x48/apps/org.gnome.Evince.png      |  Bin 3091 -> 0 bytes
 data/icons/Makefile.am                          |    2 +-
 data/icons/meson.build                          |   33 +-
 data/icons/scalable/Makefile.am                 |    2 +-
 data/icons/{16x16 => scalable}/apps/Makefile.am |    6 +-
 data/icons/scalable/apps/org.gnome.Evince.svg   |    1 +
 data/icons/source.svg                           | 2414 -----------------------
 21 files changed, 29 insertions(+), 2512 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b7b6e23f..2823294e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -932,27 +932,22 @@ data/org.gnome.Evince-previewer.desktop.in
 data/Makefile
 data/icons/Makefile
 data/icons/16x16/Makefile
-data/icons/16x16/apps/Makefile
 data/icons/16x16/actions/Makefile
 data/icons/16x16/mimetypes/Makefile
 data/icons/22x22/Makefile
-data/icons/22x22/apps/Makefile
 data/icons/22x22/actions/Makefile
 data/icons/22x22/mimetypes/Makefile
 data/icons/24x24/Makefile
-data/icons/24x24/apps/Makefile
 data/icons/24x24/actions/Makefile
 data/icons/24x24/mimetypes/Makefile
 data/icons/32x32/Makefile
 data/icons/32x32/actions/Makefile
 data/icons/32x32/mimetypes/Makefile
 data/icons/48x48/Makefile
-data/icons/48x48/apps/Makefile
 data/icons/48x48/actions/Makefile
-data/icons/256x256/Makefile
-data/icons/256x256/apps/Makefile
 data/icons/scalable/Makefile
 data/icons/scalable/actions/Makefile
+data/icons/scalable/apps/Makefile
 data/icons/scalable/mimetypes/Makefile
 data/icons/symbolic/Makefile
 data/icons/symbolic/apps/Makefile
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index b02d3a8c..02d9f743 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = actions apps mimetypes
+SUBDIRS = actions mimetypes
 
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index b02d3a8c..02d9f743 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = actions apps mimetypes
+SUBDIRS = actions mimetypes
 
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index b02d3a8c..02d9f743 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = actions apps mimetypes
+SUBDIRS = actions mimetypes
 
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index ae033087..6b7db23f 100644
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -1,4 +1,3 @@
-SUBDIRS = actions apps
-
+SUBDIRS = actions
 
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 237d7a89..bd8d2271 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = 16x16 22x22 24x24 32x32 48x48 256x256 scalable symbolic
+SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable symbolic
 
 
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/meson.build b/data/icons/meson.build
index e00b5105..a38ef0c3 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -11,7 +11,7 @@ actions = [
   'zoom.png',
 ]
 
-icons += [['16x16', actions, ['x-office-presentation.png'], [ev_namespace + '.png']]]
+icons += [['16x16', actions, ['x-office-presentation.png']]]
 
 actions = [
   'object-rotate-left.png',
@@ -23,7 +23,7 @@ actions = [
   'zoom.png',
 ]
 
-icons += [['22x22', actions, ['x-office-presentation.png'], [ev_namespace + '.png']]]
+icons += [['22x22', actions, ['x-office-presentation.png']]]
 
 actions = [
   'object-rotate-left.png',
@@ -36,7 +36,7 @@ actions = [
   'zoom.png',
 ]
 
-icons += [['24x24', actions, ['x-office-presentation.png'], [ev_namespace + '.png']]]
+icons += [['24x24', actions, ['x-office-presentation.png']]]
 
 actions = [
   'object-rotate-left.png',
@@ -45,7 +45,7 @@ actions = [
   'view-page-facing.png',
 ]
 
-icons += [['32x32', actions, ['x-office-presentation.png'], []]]
+icons += [['32x32', actions, ['x-office-presentation.png']]]
 
 actions = [
   'close.png',
@@ -55,9 +55,9 @@ actions = [
   'view-page-facing.png',
 ]
 
-icons += [['48x48', actions, [], [ev_namespace + '.png']]]
+icons += [['48x48', actions, []]]
 
-icons += [['256x256', [], [], [ev_namespace + '.png']]]
+icons += [['256x256', [], []]]
 
 actions = [
   'annotations-text-symbolic.svg',
@@ -70,9 +70,9 @@ actions = [
   'visible-symbolic.svg',
 ]
 
-icons += [['scalable', actions, ['x-office-presentation.svg'], []]]
+icons += [['scalable', actions, ['x-office-presentation.svg']]]
 
-icons += [['symbolic', [], [], [ev_namespace + '-symbolic.svg']]]
+icons += [['symbolic', [], []]]
 
 foreach icon: icons
   foreach action: icon[1]
@@ -88,11 +88,14 @@ foreach icon: icons
       install_dir: join_paths(ev_pkgdatadir, 'icons', 'hicolor', icon[0], 'mimetypes'),
     )
   endforeach
-
-  foreach app: icon[3]
-    install_data(
-      join_paths(icon[0], 'apps', app),
-      install_dir: join_paths(ev_datadir, 'icons', 'hicolor', icon[0], 'apps'),
-    )
-  endforeach
 endforeach
+
+install_data(
+  join_paths('scalable', 'apps', '@0@.svg'.format(ev_namespace)),
+  install_dir: join_paths(ev_datadir, 'icons', 'hicolor', 'scalable', 'apps'),
+)
+
+install_data(
+  join_paths('symbolic', 'apps', '@0 -symbolic svg'.format(ev_namespace)),
+  install_dir: join_paths(ev_datadir, 'icons', 'hicolor', 'symbolic', 'apps'),
+)
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index 02d9f743..b02d3a8c 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = actions mimetypes
+SUBDIRS = actions apps mimetypes
 
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/apps/Makefile.am b/data/icons/scalable/apps/Makefile.am
similarity index 78%
rename from data/icons/16x16/apps/Makefile.am
rename to data/icons/scalable/apps/Makefile.am
index 68d72ca5..cc49dbd2 100644
--- a/data/icons/16x16/apps/Makefile.am
+++ b/data/icons/scalable/apps/Makefile.am
@@ -1,13 +1,13 @@
 themedir = $(datadir)/icons/hicolor
-size = 16x16
+size = scalable
 context = apps
 
 iconsdir = $(themedir)/$(size)/$(context)
 
 icons_DATA = \
-       org.gnome.Evince.png
+       org.gnome.Evince.svg
 
-noinst_DATA = 
+noinst_DATA =
 
 EXTRA_DIST =           \
        $(icons_DATA)   \
diff --git a/data/icons/scalable/apps/org.gnome.Evince.svg b/data/icons/scalable/apps/org.gnome.Evince.svg
new file mode 100644
index 00000000..1bf77316
--- /dev/null
+++ b/data/icons/scalable/apps/org.gnome.Evince.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="#d5d3cf"/><stop offset="1" 
stop-color="#f6f5f4"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#d5d3cf"/><stop 
offset="1" stop-color="#949390"/></linearGradient><linearGradient id="c"><stop offset="0" 
stop-color="#9a9996"/><stop offset="1" stop-color="#77767b"/></linearGradient><linearGradient xlink:href="#d" 
id="e" x1="28" y1="-274" x2="116" y2="-274" gradientUnits="userSpaceOnUse" 
gradientTransform="translate(-136)"/><linearGradient id="d"><stop offset="0" stop-color="#c0bfbc"/><stop 
offset=".045" stop-color="#f6f5f4"/><stop offset=".091" stop-color="#deddda"/><stop offset=".909" 
stop-color="#deddda"/><stop offset=".955" stop-color="#f6f5f4"/><stop offset="1" 
stop-color="#c0bfbc"/></linearGradient></defs><g transform="translate(0 -172)"><rect y="233" x="20" 
height="59" widt
 h="88" r
 x="8" fill="#deddda"/><rect ry="8" rx="8" y="-292" x="-108" height="40" width="88" style="marker:none" 
transform="scale(-1)" fill="url(#e)"/><rect width="88" height="104" x="20" y="180" rx="8" ry="8" 
fill="#f6f5f4"/><path style="marker:none" d="M28 248v10h64v-4h8v-6z" color="#000" overflow="visible" 
fill="#deddda"/><path d="M48 254a6.176 6.176 0 0 0-2.982.766 5.883 5.883 0 0 0-2.262 2.22C42.164 256.42 
41.293 256 40 256H20v4h21.215c.453 0 .715.301.775.742.001.035.01.068.01.104V262H20v4h13.951l-4 
4H20v2h8.275c-.515 1.129-.448 2.63 1.108 4.225L33.607 272h5.547A4.858 4.858 0 0 0 44 
267.154v-1.125h8v1.125A4.858 4.858 0 0 0 56.846 272h5.576l4.195 4.195c1.542-1.58 1.62-3.07 
1.12-4.195h7.417A4.858 4.858 0 0 0 80 267.154v-1.125h2V258c0-1.063-.828-2-2-2H56s-1.578.002-2.752.994a5.882 
5.882 0 0 0-2.266-2.228A6.176 6.176 0 0 0 48 254zm0 2.004c.698 0 1.396.17 2.018.514 1.242.685 1.982 1.926 
1.982 3.26 0 .04.002.079.006.118-.001.037-.006.067-.006.104v2h-8v-2l-.008-.086c.006-.045.008-.091.0
 08-.137 
 0-1.333.74-2.574 1.982-3.26a4.182 4.182 0 0 1 2.018-.513zm6.785 
4.012h23.082c.079.263.133.538.133.83v1.183H58.107l-.029-.029H54v-1.154c0-.034.009-.066.01-.1.025-.436.326-.73.775-.73zm-15.207
 6.013H42v1.125A2.818 2.818 0 0 1 39.154 270h-3.547zm14.422 0h2.451l3.97 3.971h-3.575A2.818 2.818 0 0 1 54 
267.154zm8.107 0H78v1.125A2.818 2.818 0 0 1 75.154 270h-9.076z" style="marker:none" opacity=".1"/><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="M29.383 274.225c-2.112-2.164-1.492-4.164-.375-5.282l8.913-8.914H82v4H39.579z" color="#000" 
font-weight="400" font-family="sans
 -serif" 
 overflow="visible" fill="#949390"/><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="M66.617 274.195c2.112-2.164 1.492-4.164.375-5.281L58.08 260H14v4h42.421z" color="#000" font-weight="400" 
font-family="sans-serif" overflow="visible" fill="#949390"/><path style="marker:none" d="M43 257.777a4.775 5 
90 0 1 2.5-4.136 4.775 5 90 0 1 5 0 4.775 5 90 0 1 2.5 4.136" fill="none" stroke="#1a5fb4" stroke-width="2" 
stroke-linecap="round"/><path d="M40.73 269H19.27a2.264 2.264 0 0 1-2.27-2.27v-7.46a2.264 2.264 0 0 1 
2.27-2.27h21.46a2.264 2.264 0 0 1 2.27 2.27v7.46a2.264 2.264 0
  0 1-2.2
 7 2.27z" style="marker:none" fill="#fff" fill-opacity=".441"/><path d="M20.845 269h18.31A3.836 3.836 0 0 0 
43 265.155v-6.31A3.836 3.836 0 0 0 39.155 255h-18.31A3.836 3.836 0 0 0 17 258.845v6.31A3.836 3.836 0 0 0 
20.845 269z" style="marker:none" fill="none" stroke="#1a5fb4" stroke-width="2" stroke-linecap="round"/><path 
d="M76.73 269H55.27a2.264 2.264 0 0 1-2.27-2.27v-7.46a2.264 2.264 0 0 1 2.27-2.27h21.46a2.264 2.264 0 0 1 
2.27 2.27v7.46a2.264 2.264 0 0 1-2.27 2.27z" style="marker:none" fill="#fff" fill-opacity=".441"/><path 
d="M56.845 269h18.31A3.836 3.836 0 0 0 79 265.155v-6.31A3.836 3.836 0 0 0 75.155 255h-18.31A3.836 3.836 0 0 0 
53 258.845v6.31A3.836 3.836 0 0 0 56.845 269z" style="marker:none" fill="none" stroke="#1a5fb4" 
stroke-width="2" stroke-linecap="round"/><path d="M82 256c0-1.063-.828-2-2-2H56s-4 0-4 
4v4h2v-3.2c0-.468.316-.784.785-.784h23.43c.469 0 .925.337.785.785V262h1c2 0 2 2 2 2zm-38 6v-4s0-4-4-4H16c-.88 
0-2 .905-2 2v8s0-2 2-2h1v-3.215c0-.469.316-.785.785-.78
 5h23.43c
 .469 0 .737.319.785.785l.125 3.215z" 
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;marker:none"
 color="#000" font-weight="400" font-family="sans-serif" overflow="visible" fill="#1a5fb4"/><rect 
style="marker:none" width="32" height="32" x="68.001" y="210" rx="0" ry="0" fill="#f66151"/><path d="M69.71 
235.207a41.947 41.947 0 0 0 14.33-7.194c1.441-1.114 2.838-2.357 
3.717-3.952.44-.798.741-1.678.824-2.585.082-.907-.062-1.841-.468-2.656a4.788 4.788 0 0 0-1.525-1.755 5.755 
5.755 0 0 0-2.144-.918c-1.533-.32-3.144-.064-4.609.49-1.762.669-3.374 1.785-4.507 3.291-1.134 1.507-1.766
  3.412-1
 .62 5.292.096 1.218.513 2.405 1.156 3.444.643 1.04 1.509 1.935 2.496 2.656 1.975 1.442 4.395 2.171 6.82 
2.482 5.52.706 11.285-.715 15.845-3.905l-.024-5.188c-3.574 3.943-8.657 6.483-13.956 
6.975-2.287.212-4.67.039-6.736-.966-1.033-.502-1.973-1.21-2.692-2.106-.72-.895-1.214-1.98-1.355-3.12-.206-1.663.358-3.38
 1.398-4.694s2.527-2.239 4.127-2.74c.883-.275 1.818-.429 2.736-.311.917.118 1.817.527 2.415 1.233.484.572.75 
1.313.796 2.061.047.748-.117 1.501-.415 2.189-.595 1.375-1.693 2.464-2.812 3.46a46.823 46.823 0 0 1-13.796 
8.517z" style="marker:none" color="#000" overflow="visible" fill="#fff"/><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;isolat
 ion:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1" d="M28 192v4h40v-4z" color="#000" 
font-weight="400" font-family="sans-serif" overflow="visible" fill="#77767b" fill-rule="evenodd"/><path 
style="marker:none" d="M28 222h36v18H48v4H28zM64 206v12H28v-18h72v6z" color="#000" overflow="visible" 
fill="#deddda"/><path d="M108 280.654a7.468 7.468 0 0 1-7.492 7.346h-.5v1h.5a8.488 8.488 0 0 0 
7.463-4.428c.013-.19.029-.379.029-.572zM66 288l34 1v-1z" fill="#c0bfbc" fill-opacity=".272"/></g></svg>
\ No newline at end of file
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]