mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-06-18 09:05:24 -04:00
feat: add battery settings tab and update battery widget interactions (#2634)
* feat: add battery settings tab and update battery widget interactions * fix: import Quickshell.Io in BatteryTab.qml to fix Process type compilation error * feat: move battery tab under media player and add notify when charge limit reached option * chore: change default notification settings to false * feat: move battery tab under Power & Security section in settings * feat: add notification type button selection for battery alerts
This commit is contained in:
Huỳnh Thiện Lộc
@@ -118,10 +118,18 @@ BasePill {
|
||||
width: battery.width + battery.leftMargin + battery.rightMargin
|
||||
height: battery.height + battery.topMargin + battery.bottomMargin
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
acceptedButtons: Qt.LeftButton
|
||||
acceptedButtons: Qt.LeftButton | Qt.RightButton
|
||||
onPressed: mouse => {
|
||||
battery.triggerRipple(this, mouse.x, mouse.y);
|
||||
toggleBatteryPopup();
|
||||
if (mouse.button === Qt.LeftButton) {
|
||||
toggleBatteryPopup();
|
||||
} else if (mouse.button === Qt.RightButton) {
|
||||
if (PowerProfileWatcher.available) {
|
||||
PowerProfileWatcher.cycleProfile();
|
||||
} else {
|
||||
ToastService.showError(I18n.tr("power-profiles-daemon not available"));
|
||||
}
|
||||
}
|
||||
}
|
||||
onWheel: wheel => {
|
||||
var delta = wheel.angleDelta.y;
|
||||
@@ -131,33 +139,20 @@ BasePill {
|
||||
// Check if this is a touchpad
|
||||
if (delta !== 120 && delta !== -120) {
|
||||
touchpadAccumulator += delta;
|
||||
log.info("Acc: " + touchpadAccumulator);
|
||||
if (Math.abs(touchpadAccumulator) < 500)
|
||||
return;
|
||||
delta = touchpadAccumulator;
|
||||
touchpadAccumulator = 0;
|
||||
}
|
||||
log.info("Trigger! Delta: " + delta);
|
||||
|
||||
// This is after the other delta checks so it only shows on valid Y scroll
|
||||
if (!PowerProfileWatcher.available) {
|
||||
ToastService.showError(I18n.tr("power-profiles-daemon not available"));
|
||||
if (!DisplayService.brightnessAvailable) {
|
||||
return;
|
||||
}
|
||||
|
||||
const profiles = PowerProfileWatcher.availableProfiles;
|
||||
var index = profiles.findIndex(profile => PowerProfiles.profile === profile);
|
||||
|
||||
if (delta > 0)
|
||||
index += 1;
|
||||
else
|
||||
index -= 1;
|
||||
|
||||
if (index < 0 || index >= profiles.length)
|
||||
return;
|
||||
|
||||
if (!PowerProfileWatcher.applyProfile(profiles[index]))
|
||||
ToastService.showError(I18n.tr("Failed to set power profile"));
|
||||
const step = 5;
|
||||
const change = delta > 0 ? step : -step;
|
||||
const newBrightness = Math.max(0, Math.min(100, DisplayService.brightnessLevel + change));
|
||||
DisplayService.setBrightness(newBrightness, "", false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,310 @@
|
||||
import QtQuick
|
||||
import Quickshell
|
||||
import Quickshell.Io
|
||||
import qs.Common
|
||||
import qs.Services
|
||||
import qs.Widgets
|
||||
import qs.Modules.Settings.Widgets
|
||||
|
||||
Item {
|
||||
id: root
|
||||
|
||||
Process {
|
||||
id: applyLimitProcess
|
||||
command: ["pkexec", "sh", "-c", "
|
||||
for bat in /sys/class/power_supply/BAT*; do
|
||||
if [ -f \"$bat/charge_control_limit_max\" ]; then
|
||||
echo " + SettingsData.batteryChargeLimit + " > \"$bat/charge_control_limit_max\"
|
||||
elif [ -f \"$bat/charge_stop_threshold\" ]; then
|
||||
echo " + SettingsData.batteryChargeLimit + " > \"$bat/charge_stop_threshold\"
|
||||
elif [ -f \"$bat/charge_control_end_threshold\" ]; then
|
||||
echo " + SettingsData.batteryChargeLimit + " > \"$bat/charge_control_end_threshold\"
|
||||
fi
|
||||
done
|
||||
"]
|
||||
running: false
|
||||
onExited: exitCode => {
|
||||
if (exitCode !== 0) {
|
||||
ToastService.showError(I18n.tr("Failed to apply charge limit to system"), I18n.tr("Process exited with code %1").arg(exitCode));
|
||||
} else {
|
||||
ToastService.showInfo(I18n.tr("Charge limit applied successfully"), I18n.tr("Limit set to %1%").arg(SettingsData.batteryChargeLimit));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
DankFlickable {
|
||||
anchors.fill: parent
|
||||
clip: true
|
||||
contentHeight: mainColumn.height + Theme.spacingXL
|
||||
contentWidth: width
|
||||
|
||||
Column {
|
||||
id: mainColumn
|
||||
topPadding: 4
|
||||
width: Math.min(550, parent.width - Theme.spacingL * 2)
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
spacing: Theme.spacingXL
|
||||
|
||||
// 1. Information Card
|
||||
SettingsCard {
|
||||
width: parent.width
|
||||
iconName: "battery_charging_full"
|
||||
title: I18n.tr("Battery Status")
|
||||
settingKey: "batteryStatusCard"
|
||||
|
||||
Column {
|
||||
width: parent.width
|
||||
spacing: Theme.spacingM
|
||||
|
||||
Row {
|
||||
width: parent.width
|
||||
StyledText {
|
||||
text: I18n.tr("Power Source")
|
||||
font.pixelSize: Theme.fontSizeMedium
|
||||
color: Theme.surfaceVariantText
|
||||
width: parent.width / 2
|
||||
}
|
||||
StyledText {
|
||||
text: BatteryService.isPluggedIn ? I18n.tr("AC Adapter (Plugged In)") : I18n.tr("Battery Power")
|
||||
font.pixelSize: Theme.fontSizeMedium
|
||||
font.weight: Font.Medium
|
||||
color: Theme.surfaceText
|
||||
width: parent.width / 2
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
width: parent.width
|
||||
height: 1
|
||||
color: Theme.outline
|
||||
opacity: 0.1
|
||||
}
|
||||
|
||||
Row {
|
||||
width: parent.width
|
||||
StyledText {
|
||||
text: I18n.tr("Charge Level")
|
||||
font.pixelSize: Theme.fontSizeMedium
|
||||
color: Theme.surfaceVariantText
|
||||
width: parent.width / 2
|
||||
}
|
||||
StyledText {
|
||||
text: `${BatteryService.batteryLevel}%`
|
||||
font.pixelSize: Theme.fontSizeMedium
|
||||
font.weight: Font.Medium
|
||||
color: Theme.surfaceText
|
||||
width: parent.width / 2
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
width: parent.width
|
||||
height: 1
|
||||
color: Theme.outline
|
||||
opacity: 0.1
|
||||
}
|
||||
|
||||
Row {
|
||||
width: parent.width
|
||||
StyledText {
|
||||
text: I18n.tr("Status")
|
||||
font.pixelSize: Theme.fontSizeMedium
|
||||
color: Theme.surfaceVariantText
|
||||
width: parent.width / 2
|
||||
}
|
||||
StyledText {
|
||||
text: BatteryService.batteryStatus
|
||||
font.pixelSize: Theme.fontSizeMedium
|
||||
font.weight: Font.Medium
|
||||
color: Theme.surfaceText
|
||||
width: parent.width / 2
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
width: parent.width
|
||||
height: 1
|
||||
color: Theme.outline
|
||||
opacity: 0.1
|
||||
}
|
||||
|
||||
Row {
|
||||
width: parent.width
|
||||
StyledText {
|
||||
text: I18n.tr("Estimated Time")
|
||||
font.pixelSize: Theme.fontSizeMedium
|
||||
color: Theme.surfaceVariantText
|
||||
width: parent.width / 2
|
||||
}
|
||||
StyledText {
|
||||
text: BatteryService.formatTimeRemaining()
|
||||
font.pixelSize: Theme.fontSizeMedium
|
||||
font.weight: Font.Medium
|
||||
color: Theme.surfaceText
|
||||
width: parent.width / 2
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
width: parent.width
|
||||
height: 1
|
||||
color: Theme.outline
|
||||
opacity: 0.1
|
||||
}
|
||||
|
||||
Row {
|
||||
width: parent.width
|
||||
StyledText {
|
||||
text: I18n.tr("Battery Health")
|
||||
font.pixelSize: Theme.fontSizeMedium
|
||||
color: Theme.surfaceVariantText
|
||||
width: parent.width / 2
|
||||
}
|
||||
StyledText {
|
||||
text: BatteryService.batteryHealth
|
||||
font.pixelSize: Theme.fontSizeMedium
|
||||
font.weight: Font.Medium
|
||||
color: Theme.surfaceText
|
||||
width: parent.width / 2
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 2. Threshold & Limits Card
|
||||
SettingsCard {
|
||||
width: parent.width
|
||||
iconName: "tune"
|
||||
title: I18n.tr("Battery Protection & Charging")
|
||||
settingKey: "batteryProtection"
|
||||
|
||||
SettingsSliderRow {
|
||||
settingKey: "batteryChargeLimit"
|
||||
text: I18n.tr("Battery Charge Limit")
|
||||
description: I18n.tr("Limit the maximum battery charge level to extend lifespan.")
|
||||
value: SettingsData.batteryChargeLimit
|
||||
minimum: 50
|
||||
maximum: 100
|
||||
defaultValue: 100
|
||||
onSliderValueChanged: newValue => SettingsData.set("batteryChargeLimit", newValue)
|
||||
}
|
||||
|
||||
Row {
|
||||
width: parent.width
|
||||
height: applyButton.height
|
||||
layoutDirection: Qt.RightToLeft
|
||||
|
||||
DankButton {
|
||||
id: applyButton
|
||||
text: I18n.tr("Apply to Hardware")
|
||||
iconName: "lock"
|
||||
backgroundColor: Theme.primary
|
||||
textColor: Theme.onPrimary
|
||||
onClicked: {
|
||||
applyLimitProcess.running = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
SettingsToggleRow {
|
||||
settingKey: "batteryNotifyChargeLimit"
|
||||
text: I18n.tr("Notify when limit is reached")
|
||||
description: I18n.tr("Show a notification when battery reaches the charge limit.")
|
||||
checked: SettingsData.batteryNotifyChargeLimit
|
||||
onToggled: checked => SettingsData.set("batteryNotifyChargeLimit", checked)
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
width: parent.width
|
||||
height: 1
|
||||
color: Theme.outline
|
||||
opacity: 0.15
|
||||
}
|
||||
|
||||
SettingsSliderRow {
|
||||
settingKey: "batteryLowThreshold"
|
||||
text: I18n.tr("Low Battery Threshold")
|
||||
description: I18n.tr("Set the percentage at which the battery is considered low.")
|
||||
value: SettingsData.batteryLowThreshold
|
||||
minimum: 5
|
||||
maximum: 40
|
||||
defaultValue: 20
|
||||
onSliderValueChanged: newValue => SettingsData.set("batteryLowThreshold", newValue)
|
||||
}
|
||||
|
||||
SettingsToggleRow {
|
||||
settingKey: "batteryNotifyLow"
|
||||
text: I18n.tr("Low Battery Notifications")
|
||||
description: I18n.tr("Show a warning popup when battery is running low.")
|
||||
checked: SettingsData.batteryNotifyLow
|
||||
onToggled: checked => SettingsData.set("batteryNotifyLow", checked)
|
||||
}
|
||||
|
||||
SettingsButtonGroupRow {
|
||||
settingKey: "batteryNotificationType"
|
||||
text: I18n.tr("Notification Type")
|
||||
description: I18n.tr("Choose how to be notified about battery alerts.")
|
||||
model: [I18n.tr("Toast Overlay"), I18n.tr("System Notification")]
|
||||
currentIndex: SettingsData.batteryNotificationType
|
||||
onSelectionChanged: (index, selected) => {
|
||||
if (selected) {
|
||||
SettingsData.set("batteryNotificationType", index);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
SettingsToggleRow {
|
||||
settingKey: "batteryAutoPowerSaver"
|
||||
text: I18n.tr("Auto Power Saver")
|
||||
description: I18n.tr("Automatically turn on Power Saver profile when battery is low.")
|
||||
checked: SettingsData.batteryAutoPowerSaver
|
||||
onToggled: checked => SettingsData.set("batteryAutoPowerSaver", checked)
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Power Profiles Card
|
||||
SettingsCard {
|
||||
width: parent.width
|
||||
iconName: "power"
|
||||
title: I18n.tr("Power Profiles Auto-Switching")
|
||||
settingKey: "powerProfilesAuto"
|
||||
|
||||
SettingsDropdownRow {
|
||||
settingKey: "acProfileName"
|
||||
text: I18n.tr("Profile when Plugged In (AC)")
|
||||
description: I18n.tr("Power profile to use when AC power is connected.")
|
||||
options: [I18n.tr("Don't Change"), Theme.getPowerProfileLabel(0), Theme.getPowerProfileLabel(1), Theme.getPowerProfileLabel(2)]
|
||||
currentValue: {
|
||||
const val = SettingsData.acProfileName;
|
||||
const idx = ["", "0", "1", "2"].indexOf(val);
|
||||
return idx >= 0 ? options[idx] : options[0];
|
||||
}
|
||||
onValueChanged: value => {
|
||||
const idx = options.indexOf(value);
|
||||
if (idx >= 0) {
|
||||
SettingsData.set("acProfileName", ["", "0", "1", "2"][idx]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
SettingsDropdownRow {
|
||||
settingKey: "batteryProfileName"
|
||||
text: I18n.tr("Profile when on Battery")
|
||||
description: I18n.tr("Power profile to use when running on battery power.")
|
||||
options: [I18n.tr("Don't Change"), Theme.getPowerProfileLabel(0), Theme.getPowerProfileLabel(1), Theme.getPowerProfileLabel(2)]
|
||||
currentValue: {
|
||||
const val = SettingsData.batteryProfileName;
|
||||
const idx = ["", "0", "1", "2"].indexOf(val);
|
||||
return idx >= 0 ? options[idx] : options[0];
|
||||
}
|
||||
onValueChanged: value => {
|
||||
const idx = options.indexOf(value);
|
||||
if (idx >= 0) {
|
||||
SettingsData.set("batteryProfileName", ["", "0", "1", "2"][idx]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user