git.iko.soy/unity8
on xenial help sign in
merge lp:unity8
commit52b29bea3ed34203fc9576e7887cf4ce1e61df92 authorAlberto Aguirre <alberto.aguirre@canonical.com> dateFri 26 Sep 2014, 19:26 (12 years ago) parent692f0f52abe831
39 files changed+878−182
compare with xenial
unifiedsplit
debian/changelog+25 debian/control+4−3 plugins/Unity/Launcher/CMakeLists.txt+1−1 po/ast.po+3−3 po/be.po+349 po/ca.po+1−1 po/de.po+4−4 po/en_AU.po+1−1 po/es.po+1−1 po/gd.po+32−32 po/sl.po+3−3 po/sr.po+3−3 po/sv.po+3−3 po/ug.po+1−1 qml/Shell.qml+4 qml/Stages/ApplicationWindow.qml+16−1 qml/Stages/Dot.qml−25 qml/Stages/MainViewStyle.qml+79 qml/Stages/PageHeadStyle.qml+76 qml/Stages/PhoneStage.qml+2−2 qml/Stages/Splash.qml+107−13 qml/Stages/WaitingDots.qml−76 qml/Stages/graphics/PageHeaderBaseDividerBottom@18.png qml/Stages/graphics/PageHeaderBaseDividerLight@18.png qml/Stages/graphics/PageHeaderBaseDividerLight@18.sci+5 qml/Stages/graphics/background_paper@27.png tests/autopilot/unity8/indicators/tests/test_indicators.py+1−1 tests/mocks/Unity/Application/ApplicationInfo.h+7 tests/mocks/Unity/Application/CMakeLists.txt+1−1 tests/plugins/Unity/Launcher/CMakeLists.txt+1−1 tests/plugins/Unity/Launcher/launchermodeltest.cpp+6−1 tests/plugins/Utils/CMakeLists.txt+2−2 tests/qmltests/CMakeLists.txt+1 tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml+1−1 tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml+1−1 tests/qmltests/Dash/tst_GenericScopeView.qml+1−1 tests/qmltests/Stages/tst_Splash.qml+117 tests/qmltests/Components/tst_DragHandle/UnityLogo.png → tests/qmltests/UnityLogo.png tests/qmltests/tst_Shell.qml+19
debian/changelog+25
@@ -1,3 +1,28 @@
1+unity8 (8.00+14.10.20140923-0ubuntu1) utopic; urgency=low
2+
3+ [ Michael Zanetti ]
4+ * fix swiping away the launcher from the left edge
5+ * fix indicators AP test
6+
7+ [ Florian Boucault ]
8+ * New Splash screen implementation that fakes real app
9+
10+ [ Albert Astals ]
11+ * We need this in build-depends so that qmluitests pass in CI
12+
13+ [ Daniel d'Andrada ]
14+ * New Splash screen implementation that fakes real app
15+
16+ [ Michael Terry ]
17+ * Fix LC_ALL and test harder by making both manual runs of
18+ timeformattertest and the whole test suite use the same locale
19+ settings.
20+
21+ [ CI bot ]
22+ * Resync trunk
23+
24+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 23 Sep 2014 09:26:18 +0000
25+
126unity8 (8.00+14.10.20140918.3-0ubuntu1) utopic; urgency=low
227
328 [ Michał Sawicz ]
debian/control+4−3
@@ -7,6 +7,7 @@ Build-Depends: cmake,
77 debhelper (>= 9),
88 doxyqml,
99 graphviz,
10+ gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
1011# We rely on C++11 features, and to prevent from ABI breaks
1112# in libstdc++ causing us issues, we explicitly select a G++
1213# version.
@@ -24,7 +25,7 @@ Build-Depends: cmake,
2425 libpulse-dev,
2526 libqmenumodel-dev (>= 0.2.8),
2627 libqt5xmlpatterns5-dev,
27− libunity-api-dev (>= 7.90),
28+ libunity-api-dev (>= 7.91),
2829 libusermetricsoutput1-dev,
2930 libxcb1-dev,
3031 pkg-config,
@@ -112,7 +113,7 @@ Depends: qml-module-qtquick-layouts,
112113 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
113114 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
114115 ubuntu-thumbnailer-impl-0,
115− unity-application-impl-3,
116+ unity-application-impl-4,
116117 unity-notifications-impl-3,
117118 unity-plugin-scopes | unity-scopes-impl,
118119 unity-scopes-impl-4,
@@ -159,7 +160,7 @@ Pre-Depends: ${misc:Pre-Depends},
159160Depends: ${misc:Depends},
160161 ${shlibs:Depends},
161162Provides: unity-application-impl,
162− unity-application-impl-3,
163+ unity-application-impl-4,
163164Description: Fake environment for running Unity 8 shell
164165 Provides fake implementations of some QML modules used by Unity 8 shell
165166 (e.g Ubuntu.Application) so that you can run it in a sandboxed environment.
plugins/Unity/Launcher/CMakeLists.txt+1−1
@@ -1,6 +1,6 @@
11include(FindPkgConfig)
22pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=4)
3−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=3)
3+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=4)
44pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
55
66add_definitions(-DSM_BUSNAME=systemBus)
po/ast.po+3−3
@@ -8,13 +8,13 @@ msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-09-18 20:12+0800\n"
11−"PO-Revision-Date: 2014-08-31 12:51+0000\n"
11+"PO-Revision-Date: 2014-09-23 10:48+0000\n"
1212"Last-Translator: ivarela <ivarela@ubuntu.com>\n"
1313"Language-Team: Asturian <ast@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-09-20 06:33+0000\n"
17+"X-Launchpad-Export-Date: 2014-09-24 07:41+0000\n"
1818"X-Generator: Launchpad (build 17196)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:130
@@ -82,7 +82,7 @@ msgstr "Apagar"
8282
8383#: qml/Components/Dialogs.qml:157
8484msgid "Restart"
85−msgstr ""
85+msgstr "Reaniciar"
8686
8787#: qml/Components/Dialogs.qml:157
8888msgid "Cancel"
po/be.ponew file+349
@@ -0,0 +1,349 @@
1+# Belarusian translation for unity8
2+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
3+# This file is distributed under the same license as the unity8 package.
4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
5+#
6+msgid ""
7+msgstr ""
8+"Project-Id-Version: unity8\n"
9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10+"POT-Creation-Date: 2014-09-18 20:12+0800\n"
11+"PO-Revision-Date: 2014-09-24 17:12+0000\n"
12+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13+"Language-Team: Belarusian <be@li.org>\n"
14+"MIME-Version: 1.0\n"
15+"Content-Type: text/plain; charset=UTF-8\n"
16+"Content-Transfer-Encoding: 8bit\n"
17+"X-Launchpad-Export-Date: 2014-09-25 06:48+0000\n"
18+"X-Generator: Launchpad (build 17196)\n"
19+
20+#: plugins/LightDM/Greeter.cpp:130
21+msgid "Password: "
22+msgstr ""
23+
24+#: plugins/Unity/Launcher/launcheritem.cpp:43
25+#: plugins/Unity/Launcher/launcheritem.cpp:73
26+msgid "Pin shortcut"
27+msgstr ""
28+
29+#: plugins/Unity/Launcher/launcheritem.cpp:73
30+msgid "Unpin shortcut"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:70
34+msgid "Log out"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:71
38+msgid "Are you sure you want to log out?"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
42+#: qml/Components/Dialogs.qml:122
43+msgid "No"
44+msgstr ""
45+
46+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
47+#: qml/Components/Dialogs.qml:129
48+msgid "Yes"
49+msgstr ""
50+
51+#: qml/Components/Dialogs.qml:94
52+msgid "Shut down"
53+msgstr ""
54+
55+#: qml/Components/Dialogs.qml:95
56+msgid "Are you sure you want to shut down?"
57+msgstr ""
58+
59+#: qml/Components/Dialogs.qml:119
60+msgid "Reboot"
61+msgstr ""
62+
63+#: qml/Components/Dialogs.qml:120
64+msgid "Are you sure you want to reboot?"
65+msgstr ""
66+
67+#: qml/Components/Dialogs.qml:144
68+msgid "Power"
69+msgstr ""
70+
71+#: qml/Components/Dialogs.qml:145
72+msgid ""
73+"Are you sure you would like\n"
74+"to power off?"
75+msgstr ""
76+
77+#: qml/Components/Dialogs.qml:147
78+msgid "Power off"
79+msgstr ""
80+
81+#: qml/Components/Dialogs.qml:157
82+msgid "Restart"
83+msgstr ""
84+
85+#: qml/Components/Dialogs.qml:157
86+msgid "Cancel"
87+msgstr ""
88+
89+#: qml/Components/EdgeDemoOverlay.qml:151
90+msgid "Skip intro"
91+msgstr ""
92+
93+#: qml/Components/EdgeDemo.qml:112
94+msgid "Right edge"
95+msgstr ""
96+
97+#: qml/Components/EdgeDemo.qml:113
98+msgid "Try swiping from the right edge to unlock the phone"
99+msgstr ""
100+
101+#: qml/Components/EdgeDemo.qml:144
102+msgid "Top edge"
103+msgstr ""
104+
105+#: qml/Components/EdgeDemo.qml:145
106+msgid "Try swiping from the top edge to access the indicators"
107+msgstr ""
108+
109+#: qml/Components/EdgeDemo.qml:170
110+msgid "Close"
111+msgstr ""
112+
113+#: qml/Components/EdgeDemo.qml:171
114+msgid "Swipe up again to close the settings screen"
115+msgstr ""
116+
117+#: qml/Components/EdgeDemo.qml:198
118+msgid "Left edge"
119+msgstr ""
120+
121+#: qml/Components/EdgeDemo.qml:199
122+msgid "Swipe from the left to reveal the launcher for quick access to apps"
123+msgstr ""
124+
125+#: qml/Components/EdgeDemo.qml:226
126+msgid "Well done"
127+msgstr ""
128+
129+#: qml/Components/EdgeDemo.qml:227
130+msgid ""
131+"You have now mastered the edge gestures and can start using the "
132+"phone<br><br>Tap on the screen to start"
133+msgstr ""
134+
135+#: qml/Components/Lockscreen.qml:167
136+msgid "Please wait"
137+msgstr ""
138+
139+#: qml/Components/Lockscreen.qml:172
140+msgid "Too many incorrect attempts"
141+msgstr ""
142+
143+#: qml/Components/Lockscreen.qml:206
144+msgid "Emergency Call"
145+msgstr ""
146+
147+#: qml/Components/Lockscreen.qml:226
148+msgid "OK"
149+msgstr ""
150+
151+#: qml/Components/PassphraseLockscreen.qml:61
152+#, qt-format
153+msgid "Hello %1"
154+msgstr ""
155+
156+#: qml/Components/PassphraseLockscreen.qml:61
157+msgid "Hello"
158+msgstr ""
159+
160+#: qml/Dash/GenericScopeView.qml:361
161+msgid "See less"
162+msgstr ""
163+
164+#: qml/Dash/GenericScopeView.qml:361
165+msgid "See all"
166+msgstr ""
167+
168+#: qml/Dash/GenericScopeView.qml:424 qml/Dash/PageHeader.qml:260
169+#: qml/Panel/SearchIndicator.qml:27
170+msgid "Search"
171+msgstr ""
172+
173+#: qml/Dash/PageHeader.qml:270
174+msgid "Settings"
175+msgstr ""
176+
177+#: qml/Dash/PageHeader.qml:279
178+msgid "Remove from Favorites"
179+msgstr ""
180+
181+#: qml/Dash/PageHeader.qml:279
182+msgid "Add to Favorites"
183+msgstr ""
184+
185+#: qml/Dash/Previews/PreviewActionCombo.qml:34
186+msgid "More..."
187+msgstr ""
188+
189+#: qml/Dash/Previews/PreviewActionCombo.qml:34
190+msgid "Less..."
191+msgstr ""
192+
193+#: qml/Dash/Previews/PreviewRatingInput.qml:81
194+msgid "Rate this"
195+msgstr ""
196+
197+#: qml/Dash/Previews/PreviewRatingInput.qml:126
198+msgid "Add a review"
199+msgstr ""
200+
201+#: qml/Dash/Previews/PreviewRatingInput.qml:166
202+msgid "Send"
203+msgstr ""
204+
205+#: qml/Dash/ScopesOverview.qml:201
206+msgid "Manage Dash"
207+msgstr ""
208+
209+#: qml/Dash/ScopesOverview.qml:417
210+msgid "Done"
211+msgstr ""
212+
213+#: qml/Dash/ScopesOverview.qml:443
214+msgid "Store"
215+msgstr ""
216+
217+#: qml/Dash/ScopesOverviewTab.qml:36
218+msgid "Favorites"
219+msgstr ""
220+
221+#: qml/Dash/ScopesOverviewTab.qml:54
222+msgid "All"
223+msgstr ""
224+
225+#: qml/Greeter/Greeter.qml:157
226+msgid "Swipe to unlock"
227+msgstr ""
228+
229+#: qml/Hud/HudParametrizedActionsPage.qml:139
230+msgid "Confirm"
231+msgstr ""
232+
233+#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
234+msgid "Type or say a command"
235+msgstr ""
236+
237+#: qml/Hud/Hud.qml:84
238+msgid "Loading. Please Wait..."
239+msgstr ""
240+
241+#: qml/Hud/Hud.qml:89
242+msgid "Speak Now..."
243+msgstr ""
244+
245+#: qml/Hud/Hud.qml:94
246+msgid "Speaking..."
247+msgstr ""
248+
249+#: qml/Notifications/NotificationMenuItemFactory.qml:105
250+msgid "Show password"
251+msgstr ""
252+
253+#: qml/Notifications/NotificationMenuItemFactory.qml:120
254+msgid "Enter SIM PIN"
255+msgstr ""
256+
257+#: qml/Notifications/NotificationMenuItemFactory.qml:121
258+msgid "Sorry, incorrect PIN"
259+msgstr ""
260+
261+#: qml/Panel/ActiveCallHint.qml:77
262+msgid "Tap to return to call..."
263+msgstr ""
264+
265+#: qml/Panel/ActiveCallHint.qml:90
266+msgid "Conference"
267+msgstr ""
268+
269+#: qml/Panel/Indicators/MenuItemFactory.qml:651
270+msgid "In queue…"
271+msgstr ""
272+
273+#: qml/Panel/Indicators/MenuItemFactory.qml:655
274+msgid "Downloading"
275+msgstr ""
276+
277+#: qml/Panel/Indicators/MenuItemFactory.qml:657
278+msgid "Paused, tap to resume"
279+msgstr ""
280+
281+#: qml/Panel/Indicators/MenuItemFactory.qml:659
282+msgid "Canceled"
283+msgstr ""
284+
285+#: qml/Panel/Indicators/MenuItemFactory.qml:661
286+msgid "Finished"
287+msgstr ""
288+
289+#: qml/Panel/Indicators/MenuItemFactory.qml:663
290+msgid "Failed, tap to retry"
291+msgstr ""
292+
293+#: qml/Panel/Indicators/ModemInfoItem.qml:105
294+msgid "Unlock SIM"
295+msgstr ""
296+
297+#: qml/Panel/Indicators/RoamingIndication.qml:27
298+msgid "Roaming"
299+msgstr ""
300+
301+#: qml/Shell.qml:279
302+msgid "Enter your passphrase"
303+msgstr ""
304+
305+#: qml/Shell.qml:280
306+msgid "Sorry, incorrect passphrase"
307+msgstr ""
308+
309+#: qml/Shell.qml:282
310+msgid "Enter your passcode"
311+msgstr ""
312+
313+#: qml/Shell.qml:283
314+msgid "Sorry, incorrect passcode"
315+msgstr ""
316+
317+#: qml/Shell.qml:286
318+#, qt-format
319+msgid "Enter your %1"
320+msgstr ""
321+
322+#: qml/Shell.qml:287
323+#, qt-format
324+msgid "Sorry, incorrect %1"
325+msgstr ""
326+
327+#: qml/Shell.qml:323
328+msgid "Sorry, incorrect passphrase."
329+msgstr ""
330+
331+#: qml/Shell.qml:324
332+msgid "Sorry, incorrect passcode."
333+msgstr ""
334+
335+#: qml/Shell.qml:325
336+msgid "This will be your last attempt."
337+msgstr ""
338+
339+#: qml/Shell.qml:327
340+msgid ""
341+"If passphrase is entered incorrectly, your phone will conduct a factory "
342+"reset and all personal data will be deleted."
343+msgstr ""
344+
345+#: qml/Shell.qml:328
346+msgid ""
347+"If passcode is entered incorrectly, your phone will conduct a factory reset "
348+"and all personal data will be deleted."
349+msgstr ""
po/ca.po+1−1
@@ -14,7 +14,7 @@ msgstr ""
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-09-23 07:21+0000\n"
17+"X-Launchpad-Export-Date: 2014-09-24 07:41+0000\n"
1818"X-Generator: Launchpad (build 17196)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:130
po/de.po+4−4
@@ -8,13 +8,13 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-09-18 20:12+0800\n"
11−"PO-Revision-Date: 2014-09-19 15:32+0000\n"
12−"Last-Translator: Tobias Bannert <Unknown>\n"
11+"PO-Revision-Date: 2014-09-23 08:31+0000\n"
12+"Last-Translator: Martin Pitt <martin.pitt@ubuntu.com>\n"
1313"Language-Team: German <de@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-09-20 06:33+0000\n"
17+"X-Launchpad-Export-Date: 2014-09-24 07:41+0000\n"
1818"X-Generator: Launchpad (build 17196)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:130
@@ -299,7 +299,7 @@ msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"
299299
300300#: qml/Panel/Indicators/ModemInfoItem.qml:105
301301msgid "Unlock SIM"
302−msgstr "SIM-Karte entsprerren"
302+msgstr "SIM-Karte entsperren"
303303
304304#: qml/Panel/Indicators/RoamingIndication.qml:27
305305msgid "Roaming"
po/en_AU.po+1−1
@@ -14,7 +14,7 @@ msgstr ""
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-09-23 07:21+0000\n"
17+"X-Launchpad-Export-Date: 2014-09-24 07:41+0000\n"
1818"X-Generator: Launchpad (build 17196)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:130
po/es.po+1−1
@@ -14,7 +14,7 @@ msgstr ""
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-09-23 07:21+0000\n"
17+"X-Launchpad-Export-Date: 2014-09-24 07:41+0000\n"
1818"X-Generator: Launchpad (build 17196)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:130
po/gd.po+32−32
@@ -8,13 +8,13 @@ msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-09-18 20:12+0800\n"
11−"PO-Revision-Date: 2014-09-12 16:34+0000\n"
11+"PO-Revision-Date: 2014-09-25 12:40+0000\n"
1212"Last-Translator: GunChleoc <Unknown>\n"
1313"Language-Team: Fòram na Gàidhlig\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-09-20 06:33+0000\n"
17+"X-Launchpad-Export-Date: 2014-09-26 06:51+0000\n"
1818"X-Generator: Launchpad (build 17196)\n"
1919"Language: gd\n"
2020
@@ -22,12 +22,12 @@ msgstr ""
2222msgid "Password: "
2323msgstr "Facal-faire: "
2424
25−#: plugins/Unity/Launcher/launcheritem.cpp:43
26−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:44
26+#: plugins/Unity/Launcher/launcheritem.cpp:74
2727msgid "Pin shortcut"
2828msgstr "Prìnich ath-ghoirid"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:74
3131msgid "Unpin shortcut"
3232msgstr "Neo-phrìnich an ath-ghoirid"
3333
@@ -83,9 +83,9 @@ msgstr "Cuir a' chumhachd dheth"
8383
8484#: qml/Components/Dialogs.qml:157
8585msgid "Restart"
86−msgstr ""
86+msgstr "Ath-thòisich"
8787
88−#: qml/Components/Dialogs.qml:157
88+#: qml/Components/Dialogs.qml:167
8989msgid "Cancel"
9090msgstr "Sguir dheth"
9191
@@ -168,36 +168,36 @@ msgstr "Shin thu, %1"
168168msgid "Hello"
169169msgstr "Shin thu"
170170
171−#: qml/Dash/GenericScopeView.qml:361
171+#: qml/Dash/GenericScopeView.qml:364 qml/Dash/GenericScopeView.qml:483
172172msgid "See less"
173173msgstr "Seall nas lugha"
174174
175−#: qml/Dash/GenericScopeView.qml:361
175+#: qml/Dash/GenericScopeView.qml:364
176176msgid "See all"
177177msgstr "Seall na h-uile"
178178
179−#: qml/Dash/GenericScopeView.qml:424 qml/Dash/PageHeader.qml:260
179+#: qml/Dash/GenericScopeView.qml:427 qml/Dash/PageHeader.qml:258
180180#: qml/Panel/SearchIndicator.qml:27
181181msgid "Search"
182182msgstr "Lorg"
183183
184−#: qml/Dash/PageHeader.qml:270
184+#: qml/Dash/PageHeader.qml:268
185185msgid "Settings"
186186msgstr "Roghainnean"
187187
188−#: qml/Dash/PageHeader.qml:279
188+#: qml/Dash/PageHeader.qml:275
189189msgid "Remove from Favorites"
190190msgstr "Thoir air falbh o na h-annsachdan"
191191
192−#: qml/Dash/PageHeader.qml:279
192+#: qml/Dash/PageHeader.qml:275
193193msgid "Add to Favorites"
194194msgstr "Cuir ris na h-annsachdan"
195195
196−#: qml/Dash/Previews/PreviewActionCombo.qml:34
196+#: qml/Dash/Previews/PreviewActionCombo.qml:35
197197msgid "More..."
198198msgstr "Barrachd..."
199199
200−#: qml/Dash/Previews/PreviewActionCombo.qml:34
200+#: qml/Dash/Previews/PreviewActionCombo.qml:35
201201msgid "Less..."
202202msgstr "Nas lugha..."
203203
@@ -213,15 +213,15 @@ msgstr "Cuir lèirmheas ris"
213213msgid "Send"
214214msgstr "Cuir"
215215
216−#: qml/Dash/ScopesOverview.qml:201
216+#: qml/Dash/ScopesOverview.qml:206
217217msgid "Manage Dash"
218218msgstr "Stiùirich an deas-bhòrd"
219219
220−#: qml/Dash/ScopesOverview.qml:417
220+#: qml/Dash/ScopesOverview.qml:428
221221msgid "Done"
222222msgstr "Deiseil"
223223
224−#: qml/Dash/ScopesOverview.qml:443
224+#: qml/Dash/ScopesOverview.qml:454
225225msgid "Store"
226226msgstr "Am bùth"
227227
@@ -257,15 +257,15 @@ msgstr "Can rud a-nis..."
257257msgid "Speaking..."
258258msgstr "A' bruidhinn..."
259259
260−#: qml/Notifications/NotificationMenuItemFactory.qml:105
260+#: qml/Notifications/NotificationMenuItemFactory.qml:108
261261msgid "Show password"
262262msgstr "Seall am facal-faire"
263263
264−#: qml/Notifications/NotificationMenuItemFactory.qml:120
264+#: qml/Notifications/NotificationMenuItemFactory.qml:124
265265msgid "Enter SIM PIN"
266266msgstr "Cuir a-steach PIN an t-SIM"
267267
268−#: qml/Notifications/NotificationMenuItemFactory.qml:121
268+#: qml/Notifications/NotificationMenuItemFactory.qml:125
269269msgid "Sorry, incorrect PIN"
270270msgstr "Duilich ach tha a' PIN cearr"
271271
@@ -309,45 +309,45 @@ msgstr "Thoir a' ghlas far an SIM"
309309msgid "Roaming"
310310msgstr "Air fàrsan"
311311
312−#: qml/Shell.qml:279
312+#: qml/Shell.qml:292
313313msgid "Enter your passphrase"
314314msgstr "Cuir an abairt-fhaire agad a-steach"
315315
316−#: qml/Shell.qml:280
316+#: qml/Shell.qml:293
317317msgid "Sorry, incorrect passphrase"
318318msgstr "Duilich ach tha an abairt-fhaire cearr"
319319
320−#: qml/Shell.qml:282
320+#: qml/Shell.qml:295
321321msgid "Enter your passcode"
322322msgstr "Cuir an còd-faire agad a-steach"
323323
324−#: qml/Shell.qml:283
324+#: qml/Shell.qml:296
325325msgid "Sorry, incorrect passcode"
326326msgstr "Duilich ach tha an còd-faire cearr"
327327
328−#: qml/Shell.qml:286
328+#: qml/Shell.qml:299
329329#, qt-format
330330msgid "Enter your %1"
331331msgstr "Cuir a-steach a' %1 agad"
332332
333−#: qml/Shell.qml:287
333+#: qml/Shell.qml:300
334334#, qt-format
335335msgid "Sorry, incorrect %1"
336336msgstr "Duilich ach tha a' %1 cearr"
337337
338−#: qml/Shell.qml:323
338+#: qml/Shell.qml:335
339339msgid "Sorry, incorrect passphrase."
340340msgstr "Duilich ach tha an abairt-fhaire cearr."
341341
342−#: qml/Shell.qml:324
342+#: qml/Shell.qml:336
343343msgid "Sorry, incorrect passcode."
344344msgstr "Duilich ach tha an còd-faire cearr."
345345
346−#: qml/Shell.qml:325
346+#: qml/Shell.qml:337
347347msgid "This will be your last attempt."
348348msgstr "Seo an oidhirp mu dheireadh agad."
349349
350−#: qml/Shell.qml:327
350+#: qml/Shell.qml:339
351351msgid ""
352352"If passphrase is entered incorrectly, your phone will conduct a factory "
353353"reset and all personal data will be deleted."
@@ -356,7 +356,7 @@ msgstr ""
356356"ath-shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta "
357357"pearsanta a sguabadh às."
358358
359−#: qml/Shell.qml:328
359+#: qml/Shell.qml:340
360360msgid ""
361361"If passcode is entered incorrectly, your phone will conduct a factory reset "
362362"and all personal data will be deleted."
po/sl.po+3−3
@@ -8,13 +8,13 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-09-18 20:12+0800\n"
11−"PO-Revision-Date: 2014-08-28 06:43+0000\n"
11+"PO-Revision-Date: 2014-09-23 12:35+0000\n"
1212"Last-Translator: Damir Jerovšek <Unknown>\n"
1313"Language-Team: Slovenian <sl@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-09-20 06:34+0000\n"
17+"X-Launchpad-Export-Date: 2014-09-24 07:41+0000\n"
1818"X-Generator: Launchpad (build 17196)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:130
@@ -82,7 +82,7 @@ msgstr "Izklopi"
8282
8383#: qml/Components/Dialogs.qml:157
8484msgid "Restart"
85−msgstr ""
85+msgstr "Ponovni zagon"
8686
8787#: qml/Components/Dialogs.qml:157
8888msgid "Cancel"
po/sr.po+3−3
@@ -8,13 +8,13 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-09-18 20:12+0800\n"
11−"PO-Revision-Date: 2014-08-30 11:46+0000\n"
11+"PO-Revision-Date: 2014-09-24 13:29+0000\n"
1212"Last-Translator: Данило Шеган <Unknown>\n"
1313"Language-Team: Serbian <sr@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-09-20 06:34+0000\n"
17+"X-Launchpad-Export-Date: 2014-09-25 06:48+0000\n"
1818"X-Generator: Launchpad (build 17196)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:130
@@ -82,7 +82,7 @@ msgstr "Искључи"
8282
8383#: qml/Components/Dialogs.qml:157
8484msgid "Restart"
85−msgstr ""
85+msgstr "Поново покрени"
8686
8787#: qml/Components/Dialogs.qml:157
8888msgid "Cancel"
po/sv.po+3−3
@@ -8,13 +8,13 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-09-18 20:12+0800\n"
11−"PO-Revision-Date: 2014-09-08 15:57+0000\n"
11+"PO-Revision-Date: 2014-09-23 08:37+0000\n"
1212"Last-Translator: Josef Andersson <Unknown>\n"
1313"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-09-20 06:34+0000\n"
17+"X-Launchpad-Export-Date: 2014-09-24 07:41+0000\n"
1818"X-Generator: Launchpad (build 17196)\n"
1919"Language: sv\n"
2020
@@ -83,7 +83,7 @@ msgstr "Stäng av"
8383
8484#: qml/Components/Dialogs.qml:157
8585msgid "Restart"
86−msgstr ""
86+msgstr "Omstart"
8787
8888#: qml/Components/Dialogs.qml:157
8989msgid "Cancel"
po/ug.po+1−1
@@ -14,7 +14,7 @@ msgstr ""
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-09-23 07:21+0000\n"
17+"X-Launchpad-Export-Date: 2014-09-24 07:41+0000\n"
1818"X-Generator: Launchpad (build 17196)\n"
1919
2020#: plugins/LightDM/Greeter.cpp:130
qml/Shell.qml+4
@@ -576,6 +576,10 @@ Item {
576576 if (ApplicationManager.focusedApplicationId != "unity8-dash") {
577577 showDash()
578578 }
579+ if (greeter.shown) {
580+ launcher.fadeOut()
581+ greeter.hideRight()
582+ }
579583 }
580584 onDashSwipeChanged: {
581585 if (dashSwipe) {
qml/Stages/ApplicationWindow.qml+16−1
@@ -37,6 +37,12 @@ Item {
3737 readonly property string name: root.application ? root.application.name : ""
3838 readonly property url icon: root.application ? root.application.icon : ""
3939 readonly property int applicationState: root.application ? root.application.state : -1
40+ readonly property string splashTitle: root.application ? root.application.splashTitle : ""
41+ readonly property url splashImage: root.application ? root.application.splashImage : ""
42+ readonly property bool splashShowHeader: root.application ? root.application.splashShowHeader : true
43+ readonly property color splashColor: root.application ? root.application.splashColor : "#00000000"
44+ readonly property color splashColorHeader: root.application ? root.application.splashColorHeader : "#00000000"
45+ readonly property color splashColorFooter: root.application ? root.application.splashColorFooter : "#00000000"
4046
4147 // Whether the Application had a surface before but lost it.
4248 property bool hadSurface: sessionContainer.surfaceContainer.hadSurface
@@ -104,7 +110,16 @@ Item {
104110 active: false
105111 anchors.fill: parent
106112 sourceComponent: Component {
107− Splash { name: d.name; image: d.icon }
113+ Splash {
114+ id: splash
115+ title: d.splashTitle ? d.splashTitle : d.name
116+ imageSource: d.splashImage
117+ icon: d.icon
118+ showHeader: d.splashShowHeader
119+ backgroundColor: d.splashColor
120+ headerColor: d.splashColorHeader
121+ footerColor: d.splashColorFooter
122+ }
108123 }
109124 }
110125
qml/Stages/Dot.qmldeleted−25
@@ -1,25 +0,0 @@
1−/*
2− * Copyright (C) 2014 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.0
18−import Ubuntu.Components 0.1
19−
20−Rectangle {
21− radius: width
22− width: units.dp(6)
23− height: width
24− color: UbuntuColors.orange
25−}
qml/Stages/MainViewStyle.qmlnew file+79
@@ -0,0 +1,79 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+import QtQuick 2.0
17+import Ubuntu.Components 1.1
18+
19+// FIXME: copied with slight modifications from Ubuntu UI Toolkit's Ambiance's theme
20+Item {
21+ // styling properties
22+ anchors.fill: parent
23+ z: -1
24+ id: mainViewStyle
25+
26+ /*!
27+ The background texture of the main view. The image will be drawn over the background color,
28+ so if it has (semi-)transparent pixels, in those pixels the background color will be visible.
29+ */
30+ property url backgroundSource: "graphics/background_paper.png"
31+ property var theme
32+
33+ Gradient {
34+ id: backgroundGradient
35+ GradientStop { position: 0.0; color: styledItem.headerColor }
36+ GradientStop { position: 0.83; color: styledItem.backgroundColor }
37+ GradientStop { position: 1.0; color: styledItem.footerColor }
38+ }
39+
40+ Rectangle {
41+ id: backgroundColor
42+ anchors.fill: parent
43+ color: styledItem.backgroundColor
44+ gradient: internals.isGradient ? backgroundGradient : null
45+ }
46+
47+ Image {
48+ id: backgroundTexture
49+ anchors.fill: parent
50+ source: mainViewStyle.theme.name === "Ambiance" ? mainViewStyle.backgroundSource : ""
51+ fillMode: Image.Tile
52+ asynchronous: true
53+ cache: false
54+ visible: status === Image.Ready
55+ }
56+
57+ QtObject {
58+ id: internals
59+ property bool isGradient: styledItem.backgroundColor != styledItem.headerColor ||
60+ styledItem.backgroundColor != styledItem.footerColor
61+ /*
62+ As we don't know the order the property bindings and onXXXChanged signals are evaluated
63+ we should rely only on one property when changing the theme to avoid intermediate
64+ theme changes due to properties being evaluated separately.
65+
66+ Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712
67+ */
68+ property string theme: (ColorUtils.luminance(styledItem.backgroundColor) >= 0.85) ? "Ambiance" :
69+ (isGradient ? "SuruGradient" : "SuruDark")
70+ }
71+
72+ // automatically select the appropriate theme depending on the background colors
73+ Binding {
74+ target: theme
75+ property: "name"
76+ value: internals.theme
77+ when: internals.theme !== ""
78+ }
79+}
qml/Stages/PageHeadStyle.qmlnew file+76
@@ -0,0 +1,76 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+import QtQuick 2.2
17+import Ubuntu.Components 1.1
18+import Ubuntu.Components.Styles 1.1 as Style
19+
20+// FIXME: copied with large modifications from Ubuntu UI Toolkit's Ambiance's theme
21+Style.PageHeadStyle {
22+ id: headerStyle
23+
24+ contentHeight: units.gu(7)
25+ separatorSource: "graphics/PageHeaderBaseDividerLight.sci"
26+ separatorBottomSource: "graphics/PageHeaderBaseDividerBottom.png"
27+ fontWeight: Font.Light
28+ fontSize: "x-large"
29+ textColor: styledItem.config.foregroundColor
30+ textLeftMargin: units.gu(2)
31+
32+ implicitHeight: headerStyle.contentHeight
33+
34+ property var theme
35+
36+ Label {
37+ anchors {
38+ left: parent.left
39+ leftMargin: headerStyle.textLeftMargin
40+ right: parent.right
41+ verticalCenter: parent.verticalCenter
42+ }
43+ LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
44+ text: styledItem.title
45+ font.weight: headerStyle.fontWeight
46+ fontSize: headerStyle.fontSize
47+ color: headerStyle.textColor
48+ elide: Text.ElideRight
49+ }
50+
51+ BorderImage {
52+ id: separator
53+ anchors {
54+ top: parent.bottom
55+ topMargin: separatorBottom.height
56+ left: parent.left
57+ right: parent.right
58+ }
59+ source: headerStyle.separatorSource
60+ height: styledItem.config.sections.model !== undefined ? units.gu(3) : units.gu(2)
61+ asynchronous: true
62+ cache: true
63+ }
64+
65+ Image {
66+ id: separatorBottom
67+ anchors {
68+ top: separator.bottom
69+ left: parent.left
70+ right: parent.right
71+ }
72+ source: headerStyle.separatorBottomSource
73+ asynchronous: true
74+ cache: true
75+ }
76+}
qml/Stages/PhoneStage.qml+2−2
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.2
1818import Ubuntu.Components 0.1
1919import Ubuntu.Gestures 0.1
2020import Unity.Application 0.1
@@ -320,7 +320,7 @@ Rectangle {
320320 !snapAnimation.running &&
321321 priv.animateX
322322 UbuntuNumberAnimation {
323− duration: UbuntuAnimation.FastDuration
323+ duration: UbuntuAnimation.BriskDuration
324324 onRunningChanged: {
325325 if (!running && root.inverseProgress == 0) {
326326 spreadView.focusChanging = false;
qml/Stages/Splash.qml+107−13
@@ -14,16 +14,101 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515*/
1616
17−import QtQuick 2.0
18−import Ubuntu.Components 0.1
17+import QtQuick 2.2
18+import Ubuntu.Components 1.1
19+import Ubuntu.Components.Themes 0.1
1920import "../Components"
2021
21−Rectangle {
22+import Ubuntu.Components.Themes.Ambiance 1.1 as Ambiance
23+
24+Item {
2225 id: root
23− color: "black"
2426
25− property string name: ""
26− property url image: ""
27+ property color backgroundColor: d.undefinedColor
28+ property color headerColor: d.undefinedColor
29+ property color footerColor: d.undefinedColor
30+ property alias imageSource: overlaidImage.source
31+ property url icon
32+ property alias title: header.title
33+ property alias showHeader: header.visible
34+
35+ Ambiance.Palette {
36+ id: ambiancePalette
37+ }
38+
39+ QtObject {
40+ id: d
41+
42+ // As specified in qtmir, it will set the color value to this for fields left undefined
43+ // This is also the default value of a color property in QML.
44+ readonly property color undefinedColor: "#00000000"
45+
46+ readonly property color defaultBackgroundColor: header.visible ? ambiancePalette.normal.background : "black"
47+
48+ // Splash screen that shows the application icon and splashTitle
49+ readonly property bool showIcon: overlaidImage.status == Image.Null && !root.showHeader
50+ }
51+
52+ StyledItem {
53+ id: styledItem
54+ anchors.fill: parent
55+
56+ // mimic API of toolkit's MainView component required by MainViewStyle
57+ property color backgroundColor: Qt.colorEqual(root.backgroundColor, d.undefinedColor) ? d.defaultBackgroundColor
58+ : root.backgroundColor
59+ property color headerColor: Qt.colorEqual(root.headerColor, d.undefinedColor) ? styledItem.backgroundColor
60+ : root.headerColor
61+ property color footerColor: Qt.colorEqual(root.footerColor, d.undefinedColor) ? styledItem.backgroundColor
62+ : root.footerColor
63+
64+ // FIXME: fake a Theme object as to expose the Palette corresponding to the backgroundColor (see MainViewStyle.qml)
65+ property var theme: QtObject {
66+ property string name
67+ property Palette palette: Qt.createQmlObject("import QtQuick 2.2;\
68+ import Ubuntu.Components.Themes.%1 1.1;\
69+ Palette {}".arg(styledItem.theme.name),
70+ styledItem, "dynamicPalette");
71+ }
72+
73+ // FIXME: should instead use future toolkit API:
74+ // style: theme.createStyleComponent("MainViewStyle.qml", styledItem)
75+ style: Component { MainViewStyle {theme: styledItem.theme} }
76+ }
77+
78+ StyledItem {
79+ id: header
80+ anchors {
81+ left: parent.left
82+ right: parent.right
83+ }
84+ visible: false
85+
86+ // mimic API of toolkit's AppHeader component required by PageHeadStyle
87+ property Item pageStack
88+ property Item contents
89+ property string title
90+ property var tabsModel
91+ property var config: QtObject {
92+ property color foregroundColor: styledItem.theme.palette.selected.backgroundText
93+ property var sections: QtObject {}
94+ }
95+
96+ // FIXME: should instead use future toolkit API:
97+ // style: theme.createStyleComponent("PageHeadStyle.qml", header)
98+ style: Component { PageHeadStyle {theme: styledItem.theme} }
99+ }
100+
101+ Image {
102+ id: overlaidImage
103+ anchors.centerIn: parent
104+ anchors.verticalCenterOffset: header.visible ? header.height / 2 : 0
105+ sourceSize {
106+ width: root.width
107+ height: root.height
108+ }
109+ asynchronous: true
110+ cache: false
111+ }
27112
28113 UbuntuShape {
29114 id: iconShape
@@ -33,6 +118,8 @@ Rectangle {
33118 width: units.gu(8)
34119 height: units.gu(7.5)
35120
121+ visible: d.showIcon
122+
36123 radius: "medium"
37124 borderSource: "none"
38125
@@ -40,24 +127,31 @@ Rectangle {
40127 id: iconImage
41128 sourceSize.width: iconShape.width
42129 sourceSize.height: iconShape.height
43− source: root.image
130+ source: d.showIcon ? root.icon : ""
44131 fillMode: Image.PreserveAspectCrop
45132 }
46133 }
47134
48135 Label {
49− text: root.name
136+ text: root.title
50137 anchors.horizontalCenter: parent.horizontalCenter
51138 anchors.top: iconShape.bottom
52139 anchors.topMargin: units.gu(2)
53140 fontSize: "large"
141+
142+ color: styledItem.theme.palette.selected.backgroundText
143+ visible: d.showIcon
54144 }
55145
56− WaitingDots {
57− visible: parent.visible
58− anchors.horizontalCenter: parent.horizontalCenter
59− anchors.bottom: parent.bottom
60− anchors.bottomMargin: units.gu(12)
146+ ActivityIndicator {
147+ anchors.centerIn: header.visible ? parent : undefined
148+ anchors.verticalCenterOffset: header.visible ? header.height / 2 : 0
149+
150+ anchors.horizontalCenter: header.visible ? undefined : parent.horizontalCenter
151+ anchors.bottom: header.visible ? undefined : parent.bottom
152+ anchors.bottomMargin: header.visible ? 0 : units.gu(12)
153+
154+ running: true
61155 }
62156
63157 MouseArea {
qml/Stages/WaitingDots.qmldeleted−76
@@ -1,76 +0,0 @@
1−/*
2− * Copyright (C) 2014 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.2
18−import Ubuntu.Components 0.1
19−
20−Item {
21− id: waitingDots
22−
23− // center in parent; waitingDots has no size therefore anchors.centerIn cannot be used
24− x: parent.width / 2
25− y: parent.height / 2
26−
27− property var dots: [dot1, dot2, dot3]
28− property var vertices: [[-units.gu(1), -units.gu(1)],
29− [units.gu(1), -units.gu(1)],
30− [0, units.gu(1)]]
31− property int shift: 0
32−
33− function cycle () {
34− var n = vertices.length;
35− shift = (shift + 1) % n;
36−
37− for (var i = 0; i < n; i++) {
38− dots[i].x = vertices[(i+shift) % n][0];
39− dots[i].y = vertices[(i+shift) % n][1];
40− }
41− }
42−
43− Timer {
44− interval: 800
45− running: waitingDots.visible
46− repeat: true
47− triggeredOnStart: true
48− onTriggered: waitingDots.cycle()
49− }
50−
51−
52− Dot {
53− id: dot1
54− x: vertices[0][0]
55− y: vertices[0][1]
56− Behavior on x {XAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
57− Behavior on y {YAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
58− }
59−
60− Dot {
61− id: dot2
62− x: vertices[1][0]
63− y: vertices[1][1]
64− Behavior on x {XAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
65− Behavior on y {YAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
66−
67− }
68−
69− Dot {
70− id: dot3
71− x: vertices[2][0]
72− y: vertices[2][1]
73− Behavior on x {XAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
74− Behavior on y {YAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
75− }
76−}
qml/Stages/graphics/PageHeaderBaseDividerBottom@18.pngnew file

Binary file not shown.

qml/Stages/graphics/PageHeaderBaseDividerLight@18.pngnew file

Binary file not shown.

qml/Stages/graphics/PageHeaderBaseDividerLight@18.scinew file+5
@@ -0,0 +1,5 @@
1+border.top: 4
2+border.bottom: 0
3+border.left: 0
4+border.right: 0
5+source: PageHeaderBaseDividerLight@18.png
qml/Stages/graphics/background_paper@27.pngnew file

Binary file not shown.

tests/autopilot/unity8/indicators/tests/test_indicators.py+1−1
@@ -72,7 +72,7 @@ class IndicatorPageTitleMatchesWidgetTestCase(IndicatorTestCase):
7272 ('Bluetooth', dict(indicator_name='indicator-bluetooth',
7373 title='Bluetooth')),
7474 ('Datetime', dict(indicator_name='indicator-datetime',
75− title='Upcoming')),
75+ title='Upcoming events')),
7676 ('Location', dict(indicator_name='indicator-location',
7777 title='Location')),
7878 ('Messaging', dict(indicator_name='indicator-messages',
tests/mocks/Unity/Application/ApplicationInfo.h+7
@@ -68,6 +68,13 @@ public:
6868 void setFocused(bool value);
6969 bool focused() const override { return m_focused; }
7070
71+ QString splashTitle() const override { return QString(); }
72+ QUrl splashImage() const override { return QUrl(); }
73+ bool splashShowHeader() const override { return false; }
74+ QColor splashColor() const override { return QColor(0,0,0,0); }
75+ QColor splashColorHeader() const override { return QColor(0,0,0,0); }
76+ QColor splashColorFooter() const override { return QColor(0,0,0,0); }
77+
7178 QString screenshot() const { return m_screenshotFileName; }
7279
7380 void setFullscreen(bool value);
tests/mocks/Unity/Application/CMakeLists.txt+1−1
@@ -1,4 +1,4 @@
1−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=3)
1+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=4)
22
33set(FakeUnityApplicationQml_SOURCES
44 plugin.cpp
tests/plugins/Unity/Launcher/CMakeLists.txt+1−1
@@ -1,6 +1,6 @@
11pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
22pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=4)
3−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=3)
3+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=4)
44
55include_directories(
66 ${CMAKE_CURRENT_BINARY_DIR}
tests/plugins/Unity/Launcher/launchermodeltest.cpp+6−1
@@ -43,7 +43,12 @@ public:
4343 ApplicationInfoInterface::Stage stage() const { return ApplicationInfoInterface::MainStage; }
4444 ApplicationInfoInterface::State state() const { return ApplicationInfoInterface::Running; }
4545 bool focused() const { return m_focused; }
46− QUrl screenshot() const { return QUrl(); }
46+ QString splashTitle() const override { return QString(); }
47+ QUrl splashImage() const override { return QUrl(); }
48+ bool splashShowHeader() const override { return true; }
49+ QColor splashColor() const override { return QColor(0,0,0,0); }
50+ QColor splashColorHeader() const override { return QColor(0,0,0,0); }
51+ QColor splashColorFooter() const override { return QColor(0,0,0,0); }
4752
4853 // Methods used for mocking (not in the interface)
4954 void setFocused(bool focused) { m_focused = focused; Q_EMIT focusedChanged(focused); }
tests/plugins/Utils/CMakeLists.txt+2−2
@@ -7,11 +7,11 @@ include_directories(
77macro(run_tests)
88 set(_test_list "")
99 foreach(_test ${ARGN})
10− set(testCommand ${CMAKE_CURRENT_BINARY_DIR}/${_test}Exec
10+ set(testCommand env "LC_ALL=C" ${CMAKE_CURRENT_BINARY_DIR}/${_test}Exec
1111 -o ${CMAKE_BINARY_DIR}/${_test}.xml,xunitxml
1212 -o -,txt)
1313 add_test(NAME ${_test} COMMAND ${testCommand})
14− add_custom_target(${_test} env "LC_ALL=C" ${testCommand})
14+ add_custom_target(${_test} ${testCommand})
1515 add_executable(${_test}Exec ${_test}.cpp modeltest.cpp)
1616 qt5_use_modules(${_test}Exec Test Core Qml)
1717 target_link_libraries(${_test}Exec
tests/qmltests/CMakeLists.txt+1
@@ -87,3 +87,4 @@ add_qml_test(Stages PhoneStage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/
8787add_qml_test(Stages SpreadDelegate ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
8888add_qml_test(Stages SurfaceContainer ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
8989add_qml_test(Stages SessionContainer ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
90+add_qml_test(Stages Splash)
tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml+1−1
@@ -49,7 +49,7 @@ Showable {
4949 showAnimation: StandardAnimation { property: animatedProp; to: propValueWhenShown }
5050 hideAnimation: StandardAnimation { property: animatedProp; to: propValueWhenHidden }
5151
52− Image { source: "UnityLogo.png"; anchors.fill: parent }
52+ Image { source: "../../UnityLogo.png"; anchors.fill: parent }
5353
5454 DragHandle {
5555 objectName: "leftwardsDragHandle"
tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml+1−1
@@ -49,7 +49,7 @@ Showable {
4949 showAnimation: StandardAnimation { property: animatedProp; to: propValueWhenShown }
5050 hideAnimation: StandardAnimation { property: animatedProp; to: propValueWhenHidden }
5151
52− Image { source: "UnityLogo.png"; anchors.fill: parent }
52+ Image { source: "../../UnityLogo.png"; anchors.fill: parent }
5353
5454 DragHandle {
5555 objectName: "upwardsDragHandle"
tests/qmltests/Dash/tst_GenericScopeView.qml+1−1
@@ -496,7 +496,7 @@ Item {
496496 mouseClick(seeAll0, seeAll0.width / 2, seeAll0.height / 2);
497497 verify(category0.expanded);
498498 tryCompare(category0, "height", category0.item.expandedHeight + seeAll0.height);
499− tryCompare(genericScopeView.categoryView, "contentY", units.gu(13.5));
499+ tryCompare(genericScopeView.categoryView, "contentY", units.gu(14));
500500
501501 scrollToEnd();
502502
tests/qmltests/Stages/tst_Splash.qmlnew file+117
@@ -0,0 +1,117 @@
1+/*
2+ * Copyright 2014 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.0
18+import QtTest 1.0
19+import Unity.Test 0.1 as UT
20+import ".."
21+import "../../../qml/Stages"
22+import Ubuntu.Components 0.1
23+import Unity.Application 0.1
24+
25+Rectangle {
26+ color: "black"
27+ id: root
28+ width: units.gu(70)
29+ height: units.gu(70)
30+
31+ Component.onCompleted: {
32+ root.fakeApplication = ApplicationManager.add("gallery-app");
33+ root.fakeApplication.manualSurfaceCreation = true;
34+ root.fakeApplication.setState(ApplicationInfoInterface.Starting);
35+ }
36+ property QtObject fakeApplication
37+
38+ Component {
39+ id: splashComponent
40+ Splash {
41+ anchors.fill: parent
42+ title: "Splash Title"
43+ showHeader: showHeaderCheckbox.checked
44+ icon: fakeApplication ? fakeApplication.icon : ""
45+ imageSource: imageSourceCheckbox.checked ? "../UnityLogo.png" : ""
46+ backgroundColor: backgroundColorCheckbox.checked ? "darkorange" : "#00000000"
47+ headerColor: headerColorCheckbox.checked ? "mediumseagreen" : "#00000000"
48+ footerColor: footerColorCheckbox.checked ? "teal" : "#00000000"
49+ }
50+ }
51+ Loader {
52+ id: splashLoader
53+ anchors {
54+ top: parent.top
55+ bottom: parent.bottom
56+ left: parent.left
57+ }
58+ width: units.gu(40)
59+ sourceComponent: splashComponent
60+ }
61+
62+ Rectangle {
63+ color: "white"
64+ anchors {
65+ top: parent.top
66+ bottom: parent.bottom
67+ left: splashLoader.right
68+ right: parent.right
69+ }
70+
71+ Column {
72+ anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
73+ spacing: units.gu(1)
74+
75+ Row {
76+ anchors { left: parent.left; right: parent.right }
77+ CheckBox {id: showHeaderCheckbox; checked: false; }
78+ Label { text: "showHeader"; anchors.verticalCenter: parent.verticalCenter }
79+ }
80+ Row {
81+ anchors { left: parent.left; right: parent.right }
82+ CheckBox {id: imageSourceCheckbox; checked: false; }
83+ Label { text: "imageSource"; anchors.verticalCenter: parent.verticalCenter }
84+ }
85+ Row {
86+ anchors { left: parent.left; right: parent.right }
87+ CheckBox {id: backgroundColorCheckbox; checked: false; }
88+ Label { text: "custom backgroundColor"; anchors.verticalCenter: parent.verticalCenter }
89+ }
90+ Row {
91+ anchors { left: parent.left; right: parent.right }
92+ CheckBox {id: headerColorCheckbox; checked: false; }
93+ Label { text: "custom headerColor"; anchors.verticalCenter: parent.verticalCenter }
94+ }
95+ Row {
96+ anchors { left: parent.left; right: parent.right }
97+ CheckBox {id: footerColorCheckbox; checked: false; }
98+ Label { text: "custom footerColor"; anchors.verticalCenter: parent.verticalCenter }
99+ }
100+ }
101+ }
102+
103+ UT.UnityTestCase {
104+ id: testCase
105+ name: "Splash"
106+ when: windowShown
107+
108+ function cleanup() {
109+ // reload our test subject to get it in a fresh state once again
110+ splashLoader.active = false;
111+ surfaceCheckbox.checked = false;
112+ splashLoader.active = true;
113+ }
114+
115+ // No automated tests so far. Used only for manual testing at the moment.
116+ }
117+}
tests/qmltests/Components/tst_DragHandle/UnityLogo.png → tests/qmltests/UnityLogo.pngrenamed

Binary file not shown.

tests/qmltests/tst_Shell.qml+19
@@ -548,5 +548,24 @@ Row {
548548 expectFail("", "Unlock on boot temporarily disabled");
549549 tryCompare(unlockAllModemsSpy, "count", 1)
550550 }
551+
552+ function test_leftEdgeDragOnGreeter_data() {
553+ return [
554+ {tag: "short swipe", targetX: shell.width / 3, unlocked: false},
555+ {tag: "long swipe", targetX: shell.width / 3 * 2, unlocked: true}
556+ ]
557+ }
558+
559+ function test_leftEdgeDragOnGreeter(data) {
560+ var greeter = findChild(shell, "greeter");
561+ greeter.show();
562+ tryCompare(greeter, "showProgress", 1);
563+
564+ var touchStartX = 2;
565+ var touchStartY = shell.height / 2;
566+ touchFlick(shell, touchStartX, touchStartY, data.targetX, touchStartY);
567+
568+ tryCompare(greeter, "showProgress", data.unlocked ? 0 : 1);
569+ }
551570 }
552571}