git.iko.soy/unity8
on xenial help sign in
Cleanup infographics bindings
6fb4a13Michael Terry
qml/Greeter/Greeter.qml+1−1
compare with xenial
unifiedsplit
@@ -155,7 +155,7 @@ Showable {
155 source: loadContent ? "GreeterContent.qml" : ""
155 source: loadContent ? "GreeterContent.qml" : ""
156
156
157 onLoaded: {
157 onLoaded: {
158− selected(currentIndex);
158+ greeterContentLoader.item.selected(currentIndex);
159 }
159 }
160
160
161 Connections {
161 Connections {
qml/Greeter/GreeterContent.qml+9−7
@@ -110,20 +110,22 @@ Item {
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: greeterContentLoader.infographicModel
113+ visible: model.label !== ""
113
114
114 property string selectedUser
115 property string selectedUser
115− property string infographicUser: AccountsService.statsWelcomeScreen ? selectedUser : ""
116− onInfographicUserChanged: greeterContentLoader.infographicModel.username = infographicUser
117
116
118− Component.onCompleted: {
117+ Binding {
119− selectedUser = greeterContentLoader.model.data(greeterContentLoader.currentIndex, LightDM.UserRoles.NameRole)
118+ target: model
120− greeterContentLoader.infographicModel.username = infographicUser
119+ property: "username"
121− greeterContentLoader.infographicModel.readyForDataChange()
120+ value: AccountsService.statsWelcomeScreen ? selectedUser : ""
122 }
121 }
123
122
124 Connections {
123 Connections {
125 target: root
124 target: root
125+ onSelected: {
126− onSelected: infographics.selectedUser = greeterContentLoader.model.data(uid, LightDM.UserRoles.NameRole)
126+ infographics.selectedUser = greeterContentLoader.model.data(uid, LightDM.UserRoles.NameRole);
127+ greeterContentLoader.infographicModel.readyForDataChange();
128+ }
127 }
129 }
128
130
129 anchors {
131 anchors {
qml/Greeter/Infographics.qml−2
@@ -72,8 +72,6 @@ Item {
72 notification.hideAnim.start()
72 notification.hideAnim.start()
73 }
73 }
74
74
75− visible: model.label !== ""
76−
77 Component.onCompleted: startShowAnimation()
75 Component.onCompleted: startShowAnimation()
78
76
79 Item {
77 Item {