git.iko.soy/unity8
on xenial help sign in
offload the diagnostics too, sometimes it takes too long to load
ace333bLukáš Tinkl
qml/Wizard/Pages.qml+6
compare with xenial
unifiedsplit
@@ -18,6 +18,7 @@ import QtQuick 2.4
18import MeeGo.QOfono 0.2
18import MeeGo.QOfono 0.2
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20import Ubuntu.SystemSettings.SecurityPrivacy 1.0
20import Ubuntu.SystemSettings.SecurityPrivacy 1.0
21+import Ubuntu.SystemSettings.Diagnostics 1.0
21import Wizard 0.1
22import Wizard 0.1
22import "../Components"
23import "../Components"
23
24
@@ -55,6 +56,11 @@ Item {
55 objectName: "securityPrivacy"
56 objectName: "securityPrivacy"
56 }
57 }
57
58
59+ UbuntuDiagnostics {
60+ id: diagnostics
61+ objectName: "diagnostics"
62+ }
63+
58 OfonoManager { // need it here for the language and country detection
64 OfonoManager { // need it here for the language and country detection
59 id: modemManager
65 id: modemManager
60 readonly property bool gotSimCard: available && ((simManager0.ready && simManager0.present) || (simManager1.ready && simManager1.present))
66 readonly property bool gotSimCard: available && ((simManager0.ready && simManager0.present) || (simManager1.ready && simManager1.present))
qml/Wizard/Pages/75-report-check.qml−8
@@ -17,7 +17,6 @@
17import QtQuick 2.4
17import QtQuick 2.4
18import Ubuntu.Components 1.3
18import Ubuntu.Components 1.3
19import Ubuntu.Web 0.2
19import Ubuntu.Web 0.2
20−import Ubuntu.SystemSettings.Diagnostics 1.0
21import ".." as LocalComponents
20import ".." as LocalComponents
22
21
23LocalComponents.Page {
22LocalComponents.Page {
@@ -29,7 +28,6 @@ LocalComponents.Page {
29 customBack: true
28 customBack: true
30 customTitle: webview.visible
29 customTitle: webview.visible
31
30
32− skipValid: false
33 skip: !diagnostics.reportCrashes // skip the page when the system is configured not to report crashes
31 skip: !diagnostics.reportCrashes // skip the page when the system is configured not to report crashes
34
32
35 onBackClicked: {
33 onBackClicked: {
@@ -40,12 +38,6 @@ LocalComponents.Page {
40 }
38 }
41 }
39 }
42
40
43− UbuntuDiagnostics {
44− id: diagnostics
45− objectName: "diagnostics"
46− Component.onCompleted: reportingPage.skipValid = true;
47− }
48−
49 Column {
41 Column {
50 id: column
42 id: column
51 anchors {
43 anchors {