Commit 49e883b7 authored by Bilal Elmoussaoui's avatar Bilal Elmoussaoui
Browse files

use devel icon & bump handy

parent d05183c6
......@@ -109,7 +109,7 @@ dependencies = [
"glib 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gtk 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gtk-macros 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libhandy 1.0.0 (git+https://gitlab.gnome.org/World/Rust/libhandy-rs.git)",
"libhandy 1.0.0-alpha (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"pango 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pangocairo 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -521,8 +521,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "libhandy"
version = "1.0.0"
source = "git+https://gitlab.gnome.org/World/Rust/libhandy-rs.git#8e83a51344d981f0cdb6a643ae3b6fc63b328d96"
version = "1.0.0-alpha"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gdk 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -536,14 +536,14 @@ dependencies = [
"gtk-sys 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
"libhandy-sys 1.0.0 (git+https://gitlab.gnome.org/World/Rust/libhandy-rs.git)",
"libhandy-sys 1.0.0-alpha (registry+https://github.com/rust-lang/crates.io-index)",
"pango 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "libhandy-sys"
version = "1.0.0"
source = "git+https://gitlab.gnome.org/World/Rust/libhandy-rs.git#8e83a51344d981f0cdb6a643ae3b6fc63b328d96"
version = "1.0.0-alpha"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"gdk 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gdk-pixbuf-sys 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -1131,8 +1131,8 @@ dependencies = [
"checksum itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
"checksum libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)" = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018"
"checksum libhandy 1.0.0 (git+https://gitlab.gnome.org/World/Rust/libhandy-rs.git)" = "<none>"
"checksum libhandy-sys 1.0.0 (git+https://gitlab.gnome.org/World/Rust/libhandy-rs.git)" = "<none>"
"checksum libhandy 1.0.0-alpha (registry+https://github.com/rust-lang/crates.io-index)" = "b9a7422b2333a10abc6075f7548c09f992907f73cb6da2e72de69c764def9378"
"checksum libhandy-sys 1.0.0-alpha (registry+https://github.com/rust-lang/crates.io-index)" = "6c134bdb832ef5d3812ba4aa7cd9220db6a532d8c856da66f66cfaca073b06eb"
"checksum locale_config 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "73ac19ebe45489e5d53b4346d8b90bb3dd03275c5fdf2ce22a982516d86b535c"
"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
"checksum memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53445de381a1f436797497c61d851644d0e8e88e6140f22872ad33a704933978"
......
......@@ -12,7 +12,7 @@ gdk = "0.13"
pangocairo = "0.10"
log = "0.4"
gettext-rs = { version = "0.4", features = ["gettext-system"] }
libhandy = { git = "https://gitlab.gnome.org/World/Rust/libhandy-rs.git" }
libhandy = "1.0.0-alpha"
pretty_env_logger = "0.4"
pango = "0.9"
sass-rs = "0.2"
......
{
"app-id": "org.gnome.design.ContrastDevel",
"app-id": "org.gnome.design.Contrast.Devel",
"runtime": "org.gnome.Platform",
"runtime-version": "3.36",
"sdk": "org.gnome.Sdk",
......@@ -15,10 +15,6 @@
"--socket=fallback-x11",
"--socket=wayland",
"--device=dri",
"--filesystem=xdg-run/dconf",
"--filesystem=~/.config/dconf:ro",
"--talk-name=ca.desrt.dconf",
"--env=DCONF_USER_CONFIG_DIR=.config/dconf",
"--talk-name=org.gnome.Shell.Screenshot"
],
"build-options": {
......@@ -50,7 +46,7 @@
"sources": [{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/libhandy.git",
"branch": "0.83.0"
"branch": "0.90.0"
}]
},
{
......
install_data(
'org.gnome.design.Contrast.svg',
install_dir: iconsdir / 'hicolor' / 'scalable' / 'apps',
rename: '@0@.svg'.format(application_id)
'@0@.svg'.format(application_id),
install_dir: iconsdir / 'hicolor' / 'scalable' / 'apps'
)
install_data(
......
<?xml version="1.0" encoding="UTF-8"?>
<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs>
<linearGradient id="a" gradientUnits="userSpaceOnUse" x1="3.998947" x2="124.000015" y1="65" y2="65">
<stop offset="0" stop-color="#fefefe"/>
<stop offset="0.106258" stop-color="#848277"/>
<stop offset="0.262506" stop-color="#c2c1bb"/>
<stop offset="0.497921" stop-color="#c2c1bb"/>
<stop offset="0.802085" stop-color="#848277"/>
<stop offset="0.895834" stop-color="#7f7d72"/>
<stop offset="1" stop-color="#e0dfdc"/>
</linearGradient>
<filter id="b" height="100%" width="100%" x="0%" y="0%">
<feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
</filter>
<mask id="c">
<g filter="url(#b)">
<rect fill-opacity="0.309" height="128" width="128"/>
</g>
</mask>
<mask id="d">
<g filter="url(#b)">
<rect fill-opacity="0.236" height="128" width="128"/>
</g>
</mask>
<mask id="e">
<g filter="url(#b)">
<rect fill-opacity="0.6" height="128" width="128"/>
</g>
</mask>
<mask id="f">
<g filter="url(#b)">
<rect fill-opacity="0.6" height="128" width="128"/>
</g>
</mask>
<mask id="g">
<g filter="url(#b)">
<rect fill-opacity="0.6" height="128" width="128"/>
</g>
</mask>
<linearGradient id="h" gradientUnits="userSpaceOnUse" x1="104.766520767" x2="76.482256767" y1="49.50814573272" y2="21.22388173272">
<stop offset="0" stop-color="#241f31"/>
<stop offset="1" stop-color="#3d3846"/>
</linearGradient>
<mask id="i">
<g filter="url(#b)">
<rect fill-opacity="0.309" height="128" width="128"/>
</g>
</mask>
<clipPath id="j">
<rect height="128" width="128"/>
</clipPath>
<g id="k" clip-path="url(#j)">
<path d="m 100.875 16.757812 c -1.117188 0.476563 -2.144531 1.167969 -3.015625 2.050782 l -0.003906 -0.007813 l -9.699219 9.699219 l -6.0625 -6.0625 c -1.414062 -1.414062 -2.828125 0 -2.828125 0 l -4.488281 4.488281 s -1.414063 1.414063 0 2.828125 l 6.734375 6.734375 l -35.511719 35.511719 c -3 4.5 -1.5 9 -6 13.5 l 4.5 4.5 c 4.5 -4.5 10.582031 -2.949219 13.5 -6 l 35.511719 -35.511719 l 6.722656 6.722657 c 1.414063 1.414062 2.828125 0 2.828125 0 l 4.488281 -4.488282 c 1.414063 -1.414062 0 -2.828125 0 -2.828125 l -6.0625 -6.0625 l 9.699219 -9.699219 c 0.765625 -0.757812 1.378906 -1.636718 1.84375 -2.589843 c -3.398438 -4.835938 -7.496094 -9.144531 -12.15625 -12.785157 z m 0 0"/>
</g>
<mask id="l">
<g filter="url(#b)">
<rect fill-opacity="0.236" height="128" width="128"/>
</g>
</mask>
<radialGradient id="m" cx="71.999481" cy="211.20607" gradientTransform="matrix(1.206238 0 0 1.206227 -22.849003 -207.556225)" gradientUnits="userSpaceOnUse" r="60.000534">
<stop offset="0" stop-color="#fdfdfd"/>
<stop offset="1" stop-color="#fdfdfd" stop-opacity="0"/>
</radialGradient>
<clipPath id="n">
<rect height="128" width="128"/>
</clipPath>
<g id="o" clip-path="url(#n)">
<path d="m 124 64 c 0 33.136719 -26.863281 60 -60 60 s -60 -26.863281 -60 -60 s 26.863281 -60 60 -60 s 60 26.863281 60 60 z m 0 0" fill="url(#m)"/>
</g>
<mask id="p">
<g filter="url(#b)">
<rect fill-opacity="0.6" height="128" width="128"/>
</g>
</mask>
<clipPath id="q">
<rect height="128" width="128"/>
</clipPath>
<g id="r" clip-path="url(#q)">
<path d="m 83.460938 30.539062 l -37.460938 37.460938 c -3 4.5 -1.5 9 -6 13.5 l 4.5 4.5 c 4.5 -4.5 10.582031 -2.949219 13.5 -6 l 37.460938 -37.460938 z m 0 0" fill="#ffffff"/>
</g>
<mask id="s">
<g filter="url(#b)">
<rect fill-opacity="0.6" height="128" width="128"/>
</g>
</mask>
<clipPath id="t">
<rect height="128" width="128"/>
</clipPath>
<g id="u" clip-path="url(#t)">
<path d="m 38 262 l 46 -46" fill="none" stroke="#ffffff" stroke-linecap="round" stroke-width="8" transform="matrix(0.75 0 0 0.75 20.5 -127)"/>
</g>
<mask id="v">
<g filter="url(#b)">
<rect fill-opacity="0.6" height="128" width="128"/>
</g>
</mask>
<clipPath id="w">
<rect height="128" width="128"/>
</clipPath>
<g id="x" clip-path="url(#w)">
<path d="m 38 258.885417 l 46 -46" fill="none" stroke="#ffffff" stroke-linecap="round" stroke-width="4" transform="matrix(0.75 0 0 0.75 20.5 -127)"/>
</g>
<clipPath id="y">
<rect height="128" width="128"/>
</clipPath>
<clipPath id="z">
<rect height="128" width="128"/>
</clipPath>
<mask id="A">
<g clip-path="url(#z)" filter="url(#b)">
<g clip-path="url(#y)">
<path d="m 124 65 c 0 33.6875 -26.863281 61 -60 61 s -60 -27.3125 -60 -61 s 26.863281 -61 60 -61 s 60 27.3125 60 61 z m 0 0" fill="url(#a)"/>
<path d="m 124 64 c 0 33.136719 -26.863281 60 -60 60 s -60 -26.863281 -60 -60 s 26.863281 -60 60 -60 s 60 26.863281 60 60 z m 0 0" fill="#deddda"/>
<use mask="url(#i)" xlink:href="#k"/>
<path d="m 64 120 c -20.007812 0 -38.492188 -10.671875 -48.496094 -28 s -10.003906 -38.671875 0 -56 s 28.488282 -28 48.496094 -28" fill="#3d3846"/>
<path d="m 64 8 c -30.929688 0 -56 25.070312 -56 56 s 25.070312 56 56 56 s 56 -25.070312 56 -56 s -25.070312 -56 -56 -56 z m 0 2.75 c 29.410156 0 53.25 23.839844 53.25 53.25 s -23.839844 53.25 -53.25 53.25 s -53.25 -23.839844 -53.25 -53.25 s 23.839844 -53.25 53.25 -53.25 z m 0 0" fill="#3d3846"/>
<use mask="url(#l)" xlink:href="#o"/>
<use mask="url(#p)" xlink:href="#r"/>
<use mask="url(#s)" xlink:href="#u"/>
<use mask="url(#v)" xlink:href="#x"/>
<path d="m 104.5625 12 c -2.519531 0.003906 -4.933594 1.015625 -6.703125 2.808594 l -0.003906 -0.003906 l -9.699219 9.695312 l -6.0625 -6.058594 c -1.414062 -1.417968 -2.828125 0 -2.828125 0 l -4.488281 4.484375 s -1.414063 1.417969 0 2.832031 l 25.457031 25.453126 c 1.414063 1.414062 2.828125 0 2.828125 0 l 4.488281 -4.488282 c 1.414063 -1.414062 0 -2.828125 0 -2.828125 l -6.0625 -6.0625 l 9.644531 -9.640625 l 0.054688 -0.054687 l -0.003906 -0.003907 c 1.796875 -1.769531 2.804687 -4.183593 2.808594 -6.703124 c 0 -5.207032 -4.222657 -9.429688 -9.429688 -9.429688 z m 0 0" fill="url(#h)" fill-rule="evenodd"/>
<path d="m 106 18 c 0 1.65625 -1.34375 3 -3 3 s -3 -1.34375 -3 -3 s 1.34375 -3 3 -3 s 3 1.34375 3 3 z m 0 0" fill="#ffffff" fill-opacity="0.275591"/>
</g>
</g>
</mask>
<mask id="B">
<g filter="url(#b)">
<rect fill-opacity="0.8" height="128" width="128"/>
</g>
</mask>
<linearGradient id="C" gradientTransform="matrix(0 0.37 -0.98462 0 295.38501 -30.360001)" gradientUnits="userSpaceOnUse" x1="300" x2="428" y1="235" y2="235">
<stop offset="0" stop-color="#f9f06b"/>
<stop offset="1" stop-color="#f5c211"/>
</linearGradient>
<clipPath id="D">
<rect height="128" width="128"/>
</clipPath>
<clipPath id="E">
<rect height="128" width="128"/>
</clipPath>
</defs>
<path d="m 124 65 c 0 33.6875 -26.863281 61 -60 61 s -60 -27.3125 -60 -61 s 26.863281 -61 60 -61 s 60 27.3125 60 61 z m 0 0" fill="url(#a)"/>
<path d="m 124 64 c 0 33.136719 -26.863281 60 -60 60 s -60 -26.863281 -60 -60 s 26.863281 -60 60 -60 s 60 26.863281 60 60 z m 0 0" fill="#deddda"/>
<use mask="url(#c)" xlink:href="#k"/>
<path d="m 64 120 c -20.007812 0 -38.492188 -10.671875 -48.496094 -28 s -10.003906 -38.671875 0 -56 s 28.488282 -28 48.496094 -28" fill="#3d3846"/>
<path d="m 64 8 c -30.929688 0 -56 25.070312 -56 56 s 25.070312 56 56 56 s 56 -25.070312 56 -56 s -25.070312 -56 -56 -56 z m 0 2.75 c 29.410156 0 53.25 23.839844 53.25 53.25 s -23.839844 53.25 -53.25 53.25 s -53.25 -23.839844 -53.25 -53.25 s 23.839844 -53.25 53.25 -53.25 z m 0 0" fill="#3d3846"/>
<use mask="url(#d)" xlink:href="#o"/>
<use mask="url(#e)" xlink:href="#r"/>
<use mask="url(#f)" xlink:href="#u"/>
<use mask="url(#g)" xlink:href="#x"/>
<path d="m 104.5625 12 c -2.519531 0.003906 -4.933594 1.015625 -6.703125 2.808594 l -0.003906 -0.003906 l -9.699219 9.695312 l -6.0625 -6.058594 c -1.414062 -1.417968 -2.828125 0 -2.828125 0 l -4.488281 4.484375 s -1.414063 1.417969 0 2.832031 l 25.457031 25.453126 c 1.414063 1.414062 2.828125 0 2.828125 0 l 4.488281 -4.488282 c 1.414063 -1.414062 0 -2.828125 0 -2.828125 l -6.0625 -6.0625 l 9.644531 -9.640625 l 0.054688 -0.054687 l -0.003906 -0.003907 c 1.796875 -1.769531 2.804687 -4.183593 2.808594 -6.703124 c 0 -5.207032 -4.222657 -9.429688 -9.429688 -9.429688 z m 0 0" fill="url(#h)" fill-rule="evenodd"/>
<path d="m 106 18 c 0 1.65625 -1.34375 3 -3 3 s -3 -1.34375 -3 -3 s 1.34375 -3 3 -3 s 3 1.34375 3 3 z m 0 0" fill="#ffffff" fill-opacity="0.275591"/>
<g clip-path="url(#E)" mask="url(#A)">
<g clip-path="url(#D)" mask="url(#B)">
<path d="m 128 80.640625 v 47.359375 h -128 v -47.359375 z m 0 0" fill="url(#C)"/>
<path d="m 13.308594 80.640625 l 47.355468 47.359375 h 21.214844 l -47.359375 -47.359375 z m 42.421875 0 l 47.363281 47.359375 h 21.214844 l -47.363282 -47.359375 z m 42.429687 0 l 29.839844 29.839844 v -21.210938 l -8.628906 -8.628906 z m -98.160156 7.90625 v 21.214844 l 18.238281 18.238281 h 21.214844 z m 0 0"/>
</g>
</g>
</svg>
......@@ -61,8 +61,9 @@ entry selection{
}
window.main-window headerbar.titlebar {
background: none;
border: none;
background: none;
border: none;
box-shadow: none;
}
window.main-window headerbar.titlebar button.close {
......
......@@ -10,9 +10,9 @@ dependency('glib-2.0', version: '>= 2.56')
dependency('gio-2.0', version: '>= 2.56')
dependency('gdk-pixbuf-2.0')
dependency('gtk+-3.0', version: '>= 3.24.7')
dependency('libhandy-1', version: '>= 0.83')
dependency('libhandy-1', version: '>= 0.90')
find_program('cargo', required: false)
find_program('cargo', required: true)
find_program('glib-compile-resources', required: true)
glib_compile_schemas = find_program('glib-compile-schemas', required: true)
......@@ -36,9 +36,10 @@ iconsdir = datadir / 'icons'
podir =meson.source_root () / 'po'
gettext_package = meson.project_name()
application_id = 'org.gnome.design.Contrast'
if get_option('profile') == 'development'
profile = 'Devel'
application_id += '.Devel'
vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
if vcs_tag == ''
version_suffix = '-devel'
......@@ -50,7 +51,6 @@ else
version_suffix = ''
endif
application_id = 'org.gnome.design.Contrast@0@'.format(profile)
subdir('po')
subdir('data')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment