Commit 89a6218c authored by Volker Krause's avatar Volker Krause
Browse files

Port lockscreen away from QQC1

parent af6a4329
Pipeline #220087 passed with stage
in 6 minutes and 10 seconds
......@@ -5,7 +5,6 @@
*/
import QtQuick 2.5
import QtQuick.Controls 1.1
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.private.sessions 2.0
import "../components"
......
......@@ -6,7 +6,7 @@
import QtQml 2.15
import QtQuick 2.8
import QtQuick.Controls 1.1
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.1
import QtGraphicalEffects 1.0
......@@ -278,16 +278,13 @@ PlasmaCore.ColorScope {
id: mainBlock
lockScreenUiVisible: lockScreenRoot.uiVisible
// This is a focus scope and QQC1 StackView (unlike QQC2) does not set focus to the current item
focus: true
showUserList: userList.y + mainStack.y > 0
enabled: !graceLockTimer.running
Stack.onStatusChanged: {
StackView.onStatusChanged: {
// prepare for presenting again to the user
if (Stack.status === Stack.Activating) {
if (StackView.status === StackView.Activating) {
mainPasswordBox.remove(0, mainPasswordBox.length)
mainPasswordBox.focus = true
root.notification = ""
......@@ -483,8 +480,8 @@ PlasmaCore.ColorScope {
SessionManagementScreen {
property var switchSession: finalSwitchSession
Stack.onStatusChanged: {
if (Stack.status == Stack.Activating) {
StackView.onStatusChanged: {
if (StackView.status == StackView.Activating) {
focus = true
}
}
......
......@@ -7,7 +7,6 @@
import QtQuick 2.2
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.1
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 3.0 as PlasmaComponents3
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment