git.iko.soy/unity8
on xenial help sign in
put the form in a flickable
19d8928Lukáš Tinkl
qml/Wizard/Pages/40-location.qml+1−1
compare with xenial
unifiedsplit
@@ -208,7 +208,7 @@ LocalComponents.Page {
208 opacity: nopeCheckLabel.checked ? 1 : 0
208 opacity: nopeCheckLabel.checked ? 1 : 0
209 anchors.right: parent.right
209 anchors.right: parent.right
210 anchors.verticalCenter: nopeCheckLabel.verticalCenter
210 anchors.verticalCenter: nopeCheckLabel.verticalCenter
211− anchors.rightMargin: rightMargin
211+ anchors.rightMargin: rightMargin
212 }
212 }
213
213
214 Rectangle {
214 Rectangle {
qml/Wizard/Pages/60-uaccount-signup.qml+33−30
@@ -37,11 +37,14 @@ LocalComponents.Page {
37 }
37 }
38 }
38 }
39
39
40− Item {
40+ Flickable
41+ {
41 id: column
42 id: column
43+ clip: true
44+ flickableDirection: Flickable.VerticalFlick
42 anchors.fill: content
45 anchors.fill: content
43− anchors.leftMargin: leftMargin
46+ anchors.leftMargin: parent.leftMargin
44− anchors.rightMargin: rightMargin
47+ anchors.rightMargin: parent.rightMargin
45
48
46 // email
49 // email
47 Label {
50 Label {
@@ -157,33 +160,33 @@ LocalComponents.Page {
157 KeyNavigation.tab: emailInput
160 KeyNavigation.tab: emailInput
158 }
161 }
159
162
160−// LocalComponents.CheckableSetting {
163+ // LocalComponents.CheckableSetting {
161−// id: optoutCheck
164+ // id: optoutCheck
162−// objectName: "optoutCheck"
165+ // objectName: "optoutCheck"
163−// showDivider: false
166+ // showDivider: false
164−// anchors.left: parent.left
167+ // anchors.left: parent.left
165−// anchors.right: parent.right
168+ // anchors.right: parent.right
166−// anchors.top: encryptCheck.bottom
169+ // anchors.top: encryptCheck.bottom
167−// anchors.topMargin: units.gu(2)
170+ // anchors.topMargin: units.gu(2)
168−// text: i18n.tr("Opt out of cloud account (not recommended)")
171+ // text: i18n.tr("Opt out of cloud account (not recommended)")
169−// KeyNavigation.tab: termsCheck
172+ // KeyNavigation.tab: termsCheck
170−// }
173+ // }
171−
174+
172−// LocalComponents.CheckableSetting {
175+ // LocalComponents.CheckableSetting {
173−// id: termsCheck
176+ // id: termsCheck
174−// objectName: "termsCheck"
177+ // objectName: "termsCheck"
175−// showDivider: false
178+ // showDivider: false
176−// anchors.left: parent.left
179+ // anchors.left: parent.left
177−// anchors.right: parent.right
180+ // anchors.right: parent.right
178−// anchors.top: encryptCheck.bottom
181+ // anchors.top: encryptCheck.bottom
179−// anchors.topMargin: units.gu(1)
182+ // anchors.topMargin: units.gu(1)
180−// text: i18n.tr("I have read and accept the Ubuntu account <a href='#'>terms of service</a>")
183+ // text: i18n.tr("I have read and accept the Ubuntu account <a href='#'>terms of service</a>")
181−// onLinkActivated: {
184+ // onLinkActivated: {
182−// webview.visible = true;
185+ // webview.visible = true;
183−// webview.url = "https://login.ubuntu.com/terms/";
186+ // webview.url = "https://login.ubuntu.com/terms/";
184−// }
187+ // }
185−// KeyNavigation.tab: emailInput
188+ // KeyNavigation.tab: emailInput
186−// }
189+ // }
187 }
190 }
188
191
189 WebView {
192 WebView {