zoriya/noctalia-shell
1
0
Fork 0
mirror of https://github.com/zoriya/noctalia-shell.git synced 2026-06-07 04:15:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolved broken settings. Utilized Singleton more effectively

Browse Source
This commit is contained in:
Corey Woodworth
2025-10-30 19:24:48 -04:00
parent c955db20b7
commit 6a74924e04
3 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Bar/Widgets/LockKeys.qml
+14 -25
View File
@@ -3,10 +3,10 @@ import QtQuick.Layouts
import Quickshell import Quickshell
import Quickshell.Io import Quickshell.Io
import qs.Commons import qs.Commons
import qs.Modules.Settings
import qs.Services import qs.Services
import qs.Widgets import qs.Widgets
import qs.Modules.Settings //import qs.Modules.Bar.Extras
// import qs.Modules.Bar.Extras
Rectangle { Rectangle {
id: root id: root
@@ -34,17 +34,6 @@ Rectangle {
readonly property bool showNum: (widgetSettings.showNumLock !== undefined) ? widgetSettings.showNumLock : widgetMetadata.showNumLock readonly property bool showNum: (widgetSettings.showNumLock !== undefined) ? widgetSettings.showNumLock : widgetMetadata.showNumLock
readonly property bool showScroll: (widgetSettings.showScrollLock !== undefined) ? widgetSettings.showScrollLock : widgetMetadata.showScrollLock readonly property bool showScroll: (widgetSettings.showScrollLock !== undefined) ? widgetSettings.showScrollLock : widgetMetadata.showScrollLock
property bool capsLockOn: LockKeysService.capsLockOn
property bool numLockOn: LockKeysService.numLockOn
property bool scrollLockOn: LockKeysService.scrollLockOn
Connections {
target: LockKeysService
function onCapsLockChanged(active) { root.capsLockOn = active }
function onNumLockChanged(active) { root.numLockOn = active }
function onScrollLockChanged(active) { root.scrollLockOn = active }
}
implicitWidth: isVertical ? Style.capsuleHeight : Math.round(layout.implicitWidth + Style.marginM * 2) implicitWidth: isVertical ? Style.capsuleHeight : Math.round(layout.implicitWidth + Style.marginM * 2)
implicitHeight: isVertical ? Math.round(layout.implicitHeight + Style.marginM * 2) : Style.capsuleHeight implicitHeight: isVertical ? Math.round(layout.implicitHeight + Style.marginM * 2) : Style.capsuleHeight
@@ -67,19 +56,19 @@ Rectangle {
spacing: 0 spacing: 0
NIcon { NIcon {
visible: showCaps visible: root.showCaps
icon: "letter-c" icon: "letter-c"
color: root.capsLockOn ? Color.mTertiary : Qt.alpha(Color.mOnSurfaceVariant, 0.3) color: LockKeysService.capsLockOn ? Color.mTertiary : Qt.alpha(Color.mOnSurfaceVariant, 0.3)
} }
NIcon { NIcon {
visible: showNum visible: root.showNum
icon: "letter-n" icon: "letter-n"
color: root.numLockOn ? Color.mTertiary : Qt.alpha(Color.mOnSurfaceVariant, 0.3) color: LockKeysService.numLockOn ? Color.mTertiary : Qt.alpha(Color.mOnSurfaceVariant, 0.3)
} }
NIcon { NIcon {
visible: showScroll visible: root.showScroll
icon: "letter-s" icon: "letter-s"
color: root.scrollLockOn ? Color.mTertiary : Qt.alpha(Color.mOnSurfaceVariant, 0.3) color: LockKeysService.scrollLockOn ? Color.mTertiary : Qt.alpha(Color.mOnSurfaceVariant, 0.3)
} }
} }
@@ -89,19 +78,19 @@ Rectangle {
spacing: 0 spacing: 0
NIcon { NIcon {
visible: showCaps visible: root.showCaps
icon: "letter-c" icon: "letter-c"
color: root.capsLockOn ? Color.mTertiary : Qt.alpha(Color.mOnSurfaceVariant, 0.3) color: LockKeysService.capsLockOn ? Color.mTertiary : Qt.alpha(Color.mOnSurfaceVariant, 0.3)
} }
NIcon { NIcon {
visible: showNum visible: root.showNum
icon: "letter-n" icon: "letter-n"
color: root.numLockOn ? Color.mTertiary : Qt.alpha(Color.mOnSurfaceVariant, 0.3) color: LockKeysService.numLockOn ? Color.mTertiary : Qt.alpha(Color.mOnSurfaceVariant, 0.3)
} }
NIcon { NIcon {
visible: showScroll visible: root.showScroll
icon: "letter-s" icon: "letter-s"
color: root.scrollLockOn ? Color.mTertiary : Qt.alpha(Color.mOnSurfaceVariant, 0.3) color: LockKeysService.scrollLockOn ? Color.mTertiary : Qt.alpha(Color.mOnSurfaceVariant, 0.3)
} }
} }
} }
Services/BarWidgetRegistry.qml
+2 -1
View File
@@ -21,7 +21,7 @@ Singleton {
"DarkMode": darkMode, "DarkMode": darkMode,
"KeepAwake": keepAwakeComponent, "KeepAwake": keepAwakeComponent,
"KeyboardLayout": keyboardLayoutComponent, "KeyboardLayout": keyboardLayoutComponent,
"LockKeys:": lockKeysComponent, "LockKeys": lockKeysComponent,
"MediaMini": mediaMiniComponent, "MediaMini": mediaMiniComponent,
"Microphone": microphoneComponent, "Microphone": microphoneComponent,
"NightLight": nightLightComponent, "NightLight": nightLightComponent,
@@ -100,6 +100,7 @@ Singleton {
"displayMode": "onhover" "displayMode": "onhover"
}, },
"LockKeys": { "LockKeys": {
"allowUserSettings": true,
"showCapsLock": true, "showCapsLock": true,
"showNumLock": true, "showNumLock": true,
"showScrollLock": true "showScrollLock": true
a.out
View File