git.iko.soy/unity8
on xenial help sign in
update page visuals
9a819d4Lukáš Tinkl
qml/Wizard/Pages/77-system-update.qml+33−13
compare with xenial
unifiedsplit
@@ -57,16 +57,13 @@ LocalComponents.Page {
57 rowSpacing: units.gu(1)
57 rowSpacing: units.gu(1)
58 columnSpacing: units.gu(2)
58 columnSpacing: units.gu(2)
59
59
60− UbuntuShape {
60+ Image {
61 Layout.rowSpan: 3
61 Layout.rowSpan: 3
62− aspect: UbuntuShape.Flat
63− backgroundColor: theme.palette.normal.base
64− width: units.gu(8)
62+ width: units.gu(3)
65 height: width
63 height: width
66− sourceScale: Qt.vector2d(0.5,0.5)
64+ sourceSize: Qt.size(units.gu(3), units.gu(3))
67− source: Image {
65+ fillMode: Image.PreserveAspectFit
68− source: Qt.resolvedUrl("/usr/share/icons/suru/apps/scalable/ubuntu-logo-symbolic.svg")
66+ source: "image://theme/distributor-logo"
69− }
70 }
67 }
71
68
72 Label {
69 Label {
@@ -100,13 +97,36 @@ LocalComponents.Page {
100 text: i18n.tr("This could take a few minutes...")
97 text: i18n.tr("This could take a few minutes...")
101 }
98 }
102
99
103− Button {
100+ Rectangle {
104 anchors.left: parent.left
101 anchors.left: parent.left
105 anchors.leftMargin: column.anchors.leftMargin == 0 ? staticMargin : 0
102 anchors.leftMargin: column.anchors.leftMargin == 0 ? staticMargin : 0
103+ color: theme.palette.normal.base
104+ radius: units.dp(4)
105+ width: buttonLabel.paintedWidth + units.gu(3)
106+ height: buttonLabel.paintedHeight + units.gu(1.8)
107+
108+ Label {
109+ id: buttonLabel
110+ color: textColor
106− text: i18n.tr("Install and restart now")
111+ text: i18n.tr("Install and restart now")
107− onClicked: {
112+ fontSize: "medium"
113+ anchors.centerIn: parent
114+ }
115+
116+ AbstractButton {
117+ id: button
118+ objectName: "installButton"
119+ anchors.fill: parent
108− // TODO mark the wizard to skip until the finished page for the next boot
120+ onClicked: SystemImage.applyUpdate(); // TODO mark the wizard to skip until the finished page for the next boot
109− SystemImage.applyUpdate();
121+ }
122+
123+ transformOrigin: Item.Top
124+ scale: button.pressed ? 0.98 : 1.0
125+ Behavior on scale {
126+ ScaleAnimator {
127+ duration: UbuntuAnimation.SnapDuration
128+ easing.type: Easing.Linear
129+ }
110 }
130 }
111 }
131 }
112 }
132 }