From f74d79e7b478ee405eae2fdaffd002cadb8dcaca Mon Sep 17 00:00:00 2001 From: Calle Rundgren Date: Tue, 6 Jan 2026 17:50:13 +0100 Subject: [PATCH 1/4] Update sidebar icons Take care of #287 by update to use view-sidebar-end-symbolic instead of pane-show-symbolic and pane-hide-symbolic. --- src/MainWindow.vala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 24041c27..98c66df2 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -91,7 +91,7 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow { history = new List (); position = 0; button_extended = new Gtk.ToggleButton () { - icon_name = "pane-hide-symbolic", + icon_name = "view-sidebar-end-symbolic", tooltip_text = _("Show extended functionality") }; button_extended.toggled.connect (toggle_grid); @@ -773,12 +773,12 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow { position = entry.get_position (); if (button.get_active ()) { /* Show extended functionality */ - button.icon_name = "pane-show-symbolic"; + button.icon_name = "view-sidebar-end-symbolic"; button.tooltip_text = _("Hide extended functionality"); extended_revealer.reveal_child = true; } else { /* Hide extended functionality */ - button.icon_name = "pane-hide-symbolic"; + button.icon_name = "view-sidebar-end-symbolic"; button.tooltip_text = _("Show extended functionality"); extended_revealer.reveal_child = false; } From 01b611dabdfe7df3bd9351fb6b211c46f9b0f2d3 Mon Sep 17 00:00:00 2001 From: Calle Rundgren Date: Wed, 7 Jan 2026 19:55:54 +0100 Subject: [PATCH 2/4] Only set icon_name once Just set the icon_name when create button instance. --- src/MainWindow.vala | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 98c66df2..7053a570 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -773,12 +773,10 @@ public class PantheonCalculator.MainWindow : Gtk.ApplicationWindow { position = entry.get_position (); if (button.get_active ()) { /* Show extended functionality */ - button.icon_name = "view-sidebar-end-symbolic"; button.tooltip_text = _("Hide extended functionality"); extended_revealer.reveal_child = true; } else { /* Hide extended functionality */ - button.icon_name = "view-sidebar-end-symbolic"; button.tooltip_text = _("Show extended functionality"); extended_revealer.reveal_child = false; } From f6ea54d14ca1054f1f0518cc9151b3a48e1b8b14 Mon Sep 17 00:00:00 2001 From: Calle Rundgren Date: Wed, 14 Jan 2026 21:23:01 +0100 Subject: [PATCH 3/4] Gresource view-sidebar-end-symbolic.svg Add icon view-sidebar-end-symbolic.svg as a custom resource. --- data/gresource.xml | 6 ++++++ data/icons/view-sidebar-end-symbolic.svg | 16 ++++++++++++++++ data/meson.build | 6 ++++++ src/meson.build | 1 + 4 files changed, 29 insertions(+) create mode 100644 data/gresource.xml create mode 100644 data/icons/view-sidebar-end-symbolic.svg diff --git a/data/gresource.xml b/data/gresource.xml new file mode 100644 index 00000000..7261e659 --- /dev/null +++ b/data/gresource.xml @@ -0,0 +1,6 @@ + + + + view-sidebar-end-symbolic.svg + + diff --git a/data/icons/view-sidebar-end-symbolic.svg b/data/icons/view-sidebar-end-symbolic.svg new file mode 100644 index 00000000..18e7a4cf --- /dev/null +++ b/data/icons/view-sidebar-end-symbolic.svg @@ -0,0 +1,16 @@ + + diff --git a/data/meson.build b/data/meson.build index bf82962e..7f3d9f17 100644 --- a/data/meson.build +++ b/data/meson.build @@ -35,3 +35,9 @@ i18n.merge_file( install: true, install_dir: get_option('datadir') / 'metainfo', ) + +gresource = gnome.compile_resources( + 'gresource', + 'gresource.xml', + source_dir: 'icons' +) diff --git a/src/meson.build b/src/meson.build index 0207fbaa..c1fafd89 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,5 +1,6 @@ executable( meson.project_name(), + gresource, config_file, 'Application.vala', 'Button.vala', From fedc19c6edb8636c499335469fd9da4ea7a957fa Mon Sep 17 00:00:00 2001 From: Calle Rundgren Date: Sat, 17 Jan 2026 16:02:29 +0100 Subject: [PATCH 4/4] Alias path to icon As title. --- data/gresource.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/gresource.xml b/data/gresource.xml index 7261e659..e50bd1e0 100644 --- a/data/gresource.xml +++ b/data/gresource.xml @@ -1,6 +1,6 @@ - view-sidebar-end-symbolic.svg + view-sidebar-end-symbolic.svg