Hrvoje Senjan 2015-11-28 16:20:53 +00:00 committed by Git OBS Bridge
parent d0ad7e900f
commit 80de7044dc

View File

@ -2,13 +2,14 @@ Index: plasma-workspace-5.4.3/lookandfeel/contents/components/UserSelect.qml
===================================================================
--- plasma-workspace-5.4.3.orig/lookandfeel/contents/components/UserSelect.qml 2015-11-11 16:10:23.021419038 +0100
+++ plasma-workspace-5.4.3/lookandfeel/contents/components/UserSelect.qml 2015-11-11 15:25:12.570242837 +0100
@@ -27,9 +27,13 @@
@@ -27,10 +27,14 @@ FocusScope {
id: root
property alias model: usersList.model
property alias selectedUser: usersList.selectedUser
+ property var username: usersList.visible ? usersList.selectedUser : userPasswordPrompt.username
+ property alias password: userPasswordPrompt.password
property alias selectedIndex: usersList.currentIndex
property alias selectedItem: usersList.currentItem
property alias delegate: usersList.delegate
property alias notification: notificationLabel.text
+ property bool showUserList: (usersList.model.count && usersList.model.disableAvatarsThreshold) ? usersList.model.count <= usersList.model.disableAvatarsThreshold : true
@ -16,7 +17,7 @@ Index: plasma-workspace-5.4.3/lookandfeel/contents/components/UserSelect.qml
activeFocusOnTab: true
@@ -41,6 +45,10 @@
@@ -42,6 +46,10 @@ FocusScope {
usersList.decrementCurrentIndex()
}
@ -27,7 +28,7 @@ Index: plasma-workspace-5.4.3/lookandfeel/contents/components/UserSelect.qml
InfoPane {
id: infoPane
anchors {
@@ -54,6 +62,7 @@
@@ -55,6 +63,7 @@ FocusScope {
id: usersList
focus: true
@ -35,7 +36,7 @@ Index: plasma-workspace-5.4.3/lookandfeel/contents/components/UserSelect.qml
Rectangle {//debug
visible: debug
@@ -84,6 +93,21 @@
@@ -85,6 +94,21 @@ FocusScope {
}
}
@ -120,7 +121,7 @@ Index: plasma-workspace-5.4.3/lookandfeel/contents/loginmanager/Main.qml
===================================================================
--- plasma-workspace-5.4.3.orig/lookandfeel/contents/loginmanager/Main.qml 2015-11-05 13:49:30.000000000 +0100
+++ plasma-workspace-5.4.3/lookandfeel/contents/loginmanager/Main.qml 2015-11-11 15:25:12.832242854 +0100
@@ -71,6 +71,9 @@
@@ -74,6 +74,9 @@ Image {
initialItem: BreezeBlock {
id: loginPrompt
@ -130,7 +131,7 @@ Index: plasma-workspace-5.4.3/lookandfeel/contents/loginmanager/Main.qml
//Enable clipping whilst animating, otherwise the items would be shifted to other screens in multiscreen setups
//As there are only 2 items (loginPrompt and logoutScreenComponent), it's sufficient to do it only in this component
@@ -126,13 +129,14 @@
@@ -129,13 +132,14 @@ Image {
echoMode: TextInput.Password
onAccepted: loginPrompt.startLogin()
focus: true
@ -146,7 +147,7 @@ Index: plasma-workspace-5.4.3/lookandfeel/contents/loginmanager/Main.qml
onTriggered: passwordInput.forceActiveFocus()
}
//end hack
@@ -218,9 +222,13 @@
@@ -221,9 +225,13 @@ Image {
target: sddm
onLoginFailed: {
//Re-enable button and textfield
@ -163,7 +164,7 @@ Index: plasma-workspace-5.4.3/lookandfeel/contents/loginmanager/Main.qml
loginButton.enabled = true;
}
}
@@ -229,11 +237,12 @@
@@ -232,11 +240,12 @@ Image {
function startLogin () {
//Disable button and textfield while password check is running