git.iko.soy/unity8
on xenial help sign in
OOBE visual review, 2015-10-12
2a92b40Lukáš Tinkl
qml/Wizard/Page.qml+4−3
compare with xenial
unifiedsplit
@@ -128,11 +128,12 @@ Item {
128 Label {
128 Label {
129 id: titleLabel
129 id: titleLabel
130 property real animatedMargin: 0
130 property real animatedMargin: 0
131+ property real animatedTopMargin: customTitle ? customMargin :
131− property real animatedTopMargin: titleRect.height - customMargin - titleLabel.height
132+ titleRect.height - customMargin - titleLabel.height
132 anchors {
133 anchors {
133 left: parent.left
134 left: parent.left
134 right: parent.right
135 right: parent.right
135− top: parent.top
136+ bottom: parent.bottom
136 bottomMargin: bottomMargin
137 bottomMargin: bottomMargin
137 leftMargin: leftMargin + titleLabel.animatedMargin
138 leftMargin: leftMargin + titleLabel.animatedMargin
138 rightMargin: rightMargin
139 rightMargin: rightMargin
@@ -335,7 +336,7 @@ Item {
335 target: titleLabel
336 target: titleLabel
336 property: 'animatedTopMargin'
337 property: 'animatedTopMargin'
337 from: content.height
338 from: content.height
338− to: titleRect.height - customMargin - titleLabel.height
339+ to: customMargin
339 duration: UbuntuAnimation.BriskDuration
340 duration: UbuntuAnimation.BriskDuration
340 easing: UbuntuAnimation.StandardEasing
341 easing: UbuntuAnimation.StandardEasing
341 }
342 }
qml/Wizard/Pages/10-language.qml+2−2
@@ -126,7 +126,7 @@ LocalComponents.Page {
126 right: parent.right
126 right: parent.right
127 }
127 }
128
128
129− height: column.height - column.spacing
129+ height: column.height
130
130
131 model: plugin.languageNames
131 model: plugin.languageNames
132
132
@@ -157,7 +157,7 @@ LocalComponents.Page {
157 rightMargin: rightMargin
157 rightMargin: rightMargin
158 }
158 }
159 fillMode: Image.PreserveAspectFit
159 fillMode: Image.PreserveAspectFit
160− height: langLabel.height / 2
160+ height: units.gu(1.5)
161
161
162 source: "data/Tick@30.png"
162 source: "data/Tick@30.png"
163 visible: itemDelegate.isCurrent
163 visible: itemDelegate.isCurrent
qml/Wizard/Pages/30-wifi.qml+4−2
@@ -74,6 +74,8 @@ LocalComponents.Page {
74 objectName: "accessPoint"
74 objectName: "accessPoint"
75 highlightColor: backgroundColor
75 highlightColor: backgroundColor
76 enabled: menuData && menuData.sensitive || false
76 enabled: menuData && menuData.sensitive || false
77+ divider.colorFrom: dividerColor
78+ divider.colorTo: backgroundColor
77
79
78 property QtObject menuData: null
80 property QtObject menuData: null
79 property var unityMenuModel: menuModel
81 property var unityMenuModel: menuModel
@@ -103,7 +105,7 @@ LocalComponents.Page {
103 verticalCenter: parent.verticalCenter
105 verticalCenter: parent.verticalCenter
104 leftMargin: leftMargin
106 leftMargin: leftMargin
105 }
107 }
106− height: units.gu(2)
108+ height: units.gu(2.5)
107 width: height
109 width: height
108 name: getAPIcon(accessPoint.adHoc, accessPoint.signalStrength, accessPoint.secure)
110 name: getAPIcon(accessPoint.adHoc, accessPoint.signalStrength, accessPoint.secure)
109 color: textColor
111 color: textColor
@@ -112,7 +114,7 @@ LocalComponents.Page {
112 Column {
114 Column {
113 anchors.verticalCenter: parent.verticalCenter
115 anchors.verticalCenter: parent.verticalCenter
114 anchors.left: apIcon.right
116 anchors.left: apIcon.right
115− anchors.leftMargin: leftMargin
117+ anchors.leftMargin: units.gu(2)
116 Label {
118 Label {
117 id: apName
119 id: apName
118 text: menuData && menuData.label || ""
120 text: menuData && menuData.label || ""
qml/Wizard/Pages/40-location.qml+4−4
@@ -106,7 +106,7 @@ LocalComponents.Page {
106 Image {
106 Image {
107 id: hereTermsCheck
107 id: hereTermsCheck
108 fillMode: Image.PreserveAspectFit
108 fillMode: Image.PreserveAspectFit
109− height: nopeCheckLabel.height
109+ height: units.gu(1.5)
110 source: "data/Tick@30.png"
110 source: "data/Tick@30.png"
111 opacity: hereCheckLabel.checked ? 1 : 0
111 opacity: hereCheckLabel.checked ? 1 : 0
112 anchors.right: parent.right
112 anchors.right: parent.right
@@ -155,7 +155,7 @@ LocalComponents.Page {
155
155
156 Image {
156 Image {
157 fillMode: Image.PreserveAspectFit
157 fillMode: Image.PreserveAspectFit
158− height: nopeCheckLabel.height
158+ height: units.gu(1.5)
159 source: "data/Tick@30.png"
159 source: "data/Tick@30.png"
160 opacity: gpsCheckLabel.checked ? 1 : 0
160 opacity: gpsCheckLabel.checked ? 1 : 0
161 anchors.right: parent.right
161 anchors.right: parent.right
@@ -204,7 +204,7 @@ LocalComponents.Page {
204
204
205 Image {
205 Image {
206 fillMode: Image.PreserveAspectFit
206 fillMode: Image.PreserveAspectFit
207− height: nopeCheckLabel.height
207+ height: units.gu(1.5)
208 source: "data/Tick@30.png"
208 source: "data/Tick@30.png"
209 opacity: nopeCheckLabel.checked ? 1 : 0
209 opacity: nopeCheckLabel.checked ? 1 : 0
210 anchors.right: parent.right
210 anchors.right: parent.right
@@ -228,7 +228,7 @@ LocalComponents.Page {
228 left: parent.left
228 left: parent.left
229 right: parent.right
229 right: parent.right
230 top: divider3.bottom
230 top: divider3.bottom
231− topMargin: units.gu(3)
231+ topMargin: units.gu(4)
232 leftMargin: leftMargin
232 leftMargin: leftMargin
233 rightMargin: rightMargin
233 rightMargin: rightMargin
234 }
234 }
qml/Wizard/Pages/50-timezone.qml+17−4
@@ -52,6 +52,8 @@ LocalComponents.Page {
52 id: tz
52 id: tz
53 objectName: "tz"
53 objectName: "tz"
54 highlightColor: backgroundColor
54 highlightColor: backgroundColor
55+ divider.colorFrom: dividerColor
56+ divider.colorTo: backgroundColor
55 readonly property bool currentTz: ListView.view.currentIndex === index
57 readonly property bool currentTz: ListView.view.currentIndex === index
56
58
57 Column {
59 Column {
@@ -86,7 +88,7 @@ LocalComponents.Page {
86 rightMargin: rightMargin
88 rightMargin: rightMargin
87 }
89 }
88 fillMode: Image.PreserveAspectFit
90 fillMode: Image.PreserveAspectFit
89− height: cityLabel.height / 2
91+ height: units.gu(1.5)
90
92
91 source: "data/Tick@30.png"
93 source: "data/Tick@30.png"
92 visible: tz.currentTz
94 visible: tz.currentTz
@@ -101,13 +103,12 @@ LocalComponents.Page {
101 }
103 }
102 }
104 }
103
105
104− Column {
106+ Item {
105 id: column
107 id: column
106 anchors {
108 anchors {
107 fill: content
109 fill: content
108 topMargin: customMargin
110 topMargin: customMargin
109 }
111 }
110− spacing: units.gu(3)
111
112
112 LocalComponents.WizardTextField {
113 LocalComponents.WizardTextField {
113 id: searchField
114 id: searchField
@@ -125,6 +126,17 @@ LocalComponents.Page {
125 }
126 }
126 }
127 }
127
128
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+
128 ListView {
140 ListView {
129 id: tzList;
141 id: tzList;
130
142
@@ -136,9 +148,10 @@ LocalComponents.Page {
136 anchors {
148 anchors {
137 left: parent.left
149 left: parent.left
138 right: parent.right
150 right: parent.right
151+ top: divider.bottom
139 }
152 }
140
153
141− height: column.height - searchField.height - column.spacing - topMargin
154+ height: column.height - searchField.height - customMargin - topMargin - divider.height
142 model: timeDatePanel.timeZoneModel
155 model: timeDatePanel.timeZoneModel
143 delegate: tzComponent
156 delegate: tzComponent
144 }
157 }
qml/Wizard/Pages/70-passwd-type.qml+2−2
@@ -92,7 +92,7 @@ LocalComponents.Page {
92
92
93 // this is the order we want to display it; cf indexToMethod()
93 // this is the order we want to display it; cf indexToMethod()
94 model: [UbuntuSecurityPrivacyPanel.Passphrase, UbuntuSecurityPrivacyPanel.Passphrase,
94 model: [UbuntuSecurityPrivacyPanel.Passphrase, UbuntuSecurityPrivacyPanel.Passphrase,
95− UbuntuSecurityPrivacyPanel.Passcode, UbuntuSecurityPrivacyPanel.Swipe]
95+ UbuntuSecurityPrivacyPanel.Passcode, UbuntuSecurityPrivacyPanel.Swipe]
96
96
97 delegate: ListItem {
97 delegate: ListItem {
98 id: itemDelegate
98 id: itemDelegate
@@ -130,7 +130,7 @@ LocalComponents.Page {
130 rightMargin: rightMargin
130 rightMargin: rightMargin
131 }
131 }
132 fillMode: Image.PreserveAspectFit
132 fillMode: Image.PreserveAspectFit
133− height: methodLabel.height / 2
133+ height: units.gu(1.5)
134
134
135 source: "data/Tick@30.png"
135 source: "data/Tick@30.png"
136 visible: itemDelegate.isCurrent
136 visible: itemDelegate.isCurrent
qml/Wizard/Pages/80-finished.qml+17−11
@@ -42,15 +42,16 @@ LocalComponents.Page {
42 ParallelAnimation {
42 ParallelAnimation {
43 AnchorAnimation {
43 AnchorAnimation {
44 targets: [bgImage, column]
44 targets: [bgImage, column]
45− duration: UbuntuAnimation.BriskDuration
45+ duration: UbuntuAnimation.SlowDuration
46− easing.type: Easing.OutCubic
46+ easing.type: Easing.OutCirc
47 }
47 }
48− NumberAnimation { // opacity animation
48+ NumberAnimation {
49 targets: [bgImage,column]
49 targets: [bgImage,column]
50− property: 'opacity'
50+ property: "opacity"
51 from: 0
51 from: 0
52 to: 1
52 to: 1
53− duration: UbuntuAnimation.BriskDuration
53+ duration: UbuntuAnimation.SlowDuration
54+ easing.type: Easing.OutCirc
54 }
55 }
55 }
56 }
56 }
57 }
@@ -65,14 +66,14 @@ LocalComponents.Page {
65 visible: opacity > 0
66 visible: opacity > 0
66 }
67 }
67
68
68− Column {
69+ Item {
69 id: column
70 id: column
70 anchors.leftMargin: leftMargin
71 anchors.leftMargin: leftMargin
71 anchors.rightMargin: rightMargin
72 anchors.rightMargin: rightMargin
72 anchors.left: parent.left
73 anchors.left: parent.left
73 anchors.right: parent.right
74 anchors.right: parent.right
74 anchors.top: parent.bottom // outside to let it slide in
75 anchors.top: parent.bottom // outside to let it slide in
75− spacing: units.gu(2)
76+ height: childrenRect.height
76 visible: opacity > 0
77 visible: opacity > 0
77
78
78 Label {
79 Label {
@@ -87,8 +88,11 @@ LocalComponents.Page {
87 }
88 }
88
89
89 Label {
90 Label {
91+ id: welcomeText
90 anchors.left: parent.left
92 anchors.left: parent.left
91 anchors.right: parent.right
93 anchors.right: parent.right
94+ anchors.top: welcomeLabel.bottom
95+ anchors.topMargin: units.gu(2)
92 horizontalAlignment: Text.AlignHCenter
96 horizontalAlignment: Text.AlignHCenter
93 wrapMode: Text.Wrap
97 wrapMode: Text.Wrap
94 fontSize: "large"
98 fontSize: "large"
@@ -98,18 +102,20 @@ LocalComponents.Page {
98
102
99 Rectangle {
103 Rectangle {
100 anchors {
104 anchors {
105+ top: welcomeText.bottom
101 horizontalCenter: parent.horizontalCenter
106 horizontalCenter: parent.horizontalCenter
107+ topMargin: units.gu(4)
102 }
108 }
103− color: 'transparent'
109+ color: "transparent"
104 border.width: units.dp(1)
110 border.width: units.dp(1)
105− border.color: 'white'
111+ border.color: "white"
106 radius: units.dp(4)
112 radius: units.dp(4)
107 width: buttonLabel.paintedWidth + units.gu(6)
113 width: buttonLabel.paintedWidth + units.gu(6)
108− height: buttonLabel.paintedHeight + units.gu(1.7)
114+ height: buttonLabel.paintedHeight + units.gu(1.8)
109
115
110 Label {
116 Label {
111 id: buttonLabel
117 id: buttonLabel
112− color: 'white'
118+ color: "white"
113 text: i18n.tr("Get Started")
119 text: i18n.tr("Get Started")
114 fontSize: "medium"
120 fontSize: "medium"
115 anchors.centerIn: parent
121 anchors.centerIn: parent
qml/Wizard/StackButton.qml+1−1
@@ -35,7 +35,7 @@ AbstractButton {
35 color: "#333333"
35 color: "#333333"
36 opacity: enabled ? 1.0 : 0.5
36 opacity: enabled ? 1.0 : 0.5
37 fontSize: "medium"
37 fontSize: "medium"
38− font.weight: backArrow ? Font.Normal : Font.DemiBold
38+ font.weight: backArrow ? Font.Light : Font.DemiBold
39 text: stackButton.text
39 text: stackButton.text
40 horizontalAlignment: backArrow ? Text.AlignLeft : Text.AlignRight
40 horizontalAlignment: backArrow ? Text.AlignLeft : Text.AlignRight
41 }
41 }