git.iko.soy/unity8
on xenial help sign in
make the timer run only when wizard enabled
commit2b106a28b54aa9e40f3a320e4a72963ee4711c6b authorLukáš Tinkl <lukas.tinkl@canonical.com> dateMon 21 Sep 2015, 18:04 (11 years ago) parent213d8af
2 files changed+6−3
compare with xenial
unifiedsplit
qml/Wizard/Page.qml+2−2 qml/Wizard/Pages.qml+4−1
qml/Wizard/Page.qml+2−2
@@ -29,7 +29,7 @@ Item {
2929 readonly property real bottomMargin: units.gu(3)
3030 readonly property real leftMargin: units.gu(3)
3131 readonly property real rightMargin: units.gu(3)
32− readonly property real customMargin: units.gu(4) // margin for the custom (w/o title bar) pages
32+ readonly property real customMargin: units.gu(4) // margin for the custom (w/o title image) pages
3333
3434 // colors
3535 readonly property color backgroundColor: "#fdfdfd"
@@ -102,10 +102,10 @@ Item {
102102
103103 Timer {
104104 id: indicatorTimer
105− running: true
106105 interval: 1000
107106 triggeredOnStart: true
108107 repeat: true
108+ running: System.wizardEnabled
109109 onTriggered: {
110110 indicatorTime.text = Qt.formatTime(new Date(), "h:mm")
111111 }
qml/Wizard/Pages.qml+4−1
@@ -80,7 +80,10 @@ Item {
8080 pop();
8181 load(pageList.next());
8282
83− currentPage.aboutToShow(UbuntuAnimation.BriskDuration, Qt.RightToLeft);
83+ var doTransitions = !currentPage.customTitle; // skip for secondary/extra pages
84+ if (doTransitions) {
85+ currentPage.aboutToShow(UbuntuAnimation.BriskDuration, Qt.RightToLeft);
86+ }
8487 }
8588
8689 function prev() {