git.iko.soy/unity8
on xenial help sign in
merge trunk
8c6349fLukáš Tinkl
CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -57,7 +57,7 @@ find_package(Qt5DBus 5.2 REQUIRED)
57find_package(Qt5Concurrent 5.2 REQUIRED)
57find_package(Qt5Concurrent 5.2 REQUIRED)
58find_package(Qt5Sql 5.2 REQUIRED)
58find_package(Qt5Sql 5.2 REQUIRED)
59
59
60−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=8)
60+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application>=8)
61
61
62# Standard install paths
62# Standard install paths
63include(GNUInstallDirs)
63include(GNUInstallDirs)
debian/changelog+22
@@ -4,6 +4,28 @@ unity8 (8.13+15.04.20150914-0ubuntu1) UNRELEASED; urgency=medium
4
4
5 -- Lukas Tinkl <ltinkl@canonical.com> Mon, 14 Sep 2015 19:19:23 +0200
5 -- Lukas Tinkl <ltinkl@canonical.com> Mon, 14 Sep 2015 19:19:23 +0200
6
6
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+
7unity8 (8.11+15.10.20150930.1-0ubuntu1) wily; urgency=medium
29unity8 (8.11+15.10.20150930.1-0ubuntu1) wily; urgency=medium
8
30
9 [ Albert Astals Cid ]
31 [ Albert Astals Cid ]
plugins/Powerd/Powerd.h+2
@@ -38,6 +38,8 @@ public:
38 PowerKey = 2, // Display changed state due to user pressing power key
38 PowerKey = 2, // Display changed state due to user pressing power key
39 Proximity = 3, // Display changed state due to proximity events
39 Proximity = 3, // Display changed state due to proximity events
40 Notification = 4, // Display changed state due to user notification
40 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
41 };
43 };
42
44
43 enum Status {
45 enum Status {
po/ug.po+4−4
@@ -8,15 +8,15 @@ msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2015-09-16 00:49+0200\n"
10"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"
12"Last-Translator: eltikin <eltikinuyghur@hotmail.com>\n"
12"Last-Translator: eltikin <eltikinuyghur@hotmail.com>\n"
13"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
13"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-09-30 05:43+0000\n"
18+"X-Launchpad-Export-Date: 2015-10-03 05:40+0000\n"
19−"X-Generator: Launchpad (build 17768)\n"
19+"X-Generator: Launchpad (build 17783)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -96,7 +96,7 @@ msgstr ""
96#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"
96#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"
97#: plugins/Utils/relativetimeformatter.cpp:216
97#: plugins/Utils/relativetimeformatter.cpp:216
98msgid "Tomorrow %H:%M"
98msgid "Tomorrow %H:%M"
99−msgstr ""
99+msgstr "ئەتە %H:%M"
100
100
101#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
101#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
102#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.
102#. 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 {
90 // Turn on screen as needed (Powerd.Notification means the screen
90 // Turn on screen as needed (Powerd.Notification means the screen
91 // stays on for a shorter amount of time)
91 // stays on for a shorter amount of time)
92 if (type == Notification.SnapDecision) {
92 if (type == Notification.SnapDecision) {
93− Powerd.setStatus(Powerd.On, Powerd.Unknown);
93+ Powerd.setStatus(Powerd.On, Powerd.SnapDecision);
94 } else if (type != Notification.Confirmation) {
94 } else if (type != Notification.Confirmation) {
95 Powerd.setStatus(Powerd.On, Powerd.Notification);
95 Powerd.setStatus(Powerd.On, Powerd.Notification);
96 }
96 }
tests/qmltests/Wizard/tst_Wizard.qml+13−12
@@ -157,13 +157,16 @@ Item {
157 return stack.currentPage;
157 return stack.currentPage;
158 }
158 }
159
159
160− function goToPage(name, skipSim, skipLocation) {
160+ function goToPage(name, skipSim, skipLocation, skipReporting) {
161 if (skipSim === undefined) {
161 if (skipSim === undefined) {
162 skipSim = false;
162 skipSim = false;
163 }
163 }
164 if (skipLocation === undefined) {
164 if (skipLocation === undefined) {
165 skipLocation = false;
165 skipLocation = false;
166 }
166 }
167+ if (skipReporting === undefined) {
168+ skipReporting = false;
169+ }
167
170
168 var page = waitForPage("languagePage");
171 var page = waitForPage("languagePage");
169 if (name === page.objectName) return page;
172 if (name === page.objectName) return page;
@@ -190,9 +193,11 @@ Item {
190 tap(findChild(page, "forwardButton"));
193 tap(findChild(page, "forwardButton"));
191 }
194 }
192
195
196+ if (!skipReporting) {
193− page = waitForPage("reportingPage");
197+ page = waitForPage("reportingPage");
194− if (name === page.objectName) return page;
198+ if (name === page.objectName) return page;
195− tap(findChild(page, "forwardButton"));
199+ tap(findChild(page, "forwardButton"));
200+ }
196
201
197 page = waitForPage("finishedPage");
202 page = waitForPage("finishedPage");
198 if (name === page.objectName) return page;
203 if (name === page.objectName) return page;
@@ -336,8 +341,6 @@ Item {
336 tap(findChild(page, "forwardButton"));
341 tap(findChild(page, "forwardButton"));
337 page = waitForPage("locationPage");
342 page = waitForPage("locationPage");
338 tap(findChild(page, "forwardButton"));
343 tap(findChild(page, "forwardButton"));
339− page = waitForPage("reportingPage");
340− tap(findChild(page, "forwardButton"));
341 page = waitForPage("finishedPage");
344 page = waitForPage("finishedPage");
342 tap(findChild(page, "forwardButton"));
345 tap(findChild(page, "forwardButton"));
343
346
@@ -389,8 +392,6 @@ Item {
389 tap(findChild(page, "forwardButton"));
392 tap(findChild(page, "forwardButton"));
390 page = waitForPage("locationPage");
393 page = waitForPage("locationPage");
391 tap(findChild(page, "forwardButton"));
394 tap(findChild(page, "forwardButton"));
392− page = waitForPage("reportingPage");
393− tap(findChild(page, "forwardButton"));
394 page = waitForPage("finishedPage");
395 page = waitForPage("finishedPage");
395 tap(findChild(page, "forwardButton"));
396 tap(findChild(page, "forwardButton"));
396
397
@@ -401,7 +402,7 @@ Item {
401 }
402 }
402
403
403 function test_passwdSwipe() {
404 function test_passwdSwipe() {
404− goToPage(null);
405+ goToPage(null, false, false, true);
405
406
406 tryCompare(setSecuritySpy, "count", 1);
407 tryCompare(setSecuritySpy, "count", 1);
407 compare(setSecuritySpy.signalArguments[0][0], "");
408 compare(setSecuritySpy.signalArguments[0][0], "");
@@ -411,12 +412,12 @@ Item {
411
412
412 function test_locationSkipNoPath() {
413 function test_locationSkipNoPath() {
413 AccountsService.hereLicensePath = "";
414 AccountsService.hereLicensePath = "";
414− goToPage("reportingPage", false, true);
415+ goToPage("finishedPage", false, true, true);
415 }
416 }
416
417
417 function test_locationSkipNoFiles() {
418 function test_locationSkipNoFiles() {
418 AccountsService.hereLicensePath = Qt.resolvedUrl("nolicenses");
419 AccountsService.hereLicensePath = Qt.resolvedUrl("nolicenses");
419− goToPage("reportingPage", false, true);
420+ goToPage("finishedPage", false, true, true);
420 }
421 }
421
422
422 function test_locationWaitOnPath() {
423 function test_locationWaitOnPath() {
@@ -433,7 +434,7 @@ Item {
433 compare(stack.currentPage.skipValid, false);
434 compare(stack.currentPage.skipValid, false);
434
435
435 AccountsService.hereLicensePath = "";
436 AccountsService.hereLicensePath = "";
436− waitForPage("reportingPage");
437+ waitForPage("finishedPage", false, false, true);
437 }
438 }
438
439
439 function test_locationGpsOnly() {
440 function test_locationGpsOnly() {