git.iko.soy/unity8
on xenial help sign in
update to the newest assets
326f818Lukáš Tinkl
qml/Wizard/CheckableSetting.qml+1−1
compare with xenial
unifiedsplit
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.3
17import QtQuick 2.3
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.2
19import Ubuntu.Components.ListItems 1.0 as ListItem
19import Ubuntu.Components.ListItems 1.0 as ListItem
20
20
21ListItem.Empty {
21ListItem.Empty {
qml/Wizard/Page.qml+6−3
@@ -43,6 +43,7 @@ Item {
43 property bool customTitle: false
43 property bool customTitle: false
44 property alias forwardButtonSourceComponent: forwardButton.sourceComponent
44 property alias forwardButtonSourceComponent: forwardButton.sourceComponent
45 property alias content: contentHolder
45 property alias content: contentHolder
46+ property bool lastPage: false
46
47
47 property string title: ""
48 property string title: ""
48
49
@@ -52,15 +53,17 @@ Item {
52 anchors.fill: parent
53 anchors.fill: parent
53
54
54 // title
55 // title
55− Rectangle {
56+ Image {
56 id: titleRect
57 id: titleRect
58+ visible: !lastPage
57 anchors {
59 anchors {
58 top: parent.top
60 top: parent.top
59 left: parent.left
61 left: parent.left
60 right: parent.right
62 right: parent.right
61 }
63 }
64+ source: customTitle ? "" : "Pages/data/Phone header bkg.png"
62 height: customTitle ? customMargin + titleLabel.height + customMargin : topMargin + bottomMargin
65 height: customTitle ? customMargin + titleLabel.height + customMargin : topMargin + bottomMargin
63− color: customTitle ? "#fdfdfd" : "#650954"
66+ clip: true
64
67
65 Label {
68 Label {
66 id: titleLabel
69 id: titleLabel
@@ -95,7 +98,7 @@ Item {
95 // button bar
98 // button bar
96 Rectangle {
99 Rectangle {
97 id: buttonRect
100 id: buttonRect
98− visible: pageStack.currentPage.objectName !== "finishedPage" // not visible on last page
101+ visible: !lastPage
99 anchors {
102 anchors {
100 bottom: parent.bottom
103 bottom: parent.bottom
101 left: parent.left
104 left: parent.left
qml/Wizard/Pages/10-language.qml+1−1
@@ -127,7 +127,7 @@ LocalComponents.Page {
127 fillMode: Image.PreserveAspectFit
127 fillMode: Image.PreserveAspectFit
128 height: langLabel.paintedHeight
128 height: langLabel.paintedHeight
129
129
130− source: "data/tick@30.png"
130+ source: "data/Tick.png"
131 visible: itemDelegate.isCurrent
131 visible: itemDelegate.isCurrent
132 }
132 }
133
133
qml/Wizard/Pages/15-country.qml+1−1
@@ -142,7 +142,7 @@ LocalComponents.Page {
142 fillMode: Image.PreserveAspectFit
142 fillMode: Image.PreserveAspectFit
143 height: countryLabel.paintedHeight
143 height: countryLabel.paintedHeight
144
144
145− source: "data/tick@30.png"
145+ source: "data/Tick.png"
146 visible: itemDelegate.isCurrent
146 visible: itemDelegate.isCurrent
147 }
147 }
148
148
qml/Wizard/Pages/40-timezone.qml+1−2
@@ -15,7 +15,6 @@
15 */
15 */
16
16
17import QtQuick 2.3
17import QtQuick 2.3
18−import QtQuick.Layouts 1.1
19import Ubuntu.Components 1.2
18import Ubuntu.Components 1.2
20import Wizard 0.1
19import Wizard 0.1
21import ".." as LocalComponents
20import ".." as LocalComponents
@@ -80,7 +79,7 @@ LocalComponents.Page {
80 fillMode: Image.PreserveAspectFit
79 fillMode: Image.PreserveAspectFit
81 height: cityLabel.paintedHeight
80 height: cityLabel.paintedHeight
82
81
83− source: "data/tick@30.png"
82+ source: "data/Tick.png"
84 visible: tz.currentTz
83 visible: tz.currentTz
85 }
84 }
86
85
qml/Wizard/Pages/60-passwd-type.qml+1−1
@@ -124,7 +124,7 @@ LocalComponents.Page {
124 fillMode: Image.PreserveAspectFit
124 fillMode: Image.PreserveAspectFit
125 height: methodLabel.paintedHeight
125 height: methodLabel.paintedHeight
126
126
127− source: "data/tick@30.png"
127+ source: "data/Tick.png"
128 visible: itemDelegate.isCurrent
128 visible: itemDelegate.isCurrent
129 }
129 }
130
130
qml/Wizard/Pages/80-finished.qml+2−1
@@ -19,10 +19,11 @@ import Ubuntu.Components 1.2
19import ".." as LocalComponents
19import ".." as LocalComponents
20
20
21LocalComponents.Page {
21LocalComponents.Page {
22− objectName: "finishedPage" // careful when renaming the page, see Page.qml
22+ objectName: "finishedPage"
23
23
24 hasBackButton: false
24 hasBackButton: false
25 customTitle: true
25 customTitle: true
26+ lastPage: true
26
27
27 Image {
28 Image {
28 source: "data/warty-final-ubuntu.png"
29 source: "data/warty-final-ubuntu.png"
qml/Wizard/Pages/data/Phone header bkg.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/Tick@30.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/meet_ubuntu_simcard@30.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/tick@30.pngdeleted

Binary file not shown.