on xenial help sign in
Cleanup infographics bindings
commit6fb4a13496e4d85f80a2b18d9bea67297d2e8790 authorMichael Terry <michael.terry@canonical.com> dateTue 25 Nov 2014, 12:14 (12 years ago) parent037b383
3 files changed+10−10
qml/Greeter/Greeter.qml+1−1 qml/Greeter/GreeterContent.qml+9−7 qml/Greeter/Infographics.qml−2
qml/Greeter/Greeter.qml+1−1
@@ -155,7 +155,7 @@ Showable {
155155 source: loadContent ? "GreeterContent.qml" : ""
156156
157157 onLoaded: {
158− selected(currentIndex);
158+ greeterContentLoader.item.selected(currentIndex);
159159 }
160160
161161 Connections {
qml/Greeter/GreeterContent.qml+9−7
@@ -110,20 +110,22 @@ Item {
110110 objectName: "infographics"
111111 height: narrowMode ? parent.height : 0.75 * parent.height
112112 model: greeterContentLoader.infographicModel
113+ visible: model.label !== ""
113114
114115 property string selectedUser
115− property string infographicUser: AccountsService.statsWelcomeScreen ? selectedUser : ""
116− onInfographicUserChanged: greeterContentLoader.infographicModel.username = infographicUser
117116
118− Component.onCompleted: {
119− selectedUser = greeterContentLoader.model.data(greeterContentLoader.currentIndex, LightDM.UserRoles.NameRole)
120− greeterContentLoader.infographicModel.username = infographicUser
121− greeterContentLoader.infographicModel.readyForDataChange()
117+ Binding {
118+ target: model
119+ property: "username"
120+ value: AccountsService.statsWelcomeScreen ? selectedUser : ""
122121 }
123122
124123 Connections {
125124 target: root
126− onSelected: infographics.selectedUser = greeterContentLoader.model.data(uid, LightDM.UserRoles.NameRole)
125+ onSelected: {
126+ infographics.selectedUser = greeterContentLoader.model.data(uid, LightDM.UserRoles.NameRole);
127+ greeterContentLoader.infographicModel.readyForDataChange();
128+ }
127129 }
128130
129131 anchors {
qml/Greeter/Infographics.qml−2
@@ -72,8 +72,6 @@ Item {
7272 notification.hideAnim.start()
7373 }
7474
75− visible: model.label !== ""
76−
7775 Component.onCompleted: startShowAnimation()
7876
7977 Item {