From c4db1878d49b7c9e07dee99827802b7a42102ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Mon, 12 Jun 2023 10:04:17 -0700 Subject: [PATCH] Resources: Update icons (#259) --- data/gresource.xml | 59 +++++++++++++++++++ data/icons/disabled-10.svg | 28 +++++++++ data/icons/disabled-20.svg | 28 +++++++++ data/icons/disabled-30.svg | 25 ++++++++ data/icons/disabled-40.svg | 25 ++++++++ data/icons/disabled-50.svg | 25 ++++++++ data/icons/disabled-60.svg | 25 ++++++++ data/icons/disabled-70.svg | 25 ++++++++ data/icons/disabled-80.svg | 25 ++++++++ data/icons/disabled-90.svg | 35 +++++++++++ data/icons/disabled.svg | 25 ++++++++ ...ication-new-10-symbolic.svg => new-10.svg} | 0 ...ication-new-20-symbolic.svg => new-20.svg} | 0 ...ication-new-30-symbolic.svg => new-30.svg} | 0 ...ication-new-40-symbolic.svg => new-40.svg} | 0 ...ication-new-50-symbolic.svg => new-50.svg} | 0 ...ication-new-60-symbolic.svg => new-60.svg} | 0 ...ication-new-70-symbolic.svg => new-70.svg} | 0 ...ication-new-80-symbolic.svg => new-80.svg} | 0 ...ication-new-90-symbolic.svg => new-90.svg} | 0 ...{notification-new-symbolic.svg => new.svg} | 0 .../notification-disabled-10-symbolic.svg | 30 ---------- .../notification-disabled-20-symbolic.svg | 30 ---------- .../notification-disabled-30-symbolic.svg | 30 ---------- .../notification-disabled-40-symbolic.svg | 30 ---------- .../notification-disabled-50-symbolic.svg | 30 ---------- .../notification-disabled-60-symbolic.svg | 30 ---------- .../notification-disabled-70-symbolic.svg | 30 ---------- .../notification-disabled-80-symbolic.svg | 30 ---------- .../notification-disabled-90-symbolic.svg | 30 ---------- data/icons/notification-disabled-symbolic.svg | 6 -- data/icons/notification-symbolic.svg | 6 -- data/icons/notification.svg | 18 ++++++ data/indicator.css | 38 ++++-------- ...tary.wingpanel.notifications.gresource.xml | 34 ----------- meson.build | 10 ++-- src/Indicator.vala | 2 - 37 files changed, 360 insertions(+), 349 deletions(-) create mode 100644 data/gresource.xml create mode 100644 data/icons/disabled-10.svg create mode 100644 data/icons/disabled-20.svg create mode 100644 data/icons/disabled-30.svg create mode 100644 data/icons/disabled-40.svg create mode 100644 data/icons/disabled-50.svg create mode 100644 data/icons/disabled-60.svg create mode 100644 data/icons/disabled-70.svg create mode 100644 data/icons/disabled-80.svg create mode 100644 data/icons/disabled-90.svg create mode 100644 data/icons/disabled.svg rename data/icons/{notification-new-10-symbolic.svg => new-10.svg} (100%) rename data/icons/{notification-new-20-symbolic.svg => new-20.svg} (100%) rename data/icons/{notification-new-30-symbolic.svg => new-30.svg} (100%) rename data/icons/{notification-new-40-symbolic.svg => new-40.svg} (100%) rename data/icons/{notification-new-50-symbolic.svg => new-50.svg} (100%) rename data/icons/{notification-new-60-symbolic.svg => new-60.svg} (100%) rename data/icons/{notification-new-70-symbolic.svg => new-70.svg} (100%) rename data/icons/{notification-new-80-symbolic.svg => new-80.svg} (100%) rename data/icons/{notification-new-90-symbolic.svg => new-90.svg} (100%) rename data/icons/{notification-new-symbolic.svg => new.svg} (100%) delete mode 100644 data/icons/notification-disabled-10-symbolic.svg delete mode 100644 data/icons/notification-disabled-20-symbolic.svg delete mode 100644 data/icons/notification-disabled-30-symbolic.svg delete mode 100644 data/icons/notification-disabled-40-symbolic.svg delete mode 100644 data/icons/notification-disabled-50-symbolic.svg delete mode 100644 data/icons/notification-disabled-60-symbolic.svg delete mode 100644 data/icons/notification-disabled-70-symbolic.svg delete mode 100644 data/icons/notification-disabled-80-symbolic.svg delete mode 100644 data/icons/notification-disabled-90-symbolic.svg delete mode 100644 data/icons/notification-disabled-symbolic.svg delete mode 100644 data/icons/notification-symbolic.svg create mode 100644 data/icons/notification.svg delete mode 100644 data/io.elementary.wingpanel.notifications.gresource.xml diff --git a/data/gresource.xml b/data/gresource.xml new file mode 100644 index 00000000..9678f550 --- /dev/null +++ b/data/gresource.xml @@ -0,0 +1,59 @@ + + + + indicator.css + NotificationEntry.css + + + image-mask.svg + + + icons/disabled-10.svg + icons/disabled-20.svg + icons/disabled-30.svg + icons/disabled-40.svg + icons/disabled-50.svg + icons/disabled-60.svg + icons/disabled-70.svg + icons/disabled-80.svg + icons/disabled-90.svg + icons/disabled.svg + + icons/new-10.svg + icons/new-20.svg + icons/new-30.svg + icons/new-40.svg + icons/new-50.svg + icons/new-60.svg + icons/new-70.svg + icons/new-80.svg + icons/new-90.svg + icons/new.svg + + icons/notification.svg + + icons/disabled-10.svg + icons/disabled-20.svg + icons/disabled-30.svg + icons/disabled-40.svg + icons/disabled-50.svg + icons/disabled-60.svg + icons/disabled-70.svg + icons/disabled-80.svg + icons/disabled-90.svg + icons/disabled.svg + + icons/new-10.svg + icons/new-20.svg + icons/new-30.svg + icons/new-40.svg + icons/new-50.svg + icons/new-60.svg + icons/new-70.svg + icons/new-80.svg + icons/new-90.svg + icons/new.svg + + icons/notification.svg + + diff --git a/data/icons/disabled-10.svg b/data/icons/disabled-10.svg new file mode 100644 index 00000000..dd44f4ad --- /dev/null +++ b/data/icons/disabled-10.svg @@ -0,0 +1,28 @@ + + + + + + diff --git a/data/icons/disabled-20.svg b/data/icons/disabled-20.svg new file mode 100644 index 00000000..33888b73 --- /dev/null +++ b/data/icons/disabled-20.svg @@ -0,0 +1,28 @@ + + + + + + diff --git a/data/icons/disabled-30.svg b/data/icons/disabled-30.svg new file mode 100644 index 00000000..31e8dc17 --- /dev/null +++ b/data/icons/disabled-30.svg @@ -0,0 +1,25 @@ + + + + + + diff --git a/data/icons/disabled-40.svg b/data/icons/disabled-40.svg new file mode 100644 index 00000000..c9b41254 --- /dev/null +++ b/data/icons/disabled-40.svg @@ -0,0 +1,25 @@ + + + + + + diff --git a/data/icons/disabled-50.svg b/data/icons/disabled-50.svg new file mode 100644 index 00000000..63aad306 --- /dev/null +++ b/data/icons/disabled-50.svg @@ -0,0 +1,25 @@ + + + + + + diff --git a/data/icons/disabled-60.svg b/data/icons/disabled-60.svg new file mode 100644 index 00000000..6c47d540 --- /dev/null +++ b/data/icons/disabled-60.svg @@ -0,0 +1,25 @@ + + + + + + diff --git a/data/icons/disabled-70.svg b/data/icons/disabled-70.svg new file mode 100644 index 00000000..ee21180e --- /dev/null +++ b/data/icons/disabled-70.svg @@ -0,0 +1,25 @@ + + + + + + diff --git a/data/icons/disabled-80.svg b/data/icons/disabled-80.svg new file mode 100644 index 00000000..065f4f7f --- /dev/null +++ b/data/icons/disabled-80.svg @@ -0,0 +1,25 @@ + + + + + + diff --git a/data/icons/disabled-90.svg b/data/icons/disabled-90.svg new file mode 100644 index 00000000..f3fc6f45 --- /dev/null +++ b/data/icons/disabled-90.svg @@ -0,0 +1,35 @@ + + + + + + + diff --git a/data/icons/disabled.svg b/data/icons/disabled.svg new file mode 100644 index 00000000..bbf984e1 --- /dev/null +++ b/data/icons/disabled.svg @@ -0,0 +1,25 @@ + + + + + + diff --git a/data/icons/notification-new-10-symbolic.svg b/data/icons/new-10.svg similarity index 100% rename from data/icons/notification-new-10-symbolic.svg rename to data/icons/new-10.svg diff --git a/data/icons/notification-new-20-symbolic.svg b/data/icons/new-20.svg similarity index 100% rename from data/icons/notification-new-20-symbolic.svg rename to data/icons/new-20.svg diff --git a/data/icons/notification-new-30-symbolic.svg b/data/icons/new-30.svg similarity index 100% rename from data/icons/notification-new-30-symbolic.svg rename to data/icons/new-30.svg diff --git a/data/icons/notification-new-40-symbolic.svg b/data/icons/new-40.svg similarity index 100% rename from data/icons/notification-new-40-symbolic.svg rename to data/icons/new-40.svg diff --git a/data/icons/notification-new-50-symbolic.svg b/data/icons/new-50.svg similarity index 100% rename from data/icons/notification-new-50-symbolic.svg rename to data/icons/new-50.svg diff --git a/data/icons/notification-new-60-symbolic.svg b/data/icons/new-60.svg similarity index 100% rename from data/icons/notification-new-60-symbolic.svg rename to data/icons/new-60.svg diff --git a/data/icons/notification-new-70-symbolic.svg b/data/icons/new-70.svg similarity index 100% rename from data/icons/notification-new-70-symbolic.svg rename to data/icons/new-70.svg diff --git a/data/icons/notification-new-80-symbolic.svg b/data/icons/new-80.svg similarity index 100% rename from data/icons/notification-new-80-symbolic.svg rename to data/icons/new-80.svg diff --git a/data/icons/notification-new-90-symbolic.svg b/data/icons/new-90.svg similarity index 100% rename from data/icons/notification-new-90-symbolic.svg rename to data/icons/new-90.svg diff --git a/data/icons/notification-new-symbolic.svg b/data/icons/new.svg similarity index 100% rename from data/icons/notification-new-symbolic.svg rename to data/icons/new.svg diff --git a/data/icons/notification-disabled-10-symbolic.svg b/data/icons/notification-disabled-10-symbolic.svg deleted file mode 100644 index c4dbb38a..00000000 --- a/data/icons/notification-disabled-10-symbolic.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/data/icons/notification-disabled-20-symbolic.svg b/data/icons/notification-disabled-20-symbolic.svg deleted file mode 100644 index 46c712c5..00000000 --- a/data/icons/notification-disabled-20-symbolic.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/data/icons/notification-disabled-30-symbolic.svg b/data/icons/notification-disabled-30-symbolic.svg deleted file mode 100644 index 0c52f667..00000000 --- a/data/icons/notification-disabled-30-symbolic.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/data/icons/notification-disabled-40-symbolic.svg b/data/icons/notification-disabled-40-symbolic.svg deleted file mode 100644 index 82f84442..00000000 --- a/data/icons/notification-disabled-40-symbolic.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/data/icons/notification-disabled-50-symbolic.svg b/data/icons/notification-disabled-50-symbolic.svg deleted file mode 100644 index 7d89846a..00000000 --- a/data/icons/notification-disabled-50-symbolic.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/data/icons/notification-disabled-60-symbolic.svg b/data/icons/notification-disabled-60-symbolic.svg deleted file mode 100644 index 05d5fd1f..00000000 --- a/data/icons/notification-disabled-60-symbolic.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/data/icons/notification-disabled-70-symbolic.svg b/data/icons/notification-disabled-70-symbolic.svg deleted file mode 100644 index 2532e731..00000000 --- a/data/icons/notification-disabled-70-symbolic.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/data/icons/notification-disabled-80-symbolic.svg b/data/icons/notification-disabled-80-symbolic.svg deleted file mode 100644 index b2c7bca5..00000000 --- a/data/icons/notification-disabled-80-symbolic.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/data/icons/notification-disabled-90-symbolic.svg b/data/icons/notification-disabled-90-symbolic.svg deleted file mode 100644 index 5ebdad33..00000000 --- a/data/icons/notification-disabled-90-symbolic.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/data/icons/notification-disabled-symbolic.svg b/data/icons/notification-disabled-symbolic.svg deleted file mode 100644 index b3a91eaf..00000000 --- a/data/icons/notification-disabled-symbolic.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/data/icons/notification-symbolic.svg b/data/icons/notification-symbolic.svg deleted file mode 100644 index d5ddd259..00000000 --- a/data/icons/notification-symbolic.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/data/icons/notification.svg b/data/icons/notification.svg new file mode 100644 index 00000000..308ab118 --- /dev/null +++ b/data/icons/notification.svg @@ -0,0 +1,18 @@ + + + + + diff --git a/data/indicator.css b/data/indicator.css index bfbc7f01..f527b235 100644 --- a/data/indicator.css +++ b/data/indicator.css @@ -1,21 +1,7 @@ /* -* Copyright (c) 2017 elementary LLC. (https://elementary.io) -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -* You should have received a copy of the GNU General Public -* License along with this program; if not, write to the -* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -* Boston, MA 02110-1301 USA. -*/ + * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-FileCopyrightText: 2017-2023 elementary, Inc. (https://elementary.io) + */ .notification-icon { animation: none; @@ -37,15 +23,15 @@ @keyframes notification-disabled { 0% { -gtk-icon-source: -gtk-icontheme("notification-symbolic"); } - 10% { -gtk-icon-source: -gtk-icontheme("notification-disabled-10-symbolic"); opacity: 0.94; } - 20% { -gtk-icon-source: -gtk-icontheme("notification-disabled-20-symbolic"); opacity: 0.88; } - 30% { -gtk-icon-source: -gtk-icontheme("notification-disabled-30-symbolic"); opacity: 0.82; } - 40% { -gtk-icon-source: -gtk-icontheme("notification-disabled-40-symbolic"); opacity: 0.76; } - 50% { -gtk-icon-source: -gtk-icontheme("notification-disabled-50-symbolic"); opacity: 0.70; } - 60% { -gtk-icon-source: -gtk-icontheme("notification-disabled-60-symbolic"); opacity: 0.64; } - 70% { -gtk-icon-source: -gtk-icontheme("notification-disabled-70-symbolic"); opacity: 0.58; } - 80% { -gtk-icon-source: -gtk-icontheme("notification-disabled-80-symbolic"); opacity: 0.52; } - 90% { -gtk-icon-source: -gtk-icontheme("notification-disabled-90-symbolic"); opacity: 0.46; } + 10% { -gtk-icon-source: -gtk-icontheme("notification-disabled-10-symbolic"); } + 20% { -gtk-icon-source: -gtk-icontheme("notification-disabled-20-symbolic"); } + 30% { -gtk-icon-source: -gtk-icontheme("notification-disabled-30-symbolic"); } + 40% { -gtk-icon-source: -gtk-icontheme("notification-disabled-40-symbolic"); } + 50% { -gtk-icon-source: -gtk-icontheme("notification-disabled-50-symbolic"); } + 60% { -gtk-icon-source: -gtk-icontheme("notification-disabled-60-symbolic"); } + 70% { -gtk-icon-source: -gtk-icontheme("notification-disabled-70-symbolic"); } + 80% { -gtk-icon-source: -gtk-icontheme("notification-disabled-80-symbolic"); } + 90% { -gtk-icon-source: -gtk-icontheme("notification-disabled-90-symbolic"); } 100% { -gtk-icon-source: -gtk-icontheme("notification-disabled-symbolic"); } } diff --git a/data/io.elementary.wingpanel.notifications.gresource.xml b/data/io.elementary.wingpanel.notifications.gresource.xml deleted file mode 100644 index 5efac4e6..00000000 --- a/data/io.elementary.wingpanel.notifications.gresource.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - indicator.css - NotificationEntry.css - - icons/notification-disabled-10-symbolic.svg - icons/notification-disabled-20-symbolic.svg - icons/notification-disabled-30-symbolic.svg - icons/notification-disabled-40-symbolic.svg - icons/notification-disabled-50-symbolic.svg - icons/notification-disabled-60-symbolic.svg - icons/notification-disabled-70-symbolic.svg - icons/notification-disabled-80-symbolic.svg - icons/notification-disabled-90-symbolic.svg - icons/notification-disabled-symbolic.svg - - icons/notification-new-10-symbolic.svg - icons/notification-new-20-symbolic.svg - icons/notification-new-30-symbolic.svg - icons/notification-new-40-symbolic.svg - icons/notification-new-50-symbolic.svg - icons/notification-new-60-symbolic.svg - icons/notification-new-70-symbolic.svg - icons/notification-new-80-symbolic.svg - icons/notification-new-90-symbolic.svg - icons/notification-new-symbolic.svg - - icons/notification-symbolic.svg - - - image-mask.svg - - diff --git a/meson.build b/meson.build index 9bdeacb2..a3d4ffcf 100644 --- a/meson.build +++ b/meson.build @@ -18,10 +18,10 @@ add_global_arguments( ) add_project_arguments('-DG_LOG_DOMAIN="io.elementary.wingpanel.notifications"', language:'c') -asresources = gnome.compile_resources( - 'as-resources', 'data/io.elementary.wingpanel.notifications.gresource.xml', - source_dir: 'data', - c_name: 'as' +gresource = gnome.compile_resources( + 'gresource', + 'data' / 'gresource.xml', + source_dir: 'data' ) wingpanel_dep = dependency('wingpanel') @@ -47,7 +47,7 @@ shared_module( 'src/Services/Notification.vala', 'src/Services/Session.vala', 'src/Services/Interfaces.vala', - asresources, + gresource, config_vala, dependencies: [ dependency('glib-2.0'), diff --git a/src/Indicator.vala b/src/Indicator.vala index ec8b0da5..8c493058 100644 --- a/src/Indicator.vala +++ b/src/Indicator.vala @@ -46,8 +46,6 @@ public class Notifications.Indicator : Wingpanel.Indicator { public override Gtk.Widget get_display_widget () { if (dynamic_icon == null) { - Gtk.IconTheme.get_default ().add_resource_path ("/io/elementary/wingpanel/notifications"); - var provider = new Gtk.CssProvider (); provider.load_from_resource ("io/elementary/wingpanel/notifications/indicator.css");