Merge branch '9-icon' into 'master'

malcontent-control: Add scalable and symbolic icons

Closes #9

See merge request pwithnall/malcontent!28
This commit is contained in:
Philip Withnall 2020-02-19 14:01:29 +00:00
commit b311727c43
7 changed files with 35 additions and 2 deletions

View File

@ -0,0 +1,20 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
import os
import subprocess
install_prefix = os.environ['MESON_INSTALL_PREFIX']
schemadir = os.path.join(install_prefix, 'share', 'glib-2.0', 'schemas')
if not os.environ.get('DESTDIR'):
print('Compiling gsettings schemas…')
subprocess.call(['glib-compile-schemas', schemadir])
print('Updating icon cache…')
icon_cache_dir = os.path.join(install_prefix, 'share', 'icons', 'hicolor')
subprocess.call(['gtk-update-icon-cache', '-qtf', icon_cache_dir])
print('Updating desktop database…')
desktop_database_dir = os.path.join(install_prefix, 'share', 'applications')
subprocess.call(['update-desktop-database', '-q', desktop_database_dir])

View File

@ -0,0 +1,8 @@
install_data(
join_paths('scalable', application_id + '.svg'),
install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'apps'),
)
install_data(
join_paths('symbolic', application_id + '-symbolic.svg'),
install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'symbolic', 'apps'),
)

View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><clipPath id="a"><path d="M0 0h128v128H0z"/></clipPath><clipPath id="c"><path d="M0 0h128v128H0z"/></clipPath><clipPath id="i"><path d="M0 0h128v128H0z"/></clipPath><clipPath id="g"><path d="M0 0h128v128H0z"/></clipPath><g id="m" clip-path="url(#i)"><use xlink:href="#j" mask="url(#k)"/></g><g id="e" clip-path="url(#a)"><path d="M124 66c0 33.137-26.863 60-60 60S4 99.137 4 66 30.863 6 64 6s60 26.863 60 60zm0 0" fill="url(#b)"/><path d="M124 63c0 32.586-26.863 59-60 59S4 95.586 4 63 30.863 4 64 4s60 26.414 60 59zm0 0" fill="#f8e45c"/><path d="M52.785 24.977a9.317 9.317 0 000 18.632 9.317 9.317 0 000-18.632zm-5.543 22.277c-.988 0-1.937.39-2.637 1.09L28.25 65.19c-3.656 3.512 1.758 8.926 5.27 5.27l10.933-10.934-.937 1.09v36.196c-.07 5.039 7.464 5.039 7.394 0V78.867c0-2.906 3.738-2.906 3.738 0v17.945c-.07 5.04 7.485 5.04 7.414 0v-27.78l3.567 7.624c2.02 4.531 8.82 1.508 6.812-3.027L61.535 49.465a3.729 3.729 0 00-3.406-2.211zm0 0M84.848 61.16a7.46 7.46 0 017.46 7.461 7.464 7.464 0 01-14.926 0 7.464 7.464 0 017.466-7.46zm0 0" fill="#3d3846"/><path d="M71.707 75.426c-3.078-.059-3.953 4.183-1.105 5.351l7.18 2.84V97.91c-.052 3.762 5.613 3.762 5.562 0v-3.969c0-1.804 2.832-1.726 2.832 0v3.797c-.051 3.758 5.492 3.758 5.437 0v-8.156l1.207 2.09c1.852 3.21 6.668.43 4.813-2.781l-5.29-9.164a2.792 2.792 0 00-2.41-1.391H79.57l-6.785-2.672a2.708 2.708 0 00-1.078-.238zm0 0" fill="#3d3846"/><path d="M64 6.95C32.52 6.95 7 32.042 7 63c0 30.957 25.52 56.05 57 56.05S121 93.958 121 63c0-30.957-25.52-56.05-57-56.05zm0 3.706c29.398 0 53.23 23.434 53.23 52.344S93.398 115.344 64 115.344c-29.398 0-53.23-23.434-53.23-52.344S34.602 10.656 64 10.656zm0 0" fill="#3d3846"/></g><g id="f" clip-path="url(#c)" filter="url(#d)"><use xlink:href="#e"/></g><g id="j" clip-path="url(#g)"><path d="M128 80.64V128H0V80.64zm0 0" fill="url(#h)"/><path d="M13.309 80.64L60.664 128H81.88l-47.36-47.36zm42.421 0L103.094 128h21.215L76.945 80.64zm42.43 0L128 110.48V89.27l-8.629-8.63zM0 88.548v21.215L18.238 128h21.215zm0 0"/></g><linearGradient id="l" gradientUnits="userSpaceOnUse" x1="0" y1="269.463" x2="118.926" y2="269.463" gradientTransform="translate(0 -172)"><stop offset="0" stop-color="#e5a50a"/><stop offset=".414" stop-color="#fbdf9b"/><stop offset=".813" stop-color="#e5a50a"/><stop offset="1" stop-color="#f8ca5b"/></linearGradient><linearGradient id="h" gradientUnits="userSpaceOnUse" x1="300" y1="235" x2="428" y2="235" gradientTransform="matrix(0 .37 -.98462 0 295.385 -30.36)"><stop offset="0" stop-color="#f9f06b"/><stop offset="1" stop-color="#f5c211"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="0" y1="269.463" x2="118.926" y2="269.463" gradientTransform="translate(0 -172)"><stop offset="0" stop-color="#e5a50a"/><stop offset=".414" stop-color="#fbdf9b"/><stop offset=".813" stop-color="#e5a50a"/><stop offset="1" stop-color="#f8ca5b"/></linearGradient><mask id="k"><g filter="url(#d)"><path fill-opacity=".8" d="M0 0h128v128H0z"/></g></mask><mask id="n"><use xlink:href="#f"/></mask><filter id="d" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%"><feColorMatrix in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/></filter></defs><path d="M124 66c0 33.137-26.863 60-60 60S4 99.137 4 66 30.863 6 64 6s60 26.863 60 60zm0 0" fill="url(#l)"/><path d="M124 63c0 32.586-26.863 59-60 59S4 95.586 4 63 30.863 4 64 4s60 26.414 60 59zm0 0" fill="#f8e45c"/><path d="M52.785 24.977a9.317 9.317 0 000 18.632 9.317 9.317 0 000-18.632zm-5.543 22.277c-.988 0-1.937.39-2.637 1.09L28.25 65.19c-3.656 3.512 1.758 8.926 5.27 5.27l10.933-10.934-.937 1.09v36.196c-.07 5.039 7.464 5.039 7.394 0V78.867c0-2.906 3.738-2.906 3.738 0v17.945c-.07 5.04 7.485 5.04 7.414 0v-27.78l3.567 7.624c2.02 4.531 8.82 1.508 6.812-3.027L61.535 49.465a3.729 3.729 0 00-3.406-2.211zm0 0M84.848 61.16a7.46 7.46 0 017.46 7.461 7.464 7.464 0 01-14.926 0 7.464 7.464 0 017.466-7.46zm0 0" fill="#3d3846"/><path d="M71.707 75.426c-3.078-.059-3.953 4.183-1.105 5.351l7.18 2.84V97.91c-.052 3.762 5.613 3.762 5.562 0v-3.969c0-1.804 2.832-1.726 2.832 0v3.797c-.051 3.758 5.492 3.758 5.437 0v-8.156l1.207 2.09c1.852 3.21 6.668.43 4.813-2.781l-5.29-9.164a2.792 2.792 0 00-2.41-1.391H79.57l-6.785-2.672a2.708 2.708 0 00-1.078-.238zm0 0" fill="#3d3846"/><path d="M64 6.95C32.52 6.95 7 32.042 7 63c0 30.957 25.52 56.05 57 56.05S121 93.958 121 63c0-30.957-25.52-56.05-57-56.05zm0 3.706c29.398 0 53.23 23.434 53.23 52.344S93.398 115.344 64 115.344c-29.398 0-53.23-23.434-53.23-52.344S34.602 10.656 64 10.656zm0 0" fill="#3d3846"/><use xlink:href="#m" mask="url(#n)"/></svg>

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><defs><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="0" y1="269.463" x2="118.926" y2="269.463" gradientTransform="translate(0 -172)"><stop offset="0" stop-color="#e5a50a"/><stop offset=".414" stop-color="#fbdf9b"/><stop offset=".813" stop-color="#e5a50a"/><stop offset="1" stop-color="#f8ca5b"/></linearGradient></defs><path d="M124 66c0 33.137-26.863 60-60 60S4 99.137 4 66 30.863 6 64 6s60 26.863 60 60zm0 0" fill="url(#a)"/><path d="M124 63c0 32.586-26.863 59-60 59S4 95.586 4 63 30.863 4 64 4s60 26.414 60 59zm0 0" fill="#f8e45c"/><path d="M52.785 24.977a9.317 9.317 0 000 18.632 9.317 9.317 0 000-18.632zm-5.543 22.277c-.988 0-1.937.39-2.637 1.09L28.25 65.19c-3.656 3.512 1.758 8.926 5.27 5.27l10.933-10.934-.937 1.09v36.196c-.07 5.039 7.464 5.039 7.394 0V78.867c0-2.906 3.738-2.906 3.738 0v17.945c-.07 5.04 7.485 5.04 7.414 0v-27.78l3.567 7.624c2.02 4.531 8.82 1.508 6.812-3.027L61.535 49.465a3.729 3.729 0 00-3.406-2.211zm0 0M84.848 61.16a7.46 7.46 0 017.46 7.461 7.464 7.464 0 01-14.926 0 7.464 7.464 0 017.466-7.46zm0 0" fill="#3d3846"/><path d="M71.707 75.426c-3.078-.059-3.953 4.183-1.105 5.351l7.18 2.84V97.91c-.052 3.762 5.613 3.762 5.562 0v-3.969c0-1.804 2.832-1.726 2.832 0v3.797c-.051 3.758 5.492 3.758 5.437 0v-8.156l1.207 2.09c1.852 3.21 6.668.43 4.813-2.781l-5.29-9.164a2.792 2.792 0 00-2.41-1.391H79.57l-6.785-2.672a2.708 2.708 0 00-1.078-.238zm0 0" fill="#3d3846"/><path d="M64 6.95C32.52 6.95 7 32.042 7 63c0 30.957 25.52 56.05 57 56.05S121 93.958 121 63c0-30.957-25.52-56.05-57-56.05zm0 3.706c29.398 0 53.23 23.434 53.23 52.344S93.398 115.344 64 115.344c-29.398 0-53.23-23.434-53.23-52.344S34.602 10.656 64 10.656zm0 0" fill="#3d3846"/></svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#2e3436"><path d="M8 2.5C8 3.879 6.879 5 5.5 5A2.502 2.502 0 013 2.5C3 1.121 4.121 0 5.5 0S8 1.121 8 2.5zm0 0M12.5 5C13.879 5 15 6.121 15 7.5S13.879 10 12.5 10A2.502 2.502 0 0110 7.5C10 6.121 11.121 5 12.5 5zm0 0"/><path d="M10 11c-1.352-.02-1.352 2.02 0 2h1v2a.998.998 0 001.5.863A1 1 0 0014 15v-.137c.867.5 1.848-.437 1.387-1.324l-.95-1.812C14.087 11.117 13.845 11 13 11zm0 0" fill-rule="evenodd"/><path d="M4 6a1 1 0 00-.707.293l-3 3a.992.992 0 00-.273.973.99.99 0 00.714.714.992.992 0 00.973-.273L3.25 9.16 3 10.93V15c-.004.36.184.695.496.879.313.18.695.18 1.008 0 .312-.184.5-.52.496-.879v-2.5s0-.5.5-.5.5.5.5.5V15c-.004.36.184.695.496.879.313.18.695.18 1.008 0 .312-.184.5-.52.496-.879v-3.285l.086.191c.223.504.816.73 1.32.508.504-.223.73-.816.508-1.32l-2-4.5C7.754 6.234 7.394 6 7 6zm0 0" fill-rule="evenodd"/></g></svg>

After

Width:  |  Height:  |  Size: 899 B

View File

@ -113,6 +113,6 @@ if xmllint.found()
)
endif
# FIXME: Add icons and tests
#subdir('icons')
# FIXME: Add tests
subdir('icons')
#subdir('tests')

View File

@ -133,3 +133,5 @@ subdir('malcontent-client')
subdir('malcontent-control')
subdir('pam')
subdir('po')
meson.add_install_script('build-aux/meson_post_install.py')