Refine Plasma lock screen authentication retries
This commit is contained in:
ajp_anton
@@ -176,3 +176,252 @@ Item {
|
||||
interval: 3000
|
||||
onTriggered: root.notification = ""
|
||||
}
|
||||
Timer {
|
||||
id: graceLockTimer
|
||||
interval: 3000
|
||||
onTriggered: {
|
||||
root.clearPassword();
|
||||
authenticator.startAuthenticating();
|
||||
}
|
||||
}
|
||||
|
||||
PropertyAnimation {
|
||||
id: launchAnimation
|
||||
target: lockScreenRoot
|
||||
property: "opacity"
|
||||
from: 0
|
||||
to: 1
|
||||
duration: Kirigami.Units.veryLongDuration * 2
|
||||
}
|
||||
|
||||
Component.onCompleted: launchAnimation.start();
|
||||
|
||||
WallpaperFader {
|
||||
anchors.fill: parent
|
||||
state: lockScreenRoot.uiVisible ? "on" : "off"
|
||||
source: wallpaper
|
||||
mainStack: mainStack
|
||||
footer: footer
|
||||
clock: clock
|
||||
alwaysShowClock: config.alwaysShowClock && !config.hideClockWhenIdle
|
||||
}
|
||||
|
||||
DropShadow {
|
||||
id: clockShadow
|
||||
anchors.fill: clock
|
||||
source: clock
|
||||
visible: !lockScreenUi.softwareRendering && config.alwaysShowClock
|
||||
radius: 7
|
||||
verticalOffset: 0.8
|
||||
samples: 15
|
||||
spread: 0.2
|
||||
color : Qt.rgba(0, 0, 0, 0.7)
|
||||
opacity: lockScreenRoot.uiVisible ? 0 : 1
|
||||
Behavior on opacity {
|
||||
OpacityAnimator {
|
||||
duration: Kirigami.Units.veryLongDuration * 2
|
||||
easing.type: Easing.InOutQuad
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Clock {
|
||||
id: clock
|
||||
property Item shadow: clockShadow
|
||||
visible: y > 0 && config.alwaysShowClock
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
y: (mainBlock.userList.y + mainStack.y)/2 - height/2
|
||||
Layout.alignment: Qt.AlignBaseline
|
||||
}
|
||||
|
||||
ListModel {
|
||||
id: users
|
||||
|
||||
Component.onCompleted: {
|
||||
users.append({
|
||||
name: kscreenlocker_userName,
|
||||
realName: kscreenlocker_userName,
|
||||
icon: kscreenlocker_userImage !== ""
|
||||
? "file://" + kscreenlocker_userImage.split("/").map(encodeURIComponent).join("/")
|
||||
: "",
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
StackView {
|
||||
id: mainStack
|
||||
anchors {
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
}
|
||||
height: lockScreenRoot.height + Kirigami.Units.gridUnit * 3
|
||||
focus: true //StackView is an implicit focus scope, so we need to give this focus so the item inside will have it
|
||||
|
||||
// this isn't implicit, otherwise items still get processed for the scenegraph
|
||||
visible: opacity > 0
|
||||
|
||||
initialItem: MainBlock {
|
||||
id: mainBlock
|
||||
lockScreenUiVisible: lockScreenRoot.uiVisible
|
||||
|
||||
showUserList: userList.y + mainStack.y > 0
|
||||
|
||||
enabled: !graceLockTimer.running
|
||||
|
||||
StackView.onStatusChanged: {
|
||||
// prepare for presenting again to the user
|
||||
if (StackView.status === StackView.Activating) {
|
||||
mainPasswordBox.clear();
|
||||
mainPasswordBox.focus = true;
|
||||
root.notification = "";
|
||||
}
|
||||
}
|
||||
userListModel: users
|
||||
|
||||
|
||||
notificationMessage: {
|
||||
const parts = [];
|
||||
if (capsLockState.locked) {
|
||||
parts.push(i18ndc("plasma_shell_org.kde.plasma.desktop", "@info:status", "Caps Lock is on"));
|
||||
}
|
||||
if (root.notification) {
|
||||
parts.push(root.notification);
|
||||
}
|
||||
return parts.join(" • ");
|
||||
}
|
||||
|
||||
onPasswordResult: password => {
|
||||
authenticator.respond(password)
|
||||
}
|
||||
|
||||
actionItems: [
|
||||
ActionButton {
|
||||
text: i18ndc("plasma_shell_org.kde.plasma.desktop", "@action:button", "Slee&p")
|
||||
icon.name: "system-suspend"
|
||||
onClicked: sessionManagement.suspend()
|
||||
visible: sessionManagement.canSuspend
|
||||
},
|
||||
ActionButton {
|
||||
text: i18ndc("plasma_shell_org.kde.plasma.desktop", "@action:button", "&Hibernate")
|
||||
icon.name: "system-suspend-hibernate"
|
||||
onClicked: sessionManagement.hibernate()
|
||||
visible: sessionManagement.canHibernate
|
||||
},
|
||||
ActionButton {
|
||||
text: i18ndc("plasma_shell_org.kde.plasma.desktop", "@action:button", "Switch &User")
|
||||
icon.name: "system-switch-user"
|
||||
onClicked: {
|
||||
sessionManagement.switchUser();
|
||||
}
|
||||
visible: sessionManagement.canSwitchUser
|
||||
}
|
||||
]
|
||||
|
||||
Loader {
|
||||
Layout.topMargin: Kirigami.Units.smallSpacing // some distance to the password field
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: item ? item.implicitHeight : 0
|
||||
active: config.showMediaControls
|
||||
source: "MediaControls.qml"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
VirtualKeyboardLoader {
|
||||
id: inputPanel
|
||||
|
||||
z: 1
|
||||
|
||||
screenRoot: lockScreenRoot
|
||||
mainStack: mainStack
|
||||
mainBlock: mainBlock
|
||||
passwordField: mainBlock.mainPasswordBox
|
||||
}
|
||||
|
||||
Loader {
|
||||
z: 2
|
||||
active: root.viewVisible
|
||||
source: "LockOsd.qml"
|
||||
anchors {
|
||||
horizontalCenter: parent.horizontalCenter
|
||||
bottom: parent.bottom
|
||||
bottomMargin: Kirigami.Units.gridUnit
|
||||
}
|
||||
}
|
||||
|
||||
// Note: Containment masks stretch clickable area of their buttons to
|
||||
// the screen edges, essentially making them adhere to Fitts's law.
|
||||
// Due to virtual keyboard button having an icon, buttons may have
|
||||
// different heights, so fillHeight is required.
|
||||
//
|
||||
// Note for contributors: Keep this in sync with SDDM Main.qml footer.
|
||||
RowLayout {
|
||||
id: footer
|
||||
anchors {
|
||||
bottom: parent.bottom
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
margins: Kirigami.Units.smallSpacing
|
||||
}
|
||||
spacing: Kirigami.Units.smallSpacing
|
||||
|
||||
PlasmaComponents3.ToolButton {
|
||||
id: virtualKeyboardButton
|
||||
|
||||
focusPolicy: Qt.TabFocus
|
||||
text: i18ndc("plasma_shell_org.kde.plasma.desktop", "Button to show/hide virtual keyboard", "Virtual Keyboard")
|
||||
icon.name: inputPanel.keyboardActive ? "input-keyboard-virtual-on" : "input-keyboard-virtual-off"
|
||||
onClicked: {
|
||||
// Otherwise the password field loses focus and virtual keyboard
|
||||
// keystrokes get eaten
|
||||
mainBlock.mainPasswordBox.forceActiveFocus();
|
||||
inputPanel.showHide()
|
||||
}
|
||||
|
||||
visible: inputPanel.status === Loader.Ready
|
||||
|
||||
Layout.fillHeight: true
|
||||
containmentMask: Item {
|
||||
parent: virtualKeyboardButton
|
||||
anchors.fill: parent
|
||||
anchors.leftMargin: -footer.anchors.margins
|
||||
anchors.bottomMargin: -footer.anchors.margins
|
||||
}
|
||||
}
|
||||
|
||||
PlasmaComponents3.ToolButton {
|
||||
id: keyboardButton
|
||||
|
||||
focusPolicy: Qt.TabFocus
|
||||
Accessible.description: i18ndc("plasma_shell_org.kde.plasma.desktop", "Button to change keyboard layout", "Switch layout")
|
||||
icon.name: "input-keyboard"
|
||||
|
||||
PW.KeyboardLayoutSwitcher {
|
||||
id: keyboardLayoutSwitcher
|
||||
|
||||
anchors.fill: parent
|
||||
acceptedButtons: Qt.NoButton
|
||||
}
|
||||
|
||||
text: keyboardLayoutSwitcher.layoutNames.longName
|
||||
onClicked: keyboardLayoutSwitcher.keyboardLayout.switchToNextLayout()
|
||||
|
||||
visible: keyboardLayoutSwitcher.hasMultipleKeyboardLayouts
|
||||
|
||||
Layout.fillHeight: true
|
||||
containmentMask: Item {
|
||||
parent: keyboardButton
|
||||
anchors.fill: parent
|
||||
anchors.leftMargin: virtualKeyboardButton.visible ? 0 : -footer.anchors.margins
|
||||
anchors.bottomMargin: -footer.anchors.margins
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
|
||||
Battery {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,9 +35,20 @@ fi
|
||||
run_tool apply >/dev/null
|
||||
run_tool status >/dev/null
|
||||
grep -q 'function onViewVisibleChanged()' "$target"
|
||||
grep -q 'running: parent.uiVisible' "$target"
|
||||
grep -q 'id: resumeAuthenticationTimer' "$target"
|
||||
grep -q 'id: postGraceAuthenticationTimer' "$target"
|
||||
grep -q 'interval: 1500' "$target"
|
||||
grep -q 'interval: 6000' "$target"
|
||||
grep -q 'running: root.viewVisible' "$target"
|
||||
grep -q 'onTriggered: authenticator.startAuthenticating()' "$target"
|
||||
if grep -q 'seenPositionChange\|lockScreenRoot.uiVisible = false' "$target"; then
|
||||
grep -q 'function onResumingFromSuspend()' "$target"
|
||||
[[ $(grep -c 'resumeAuthenticationTimer.restart()' "$target") -eq 1 ]]
|
||||
grep -q 'cursorShape: Qt.ArrowCursor' "$target"
|
||||
grep -q 'state: "on"' "$target"
|
||||
grep -q 'opacity: 0' "$target"
|
||||
grep -q 'lockScreenUiVisible: true' "$target"
|
||||
grep -q 'lockScreenRoot.uiVisible = false' "$target"
|
||||
if grep -q 'seenPositionChange\|running: parent.uiVisible\|repeat: true' "$target"; then
|
||||
printf 'The patched fixture still contains prompt-hiding logic.\n' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user