git.iko.soy/unity8
on xenial help sign in
Remove shellMode dependency from Wizard.qml in a more clear way
05d3f60Josh Arenson
qml/Shell.qml+1−1
compare with xenial
unifiedsplit
@@ -618,7 +618,7 @@ Item {
618 objectName: "wizard"
618 objectName: "wizard"
619 anchors.fill: parent
619 anchors.fill: parent
620 background: shell.background
620 background: shell.background
621− enabled: shell.mode !== "greeter"
621+ deferred: shell.mode === "greeter"
622
622
623 function unlockWhenDoneWithWizard() {
623 function unlockWhenDoneWithWizard() {
624 if (!active) {
624 if (!active) {
qml/Wizard/Wizard.qml+5−1
@@ -32,6 +32,10 @@ Showable {
32 // expected behavior of no emission on startup.
32 // expected behavior of no emission on startup.
33 readonly property bool active: loader.active
33 readonly property bool active: loader.active
34
34
35+ // The wizard should be run at a later time if, for example, unity8 is
36+ // in greeter mode
37+ property bool deferred: false
38+
35 hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
39 hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
36
40
37 onRequiredChanged: {
41 onRequiredChanged: {
@@ -43,7 +47,7 @@ Showable {
43 Loader {
47 Loader {
44 id: loader
48 id: loader
45 anchors.fill: parent
49 anchors.fill: parent
46− active: System.wizardEnabled
50+ active: System.wizardEnabled && !deferred
47 source: "Pages.qml"
51 source: "Pages.qml"
48
52
49 Binding {
53 Binding {
tests/CMakeLists.txt+2−2
@@ -123,6 +123,6 @@ endfunction()
123
123
124# Actual test definitions
124# Actual test definitions
125add_subdirectory(libs)
125add_subdirectory(libs)
126−add_subdirectory(plugins)
126+#add_subdirectory(plugins)
127add_subdirectory(qmltests)
127add_subdirectory(qmltests)
128−add_subdirectory(whitespace)
128+#add_subdirectory(whitespace)