git.iko.soy/unity8
on xenial help sign in
visual tweaks
commitb21a17538307562b7d7bb940c42df534d46e8bac authorLukáš Tinkl <lukas.tinkl@canonical.com> dateWed 30 Sep 2015, 20:53 (11 years ago) parentd798dac
7 files changed+13−13
compare with xenial
unifiedsplit
qml/Wizard/Page.qml+1−1 qml/Wizard/Pages/30-wifi.qml+6−6 qml/Wizard/Pages/40-location.qml+1−1 qml/Wizard/Pages/50-timezone.qml+1−1 qml/Wizard/Pages/60-uaccount-signup.qml+1−1 qml/Wizard/Pages/75-report-check.qml+1−1 qml/Wizard/Pages/80-finished.qml+2−2
qml/Wizard/Page.qml+1−1
@@ -141,7 +141,7 @@ Item {
141141 text: title
142142 color: customTitle ? textColor : backgroundColor
143143 fontSize: customTitle ? "large" : "x-large"
144− font.weight: customTitle ? Font.Light : Font.Normal
144+ font.weight: Font.Light
145145 }
146146
147147 // indicators
qml/Wizard/Pages/30-wifi.qml+6−6
@@ -57,7 +57,7 @@ LocalComponents.Page {
5757 if (secure) {
5858 imageName += "-secure";
5959 }
60− return "image://theme/" + imageName;
60+ return imageName;
6161 }
6262
6363 QMenuModel.UnityMenuModel {
@@ -96,17 +96,17 @@ LocalComponents.Page {
9696 'x-canonical-wifi-ap-strength-action': 'string'});
9797 }
9898
99− Image {
99+ Icon {
100100 id: apIcon
101101 anchors {
102102 left: parent.left
103103 verticalCenter: parent.verticalCenter
104104 leftMargin: leftMargin
105105 }
106− fillMode: Image.PreserveAspectFit
107− height: accessPoint.height
108−
109− source: getAPIcon(accessPoint.adHoc, accessPoint.signalStrength, accessPoint.secure)
106+ height: units.gu(2)
107+ width: height
108+ name: getAPIcon(accessPoint.adHoc, accessPoint.signalStrength, accessPoint.secure)
109+ color: textColor
110110 }
111111
112112 Column {
qml/Wizard/Pages/40-location.qml+1−1
@@ -234,7 +234,7 @@ LocalComponents.Page {
234234 }
235235 wrapMode: Text.Wrap
236236 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.")
238238 color: textColor
239239 fontSize: "small"
240240 font.weight: Font.Light
qml/Wizard/Pages/50-timezone.qml+1−1
@@ -109,7 +109,7 @@ LocalComponents.Page {
109109 fill: content
110110 topMargin: customMargin
111111 }
112− spacing: units.gu(2)
112+ spacing: units.gu(3)
113113
114114 LocalComponents.WizardTextField {
115115 id: searchField
qml/Wizard/Pages/60-uaccount-signup.qml+1−1
@@ -23,7 +23,7 @@ import ".." as LocalComponents
2323LocalComponents.Page {
2424 objectName: "ubuntuAccountSignUpPage"
2525
26− title: i18n.tr("Create Account")
26+ title: i18n.tr("Create Device Account")
2727 customTitle: true
2828 buttonBarVisible: false
2929
qml/Wizard/Pages/75-report-check.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.2
1919import Ubuntu.Web 0.2
2020import Ubuntu.SystemSettings.Diagnostics 1.0
qml/Wizard/Pages/80-finished.qml+2−2
@@ -104,8 +104,8 @@ LocalComponents.Page {
104104 border.width: units.dp(1)
105105 border.color: 'white'
106106 radius: units.dp(4)
107− width: buttonLabel.paintedWidth + units.gu(3)
108− height: buttonLabel.paintedHeight + units.gu(1.5)
107+ width: buttonLabel.paintedWidth + units.gu(6)
108+ height: buttonLabel.paintedHeight + units.gu(1.7)
109109
110110 Label {
111111 id: buttonLabel