git.iko.soy/unity8
on xenial help sign in
make the timer run only when wizard enabled
2b106a2Lukáš Tinkl
qml/Wizard/Page.qml+2−2
compare with xenial
unifiedsplit
@@ -29,7 +29,7 @@ Item {
29 readonly property real bottomMargin: units.gu(3)
29 readonly property real bottomMargin: units.gu(3)
30 readonly property real leftMargin: units.gu(3)
30 readonly property real leftMargin: units.gu(3)
31 readonly property real rightMargin: units.gu(3)
31 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
33
33
34 // colors
34 // colors
35 readonly property color backgroundColor: "#fdfdfd"
35 readonly property color backgroundColor: "#fdfdfd"
@@ -102,10 +102,10 @@ Item {
102
102
103 Timer {
103 Timer {
104 id: indicatorTimer
104 id: indicatorTimer
105− running: true
106 interval: 1000
105 interval: 1000
107 triggeredOnStart: true
106 triggeredOnStart: true
108 repeat: true
107 repeat: true
108+ running: System.wizardEnabled
109 onTriggered: {
109 onTriggered: {
110 indicatorTime.text = Qt.formatTime(new Date(), "h:mm")
110 indicatorTime.text = Qt.formatTime(new Date(), "h:mm")
111 }
111 }
qml/Wizard/Pages.qml+4−1
@@ -80,7 +80,10 @@ Item {
80 pop();
80 pop();
81 load(pageList.next());
81 load(pageList.next());
82
82
83+ var doTransitions = !currentPage.customTitle; // skip for secondary/extra pages
84+ if (doTransitions) {
83− currentPage.aboutToShow(UbuntuAnimation.BriskDuration, Qt.RightToLeft);
85+ currentPage.aboutToShow(UbuntuAnimation.BriskDuration, Qt.RightToLeft);
86+ }
84 }
87 }
85
88
86 function prev() {
89 function prev() {