never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removing test mode on battery

Browse source
This commit is contained in:
LemmyCook 2025-09-14 17:21:38 -04:00
parent 118323e6b5
commit 19312d94c3
8 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Modules/Bar/Widgets/Battery.qml
View file

@ -34,7 +34,7 @@ Item {
readonly property real warningThreshold: widgetSettings.warningThreshold !== undefined ? widgetSettings.warningThreshold : widgetMetadata.warningThreshold readonly property real warningThreshold: widgetSettings.warningThreshold !== undefined ? widgetSettings.warningThreshold : widgetMetadata.warningThreshold
// Test mode // Test mode
readonly property bool testMode: true readonly property bool testMode: false
readonly property int testPercent: 100 readonly property int testPercent: 100
readonly property bool testCharging: false readonly property bool testCharging: false
@ -89,7 +89,7 @@ Item {
text: (isReady || testMode) ? Math.round(percent) : "-" text: (isReady || testMode) ? Math.round(percent) : "-"
autoHide: false autoHide: false
forceOpen: isReady && (testMode || battery.isLaptopBattery) && displayMode === "alwaysShow" forceOpen: isReady && (testMode || battery.isLaptopBattery) && displayMode === "alwaysShow"
forceClosed: displayMode === "alwaysHide" forceClose: displayMode === "alwaysHide"
disableOpen: (!isReady || (!testMode && !battery.isLaptopBattery)) disableOpen: (!isReady || (!testMode && !battery.isLaptopBattery))
tooltipText: { tooltipText: {
let lines = [] let lines = []

2
Modules/Bar/Widgets/Brightness.qml
View file

@ -83,7 +83,7 @@ Item {
return monitor ? Math.round(monitor.brightness * 100) : "" return monitor ? Math.round(monitor.brightness * 100) : ""
} }
forceOpen: displayMode === "alwaysShow" forceOpen: displayMode === "alwaysShow"
forceClosed: displayMode === "alwaysHide" forceClose: displayMode === "alwaysHide"
tooltipText: { tooltipText: {
var monitor = getMonitor() var monitor = getMonitor()
if (!monitor) if (!monitor)

2
Modules/Bar/Widgets/KeyboardLayout.qml
View file

@ -48,7 +48,7 @@ Item {
text: currentLayout.toUpperCase() text: currentLayout.toUpperCase()
tooltipText: "Keyboard layout: " + currentLayout.toUpperCase() tooltipText: "Keyboard layout: " + currentLayout.toUpperCase()
forceOpen: root.displayMode === "forceOpen" forceOpen: root.displayMode === "forceOpen"
forceClosed: root.displayMode === "alwaysHide" forceClose: root.displayMode === "alwaysHide"
fontSize: Style.fontSizeS // Use larger font size fontSize: Style.fontSizeS // Use larger font size
onClicked: { onClicked: {

2
Modules/Bar/Widgets/Microphone.qml
View file

@ -93,7 +93,7 @@ Item {
autoHide: false // Important to be false so we can hover as long as we want autoHide: false // Important to be false so we can hover as long as we want
text: Math.floor(AudioService.inputVolume * 100) text: Math.floor(AudioService.inputVolume * 100)
forceOpen: displayMode === "alwaysShow" forceOpen: displayMode === "alwaysShow"
forceClosed: displayMode === "alwaysHide" forceClose: displayMode === "alwaysHide"
tooltipText: "Microphone: " + Math.round(AudioService.inputVolume * 100) + "%\nLeft click for advanced settings.\nScroll up/down to change volume.\nRight click to toggle mute." tooltipText: "Microphone: " + Math.round(AudioService.inputVolume * 100) + "%\nLeft click for advanced settings.\nScroll up/down to change volume.\nRight click to toggle mute."
onWheel: function (delta) { onWheel: function (delta) {

5
Modules/Bar/Widgets/Volume.qml
View file

@ -30,6 +30,7 @@ Item {
return {} return {}
} }
readonly property bool isVertical: Settings.data.bar.position === "left" || Settings.data.bar.position === "right"
readonly property string displayMode: (widgetSettings.displayMode !== undefined) ? widgetSettings.displayMode : widgetMetadata.displayMode readonly property string displayMode: (widgetSettings.displayMode !== undefined) ? widgetSettings.displayMode : widgetMetadata.displayMode
// Used to avoid opening the pill on Quickshell startup // Used to avoid opening the pill on Quickshell startup
@ -76,9 +77,9 @@ Item {
rightOpen: BarWidgetRegistry.getNPillDirection(root) rightOpen: BarWidgetRegistry.getNPillDirection(root)
icon: getIcon() icon: getIcon()
autoHide: false // Important to be false so we can hover as long as we want autoHide: false // Important to be false so we can hover as long as we want
text: Math.floor(AudioService.volume * 100) text: `${Math.floor(AudioService.volume * 100)}${isVertical ? "" : "%"}`
forceOpen: displayMode === "alwaysShow" forceOpen: displayMode === "alwaysShow"
forceClosed: displayMode === "alwaysHide" forceClose: displayMode === "alwaysHide"
tooltipText: "Volume: " + Math.round(AudioService.volume * 100) + "%\nLeft click for advanced settings.\nScroll up/down to change volume.\nRight click to toggle mute." tooltipText: "Volume: " + Math.round(AudioService.volume * 100) + "%\nLeft click for advanced settings.\nScroll up/down to change volume.\nRight click to toggle mute."
onWheel: function (delta) { onWheel: function (delta) {

6
Widgets/NPill.qml
View file

@ -12,7 +12,7 @@ Item {
property real sizeRatio: 0.8 property real sizeRatio: 0.8
property bool autoHide: false property bool autoHide: false
property bool forceOpen: false property bool forceOpen: false
property bool forceClosed: false property bool forceClose: false
property bool disableOpen: false property bool disableOpen: false
property bool rightOpen: false property bool rightOpen: false
property bool hovered: false property bool hovered: false
@ -48,7 +48,7 @@ Item {
sizeRatio: root.sizeRatio sizeRatio: root.sizeRatio
autoHide: root.autoHide autoHide: root.autoHide
forceOpen: root.forceOpen forceOpen: root.forceOpen
forceClosed: root.forceClosed forceClose: root.forceClose
disableOpen: root.disableOpen disableOpen: root.disableOpen
rightOpen: root.rightOpen rightOpen: root.rightOpen
hovered: root.hovered hovered: root.hovered
@ -74,7 +74,7 @@ Item {
sizeRatio: root.sizeRatio sizeRatio: root.sizeRatio
autoHide: root.autoHide autoHide: root.autoHide
forceOpen: root.forceOpen forceOpen: root.forceOpen
forceClosed: root.forceClosed forceClose: root.forceClose
disableOpen: root.disableOpen disableOpen: root.disableOpen
rightOpen: root.rightOpen rightOpen: root.rightOpen
hovered: root.hovered hovered: root.hovered

8
Widgets/NPillHorizontal.qml
View file

@ -12,7 +12,7 @@ Item {
property real sizeRatio: 0.8 property real sizeRatio: 0.8
property bool autoHide: false property bool autoHide: false
property bool forceOpen: false property bool forceOpen: false
property bool forceClosed: false property bool forceClose: false
property bool disableOpen: false property bool disableOpen: false
property bool rightOpen: false property bool rightOpen: false
property bool hovered: false property bool hovered: false
@ -27,7 +27,7 @@ Item {
readonly property bool openLeftward: !rightOpen readonly property bool openLeftward: !rightOpen
// Effective shown state (true if animated open or forced, but not if force closed) // Effective shown state (true if animated open or forced, but not if force closed)
readonly property bool revealed: !forceClosed && (forceOpen || showPill) readonly property bool revealed: !forceClose && (forceOpen || showPill)
signal shown signal shown
signal hidden signal hidden
@ -254,7 +254,7 @@ Item {
hovered = true hovered = true
root.entered() root.entered()
tooltip.show() tooltip.show()
if (disableOpen || forceClosed) { if (disableOpen || forceClose) {
return return
} }
if (!forceOpen) { if (!forceOpen) {
@ -264,7 +264,7 @@ Item {
onExited: { onExited: {
hovered = false hovered = false
root.exited() root.exited()
if (!forceOpen && !forceClosed) { if (!forceOpen && !forceClose) {
hide() hide()
} }
tooltip.hide() tooltip.hide()

8
Widgets/NPillVertical.qml
View file

@ -12,7 +12,7 @@ Item {
property real sizeRatio: 0.8 property real sizeRatio: 0.8
property bool autoHide: false property bool autoHide: false
property bool forceOpen: false property bool forceOpen: false
property bool forceClosed: false property bool forceClose: false
property bool disableOpen: false property bool disableOpen: false
property bool rightOpen: false property bool rightOpen: false
property bool hovered: false property bool hovered: false
@ -27,7 +27,7 @@ Item {
readonly property bool openUpward: !rightOpen readonly property bool openUpward: !rightOpen
// Effective shown state (true if animated open or forced, but not if force closed) // Effective shown state (true if animated open or forced, but not if force closed)
readonly property bool revealed: !forceClosed && (forceOpen || showPill) readonly property bool revealed: !forceClose && (forceOpen || showPill)
signal shown signal shown
signal hidden signal hidden
@ -256,7 +256,7 @@ Item {
hovered = true hovered = true
root.entered() root.entered()
tooltip.show() tooltip.show()
if (disableOpen || forceClosed) { if (disableOpen || forceClose) {
return return
} }
if (!forceOpen) { if (!forceOpen) {
@ -266,7 +266,7 @@ Item {
onExited: { onExited: {
hovered = false hovered = false
root.exited() root.exited()
if (!forceOpen && !forceClosed) { if (!forceOpen && !forceClose) {
hide() hide()
} }
tooltip.hide() tooltip.hide()