From bb6377a86ad974cc66bb961a95ab08d5ce5682c0 Mon Sep 17 00:00:00 2001 From: lucy Date: Wed, 31 Dec 2025 15:59:41 +0100 Subject: [PATCH] use material font instead of svg icons --- Icons.qml | 15 +++++++++ icons/audio-volume-headphones-symbolic.svg | 8 ----- icons/audio-volume-high-danger-symbolic.svg | 10 ------ icons/audio-volume-high-symbolic.svg | 8 ----- icons/audio-volume-high-warning-symbolic.svg | 10 ------ icons/audio-volume-low-symbolic.svg | 9 ----- icons/audio-volume-medium-symbolic.svg | 9 ----- ...ume-muted-blocking-headphones-symbolic.svg | 8 ----- .../audio-volume-muted-blocking-symbolic.svg | 8 ----- ...audio-volume-muted-headphones-symbolic.svg | 8 ----- icons/audio-volume-muted-symbolic.svg | 8 ----- icons/audio-volume-overamplified-symbolic.svg | 8 ----- icons/battery-000-charging-symbolic.svg | 8 ----- icons/battery-000-symbolic.svg | 9 ----- icons/battery-010-charging-symbolic.svg | 9 ----- icons/battery-010-symbolic.svg | 10 ------ icons/battery-020-charging-symbolic.svg | 9 ----- icons/battery-020-symbolic.svg | 9 ----- icons/battery-030-charging-symbolic.svg | 9 ----- icons/battery-030-symbolic.svg | 9 ----- icons/battery-040-charging-symbolic.svg | 9 ----- icons/battery-040-symbolic.svg | 9 ----- icons/battery-050-charging-symbolic.svg | 9 ----- icons/battery-050-symbolic.svg | 9 ----- icons/battery-060-charging-symbolic.svg | 9 ----- icons/battery-060-symbolic.svg | 9 ----- icons/battery-070-charging-symbolic.svg | 9 ----- icons/battery-070-symbolic.svg | 9 ----- icons/battery-080-charging-symbolic.svg | 9 ----- icons/battery-080-symbolic.svg | 9 ----- icons/battery-090-charging-symbolic.svg | 9 ----- icons/battery-090-symbolic.svg | 9 ----- icons/battery-100-charging-symbolic.svg | 8 ----- icons/battery-100-symbolic.svg | 8 ----- icons/battery-ac-adapter-symbolic.svg | 8 ----- icons/battery-caution-charging-symbolic.svg | 8 ----- icons/battery-caution-symbolic.svg | 9 ----- icons/battery-empty-charging-symbolic.svg | 8 ----- icons/battery-empty-symbolic.svg | 9 ----- icons/battery-full-charged-symbolic.svg | 8 ----- icons/battery-full-charging-symbolic.svg | 8 ----- icons/battery-full-symbolic.svg | 8 ----- icons/battery-good-charging-symbolic.svg | 9 ----- icons/battery-good-symbolic.svg | 9 ----- icons/battery-level-0-charging-symbolic.svg | 8 ----- icons/battery-level-0-symbolic.svg | 9 ----- icons/battery-level-10-charging-symbolic.svg | 9 ----- icons/battery-level-10-symbolic.svg | 10 ------ icons/battery-level-100-charged-symbolic.svg | 8 ----- icons/battery-level-100-symbolic.svg | 8 ----- icons/battery-level-20-charging-symbolic.svg | 9 ----- icons/battery-level-20-symbolic.svg | 9 ----- icons/battery-level-30-charging-symbolic.svg | 9 ----- icons/battery-level-30-symbolic.svg | 9 ----- icons/battery-level-40-charging-symbolic.svg | 9 ----- icons/battery-level-40-symbolic.svg | 9 ----- icons/battery-level-50-charging-symbolic.svg | 9 ----- icons/battery-level-50-symbolic.svg | 9 ----- icons/battery-level-60-charging-symbolic.svg | 9 ----- icons/battery-level-60-symbolic.svg | 9 ----- icons/battery-level-70-charging-symbolic.svg | 9 ----- icons/battery-level-70-symbolic.svg | 9 ----- icons/battery-level-80-charging-symbolic.svg | 9 ----- icons/battery-level-80-symbolic.svg | 9 ----- icons/battery-level-90-charging-symbolic.svg | 9 ----- icons/battery-level-90-symbolic.svg | 9 ----- icons/battery-low-charging-symbolic.svg | 9 ----- icons/battery-low-symbolic.svg | 9 ----- icons/battery-medium-charging-symbolic.svg | 9 ----- icons/battery-medium-symbolic.svg | 9 ----- icons/battery-missing-symbolic.svg | 9 ----- .../battery-profile-performance-symbolic.svg | 6 ---- icons/battery-profile-powersave-symbolic.svg | 6 ---- modules/bar/Battery.qml | 33 ++++++++++++++++--- modules/bar/Volume.qml | 22 +++++-------- qmldir | 1 + 76 files changed, 53 insertions(+), 645 deletions(-) create mode 100644 Icons.qml delete mode 100644 icons/audio-volume-headphones-symbolic.svg delete mode 100644 icons/audio-volume-high-danger-symbolic.svg delete mode 100644 icons/audio-volume-high-symbolic.svg delete mode 100644 icons/audio-volume-high-warning-symbolic.svg delete mode 100644 icons/audio-volume-low-symbolic.svg delete mode 100644 icons/audio-volume-medium-symbolic.svg delete mode 100644 icons/audio-volume-muted-blocking-headphones-symbolic.svg delete mode 100644 icons/audio-volume-muted-blocking-symbolic.svg delete mode 100644 icons/audio-volume-muted-headphones-symbolic.svg delete mode 100644 icons/audio-volume-muted-symbolic.svg delete mode 100644 icons/audio-volume-overamplified-symbolic.svg delete mode 100644 icons/battery-000-charging-symbolic.svg delete mode 100644 icons/battery-000-symbolic.svg delete mode 100644 icons/battery-010-charging-symbolic.svg delete mode 100644 icons/battery-010-symbolic.svg delete mode 100644 icons/battery-020-charging-symbolic.svg delete mode 100644 icons/battery-020-symbolic.svg delete mode 100644 icons/battery-030-charging-symbolic.svg delete mode 100644 icons/battery-030-symbolic.svg delete mode 100644 icons/battery-040-charging-symbolic.svg delete mode 100644 icons/battery-040-symbolic.svg delete mode 100644 icons/battery-050-charging-symbolic.svg delete mode 100644 icons/battery-050-symbolic.svg delete mode 100644 icons/battery-060-charging-symbolic.svg delete mode 100644 icons/battery-060-symbolic.svg delete mode 100644 icons/battery-070-charging-symbolic.svg delete mode 100644 icons/battery-070-symbolic.svg delete mode 100644 icons/battery-080-charging-symbolic.svg delete mode 100644 icons/battery-080-symbolic.svg delete mode 100644 icons/battery-090-charging-symbolic.svg delete mode 100644 icons/battery-090-symbolic.svg delete mode 100644 icons/battery-100-charging-symbolic.svg delete mode 100644 icons/battery-100-symbolic.svg delete mode 100644 icons/battery-ac-adapter-symbolic.svg delete mode 100644 icons/battery-caution-charging-symbolic.svg delete mode 100644 icons/battery-caution-symbolic.svg delete mode 100644 icons/battery-empty-charging-symbolic.svg delete mode 100644 icons/battery-empty-symbolic.svg delete mode 100644 icons/battery-full-charged-symbolic.svg delete mode 100644 icons/battery-full-charging-symbolic.svg delete mode 100644 icons/battery-full-symbolic.svg delete mode 100644 icons/battery-good-charging-symbolic.svg delete mode 100644 icons/battery-good-symbolic.svg delete mode 100644 icons/battery-level-0-charging-symbolic.svg delete mode 100644 icons/battery-level-0-symbolic.svg delete mode 100644 icons/battery-level-10-charging-symbolic.svg delete mode 100644 icons/battery-level-10-symbolic.svg delete mode 100644 icons/battery-level-100-charged-symbolic.svg delete mode 100644 icons/battery-level-100-symbolic.svg delete mode 100644 icons/battery-level-20-charging-symbolic.svg delete mode 100644 icons/battery-level-20-symbolic.svg delete mode 100644 icons/battery-level-30-charging-symbolic.svg delete mode 100644 icons/battery-level-30-symbolic.svg delete mode 100644 icons/battery-level-40-charging-symbolic.svg delete mode 100644 icons/battery-level-40-symbolic.svg delete mode 100644 icons/battery-level-50-charging-symbolic.svg delete mode 100644 icons/battery-level-50-symbolic.svg delete mode 100644 icons/battery-level-60-charging-symbolic.svg delete mode 100644 icons/battery-level-60-symbolic.svg delete mode 100644 icons/battery-level-70-charging-symbolic.svg delete mode 100644 icons/battery-level-70-symbolic.svg delete mode 100644 icons/battery-level-80-charging-symbolic.svg delete mode 100644 icons/battery-level-80-symbolic.svg delete mode 100644 icons/battery-level-90-charging-symbolic.svg delete mode 100644 icons/battery-level-90-symbolic.svg delete mode 100644 icons/battery-low-charging-symbolic.svg delete mode 100644 icons/battery-low-symbolic.svg delete mode 100644 icons/battery-medium-charging-symbolic.svg delete mode 100644 icons/battery-medium-symbolic.svg delete mode 100644 icons/battery-missing-symbolic.svg delete mode 100644 icons/battery-profile-performance-symbolic.svg delete mode 100644 icons/battery-profile-powersave-symbolic.svg diff --git a/Icons.qml b/Icons.qml new file mode 100644 index 0000000..cac6925 --- /dev/null +++ b/Icons.qml @@ -0,0 +1,15 @@ +import QtQuick +import "./modules/settings/" + +Text { + property real fill + font.family: "Material Symbols Rounded" + property int grade: 20 + color: Colors.foreground + font.variableAxes: ({ + FILL: fill.toFixed(1), + GRAD: grade, + opsz: Settings.fontSize, + wght: 700 + }) +} diff --git a/icons/audio-volume-headphones-symbolic.svg b/icons/audio-volume-headphones-symbolic.svg deleted file mode 100644 index 19c7faa..0000000 --- a/icons/audio-volume-headphones-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/icons/audio-volume-high-danger-symbolic.svg b/icons/audio-volume-high-danger-symbolic.svg deleted file mode 100644 index aec691d..0000000 --- a/icons/audio-volume-high-danger-symbolic.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/icons/audio-volume-high-symbolic.svg b/icons/audio-volume-high-symbolic.svg deleted file mode 100644 index 681f942..0000000 --- a/icons/audio-volume-high-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/icons/audio-volume-high-warning-symbolic.svg b/icons/audio-volume-high-warning-symbolic.svg deleted file mode 100644 index 7a909c6..0000000 --- a/icons/audio-volume-high-warning-symbolic.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/icons/audio-volume-low-symbolic.svg b/icons/audio-volume-low-symbolic.svg deleted file mode 100644 index b29db89..0000000 --- a/icons/audio-volume-low-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/audio-volume-medium-symbolic.svg b/icons/audio-volume-medium-symbolic.svg deleted file mode 100644 index e36b90e..0000000 --- a/icons/audio-volume-medium-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/audio-volume-muted-blocking-headphones-symbolic.svg b/icons/audio-volume-muted-blocking-headphones-symbolic.svg deleted file mode 100644 index 805c2da..0000000 --- a/icons/audio-volume-muted-blocking-headphones-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/icons/audio-volume-muted-blocking-symbolic.svg b/icons/audio-volume-muted-blocking-symbolic.svg deleted file mode 100644 index 252f442..0000000 --- a/icons/audio-volume-muted-blocking-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/icons/audio-volume-muted-headphones-symbolic.svg b/icons/audio-volume-muted-headphones-symbolic.svg deleted file mode 100644 index 805c2da..0000000 --- a/icons/audio-volume-muted-headphones-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/icons/audio-volume-muted-symbolic.svg b/icons/audio-volume-muted-symbolic.svg deleted file mode 100644 index 252f442..0000000 --- a/icons/audio-volume-muted-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/icons/audio-volume-overamplified-symbolic.svg b/icons/audio-volume-overamplified-symbolic.svg deleted file mode 100644 index 757d05f..0000000 --- a/icons/audio-volume-overamplified-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/icons/battery-000-charging-symbolic.svg b/icons/battery-000-charging-symbolic.svg deleted file mode 100644 index a29fd59..0000000 --- a/icons/battery-000-charging-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/icons/battery-000-symbolic.svg b/icons/battery-000-symbolic.svg deleted file mode 100644 index 338cc80..0000000 --- a/icons/battery-000-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-010-charging-symbolic.svg b/icons/battery-010-charging-symbolic.svg deleted file mode 100644 index 7de2cea..0000000 --- a/icons/battery-010-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-010-symbolic.svg b/icons/battery-010-symbolic.svg deleted file mode 100644 index e74281d..0000000 --- a/icons/battery-010-symbolic.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/icons/battery-020-charging-symbolic.svg b/icons/battery-020-charging-symbolic.svg deleted file mode 100644 index ef64cbb..0000000 --- a/icons/battery-020-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-020-symbolic.svg b/icons/battery-020-symbolic.svg deleted file mode 100644 index 9d7fa5b..0000000 --- a/icons/battery-020-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-030-charging-symbolic.svg b/icons/battery-030-charging-symbolic.svg deleted file mode 100644 index 9cccd3d..0000000 --- a/icons/battery-030-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-030-symbolic.svg b/icons/battery-030-symbolic.svg deleted file mode 100644 index 724eb02..0000000 --- a/icons/battery-030-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-040-charging-symbolic.svg b/icons/battery-040-charging-symbolic.svg deleted file mode 100644 index a0635bf..0000000 --- a/icons/battery-040-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-040-symbolic.svg b/icons/battery-040-symbolic.svg deleted file mode 100644 index 659d5fe..0000000 --- a/icons/battery-040-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-050-charging-symbolic.svg b/icons/battery-050-charging-symbolic.svg deleted file mode 100644 index 52ade2a..0000000 --- a/icons/battery-050-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-050-symbolic.svg b/icons/battery-050-symbolic.svg deleted file mode 100644 index 870c759..0000000 --- a/icons/battery-050-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-060-charging-symbolic.svg b/icons/battery-060-charging-symbolic.svg deleted file mode 100644 index bc4b098..0000000 --- a/icons/battery-060-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-060-symbolic.svg b/icons/battery-060-symbolic.svg deleted file mode 100644 index a7df9fc..0000000 --- a/icons/battery-060-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-070-charging-symbolic.svg b/icons/battery-070-charging-symbolic.svg deleted file mode 100644 index 82e7527..0000000 --- a/icons/battery-070-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-070-symbolic.svg b/icons/battery-070-symbolic.svg deleted file mode 100644 index 6ec3774..0000000 --- a/icons/battery-070-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-080-charging-symbolic.svg b/icons/battery-080-charging-symbolic.svg deleted file mode 100644 index 60ea72c..0000000 --- a/icons/battery-080-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-080-symbolic.svg b/icons/battery-080-symbolic.svg deleted file mode 100644 index 97d75cf..0000000 --- a/icons/battery-080-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-090-charging-symbolic.svg b/icons/battery-090-charging-symbolic.svg deleted file mode 100644 index e1547d7..0000000 --- a/icons/battery-090-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-090-symbolic.svg b/icons/battery-090-symbolic.svg deleted file mode 100644 index fc844ea..0000000 --- a/icons/battery-090-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-100-charging-symbolic.svg b/icons/battery-100-charging-symbolic.svg deleted file mode 100644 index 1043108..0000000 --- a/icons/battery-100-charging-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/icons/battery-100-symbolic.svg b/icons/battery-100-symbolic.svg deleted file mode 100644 index 5b5d3d7..0000000 --- a/icons/battery-100-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/icons/battery-ac-adapter-symbolic.svg b/icons/battery-ac-adapter-symbolic.svg deleted file mode 100644 index dba0a9b..0000000 --- a/icons/battery-ac-adapter-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/icons/battery-caution-charging-symbolic.svg b/icons/battery-caution-charging-symbolic.svg deleted file mode 100644 index a29fd59..0000000 --- a/icons/battery-caution-charging-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/icons/battery-caution-symbolic.svg b/icons/battery-caution-symbolic.svg deleted file mode 100644 index 338cc80..0000000 --- a/icons/battery-caution-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-empty-charging-symbolic.svg b/icons/battery-empty-charging-symbolic.svg deleted file mode 100644 index a29fd59..0000000 --- a/icons/battery-empty-charging-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/icons/battery-empty-symbolic.svg b/icons/battery-empty-symbolic.svg deleted file mode 100644 index 338cc80..0000000 --- a/icons/battery-empty-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-full-charged-symbolic.svg b/icons/battery-full-charged-symbolic.svg deleted file mode 100644 index 1043108..0000000 --- a/icons/battery-full-charged-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/icons/battery-full-charging-symbolic.svg b/icons/battery-full-charging-symbolic.svg deleted file mode 100644 index 1043108..0000000 --- a/icons/battery-full-charging-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/icons/battery-full-symbolic.svg b/icons/battery-full-symbolic.svg deleted file mode 100644 index 5b5d3d7..0000000 --- a/icons/battery-full-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/icons/battery-good-charging-symbolic.svg b/icons/battery-good-charging-symbolic.svg deleted file mode 100644 index 60ea72c..0000000 --- a/icons/battery-good-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-good-symbolic.svg b/icons/battery-good-symbolic.svg deleted file mode 100644 index 97d75cf..0000000 --- a/icons/battery-good-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-level-0-charging-symbolic.svg b/icons/battery-level-0-charging-symbolic.svg deleted file mode 100644 index a29fd59..0000000 --- a/icons/battery-level-0-charging-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/icons/battery-level-0-symbolic.svg b/icons/battery-level-0-symbolic.svg deleted file mode 100644 index 338cc80..0000000 --- a/icons/battery-level-0-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-level-10-charging-symbolic.svg b/icons/battery-level-10-charging-symbolic.svg deleted file mode 100644 index 7de2cea..0000000 --- a/icons/battery-level-10-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-level-10-symbolic.svg b/icons/battery-level-10-symbolic.svg deleted file mode 100644 index e74281d..0000000 --- a/icons/battery-level-10-symbolic.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/icons/battery-level-100-charged-symbolic.svg b/icons/battery-level-100-charged-symbolic.svg deleted file mode 100644 index 1043108..0000000 --- a/icons/battery-level-100-charged-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/icons/battery-level-100-symbolic.svg b/icons/battery-level-100-symbolic.svg deleted file mode 100644 index 5b5d3d7..0000000 --- a/icons/battery-level-100-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/icons/battery-level-20-charging-symbolic.svg b/icons/battery-level-20-charging-symbolic.svg deleted file mode 100644 index ef64cbb..0000000 --- a/icons/battery-level-20-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-level-20-symbolic.svg b/icons/battery-level-20-symbolic.svg deleted file mode 100644 index 9d7fa5b..0000000 --- a/icons/battery-level-20-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-level-30-charging-symbolic.svg b/icons/battery-level-30-charging-symbolic.svg deleted file mode 100644 index 9cccd3d..0000000 --- a/icons/battery-level-30-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-level-30-symbolic.svg b/icons/battery-level-30-symbolic.svg deleted file mode 100644 index 724eb02..0000000 --- a/icons/battery-level-30-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-level-40-charging-symbolic.svg b/icons/battery-level-40-charging-symbolic.svg deleted file mode 100644 index a0635bf..0000000 --- a/icons/battery-level-40-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-level-40-symbolic.svg b/icons/battery-level-40-symbolic.svg deleted file mode 100644 index 659d5fe..0000000 --- a/icons/battery-level-40-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-level-50-charging-symbolic.svg b/icons/battery-level-50-charging-symbolic.svg deleted file mode 100644 index 52ade2a..0000000 --- a/icons/battery-level-50-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-level-50-symbolic.svg b/icons/battery-level-50-symbolic.svg deleted file mode 100644 index 870c759..0000000 --- a/icons/battery-level-50-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-level-60-charging-symbolic.svg b/icons/battery-level-60-charging-symbolic.svg deleted file mode 100644 index bc4b098..0000000 --- a/icons/battery-level-60-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-level-60-symbolic.svg b/icons/battery-level-60-symbolic.svg deleted file mode 100644 index a7df9fc..0000000 --- a/icons/battery-level-60-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-level-70-charging-symbolic.svg b/icons/battery-level-70-charging-symbolic.svg deleted file mode 100644 index 82e7527..0000000 --- a/icons/battery-level-70-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-level-70-symbolic.svg b/icons/battery-level-70-symbolic.svg deleted file mode 100644 index 6ec3774..0000000 --- a/icons/battery-level-70-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-level-80-charging-symbolic.svg b/icons/battery-level-80-charging-symbolic.svg deleted file mode 100644 index 60ea72c..0000000 --- a/icons/battery-level-80-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-level-80-symbolic.svg b/icons/battery-level-80-symbolic.svg deleted file mode 100644 index 97d75cf..0000000 --- a/icons/battery-level-80-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-level-90-charging-symbolic.svg b/icons/battery-level-90-charging-symbolic.svg deleted file mode 100644 index e1547d7..0000000 --- a/icons/battery-level-90-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-level-90-symbolic.svg b/icons/battery-level-90-symbolic.svg deleted file mode 100644 index fc844ea..0000000 --- a/icons/battery-level-90-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-low-charging-symbolic.svg b/icons/battery-low-charging-symbolic.svg deleted file mode 100644 index ef64cbb..0000000 --- a/icons/battery-low-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-low-symbolic.svg b/icons/battery-low-symbolic.svg deleted file mode 100644 index 9d7fa5b..0000000 --- a/icons/battery-low-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-medium-charging-symbolic.svg b/icons/battery-medium-charging-symbolic.svg deleted file mode 100644 index 52ade2a..0000000 --- a/icons/battery-medium-charging-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-medium-symbolic.svg b/icons/battery-medium-symbolic.svg deleted file mode 100644 index 870c759..0000000 --- a/icons/battery-medium-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-missing-symbolic.svg b/icons/battery-missing-symbolic.svg deleted file mode 100644 index 073a144..0000000 --- a/icons/battery-missing-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/icons/battery-profile-performance-symbolic.svg b/icons/battery-profile-performance-symbolic.svg deleted file mode 100644 index d90fc19..0000000 --- a/icons/battery-profile-performance-symbolic.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/icons/battery-profile-powersave-symbolic.svg b/icons/battery-profile-powersave-symbolic.svg deleted file mode 100644 index e77335f..0000000 --- a/icons/battery-profile-powersave-symbolic.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/modules/bar/Battery.qml b/modules/bar/Battery.qml index 8477be0..96761a4 100644 --- a/modules/bar/Battery.qml +++ b/modules/bar/Battery.qml @@ -1,3 +1,4 @@ +pragma ComponentBehavior: Bound import Quickshell.Services.UPower import QtQuick import Quickshell.Widgets @@ -25,11 +26,33 @@ Rectangle { text: Math.round(UPower.displayDevice.percentage * 100) + "%" color: Colors.foreground } - IconImage { - anchors.verticalCenter: parent.verticalCenter - source: "root:/icons/" + UPower.displayDevice.iconName + ".svg" - width: 12 - height: 12 + Icons { + function getBatteryIcon() { + if (UPower.displayDevice.percentage < 12) { + return "battery_android_0"; + } + if (UPower.displayDevice.percentage < 24) { + return "battery_android_1"; + } + if (UPower.displayDevice.percentage < 36) { + return "battery_android_2"; + } + if (UPower.displayDevice.percentage < 48) { + return "battery_android_3"; + } + if (UPower.displayDevice.percentage < 60) { + return "battery_android_4"; + } + if (UPower.displayDevice.percentage < 72) { + return "battery_android_5"; + } + if (UPower.displayDevice.percentage < 84) { + return "battery_android_6"; + } + if (UPower.displayDevice.percentage > 84) { + return "battery_android_full"; + } + } } } Text { diff --git a/modules/bar/Volume.qml b/modules/bar/Volume.qml index 8f2bf48..eea0387 100644 --- a/modules/bar/Volume.qml +++ b/modules/bar/Volume.qml @@ -38,15 +38,15 @@ Item { // Volume is usually 0.0 to 1.0 (0% to 100%) const vol = sink.audio.volume; - if (vol <= 0.0) - return "audio-volume-low"; - if (vol < 0.33) - return "audio-volume-low"; - if (vol < 0.66) - return "audio-volume-medium"; + if (vol <= 0.25) + return "volume_mute"; + if (vol < 0.75) + return "volume_down"; + if (vol < 1.00) + return "volume_up"; // If it's loud, prepare the ears! - return "audio-volume-high"; + return "volume_up"; } ColumnLayout { @@ -65,12 +65,8 @@ Item { font.pixelSize: Settings.fontSize text: Pipewire.ready ? Math.round(root.sink.audio.volume * 100) + "%" : "0%" } - - IconImage { - anchors.verticalCenter: parent.verticalCenter - width: 12 - height: 12 - source: "root:/icons/" + root.getVolumeIcon() + "-symbolic.svg" + Icons { + text: root.getVolumeIcon() } } Text { diff --git a/qmldir b/qmldir index b7cddb9..f87b018 100644 --- a/qmldir +++ b/qmldir @@ -1 +1,2 @@ singleton Colors 1.0 Colors.qml +Icons 1.0 Icons.qml