nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lock: show keyboard layout

Browse source 
Closes #450
This commit is contained in:
2 * r + 2 * t 2025-08-28 15:27:20 +10:00
parent f2b79757e2
commit 1191af68fb
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/lock/Center.qml
View file

@ -217,18 +217,33 @@ ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -Appearance.spacing.large Layout.topMargin: -Appearance.spacing.large
implicitHeight: stateMessage.implicitHeight implicitHeight: Math.max(message.implicitHeight, stateMessage.implicitHeight)
Behavior on implicitHeight {
Anim {}
}
StyledText { StyledText {
id: stateMessage id: stateMessage
readonly property string msg: { readonly property string msg: {
if (Hypr.kbLayout !== Hypr.defaultKbLayout) {
if (Hypr.capsLock && Hypr.numLock)
return qsTr("Caps lock and Num lock are ON.\nKeyboard layout: %1").arg(Hypr.kbLayoutFull);
if (Hypr.capsLock)
return qsTr("Caps lock is ON. Kb layout: %1").arg(Hypr.kbLayoutFull);
if (Hypr.numLock)
return qsTr("Num lock is ON. Kb layout: %1").arg(Hypr.kbLayoutFull);
return qsTr("Keyboard layout: %1").arg(Hypr.kbLayoutFull);
}
if (Hypr.capsLock && Hypr.numLock) if (Hypr.capsLock && Hypr.numLock)
return qsTr("Caps lock and Num lock are ON."); return qsTr("Caps lock and Num lock are ON.");
if (Hypr.capsLock) if (Hypr.capsLock)
return qsTr("Caps lock is ON."); return qsTr("Caps lock is ON.");
if (Hypr.numLock) if (Hypr.numLock)
return qsTr("Num lock is ON."); return qsTr("Num lock is ON.");
return ""; return "";
} }
@ -260,6 +275,7 @@ ColumnLayout {
font.family: Appearance.font.family.mono font.family: Appearance.font.family.mono
horizontalAlignment: Qt.AlignHCenter horizontalAlignment: Qt.AlignHCenter
wrapMode: Text.WrapAtWordBoundaryOrAnywhere wrapMode: Text.WrapAtWordBoundaryOrAnywhere
lineHeight: 1.2
Behavior on scale { Behavior on scale {
Anim {} Anim {}

3
services/Hypr.qml
View file

@ -21,7 +21,8 @@ Singleton {
property var keyboard property var keyboard
readonly property bool capsLock: keyboard?.capsLock ?? false readonly property bool capsLock: keyboard?.capsLock ?? false
readonly property bool numLock: keyboard?.numLock ?? false readonly property bool numLock: keyboard?.numLock ?? false
readonly property string kbLayoutFull: keyboard?.active_keymap ?? "?" readonly property string defaultKbLayout: keyboard?.layout.split(",")[0] ?? "??"
readonly property string kbLayoutFull: keyboard?.active_keymap ?? "Unknown"
readonly property string kbLayout: kbMap.get(kbLayoutFull) ?? "??" readonly property string kbLayout: kbMap.get(kbLayoutFull) ?? "??"
readonly property var kbMap: new Map() readonly property var kbMap: new Map()