update to the newest assets
commit326f818a0f4611218ff2b2525da9383135100c6d
authorLukáš Tinkl <lukas.tinkl@canonical.com>
dateWed 1 Jul 2015, 17:25 (11 years ago)
parenta8442cc
qml/Wizard/CheckableSetting.qml+1−1
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.3
18−import Ubuntu.Components 1.1
18+import Ubuntu.Components 1.2
1919import Ubuntu.Components.ListItems 1.0 as ListItem
2020
2121ListItem.Empty {
qml/Wizard/Page.qml+6−3
@@ -43,6 +43,7 @@ Item {
4343 property bool customTitle: false
4444 property alias forwardButtonSourceComponent: forwardButton.sourceComponent
4545 property alias content: contentHolder
46+ property bool lastPage: false
4647
4748 property string title: ""
4849
@@ -52,15 +53,17 @@ Item {
5253 anchors.fill: parent
5354
5455 // title
55− Rectangle {
56+ Image {
5657 id: titleRect
58+ visible: !lastPage
5759 anchors {
5860 top: parent.top
5961 left: parent.left
6062 right: parent.right
6163 }
64+ source: customTitle ? "" : "Pages/data/Phone header bkg.png"
6265 height: customTitle ? customMargin + titleLabel.height + customMargin : topMargin + bottomMargin
63− color: customTitle ? "#fdfdfd" : "#650954"
66+ clip: true
6467
6568 Label {
6669 id: titleLabel
@@ -95,7 +98,7 @@ Item {
9598 // button bar
9699 Rectangle {
97100 id: buttonRect
98− visible: pageStack.currentPage.objectName !== "finishedPage" // not visible on last page
101+ visible: !lastPage
99102 anchors {
100103 bottom: parent.bottom
101104 left: parent.left
qml/Wizard/Pages/10-language.qml+1−1
@@ -127,7 +127,7 @@ LocalComponents.Page {
127127 fillMode: Image.PreserveAspectFit
128128 height: langLabel.paintedHeight
129129
130− source: "data/tick@30.png"
130+ source: "data/Tick.png"
131131 visible: itemDelegate.isCurrent
132132 }
133133
qml/Wizard/Pages/15-country.qml+1−1
@@ -142,7 +142,7 @@ LocalComponents.Page {
142142 fillMode: Image.PreserveAspectFit
143143 height: countryLabel.paintedHeight
144144
145− source: "data/tick@30.png"
145+ source: "data/Tick.png"
146146 visible: itemDelegate.isCurrent
147147 }
148148
qml/Wizard/Pages/40-timezone.qml+1−2
@@ -15,7 +15,6 @@
1515 */
1616
1717import QtQuick 2.3
18−import QtQuick.Layouts 1.1
1918import Ubuntu.Components 1.2
2019import Wizard 0.1
2120import ".." as LocalComponents
@@ -80,7 +79,7 @@ LocalComponents.Page {
8079 fillMode: Image.PreserveAspectFit
8180 height: cityLabel.paintedHeight
8281
83− source: "data/tick@30.png"
82+ source: "data/Tick.png"
8483 visible: tz.currentTz
8584 }
8685
qml/Wizard/Pages/60-passwd-type.qml+1−1
@@ -124,7 +124,7 @@ LocalComponents.Page {
124124 fillMode: Image.PreserveAspectFit
125125 height: methodLabel.paintedHeight
126126
127− source: "data/tick@30.png"
127+ source: "data/Tick.png"
128128 visible: itemDelegate.isCurrent
129129 }
130130
qml/Wizard/Pages/80-finished.qml+2−1
@@ -19,10 +19,11 @@ import Ubuntu.Components 1.2
1919import ".." as LocalComponents
2020
2121LocalComponents.Page {
22− objectName: "finishedPage" // careful when renaming the page, see Page.qml
22+ objectName: "finishedPage"
2323
2424 hasBackButton: false
2525 customTitle: true
26+ lastPage: true
2627
2728 Image {
2829 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.