on xenial help sign in
OOBE visual review, 2015-10-12
commit2a92b408f7fa9a20b89d3a3629a4b29804327701 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateTue 13 Oct 2015, 00:42 (11 years ago) parent53b0e4f
8 files changed+51−29
qml/Wizard/Page.qml+4−3 qml/Wizard/Pages/10-language.qml+2−2 qml/Wizard/Pages/30-wifi.qml+4−2 qml/Wizard/Pages/40-location.qml+4−4 qml/Wizard/Pages/50-timezone.qml+17−4 qml/Wizard/Pages/70-passwd-type.qml+2−2 qml/Wizard/Pages/80-finished.qml+17−11 qml/Wizard/StackButton.qml+1−1
qml/Wizard/Page.qml+4−3
@@ -128,11 +128,12 @@ Item {
128128 Label {
129129 id: titleLabel
130130 property real animatedMargin: 0
131− property real animatedTopMargin: titleRect.height - customMargin - titleLabel.height
131+ property real animatedTopMargin: customTitle ? customMargin :
132+ titleRect.height - customMargin - titleLabel.height
132133 anchors {
133134 left: parent.left
134135 right: parent.right
135− top: parent.top
136+ bottom: parent.bottom
136137 bottomMargin: bottomMargin
137138 leftMargin: leftMargin + titleLabel.animatedMargin
138139 rightMargin: rightMargin
@@ -335,7 +336,7 @@ Item {
335336 target: titleLabel
336337 property: 'animatedTopMargin'
337338 from: content.height
338− to: titleRect.height - customMargin - titleLabel.height
339+ to: customMargin
339340 duration: UbuntuAnimation.BriskDuration
340341 easing: UbuntuAnimation.StandardEasing
341342 }
qml/Wizard/Pages/10-language.qml+2−2
@@ -126,7 +126,7 @@ LocalComponents.Page {
126126 right: parent.right
127127 }
128128
129− height: column.height - column.spacing
129+ height: column.height
130130
131131 model: plugin.languageNames
132132
@@ -157,7 +157,7 @@ LocalComponents.Page {
157157 rightMargin: rightMargin
158158 }
159159 fillMode: Image.PreserveAspectFit
160− height: langLabel.height / 2
160+ height: units.gu(1.5)
161161
162162 source: "data/Tick@30.png"
163163 visible: itemDelegate.isCurrent
qml/Wizard/Pages/30-wifi.qml+4−2
@@ -74,6 +74,8 @@ LocalComponents.Page {
7474 objectName: "accessPoint"
7575 highlightColor: backgroundColor
7676 enabled: menuData && menuData.sensitive || false
77+ divider.colorFrom: dividerColor
78+ divider.colorTo: backgroundColor
7779
7880 property QtObject menuData: null
7981 property var unityMenuModel: menuModel
@@ -103,7 +105,7 @@ LocalComponents.Page {
103105 verticalCenter: parent.verticalCenter
104106 leftMargin: leftMargin
105107 }
106− height: units.gu(2)
108+ height: units.gu(2.5)
107109 width: height
108110 name: getAPIcon(accessPoint.adHoc, accessPoint.signalStrength, accessPoint.secure)
109111 color: textColor
@@ -112,7 +114,7 @@ LocalComponents.Page {
112114 Column {
113115 anchors.verticalCenter: parent.verticalCenter
114116 anchors.left: apIcon.right
115− anchors.leftMargin: leftMargin
117+ anchors.leftMargin: units.gu(2)
116118 Label {
117119 id: apName
118120 text: menuData && menuData.label || ""
qml/Wizard/Pages/40-location.qml+4−4
@@ -106,7 +106,7 @@ LocalComponents.Page {
106106 Image {
107107 id: hereTermsCheck
108108 fillMode: Image.PreserveAspectFit
109− height: nopeCheckLabel.height
109+ height: units.gu(1.5)
110110 source: "data/Tick@30.png"
111111 opacity: hereCheckLabel.checked ? 1 : 0
112112 anchors.right: parent.right
@@ -155,7 +155,7 @@ LocalComponents.Page {
155155
156156 Image {
157157 fillMode: Image.PreserveAspectFit
158− height: nopeCheckLabel.height
158+ height: units.gu(1.5)
159159 source: "data/Tick@30.png"
160160 opacity: gpsCheckLabel.checked ? 1 : 0
161161 anchors.right: parent.right
@@ -204,7 +204,7 @@ LocalComponents.Page {
204204
205205 Image {
206206 fillMode: Image.PreserveAspectFit
207− height: nopeCheckLabel.height
207+ height: units.gu(1.5)
208208 source: "data/Tick@30.png"
209209 opacity: nopeCheckLabel.checked ? 1 : 0
210210 anchors.right: parent.right
@@ -228,7 +228,7 @@ LocalComponents.Page {
228228 left: parent.left
229229 right: parent.right
230230 top: divider3.bottom
231− topMargin: units.gu(3)
231+ topMargin: units.gu(4)
232232 leftMargin: leftMargin
233233 rightMargin: rightMargin
234234 }
qml/Wizard/Pages/50-timezone.qml+17−4
@@ -52,6 +52,8 @@ LocalComponents.Page {
5252 id: tz
5353 objectName: "tz"
5454 highlightColor: backgroundColor
55+ divider.colorFrom: dividerColor
56+ divider.colorTo: backgroundColor
5557 readonly property bool currentTz: ListView.view.currentIndex === index
5658
5759 Column {
@@ -86,7 +88,7 @@ LocalComponents.Page {
8688 rightMargin: rightMargin
8789 }
8890 fillMode: Image.PreserveAspectFit
89− height: cityLabel.height / 2
91+ height: units.gu(1.5)
9092
9193 source: "data/Tick@30.png"
9294 visible: tz.currentTz
@@ -101,13 +103,12 @@ LocalComponents.Page {
101103 }
102104 }
103105
104− Column {
106+ Item {
105107 id: column
106108 anchors {
107109 fill: content
108110 topMargin: customMargin
109111 }
110− spacing: units.gu(3)
111112
112113 LocalComponents.WizardTextField {
113114 id: searchField
@@ -125,6 +126,17 @@ LocalComponents.Page {
125126 }
126127 }
127128
129+ Rectangle {
130+ id: divider
131+ anchors.left: parent.left
132+ anchors.right: parent.right
133+ anchors.top: searchField.bottom
134+ anchors.topMargin: units.gu(3)
135+ height: units.dp(1)
136+ color: dividerColor
137+ visible: tzList.count > 0
138+ }
139+
128140 ListView {
129141 id: tzList;
130142
@@ -136,9 +148,10 @@ LocalComponents.Page {
136148 anchors {
137149 left: parent.left
138150 right: parent.right
151+ top: divider.bottom
139152 }
140153
141− height: column.height - searchField.height - column.spacing - topMargin
154+ height: column.height - searchField.height - customMargin - topMargin - divider.height
142155 model: timeDatePanel.timeZoneModel
143156 delegate: tzComponent
144157 }
qml/Wizard/Pages/70-passwd-type.qml+2−2
@@ -92,7 +92,7 @@ LocalComponents.Page {
9292
9393 // this is the order we want to display it; cf indexToMethod()
9494 model: [UbuntuSecurityPrivacyPanel.Passphrase, UbuntuSecurityPrivacyPanel.Passphrase,
95− UbuntuSecurityPrivacyPanel.Passcode, UbuntuSecurityPrivacyPanel.Swipe]
95+ UbuntuSecurityPrivacyPanel.Passcode, UbuntuSecurityPrivacyPanel.Swipe]
9696
9797 delegate: ListItem {
9898 id: itemDelegate
@@ -130,7 +130,7 @@ LocalComponents.Page {
130130 rightMargin: rightMargin
131131 }
132132 fillMode: Image.PreserveAspectFit
133− height: methodLabel.height / 2
133+ height: units.gu(1.5)
134134
135135 source: "data/Tick@30.png"
136136 visible: itemDelegate.isCurrent
qml/Wizard/Pages/80-finished.qml+17−11
@@ -42,15 +42,16 @@ LocalComponents.Page {
4242 ParallelAnimation {
4343 AnchorAnimation {
4444 targets: [bgImage, column]
45− duration: UbuntuAnimation.BriskDuration
46− easing.type: Easing.OutCubic
45+ duration: UbuntuAnimation.SlowDuration
46+ easing.type: Easing.OutCirc
4747 }
48− NumberAnimation { // opacity animation
48+ NumberAnimation {
4949 targets: [bgImage,column]
50− property: 'opacity'
50+ property: "opacity"
5151 from: 0
5252 to: 1
53− duration: UbuntuAnimation.BriskDuration
53+ duration: UbuntuAnimation.SlowDuration
54+ easing.type: Easing.OutCirc
5455 }
5556 }
5657 }
@@ -65,14 +66,14 @@ LocalComponents.Page {
6566 visible: opacity > 0
6667 }
6768
68− Column {
69+ Item {
6970 id: column
7071 anchors.leftMargin: leftMargin
7172 anchors.rightMargin: rightMargin
7273 anchors.left: parent.left
7374 anchors.right: parent.right
7475 anchors.top: parent.bottom // outside to let it slide in
75− spacing: units.gu(2)
76+ height: childrenRect.height
7677 visible: opacity > 0
7778
7879 Label {
@@ -87,8 +88,11 @@ LocalComponents.Page {
8788 }
8889
8990 Label {
91+ id: welcomeText
9092 anchors.left: parent.left
9193 anchors.right: parent.right
94+ anchors.top: welcomeLabel.bottom
95+ anchors.topMargin: units.gu(2)
9296 horizontalAlignment: Text.AlignHCenter
9397 wrapMode: Text.Wrap
9498 fontSize: "large"
@@ -98,18 +102,20 @@ LocalComponents.Page {
98102
99103 Rectangle {
100104 anchors {
105+ top: welcomeText.bottom
101106 horizontalCenter: parent.horizontalCenter
107+ topMargin: units.gu(4)
102108 }
103− color: 'transparent'
109+ color: "transparent"
104110 border.width: units.dp(1)
105− border.color: 'white'
111+ border.color: "white"
106112 radius: units.dp(4)
107113 width: buttonLabel.paintedWidth + units.gu(6)
108− height: buttonLabel.paintedHeight + units.gu(1.7)
114+ height: buttonLabel.paintedHeight + units.gu(1.8)
109115
110116 Label {
111117 id: buttonLabel
112− color: 'white'
118+ color: "white"
113119 text: i18n.tr("Get Started")
114120 fontSize: "medium"
115121 anchors.centerIn: parent
qml/Wizard/StackButton.qml+1−1
@@ -35,7 +35,7 @@ AbstractButton {
3535 color: "#333333"
3636 opacity: enabled ? 1.0 : 0.5
3737 fontSize: "medium"
38− font.weight: backArrow ? Font.Normal : Font.DemiBold
38+ font.weight: backArrow ? Font.Light : Font.DemiBold
3939 text: stackButton.text
4040 horizontalAlignment: backArrow ? Text.AlignLeft : Text.AlignRight
4141 }