git.iko.soy/unity8
on xenial help sign in
[ CI Train Bot ]

* Resync trunk. [ Lukáš Tinkl ] * Wizard: skip the reporting page if the system is configured not to report crashes (LP: #1494442) [ Alexandros Frantzis ] * Use power state change reason SnapDecision to turn screen on when a SnapDecision arrives (LP: #1291455) [ CI Train Bot ] * New rebuild forced.

commit2c7c6bac996262e0f5adcff827ad2534421830fb authorJosh Arenson <joshua.arenson@canonical.com> dateSat 3 Oct 2015, 10:30 (11 years ago) parentd4ba6efe46cde1
7 files changed+53−18
compare with xenial
unifiedsplit
CMakeLists.txt+1−1 debian/changelog+22 plugins/Powerd/Powerd.h+2 po/ug.po+4−4 qml/Notifications/Notification.qml+1−1 qml/Wizard/Pages/60-reporting.qml+10 tests/qmltests/Wizard/tst_Wizard.qml+13−12
CMakeLists.txt+1−1
@@ -57,7 +57,7 @@ find_package(Qt5DBus 5.2 REQUIRED)
5757find_package(Qt5Concurrent 5.2 REQUIRED)
5858find_package(Qt5Sql 5.2 REQUIRED)
5959
60−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=8)
60+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application>=8)
6161
6262# Standard install paths
6363include(GNUInstallDirs)
debian/changelog+22
@@ -1,3 +1,25 @@
1+unity8 (8.11+15.10.20151002-0ubuntu1) wily; urgency=medium
2+
3+ [ CI Train Bot ]
4+ * Resync trunk.
5+
6+ [ Lukáš Tinkl ]
7+ * Wizard: skip the reporting page if the system is configured not to
8+ report crashes (LP: #1494442)
9+
10+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 02 Oct 2015 13:24:03 +0000
11+
12+unity8 (8.11+15.10.20151001-0ubuntu1) wily; urgency=medium
13+
14+ [ Alexandros Frantzis ]
15+ * Use power state change reason SnapDecision to turn screen on when a
16+ SnapDecision arrives (LP: #1291455)
17+
18+ [ CI Train Bot ]
19+ * New rebuild forced.
20+
21+ -- Alexandros Frantzis <alexandros.frantzis@canonical.com> Thu, 01 Oct 2015 12:04:04 +0000
22+
123unity8 (8.11+15.10.20150930.1-0ubuntu1) wily; urgency=medium
224
325 [ Albert Astals Cid ]
plugins/Powerd/Powerd.h+2
@@ -38,6 +38,8 @@ public:
3838 PowerKey = 2, // Display changed state due to user pressing power key
3939 Proximity = 3, // Display changed state due to proximity events
4040 Notification = 4, // Display changed state due to user notification
41+ SnapDecision = 5, // Display changed state due to snap decision prompt
42+ CallDone = 6, // Display changed state due to voice call end
4143 };
4244
4345 enum Status {
po/ug.po+4−4
@@ -8,15 +8,15 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2015-09-16 00:49+0200\n"
11−"PO-Revision-Date: 2015-09-24 05:59+0000\n"
11+"PO-Revision-Date: 2015-10-02 03:54+0000\n"
1212"Last-Translator: eltikin <eltikinuyghur@hotmail.com>\n"
1313"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-09-30 05:43+0000\n"
19−"X-Generator: Launchpad (build 17768)\n"
18+"X-Launchpad-Export-Date: 2015-10-03 05:40+0000\n"
19+"X-Generator: Launchpad (build 17783)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -96,7 +96,7 @@ msgstr ""
9696#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"
9797#: plugins/Utils/relativetimeformatter.cpp:216
9898msgid "Tomorrow %H:%M"
99−msgstr ""
99+msgstr "ئەتە %H:%M"
100100
101101#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
102102#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.
qml/Notifications/Notification.qml+1−1
@@ -90,7 +90,7 @@ Item {
9090 // Turn on screen as needed (Powerd.Notification means the screen
9191 // stays on for a shorter amount of time)
9292 if (type == Notification.SnapDecision) {
93− Powerd.setStatus(Powerd.On, Powerd.Unknown);
93+ Powerd.setStatus(Powerd.On, Powerd.SnapDecision);
9494 } else if (type != Notification.Confirmation) {
9595 Powerd.setStatus(Powerd.On, Powerd.Notification);
9696 }
qml/Wizard/Pages/60-reporting.qml+10
@@ -16,14 +16,24 @@
1616
1717import QtQuick 2.0
1818import Ubuntu.Components 0.1
19+import Ubuntu.SystemSettings.Diagnostics 1.0
1920import ".." as LocalComponents
2021
2122LocalComponents.Page {
23+ id: reportingPage
2224 objectName: "reportingPage"
2325
2426 title: i18n.tr("Improving your experience")
2527 forwardButtonSourceComponent: forwardButton
2628
29+ skipValid: false
30+ skip: !diagnostics.reportCrashes // skip the page when the system is configured not to report crashes
31+
32+ UbuntuDiagnostics {
33+ id: diagnostics
34+ Component.onCompleted: reportingPage.skipValid = true;
35+ }
36+
2737 Column {
2838 id: column
2939 anchors.fill: content
tests/qmltests/Wizard/tst_Wizard.qml+13−12
@@ -164,13 +164,16 @@ Item {
164164 return stack.currentPage;
165165 }
166166
167− function goToPage(name, skipSim, skipLocation) {
167+ function goToPage(name, skipSim, skipLocation, skipReporting) {
168168 if (skipSim === undefined) {
169169 skipSim = false;
170170 }
171171 if (skipLocation === undefined) {
172172 skipLocation = false;
173173 }
174+ if (skipReporting === undefined) {
175+ skipReporting = false;
176+ }
174177
175178 var page = waitForPage("languagePage");
176179 if (name === page.objectName) return page;
@@ -197,9 +200,11 @@ Item {
197200 tap(findChild(page, "forwardButton"));
198201 }
199202
200− page = waitForPage("reportingPage");
201− if (name === page.objectName) return page;
202− tap(findChild(page, "forwardButton"));
203+ if (!skipReporting) {
204+ page = waitForPage("reportingPage");
205+ if (name === page.objectName) return page;
206+ tap(findChild(page, "forwardButton"));
207+ }
203208
204209 page = waitForPage("finishedPage");
205210 if (name === page.objectName) return page;
@@ -343,8 +348,6 @@ Item {
343348 tap(findChild(page, "forwardButton"));
344349 page = waitForPage("locationPage");
345350 tap(findChild(page, "forwardButton"));
346− page = waitForPage("reportingPage");
347− tap(findChild(page, "forwardButton"));
348351 page = waitForPage("finishedPage");
349352 tap(findChild(page, "forwardButton"));
350353
@@ -396,8 +399,6 @@ Item {
396399 tap(findChild(page, "forwardButton"));
397400 page = waitForPage("locationPage");
398401 tap(findChild(page, "forwardButton"));
399− page = waitForPage("reportingPage");
400− tap(findChild(page, "forwardButton"));
401402 page = waitForPage("finishedPage");
402403 tap(findChild(page, "forwardButton"));
403404
@@ -408,7 +409,7 @@ Item {
408409 }
409410
410411 function test_passwdSwipe() {
411− goToPage(null);
412+ goToPage(null, false, false, true);
412413
413414 tryCompare(setSecuritySpy, "count", 1);
414415 compare(setSecuritySpy.signalArguments[0][0], "");
@@ -418,12 +419,12 @@ Item {
418419
419420 function test_locationSkipNoPath() {
420421 AccountsService.hereLicensePath = "";
421− goToPage("reportingPage", false, true);
422+ goToPage("finishedPage", false, true, true);
422423 }
423424
424425 function test_locationSkipNoFiles() {
425426 AccountsService.hereLicensePath = Qt.resolvedUrl("nolicenses");
426− goToPage("reportingPage", false, true);
427+ goToPage("finishedPage", false, true, true);
427428 }
428429
429430 function test_locationWaitOnPath() {
@@ -440,7 +441,7 @@ Item {
440441 compare(stack.currentPage.skipValid, false);
441442
442443 AccountsService.hereLicensePath = "";
443− waitForPage("reportingPage");
444+ waitForPage("finishedPage", false, false, true);
444445 }
445446
446447 function test_locationGpsOnly() {