From 92f9d5db8ef5d0c17c5cbad0b7c6b26150b13701 Mon Sep 17 00:00:00 2001
From: "Geoffrey D. Bennett" <g@b4.vu>
Date: Sun, 31 Mar 2024 03:00:04 +1030
Subject: [PATCH] Switch to embedded SVG icons

Make the icons independent of the desktop theme so they always look
good.
---
 src/alsa-scarlett-gui-resources.xml | 4 ++++
 src/img/audio-volume-high.svg       | 4 ++++
 src/img/audio-volume-low.svg        | 4 ++++
 src/img/audio-volume-medium.svg     | 7 +++++++
 src/img/audio-volume-muted.svg      | 7 +++++++
 src/widget-boolean.c                | 8 +++++++-
 6 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 src/img/audio-volume-high.svg
 create mode 100644 src/img/audio-volume-low.svg
 create mode 100644 src/img/audio-volume-medium.svg
 create mode 100644 src/img/audio-volume-muted.svg

diff --git a/src/alsa-scarlett-gui-resources.xml b/src/alsa-scarlett-gui-resources.xml
index 117f1d6..a708d4c 100644
--- a/src/alsa-scarlett-gui-resources.xml
+++ b/src/alsa-scarlett-gui-resources.xml
@@ -3,6 +3,10 @@
   <gresource prefix="/vu/b4/alsa-scarlett-gui/icons">
     <file alias="alsa-scarlett-gui-logo.png">img/alsa-scarlett-gui-logo.png</file>
     <file alias="socket.svg">img/socket.svg</file>
+    <file alias="audio-volume-high.svg">img/audio-volume-high.svg</file>
+    <file alias="audio-volume-low.svg">img/audio-volume-low.svg</file>
+    <file alias="audio-volume-medium.svg">img/audio-volume-medium.svg</file>
+    <file alias="audio-volume-muted.svg">img/audio-volume-muted.svg</file>
   </gresource>
   <gresource prefix="/vu/b4/alsa-scarlett-gui">
     <file>alsa-scarlett-gui.css</file>
diff --git a/src/img/audio-volume-high.svg b/src/img/audio-volume-high.svg
new file mode 100644
index 0000000..585ccba
--- /dev/null
+++ b/src/img/audio-volume-high.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 7 1.007812 c -0.296875 -0.003906 -0.578125 0.125 -0.769531 0.351563 l -3.230469 3.640625 h -1 c -1.09375 0 -2 0.84375 -2 2 v 2 c 0 1.089844 0.910156 2 2 2 h 1 l 3.230469 3.640625 c 0.210937 0.253906 0.492187 0.363281 0.769531 0.359375 z m 6.460938 0.960938 c -0.191407 -0.003906 -0.386719 0.054688 -0.558594 0.167969 c -0.457032 0.3125 -0.578125 0.933593 -0.269532 1.390625 c 1.824219 2.707031 1.824219 6.238281 0 8.945312 c -0.308593 0.457032 -0.1875 1.078125 0.269532 1.390625 c 0.457031 0.308594 1.078125 0.1875 1.390625 -0.269531 c 1.136719 -1.691406 1.707031 -3.640625 1.707031 -5.59375 s -0.570312 -3.902344 -1.707031 -5.59375 c -0.195313 -0.285156 -0.511719 -0.4375 -0.832031 -0.4375 z m -3.421876 2.019531 c -0.222656 -0.007812 -0.453124 0.058594 -0.644531 0.203125 c -0.261719 0.199219 -0.394531 0.5 -0.394531 0.804688 v 0.058594 c 0.011719 0.191406 0.074219 0.375 0.199219 0.535156 c 1.074219 1.429687 1.074219 3.390625 0 4.816406 c -0.125 0.164062 -0.1875 0.347656 -0.199219 0.535156 v 0.0625 c 0 0.304688 0.132812 0.605469 0.394531 0.804688 c 0.441407 0.332031 1.066407 0.242187 1.398438 -0.199219 c 0.804687 -1.066406 1.207031 -2.335937 1.207031 -3.609375 s -0.402344 -2.542969 -1.207031 -3.613281 c -0.183594 -0.246094 -0.464844 -0.382813 -0.753907 -0.398438 z m 0 0" fill="#ffffff"/>
+</svg>
diff --git a/src/img/audio-volume-low.svg b/src/img/audio-volume-low.svg
new file mode 100644
index 0000000..1bc37c6
--- /dev/null
+++ b/src/img/audio-volume-low.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 7 1.007812 c -0.296875 -0.003906 -0.578125 0.125 -0.769531 0.351563 l -3.230469 3.640625 h -1 c -1.09375 0 -2 0.84375 -2 2 v 2 c 0 1.089844 0.910156 2 2 2 h 1 l 3.230469 3.640625 c 0.210937 0.253906 0.492187 0.363281 0.769531 0.359375 z m 2.957031 2.980469 c -0.199219 0.011719 -0.394531 0.074219 -0.5625 0.203125 c -0.441406 0.332032 -0.53125 0.960938 -0.195312 1.402344 c 1.074219 1.425781 1.074219 3.386719 0 4.8125 c -0.335938 0.441406 -0.246094 1.070312 0.195312 1.402344 c 0.441407 0.332031 1.066407 0.242187 1.398438 -0.195313 c 0.804687 -1.070312 1.207031 -2.339843 1.207031 -3.613281 s -0.402344 -2.542969 -1.207031 -3.613281 c -0.183594 -0.246094 -0.464844 -0.382813 -0.753907 -0.398438 c -0.027343 0 -0.054687 0 -0.085937 0 z m 0 0" fill="#ffffff"/>
+</svg>
diff --git a/src/img/audio-volume-medium.svg b/src/img/audio-volume-medium.svg
new file mode 100644
index 0000000..92f720e
--- /dev/null
+++ b/src/img/audio-volume-medium.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
+    <g fill="#ffffff">
+        <path d="m 7 1.007812 c -0.296875 -0.003906 -0.578125 0.125 -0.769531 0.351563 l -3.230469 3.640625 h -1 c -1.09375 0 -2 0.84375 -2 2 v 2 c 0 1.089844 0.910156 2 2 2 h 1 l 3.230469 3.640625 c 0.210937 0.253906 0.492187 0.363281 0.769531 0.359375 z m 3.039062 2.980469 c -0.222656 -0.007812 -0.453124 0.058594 -0.644531 0.203125 c -0.261719 0.199219 -0.394531 0.5 -0.394531 0.804688 v 0.066406 c 0.011719 0.1875 0.078125 0.371094 0.199219 0.527344 c 1.074219 1.429687 1.074219 3.390625 0 4.816406 c -0.121094 0.160156 -0.1875 0.34375 -0.199219 0.53125 v 0.066406 c 0 0.304688 0.132812 0.605469 0.394531 0.804688 c 0.441407 0.332031 1.066407 0.242187 1.398438 -0.199219 c 0.804687 -1.066406 1.207031 -2.335937 1.207031 -3.609375 s -0.402344 -2.542969 -1.207031 -3.613281 c -0.183594 -0.246094 -0.464844 -0.382813 -0.753907 -0.398438 z m 0 0"/>
+        <path d="m 13.460938 1.96875 c -0.191407 -0.003906 -0.386719 0.054688 -0.558594 0.167969 c -0.457032 0.3125 -0.578125 0.933593 -0.269532 1.390625 c 1.824219 2.707031 1.824219 6.238281 0 8.945312 c -0.308593 0.457032 -0.1875 1.078125 0.269532 1.390625 c 0.457031 0.308594 1.078125 0.1875 1.390625 -0.269531 c 1.136719 -1.691406 1.707031 -3.640625 1.707031 -5.59375 s -0.570312 -3.902344 -1.707031 -5.59375 c -0.195313 -0.285156 -0.511719 -0.4375 -0.832031 -0.4375 z m 0 0" fill-opacity="0.34902"/>
+    </g>
+</svg>
diff --git a/src/img/audio-volume-muted.svg b/src/img/audio-volume-muted.svg
new file mode 100644
index 0000000..4f8858b
--- /dev/null
+++ b/src/img/audio-volume-muted.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
+    <g fill="#ffffff">
+        <path d="m 7 1.007812 c -0.296875 -0.003906 -0.578125 0.125 -0.769531 0.351563 l -3.230469 3.640625 h -1 c -1.09375 0 -2 0.84375 -2 2 v 2 c 0 1.089844 0.910156 2 2 2 h 1 l 3.230469 3.640625 c 0.210937 0.253906 0.492187 0.363281 0.769531 0.359375 z m 0 0"/>
+        <path d="m 10 5 c -0.265625 0 -0.519531 0.105469 -0.707031 0.292969 c -0.390625 0.390625 -0.390625 1.023437 0 1.414062 l 1.292969 1.292969 l -1.292969 1.292969 c -0.390625 0.390625 -0.390625 1.023437 0 1.414062 s 1.023437 0.390625 1.414062 0 l 1.292969 -1.292969 l 1.292969 1.292969 c 0.390625 0.390625 1.023437 0.390625 1.414062 0 s 0.390625 -1.023437 0 -1.414062 l -1.292969 -1.292969 l 1.292969 -1.292969 c 0.390625 -0.390625 0.390625 -1.023437 0 -1.414062 c -0.1875 -0.1875 -0.441406 -0.292969 -0.707031 -0.292969 s -0.519531 0.105469 -0.707031 0.292969 l -1.292969 1.292969 l -1.292969 -1.292969 c -0.1875 -0.1875 -0.441406 -0.292969 -0.707031 -0.292969 z m 0 0"/>
+    </g>
+</svg>
diff --git a/src/widget-boolean.c b/src/widget-boolean.c
index b3017df..20d60dc 100644
--- a/src/widget-boolean.c
+++ b/src/widget-boolean.c
@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: 2022-2024 Geoffrey D. Bennett <g@b4.vu>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+#include "gtkhelper.h"
 #include "widget-boolean.h"
 
 struct boolean {
@@ -65,8 +66,13 @@ static void on_destroy(struct boolean *data) {
 static void load_icons(struct boolean *data) {
   for (int i = 0; i < 2; i++)
     if (data->text[i] && *data->text[i] == '*') {
-      data->icons[i] = gtk_image_new_from_icon_name(data->text[i] + 1);
+      char *path = g_strdup_printf(
+        "/vu/b4/alsa-scarlett-gui/icons/%s.svg", data->text[i] + 1
+      );
+      data->icons[i] = gtk_image_new_from_resource(path);
+      gtk_widget_set_align(data->icons[i], GTK_ALIGN_CENTER, GTK_ALIGN_CENTER);
       g_object_ref(data->icons[i]);
+      g_free(path);
     }
 }