git.iko.soy/unity8
on xenial help sign in
merge trunk
commit8c6349f19770be2bbd372f8dafa413035938a60b authorLukáš Tinkl <lukas.tinkl@canonical.com> dateMon 5 Oct 2015, 15:58 (11 years ago) parent4310f8ce46cde1
6 files changed+43−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 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
@@ -4,6 +4,28 @@ unity8 (8.13+15.04.20150914-0ubuntu1) UNRELEASED; urgency=medium
44
55 -- Lukas Tinkl <ltinkl@canonical.com> Mon, 14 Sep 2015 19:19:23 +0200
66
7+unity8 (8.11+15.10.20151002-0ubuntu1) wily; urgency=medium
8+
9+ [ CI Train Bot ]
10+ * Resync trunk.
11+
12+ [ Lukáš Tinkl ]
13+ * Wizard: skip the reporting page if the system is configured not to
14+ report crashes (LP: #1494442)
15+
16+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 02 Oct 2015 13:24:03 +0000
17+
18+unity8 (8.11+15.10.20151001-0ubuntu1) wily; urgency=medium
19+
20+ [ Alexandros Frantzis ]
21+ * Use power state change reason SnapDecision to turn screen on when a
22+ SnapDecision arrives (LP: #1291455)
23+
24+ [ CI Train Bot ]
25+ * New rebuild forced.
26+
27+ -- Alexandros Frantzis <alexandros.frantzis@canonical.com> Thu, 01 Oct 2015 12:04:04 +0000
28+
729unity8 (8.11+15.10.20150930.1-0ubuntu1) wily; urgency=medium
830
931 [ 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 }
tests/qmltests/Wizard/tst_Wizard.qml+13−12
@@ -157,13 +157,16 @@ Item {
157157 return stack.currentPage;
158158 }
159159
160− function goToPage(name, skipSim, skipLocation) {
160+ function goToPage(name, skipSim, skipLocation, skipReporting) {
161161 if (skipSim === undefined) {
162162 skipSim = false;
163163 }
164164 if (skipLocation === undefined) {
165165 skipLocation = false;
166166 }
167+ if (skipReporting === undefined) {
168+ skipReporting = false;
169+ }
167170
168171 var page = waitForPage("languagePage");
169172 if (name === page.objectName) return page;
@@ -190,9 +193,11 @@ Item {
190193 tap(findChild(page, "forwardButton"));
191194 }
192195
193− page = waitForPage("reportingPage");
194− if (name === page.objectName) return page;
195− tap(findChild(page, "forwardButton"));
196+ if (!skipReporting) {
197+ page = waitForPage("reportingPage");
198+ if (name === page.objectName) return page;
199+ tap(findChild(page, "forwardButton"));
200+ }
196201
197202 page = waitForPage("finishedPage");
198203 if (name === page.objectName) return page;
@@ -336,8 +341,6 @@ Item {
336341 tap(findChild(page, "forwardButton"));
337342 page = waitForPage("locationPage");
338343 tap(findChild(page, "forwardButton"));
339− page = waitForPage("reportingPage");
340− tap(findChild(page, "forwardButton"));
341344 page = waitForPage("finishedPage");
342345 tap(findChild(page, "forwardButton"));
343346
@@ -389,8 +392,6 @@ Item {
389392 tap(findChild(page, "forwardButton"));
390393 page = waitForPage("locationPage");
391394 tap(findChild(page, "forwardButton"));
392− page = waitForPage("reportingPage");
393− tap(findChild(page, "forwardButton"));
394395 page = waitForPage("finishedPage");
395396 tap(findChild(page, "forwardButton"));
396397
@@ -401,7 +402,7 @@ Item {
401402 }
402403
403404 function test_passwdSwipe() {
404− goToPage(null);
405+ goToPage(null, false, false, true);
405406
406407 tryCompare(setSecuritySpy, "count", 1);
407408 compare(setSecuritySpy.signalArguments[0][0], "");
@@ -411,12 +412,12 @@ Item {
411412
412413 function test_locationSkipNoPath() {
413414 AccountsService.hereLicensePath = "";
414− goToPage("reportingPage", false, true);
415+ goToPage("finishedPage", false, true, true);
415416 }
416417
417418 function test_locationSkipNoFiles() {
418419 AccountsService.hereLicensePath = Qt.resolvedUrl("nolicenses");
419− goToPage("reportingPage", false, true);
420+ goToPage("finishedPage", false, true, true);
420421 }
421422
422423 function test_locationWaitOnPath() {
@@ -433,7 +434,7 @@ Item {
433434 compare(stack.currentPage.skipValid, false);
434435
435436 AccountsService.hereLicensePath = "";
436− waitForPage("reportingPage");
437+ waitForPage("finishedPage", false, false, true);
437438 }
438439
439440 function test_locationGpsOnly() {