diff --git a/components/LucideIcon.qml b/components/LucideIcon.qml index 206d5b4..500fff6 100644 --- a/components/LucideIcon.qml +++ b/components/LucideIcon.qml @@ -2,12 +2,9 @@ import qs.config import QtQuick Text { + color: Theme.palette.basecontent - Behavior on color { - ColorAnimation { - duration: 100 - } - } + font.family: Theme.lucide.font.family font.pixelSize: Dimensions.gpu.iconSize font.bold: true diff --git a/constants/Icons.qml b/constants/Icons.qml index 881277e..7caf3e3 100644 --- a/constants/Icons.qml +++ b/constants/Icons.qml @@ -3,7 +3,6 @@ pragma Singleton import Quickshell Singleton { - property string batteryCharging: "\u{E058}" property string batteryFull: "\u{E059}" property string batteryMedium: "\u{E05b}" property string batteryLow: "\u{E05a}" diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml index c39e847..1f468d4 100644 --- a/modules/bar/Bar.qml +++ b/modules/bar/Bar.qml @@ -107,8 +107,6 @@ PanelWindow { Gpu {} - Power {} - Clock {} Notifications {} diff --git a/modules/bar/components/Power.qml b/modules/bar/components/Power.qml deleted file mode 100644 index 5cb6150..0000000 --- a/modules/bar/components/Power.qml +++ /dev/null @@ -1,60 +0,0 @@ -import qs.components -import qs.config -import qs.constants -import qs.widgets -import QtQuick -import QtQuick.Layouts -import Quickshell.Services.UPower - -StyledButton { - id: root - property UPowerDevice laptopBattery: UPower.devices.values.find(device => device.isLaptopBattery) - property bool isCritical: laptopBattery.percentage < 0.10 - - contentItem: RowLayout { - spacing: 4 - LucideIcon { - Layout.alignment: Qt.AlignVCenter - color: { - if (root.isCritical) { - return Theme.palette.error; - } - if (root.hovered) { - return Theme.palette.primarycontent; - } - return Theme.palette.basecontent; - } - font.pixelSize: 16 - text: { - if (root.laptopBattery.state == UPowerDeviceState.Charging) { - return Icons.batteryCharging; - } - if (root.isCritical) { - return Icons.batteryWarning; - } - if (root.laptopBattery.percentage < 0.33) { - return Icons.batteryLow; - } - if (root.laptopBattery.percentage < 0.66) { - return Icons.batteryMedium; - } - return Icons.batteryFull; - } - } - - StyledText { - Layout.alignment: Qt.AlignVCenter - color: { - if (root.isCritical) { - return Theme.palette.error; - } - if (root.hovered) { - return Theme.palette.primarycontent; - } - return Theme.palette.basecontent; - } - text: `${root.laptopBattery.percentage * 100}%` - } - } - visible: laptopBattery -} diff --git a/modules/launcher/Launcher.qml b/modules/launcher/Launcher.qml index 137c861..36d65ab 100644 --- a/modules/launcher/Launcher.qml +++ b/modules/launcher/Launcher.qml @@ -2,8 +2,10 @@ pragma ComponentBehavior: Bound import "services" import qs.components +import qs.config import qs.constants import qs.services +import qs.widgets import Quickshell.Hyprland import Quickshell.Wayland import QtQuick diff --git a/services/PowerService.qml b/services/PowerService.qml deleted file mode 100644 index 09735ae..0000000 --- a/services/PowerService.qml +++ /dev/null @@ -1,12 +0,0 @@ -pragma Singleton - -import Quickshell -import Quickshell.Services.UPower - -Singleton { - id: root - - property bool onBattery: UPower.onBattery - property UPowerDevice laptopBattery: UPower.devices.values.find(device => device.isLaptopBattery) - -}