git.iko.soy/unity8
on xenial help sign in
And drop infographicModel
5b21be4Michael Terry
qml/Greeter/Greeter.qml−1
compare with xenial
unifiedsplit
@@ -148,7 +148,6 @@ Showable {
148 anchors.fill: parent
148 anchors.fill: parent
149 property var model: LightDM.Users
149 property var model: LightDM.Users
150 property int currentIndex: 0
150 property int currentIndex: 0
151− property var infographicModel: LightDM.Infographic
152 readonly property int backgroundTopMargin: -greeter.y
151 readonly property int backgroundTopMargin: -greeter.y
153 property bool everLoaded: false
152 property bool everLoaded: false
154
153
qml/Greeter/GreeterContent.qml+4−4
@@ -109,13 +109,13 @@ Item {
109 id: infographics
109 id: infographics
110 objectName: "infographics"
110 objectName: "infographics"
111 height: narrowMode ? parent.height : 0.75 * parent.height
111 height: narrowMode ? parent.height : 0.75 * parent.height
112− model: greeterContentLoader.infographicModel
112+ model: LightDM.Infographic
113− visible: model.label !== ""
113+ visible: LightDM.Infographic.label !== ""
114
114
115 property string selectedUser
115 property string selectedUser
116
116
117 Binding {
117 Binding {
118− target: model
118+ target: LightDM.Infographic
119 property: "username"
119 property: "username"
120 value: AccountsService.statsWelcomeScreen ? infographics.selectedUser : ""
120 value: AccountsService.statsWelcomeScreen ? infographics.selectedUser : ""
121 }
121 }
@@ -124,7 +124,7 @@ Item {
124 target: root
124 target: root
125 onSelected: {
125 onSelected: {
126 infographics.selectedUser = greeterContentLoader.model.data(uid, LightDM.UserRoles.NameRole);
126 infographics.selectedUser = greeterContentLoader.model.data(uid, LightDM.UserRoles.NameRole);
127− greeterContentLoader.infographicModel.readyForDataChange();
127+ LightDM.Infographic.readyForDataChange();
128 }
128 }
129 }
129 }
130
130