git.iko.soy/unity8
on xenial help sign in
Merge pull request #78 from ubports/bionic_-_nowhoopsie
18c3f6fRodney
qml/Wizard/Pages/75-report-check.qmldeleted−91
compare with xenial
unifiedsplit
@@ -1,91 +0,0 @@
1−/*
2− * Copyright (C) 2015-2016 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.4
18−import Ubuntu.Components 1.3
19−import Ubuntu.Web 0.2
20−import ".." as LocalComponents
21−
22−LocalComponents.Page {
23− id: reportingPage
24− objectName: "reportingPage"
25−
26− title: webview.visible ? i18n.tr("Privacy Policy") : i18n.tr("Help Us Improve")
27− forwardButtonSourceComponent: !webview.visible ? forwardButton : null
28− customBack: true
29− customTitle: webview.visible
30−
31− skip: !diagnostics.reportCrashes // skip the page when the system is configured not to report crashes
32−
33− onBackClicked: {
34− if (webview.visible) {
35− webview.visible = false;
36− } else {
37− pageStack.prev();
38− }
39− }
40−
41− Column {
42− id: column
43− anchors {
44− fill: content
45− leftMargin: leftMargin
46− rightMargin: rightMargin
47− topMargin: customMargin
48− }
49−
50− LocalComponents.CheckableSetting {
51− anchors {
52− left: parent.left
53− right: parent.right
54− }
55−
56− id: reportCheck
57− objectName: "reportCheck"
58− showDivider: false
59− text: i18n.tr("Improve system performance by sending us crashes and error reports.") + "<br><br><a href='#'>" +
60− i18n.tr("Privacy policy") + "</a>"
61− checked: diagnostics.reportCrashes
62− visible: !webview.visible
63− onLinkActivated: {
64− webview.url = "http://www.ubuntu.com/legal/terms-and-policies/privacy-policy";
65− webview.visible = true;
66− }
67− }
68−
69− WebView {
70− id: webview
71− objectName: "webview"
72− anchors.left: parent.left
73− anchors.right: parent.right
74− anchors.leftMargin: -leftMargin
75− anchors.rightMargin: -rightMargin
76− height: parent.height
77− visible: false
78− }
79− }
80−
81− Component {
82− id: forwardButton
83− LocalComponents.StackButton {
84− text: i18n.tr("Next")
85− onClicked: {
86− diagnostics.setReportCrashes(reportCheck.checked);
87− pageStack.next();
88− }
89− }
90− }
91−}
tests/qmltests/Wizard/tst_Wizard.qml+1−16
@@ -168,16 +168,13 @@ Item {
168 return stack.currentPage;
168 return stack.currentPage;
169 }
169 }
170
170
171− function goToPage(name, skipSim, skipLocation, skipReporting) {
171+ function goToPage(name, skipSim, skipLocation) {
172 if (skipSim === undefined) {
172 if (skipSim === undefined) {
173 skipSim = false;
173 skipSim = false;
174 }
174 }
175 if (skipLocation === undefined) {
175 if (skipLocation === undefined) {
176 skipLocation = false;
176 skipLocation = false;
177 }
177 }
178− if (skipReporting === undefined) {
179− skipReporting = false;
180− }
181
178
182 var page = waitForPage("languagePage");
179 var page = waitForPage("languagePage");
183 if (name === page.objectName) return page;
180 if (name === page.objectName) return page;
@@ -222,12 +219,6 @@ Item {
222 if (name === page.objectName) return page;
219 if (name === page.objectName) return page;
223 tap(findChild(page, "forwardButton"));
220 tap(findChild(page, "forwardButton"));
224
221
225− if (!skipReporting) {
226− page = waitForPage("reportingPage");
227− if (name === page.objectName) return page;
228− tap(findChild(page, "forwardButton"));
229− }
230−
231 page = waitForPage("finishedPage");
222 page = waitForPage("finishedPage");
232 if (name === page.objectName) return page;
223 if (name === page.objectName) return page;
233 waitUntilTransitionsEnd(page);
224 waitUntilTransitionsEnd(page);
@@ -334,8 +325,6 @@ Item {
334 enterPasscode("1111");
325 enterPasscode("1111");
335
326
336 // now finish up
327 // now finish up
337− page = waitForPage("reportingPage");
338− tap(findChild(page, "forwardButton"));
339 page = waitForPage("finishedPage");
328 page = waitForPage("finishedPage");
340 waitUntilTransitionsEnd(page);
329 waitUntilTransitionsEnd(page);
341 tap(findChild(page, "finishButton"));
330 tap(findChild(page, "finishButton"));
@@ -374,8 +363,6 @@ Item {
374 tap(continueButton);
363 tap(continueButton);
375
364
376 // now finish up
365 // now finish up
377− page = waitForPage("reportingPage");
378− tap(findChild(page, "forwardButton"));
379 page = waitForPage("finishedPage");
366 page = waitForPage("finishedPage");
380 waitUntilTransitionsEnd(page);
367 waitUntilTransitionsEnd(page);
381 tap(findChild(page, "finishButton"));
368 tap(findChild(page, "finishButton"));
@@ -392,8 +379,6 @@ Item {
392
379
393 // now finish up
380 // now finish up
394 tap(findChild(page, "forwardButton"));
381 tap(findChild(page, "forwardButton"));
395− page = waitForPage("reportingPage");
396− tap(findChild(page, "forwardButton"));
397 page = waitForPage("finishedPage");
382 page = waitForPage("finishedPage");
398 waitUntilTransitionsEnd(page);
383 waitUntilTransitionsEnd(page);
399 tap(findChild(page, "finishButton"));
384 tap(findChild(page, "finishButton"));