From a15e68913ffc762fc15a14d88f92682e43a8a0ac Mon Sep 17 00:00:00 2001 From: Cassidy James Blaede Date: Fri, 12 Jan 2024 15:52:11 -0700 Subject: [PATCH 1/2] Icon: add Jakub-based icons --- data/icons/app.svg | 274 +-- data/icons/com.cassidyjames.butler.Source.svg | 1471 +++++++++++++++++ data/icons/devel.svg | 1063 ++++++++++++ data/icons/symbolic.svg | 28 + 4 files changed, 2734 insertions(+), 102 deletions(-) create mode 100644 data/icons/com.cassidyjames.butler.Source.svg create mode 100644 data/icons/devel.svg create mode 100644 data/icons/symbolic.svg diff --git a/data/icons/app.svg b/data/icons/app.svg index fc4c3b9..fc13524 100644 --- a/data/icons/app.svg +++ b/data/icons/app.svg @@ -1,104 +1,174 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + diff --git a/data/icons/com.cassidyjames.butler.Source.svg b/data/icons/com.cassidyjames.butler.Source.svg new file mode 100644 index 0000000..f837c63 --- /dev/null +++ b/data/icons/com.cassidyjames.butler.Source.svg @@ -0,0 +1,1471 @@ + + + +Adwaita Icon Templateimage/svg+xmlGNOME Design TeamAdwaita Icon TemplateHicolorSymbolic diff --git a/data/icons/devel.svg b/data/icons/devel.svg new file mode 100644 index 0000000..e8af89c --- /dev/null +++ b/data/icons/devel.svg @@ -0,0 +1,1063 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/symbolic.svg b/data/icons/symbolic.svg new file mode 100644 index 0000000..b124fa0 --- /dev/null +++ b/data/icons/symbolic.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 1f3528743f61015e00fd55986f6d7a5e28b5d4da Mon Sep 17 00:00:00 2001 From: Cassidy James Blaede Date: Fri, 12 Jan 2024 16:08:53 -0700 Subject: [PATCH 2/2] Prep 1.0.3 release --- data/meson.build | 8 +++++++- data/metainfo.xml | 13 +++++++++++++ meson.build | 2 +- src/MainWindow.vala | 3 +++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/data/meson.build b/data/meson.build index 01c4ec7..72b908a 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,9 +1,15 @@ install_data( 'icons' / 'app.svg', - install_dir: get_option('datadir') / 'icons' / 'hicolor' / 'scalable' / 'apps', + install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'apps'), rename: meson.project_name() + '.svg' ) +install_data( + 'icons' / 'symbolic.svg', + install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'symbolic', 'apps'), + rename: meson.project_name() + '-symbolic.svg' +) + install_data( 'gschema.xml', install_dir: get_option('datadir') / 'glib-2.0' / 'schemas', diff --git a/data/metainfo.xml b/data/metainfo.xml index 224b74f..e0eed69 100644 --- a/data/metainfo.xml +++ b/data/metainfo.xml @@ -56,6 +56,19 @@ + + +

Improved app listing

+
    +
  • New icon based on Jakub Steiner's excellent work
    • +
  • Refreshed summary and description to better align with Flathub recommendations
    • +
+ + + Metainfo: failing summery length + Unique icon + +

Small improvements

diff --git a/meson.build b/meson.build index 6529925..1c2dad3 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'com.cassidyjames.butler', 'vala', 'c', - version: '1.0.2', + version: '1.0.3', meson_version: '>=0.58', ) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 3d6f52b..b7db8b1 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -43,6 +43,9 @@ public class Butler.MainWindow : Adw.ApplicationWindow { /// The translator credits. Please translate this with your name(s). translator_credits = _("translator-credits"), + artists = { + "Jakub Steiner https://jimmac.eu/", + }, }; about_window.copyright = "© 2020–%i %s".printf ( new DateTime.now_local ().get_year (),