From 686e4ce81c475053ba4e94a1864e6edbb8d70b71 Mon Sep 17 00:00:00 2001 From: Lysec <52084453+Ly-sec@users.noreply.github.com> Date: Sun, 20 Jul 2025 12:10:50 +0200 Subject: [PATCH] Revert "Revert "Quick fixs"" --- Bar/Modules/AudioDeviceSelector.qml | 2 +- Bar/Modules/Battery.qml | 7 ++++--- Services/Sysinfo.qml | 2 +- Services/WallpaperManager.qml | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Bar/Modules/AudioDeviceSelector.qml b/Bar/Modules/AudioDeviceSelector.qml index d089341..6d14974 100644 --- a/Bar/Modules/AudioDeviceSelector.qml +++ b/Bar/Modules/AudioDeviceSelector.qml @@ -7,7 +7,7 @@ import qs.Settings PanelWithOverlay { id: ioSelector - signal closed() + signal panelClosed() property int tabIndex: 0 property Item anchorItem: null diff --git a/Bar/Modules/Battery.qml b/Bar/Modules/Battery.qml index 49b3eb3..fe66910 100644 --- a/Bar/Modules/Battery.qml +++ b/Bar/Modules/Battery.qml @@ -6,9 +6,10 @@ import qs.Components Item { id: batteryWidget + property var battery: UPower.displayDevice property bool isReady: battery && battery.ready && battery.isLaptopBattery && battery.isPresent - property real percent: isReady ? battery.percentage : 0 + property real percent: isReady ? (battery.percentage * 100) : 0 property bool charging: isReady ? battery.state === UPowerDeviceState.Charging : false property bool show: isReady && percent > 0 @@ -24,7 +25,7 @@ Item { return "battery_alert"; } - visible: show + visible: isReady && battery.isLaptopBattery width: 22 height: 36 @@ -78,4 +79,4 @@ Item { targetItem: batteryWidget delay: 200 } -} \ No newline at end of file +} \ No newline at end of file diff --git a/Services/Sysinfo.qml b/Services/Sysinfo.qml index 9a168c3..521e768 100644 --- a/Services/Sysinfo.qml +++ b/Services/Sysinfo.qml @@ -23,7 +23,7 @@ Singleton { Process { id: zigstatProcess running: true - command: [Quickshell.shellRoot + "/Programs/zigstat", updateInterval] + command: [Quickshell.shellDir + "/Programs/zigstat", updateInterval] stdout: SplitParser { onRead: function (line) { try { diff --git a/Services/WallpaperManager.qml b/Services/WallpaperManager.qml index 84c0e4f..f32f72c 100644 --- a/Services/WallpaperManager.qml +++ b/Services/WallpaperManager.qml @@ -116,7 +116,7 @@ Singleton { Process { id: generateThemeProcess command: ["wallust", "run", currentWallpaper, "-u", "-k", "-d", "Templates"] - workingDirectory: Quickshell.configDir + workingDirectory: Quickshell.shellDir running: false } }