Accepting request 347488 from home:alarrosa:branches:KDE:Frameworks5

- Rebased fix-breeze-sddm-theme-with-many-users.patch in preparation
  for 5.5.0 
- Removed 'de' language and added 'ca' from _kf5_htmldir

OBS-URL: https://build.opensuse.org/request/show/347488
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=143
This commit is contained in:
Hrvoje Senjan 2015-12-05 01:05:39 +00:00 committed by Git OBS Bridge
parent e2da947593
commit 8b0b656021
3 changed files with 21 additions and 13 deletions

View File

@ -1,8 +1,8 @@
Index: plasma-workspace-5.4.3/lookandfeel/contents/components/UserSelect.qml Index: plasma-workspace-5.5.0/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.5.0.orig/lookandfeel/contents/components/UserSelect.qml
+++ plasma-workspace-5.4.3/lookandfeel/contents/components/UserSelect.qml 2015-11-11 15:25:12.570242837 +0100 +++ plasma-workspace-5.5.0/lookandfeel/contents/components/UserSelect.qml
@@ -27,10 +27,14 @@ FocusScope { @@ -27,11 +27,15 @@ FocusScope {
id: root id: root
property alias model: usersList.model property alias model: usersList.model
property alias selectedUser: usersList.selectedUser property alias selectedUser: usersList.selectedUser
@ -12,12 +12,13 @@ Index: plasma-workspace-5.4.3/lookandfeel/contents/components/UserSelect.qml
property alias selectedItem: usersList.currentItem property alias selectedItem: usersList.currentItem
property alias delegate: usersList.delegate property alias delegate: usersList.delegate
property alias notification: notificationLabel.text property alias notification: notificationLabel.text
property alias infoPaneVisible: infoPaneLoader.active
+ property bool showUserList: (usersList.model.count && usersList.model.disableAvatarsThreshold) ? usersList.model.count <= usersList.model.disableAvatarsThreshold : true + property bool showUserList: (usersList.model.count && usersList.model.disableAvatarsThreshold) ? usersList.model.count <= usersList.model.disableAvatarsThreshold : true
+ property alias pwFieldEnabled: userPasswordPrompt.pwFieldEnabled + property alias pwFieldEnabled: userPasswordPrompt.pwFieldEnabled
activeFocusOnTab: true activeFocusOnTab: true
@@ -42,6 +46,10 @@ FocusScope { @@ -43,6 +47,10 @@ FocusScope {
usersList.decrementCurrentIndex() usersList.decrementCurrentIndex()
} }
@ -25,19 +26,19 @@ Index: plasma-workspace-5.4.3/lookandfeel/contents/components/UserSelect.qml
+ userPasswordPrompt.reenablePasswordInput(); + userPasswordPrompt.reenablePasswordInput();
+ } + }
+ +
InfoPane { Loader {
id: infoPane id: infoPaneLoader
anchors { anchors {
@@ -55,6 +63,7 @@ FocusScope { @@ -57,6 +65,7 @@ FocusScope {
id: usersList id: usersList
focus: true focus: true
+ visible: root.showUserList + visible: root.showUserList
Rectangle {//debug anchors {
visible: debug top: parent.top
@@ -85,6 +94,21 @@ FocusScope { @@ -96,6 +105,21 @@ FocusScope {
} ]
} }
+ UserPasswordPrompt { + UserPasswordPrompt {

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Dec 4 12:02:33 UTC 2015 - alarrosa@suse.com
- Rebased fix-breeze-sddm-theme-with-many-users.patch in preparation
for 5.5.0
- Removed 'de' language and added 'ca' from _kf5_htmldir
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 25 23:58:24 UTC 2015 - opensuse@cboltz.de Wed Nov 25 23:58:24 UTC 2015 - opensuse@cboltz.de

View File

@ -323,7 +323,7 @@ workspace. Development files.
%files lang %files lang
%defattr(-,root,root) %defattr(-,root,root)
%{_kf5_localedir}/ %{_kf5_localedir}/
%doc %lang(de) %{_kf5_htmldir}/de/ %doc %lang(ca) %{_kf5_htmldir}/ca/
%endif %endif
%changelog %changelog