From bdfab74e1e2444026f16bb794da470448abb15b0 Mon Sep 17 00:00:00 2001 From: JPratama7 Date: Tue, 29 Jul 2025 00:13:02 +0700 Subject: [PATCH 1/3] feat: add charging-specific battery icons to battery status indicator --- Bar/Modules/Battery.qml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Bar/Modules/Battery.qml b/Bar/Modules/Battery.qml index 6ca0848..899c829 100644 --- a/Bar/Modules/Battery.qml +++ b/Bar/Modules/Battery.qml @@ -16,6 +16,19 @@ Item { // Choose icon based on charge and charging state function batteryIcon() { if (!show) return ""; + + // Show charging icons with lightning when charging + if (charging) { + if (percent >= 95) return "battery_charging_full"; + if (percent >= 80) return "battery_charging_80"; + if (percent >= 60) return "battery_charging_60"; + if (percent >= 50) return "battery_charging_50"; + if (percent >= 30) return "battery_charging_30"; + if (percent >= 20) return "battery_charging_20"; + return "battery_charging_20"; // Use charging_20 for very low battery + } + + // Regular battery icons when not charging if (percent >= 95) return "battery_full"; if (percent >= 80) return "battery_80"; if (percent >= 60) return "battery_60"; From e319d0dfd605bc8d5de61a8c0356c4c39068af0e Mon Sep 17 00:00:00 2001 From: JPratama7 Date: Tue, 29 Jul 2025 00:18:37 +0700 Subject: [PATCH 2/3] refactor: centralize utility paths in Settings for zigbrightness and zigstat programs --- Bar/Modules/Brightness.qml | 4 ++-- Services/Sysinfo.qml | 2 +- Settings/Settings.qml | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Bar/Modules/Brightness.qml b/Bar/Modules/Brightness.qml index 5aa5fd7..4200ec9 100644 --- a/Bar/Modules/Brightness.qml +++ b/Bar/Modules/Brightness.qml @@ -19,7 +19,7 @@ Item { Process { id: getBrightnessProcess - command: [Quickshell.shellDir + "/Programs/zigbrightness", "get", monitorName] + command: [Settings.settings.zigbrightnessPath, "get", monitorName] stdout: StdioCollector { onStreamFinished: { @@ -47,7 +47,7 @@ Item { Process { id: setBrightnessProcess property int targetValue: -1 - command: [Quickshell.shellDir + "/Programs/zigbrightness", "set", monitorName, targetValue.toString()] + command: [Settings.settings.zigbrightnessPath, "set", monitorName, targetValue.toString()] stdout: StdioCollector { onStreamFinished: { diff --git a/Services/Sysinfo.qml b/Services/Sysinfo.qml index 521e768..36bd987 100644 --- a/Services/Sysinfo.qml +++ b/Services/Sysinfo.qml @@ -23,7 +23,7 @@ Singleton { Process { id: zigstatProcess running: true - command: [Quickshell.shellDir + "/Programs/zigstat", updateInterval] + command: [Settings.settings.zigstatPath, updateInterval] stdout: SplitParser { onRead: function (line) { try { diff --git a/Settings/Settings.qml b/Settings/Settings.qml index 879abd2..1c3c75e 100644 --- a/Settings/Settings.qml +++ b/Settings/Settings.qml @@ -65,6 +65,8 @@ Singleton { property real fontSizeMultiplier: 1.0 // Font size multiplier (1.0 = normal, 1.2 = 20% larger, 0.8 = 20% smaller) property int taskbarIconSize: 24 // Taskbar icon button size in pixels (default: 32, smaller: 24, larger: 40) property var pinnedExecs: [] // Added for AppLauncher pinned apps + property string zigbrightnessPath: Quickshell.shellDir + "/Programs/zigbrightness" // Path to zigbrightness utility + property string zigstatPath: Quickshell.shellDir + "/Programs/zigstat" // Path to zigstat utility } } From 272dafcfe18bbb746666c39c7c41a693caf166bb Mon Sep 17 00:00:00 2001 From: JPratama7 Date: Wed, 30 Jul 2025 14:14:46 +0700 Subject: [PATCH 3/3] Revert "refactor: centralize utility paths in Settings for zigbrightness and zigstat programs" --- Bar/Modules/Brightness.qml | 4 ++-- Services/Sysinfo.qml | 2 +- Settings/Settings.qml | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Bar/Modules/Brightness.qml b/Bar/Modules/Brightness.qml index 4200ec9..5aa5fd7 100644 --- a/Bar/Modules/Brightness.qml +++ b/Bar/Modules/Brightness.qml @@ -19,7 +19,7 @@ Item { Process { id: getBrightnessProcess - command: [Settings.settings.zigbrightnessPath, "get", monitorName] + command: [Quickshell.shellDir + "/Programs/zigbrightness", "get", monitorName] stdout: StdioCollector { onStreamFinished: { @@ -47,7 +47,7 @@ Item { Process { id: setBrightnessProcess property int targetValue: -1 - command: [Settings.settings.zigbrightnessPath, "set", monitorName, targetValue.toString()] + command: [Quickshell.shellDir + "/Programs/zigbrightness", "set", monitorName, targetValue.toString()] stdout: StdioCollector { onStreamFinished: { diff --git a/Services/Sysinfo.qml b/Services/Sysinfo.qml index 36bd987..521e768 100644 --- a/Services/Sysinfo.qml +++ b/Services/Sysinfo.qml @@ -23,7 +23,7 @@ Singleton { Process { id: zigstatProcess running: true - command: [Settings.settings.zigstatPath, updateInterval] + command: [Quickshell.shellDir + "/Programs/zigstat", updateInterval] stdout: SplitParser { onRead: function (line) { try { diff --git a/Settings/Settings.qml b/Settings/Settings.qml index 1c3c75e..879abd2 100644 --- a/Settings/Settings.qml +++ b/Settings/Settings.qml @@ -65,8 +65,6 @@ Singleton { property real fontSizeMultiplier: 1.0 // Font size multiplier (1.0 = normal, 1.2 = 20% larger, 0.8 = 20% smaller) property int taskbarIconSize: 24 // Taskbar icon button size in pixels (default: 32, smaller: 24, larger: 40) property var pinnedExecs: [] // Added for AppLauncher pinned apps - property string zigbrightnessPath: Quickshell.shellDir + "/Programs/zigbrightness" // Path to zigbrightness utility - property string zigstatPath: Quickshell.shellDir + "/Programs/zigstat" // Path to zigstat utility } }