on xenial help sign in
visual tweaks
b21a175Lukáš Tinkl
qml/Wizard/Page.qml+1−1
@@ -141,7 +141,7 @@ Item {
141 text: title
141 text: title
142 color: customTitle ? textColor : backgroundColor
142 color: customTitle ? textColor : backgroundColor
143 fontSize: customTitle ? "large" : "x-large"
143 fontSize: customTitle ? "large" : "x-large"
144− font.weight: customTitle ? Font.Light : Font.Normal
144+ font.weight: Font.Light
145 }
145 }
146
146
147 // indicators
147 // indicators
qml/Wizard/Pages/30-wifi.qml+6−6
@@ -57,7 +57,7 @@ LocalComponents.Page {
57 if (secure) {
57 if (secure) {
58 imageName += "-secure";
58 imageName += "-secure";
59 }
59 }
60− return "image://theme/" + imageName;
60+ return imageName;
61 }
61 }
62
62
63 QMenuModel.UnityMenuModel {
63 QMenuModel.UnityMenuModel {
@@ -96,17 +96,17 @@ LocalComponents.Page {
96 'x-canonical-wifi-ap-strength-action': 'string'});
96 'x-canonical-wifi-ap-strength-action': 'string'});
97 }
97 }
98
98
99− Image {
99+ Icon {
100 id: apIcon
100 id: apIcon
101 anchors {
101 anchors {
102 left: parent.left
102 left: parent.left
103 verticalCenter: parent.verticalCenter
103 verticalCenter: parent.verticalCenter
104 leftMargin: leftMargin
104 leftMargin: leftMargin
105 }
105 }
106− fillMode: Image.PreserveAspectFit
106+ height: units.gu(2)
107− height: accessPoint.height
107+ width: height
108−
109− source: getAPIcon(accessPoint.adHoc, accessPoint.signalStrength, accessPoint.secure)
108+ name: getAPIcon(accessPoint.adHoc, accessPoint.signalStrength, accessPoint.secure)
109+ color: textColor
110 }
110 }
111
111
112 Column {
112 Column {
qml/Wizard/Pages/40-location.qml+1−1
@@ -234,7 +234,7 @@ LocalComponents.Page {
234 }
234 }
235 wrapMode: Text.Wrap
235 wrapMode: Text.Wrap
236 textFormat: Text.RichText
236 textFormat: Text.RichText
237− text: i18n.tr("You can change it later in <em>System Settings</em>.")
237+ text: i18n.tr("You can change it later in System Settings.")
238 color: textColor
238 color: textColor
239 fontSize: "small"
239 fontSize: "small"
240 font.weight: Font.Light
240 font.weight: Font.Light
qml/Wizard/Pages/50-timezone.qml+1−1
@@ -109,7 +109,7 @@ LocalComponents.Page {
109 fill: content
109 fill: content
110 topMargin: customMargin
110 topMargin: customMargin
111 }
111 }
112− spacing: units.gu(2)
112+ spacing: units.gu(3)
113
113
114 LocalComponents.WizardTextField {
114 LocalComponents.WizardTextField {
115 id: searchField
115 id: searchField
qml/Wizard/Pages/60-uaccount-signup.qml+1−1
@@ -23,7 +23,7 @@ import ".." as LocalComponents
23LocalComponents.Page {
23LocalComponents.Page {
24 objectName: "ubuntuAccountSignUpPage"
24 objectName: "ubuntuAccountSignUpPage"
25
25
26− title: i18n.tr("Create Account")
26+ title: i18n.tr("Create Device Account")
27 customTitle: true
27 customTitle: true
28 buttonBarVisible: false
28 buttonBarVisible: false
29
29
qml/Wizard/Pages/75-report-check.qml+1−1
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−import QtQuick 2.3
17+import QtQuick 2.4
18import Ubuntu.Components 1.2
18import Ubuntu.Components 1.2
19import Ubuntu.Web 0.2
19import Ubuntu.Web 0.2
20import Ubuntu.SystemSettings.Diagnostics 1.0
20import Ubuntu.SystemSettings.Diagnostics 1.0
qml/Wizard/Pages/80-finished.qml+2−2
@@ -104,8 +104,8 @@ LocalComponents.Page {
104 border.width: units.dp(1)
104 border.width: units.dp(1)
105 border.color: 'white'
105 border.color: 'white'
106 radius: units.dp(4)
106 radius: units.dp(4)
107− width: buttonLabel.paintedWidth + units.gu(3)
107+ width: buttonLabel.paintedWidth + units.gu(6)
108− height: buttonLabel.paintedHeight + units.gu(1.5)
108+ height: buttonLabel.paintedHeight + units.gu(1.7)
109
109
110 Label {
110 Label {
111 id: buttonLabel
111 id: buttonLabel