git.iko.soy/unity8
on xenial help sign in
merge prereq
commitfa6ee0b7382dd95826b3fa0eccb414fd2fcccdb7 authorJosh Arenson <joshua.arenson@canonical.com> dateMon 21 Mar 2016, 10:42 (11 years ago) parent34436b794b8489
21 files changed+210−198
compare with xenial
unifiedsplit
debian/changelog+14 po/es.po+49−55 po/hu.po+45−54 po/unity8.pot+13−13 qml/Components/ShellDialog.qml+3−1 qml/Launcher/LauncherPanel.qml+34−30 qml/Notifications/Notification.qml+10−16 qml/Notifications/Notifications.qml+2 qml/Notifications/OptionToggle.qml+1−1 qml/Panel/IndicatorItem.qml−7 qml/Panel/Indicators/MenuItemFactory.qml+5 qml/Panel/IndicatorsMenu.qml+2−3 qml/Panel/Panel.qml+1−1 qml/Shell.qml+1 qml/Stages/WindowDecoration.qml+1−1 tests/qmltests/Notifications/tst_Notifications.qml+13−8 tests/qmltests/Panel/IndicatorTest.qml+2−1 tests/qmltests/Panel/tst_IndicatorItem.qml−3 tests/qmltests/Panel/tst_IndicatorItemRow.qml+1−2 tests/qmltests/Panel/tst_IndicatorsMenu.qml−1 tests/qmltests/tst_Shell.qml+13−1
debian/changelog+14
@@ -1,3 +1,17 @@
1+unity8 (8.11+16.04.20160318.1-0ubuntu1) xenial; urgency=medium
2+
3+ [ CI Train Bot ]
4+ * Update translation template
5+
6+ [ Lukáš Tinkl ]
7+ * Fix notifications with the new UITK color schemes (LP: #1554616,
8+ #1556523)
9+
10+ [ Lukáš Tinkl, Michael Zanetti, Nick Dedekind ]
11+ * more fixes for the new theme palette (LP: #1554616, #1557534)
12+
13+ -- Michael Zanetti <michael.zanetti@canonical.com> Fri, 18 Mar 2016 17:12:53 +0000
14+
115unity8 (8.11+16.04.20160310.4-0ubuntu1) xenial; urgency=medium
216
317 [ Albert Astals Cid ]
po/es.po+49−55
@@ -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: 2016-03-10 22:48+0000\n"
11−"PO-Revision-Date: 2016-01-15 14:48+0000\n"
12−"Last-Translator: Víctor R. Ruiz <Unknown>\n"
11+"PO-Revision-Date: 2016-03-21 04:18+0000\n"
12+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
1313"Language-Team: Spanish <es@li.org>\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=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-13 05:51+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
18+"X-Launchpad-Export-Date: 2016-03-21 06:03+0000\n"
19+"X-Generator: Launchpad (build 17947)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -77,8 +77,9 @@ msgctxt "Button: Log out from the system"
7777msgid "Log Out"
7878msgstr "Cerrar la sesión"
7979
80−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
81−#: qml/Components/Dialogs.qml:253
80+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
81+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
82+#: qml/Wizard/Pages/passcode-set.qml:32
8283msgid "Cancel"
8384msgstr "Cancelar"
8485
@@ -101,29 +102,29 @@ msgctxt "Button: Shut down the system"
101102msgid "Shut down"
102103msgstr "Apagar"
103104
104−#: qml/Components/Dialogs.qml:207
105+#: qml/Components/Dialogs.qml:173
105106msgctxt "Title: Reboot dialog"
106107msgid "Reboot"
107108msgstr "Reiniciar"
108109
109−#: qml/Components/Dialogs.qml:208
110+#: qml/Components/Dialogs.qml:174
110111msgid "Are you sure you want to reboot?"
111112msgstr "¿Seguro que quiere reiniciar?"
112113
113−#: qml/Components/Dialogs.qml:210
114+#: qml/Components/Dialogs.qml:176
114115msgid "No"
115116msgstr "No"
116117
117−#: qml/Components/Dialogs.qml:217
118+#: qml/Components/Dialogs.qml:183
118119msgid "Yes"
119120msgstr "Sí"
120121
121−#: qml/Components/Dialogs.qml:232
122+#: qml/Components/Dialogs.qml:198
122123msgctxt "Title: Power off/Restart dialog"
123124msgid "Power"
124125msgstr "Apagar"
125126
126−#: qml/Components/Dialogs.qml:233
127+#: qml/Components/Dialogs.qml:199
127128msgid ""
128129"Are you sure you would like\n"
129130"to power off?"
@@ -131,12 +132,12 @@ msgstr ""
131132"¿Seguro que quiere\n"
132133"apagar?"
133134
134−#: qml/Components/Dialogs.qml:235
135+#: qml/Components/Dialogs.qml:201
135136msgctxt "Button: Power off the system"
136137msgid "Power off"
137138msgstr "Apagar"
138139
139−#: qml/Components/Dialogs.qml:244
140+#: qml/Components/Dialogs.qml:210
140141msgctxt "Button: Restart the system"
141142msgid "Restart"
142143msgstr "Reiniciar"
@@ -162,6 +163,7 @@ msgctxt ""
162163"Re-dock means connect the device again to an external screen/mouse/keyboard"
163164msgid "Re-dock, save your work and close these apps to continue."
164165msgstr ""
166+"Reconecte, guarde el trabajo y cierre estas aplicaciones para continuar."
165167
166168#: qml/Components/ModeSwitchWarningDialog.qml:63
167169msgid "Or force close now (unsaved data will be lost)."
@@ -179,38 +181,38 @@ msgstr "¡Reconectar ahora!"
179181msgid "Close all"
180182msgstr "Cerrar todo"
181183
182−#: qml/Dash/DashPageHeader.qml:270
184+#: qml/Dash/DashPageHeader.qml:337
183185msgctxt "Button: Open the Ubuntu Store"
184186msgid "Store"
185187msgstr "Tienda"
186188
187−#: qml/Dash/DashPageHeader.qml:277
189+#: qml/Dash/DashPageHeader.qml:344
188190msgctxt "Button: Start a search in the current dash scope"
189191msgid "Search"
190192msgstr "Buscar"
191193
192−#: qml/Dash/DashPageHeader.qml:287
194+#: qml/Dash/DashPageHeader.qml:354
193195msgctxt "Button: Show the current dash scope settings"
194196msgid "Settings"
195197msgstr "Ajustes"
196198
197−#: qml/Dash/DashPageHeader.qml:294
199+#: qml/Dash/DashPageHeader.qml:361
198200msgid "Remove from Favorites"
199201msgstr "Quitar de favoritos"
200202
201−#: qml/Dash/DashPageHeader.qml:294
203+#: qml/Dash/DashPageHeader.qml:361
202204msgid "Add to Favorites"
203205msgstr "Añadir a favoritos"
204206
205−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
207+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
206208msgid "See less"
207209msgstr "Ver menos"
208210
209−#: qml/Dash/GenericScopeView.qml:567
211+#: qml/Dash/GenericScopeView.qml:570
210212msgid "See all"
211213msgstr "Ver todo"
212214
213−#: qml/Dash/GenericScopeView.qml:629
215+#: qml/Dash/GenericScopeView.qml:627
214216msgctxt "Label: Hint for dash search line edit"
215217msgid "Search"
216218msgstr "Búsqueda"
@@ -269,6 +271,8 @@ msgid ""
269271"Your device is now connected to an external display. Use this screen as a "
270272"touch pad to interact with the pointer."
271273msgstr ""
274+"Se ha conectado el dispositivo a una pantalla externa. Utilice esta ventana "
275+"como panel táctil para mover el puntero."
272276
273277#: qml/Greeter/CoverPage.qml:118
274278msgid "Unlock"
@@ -282,11 +286,11 @@ msgstr "Reintentar"
282286msgid "Tap to unlock"
283287msgstr "Toque para desbloquear"
284288
285−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
289+#: qml/Greeter/NarrowView.qml:54
286290msgid "Sorry, incorrect passphrase."
287291msgstr "La contraseña es incorrecta."
288292
289−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
293+#: qml/Greeter/NarrowView.qml:55
290294msgid "Sorry, incorrect passcode."
291295msgstr "Código de acceso incorrecto."
292296
@@ -315,7 +319,7 @@ msgstr ""
315319msgid "Enter %1"
316320msgstr "Introduzca %1"
317321
318−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
322+#: qml/Greeter/NarrowView.qml:117
319323msgid "Enter passphrase"
320324msgstr "Introduzca la contraseña"
321325
@@ -353,62 +357,62 @@ msgstr "Toque para volver a la llamada…"
353357msgid "Conference"
354358msgstr "Conferencia"
355359
356−#: qml/Panel/Indicators/MenuItemFactory.qml:752
360+#: qml/Panel/Indicators/MenuItemFactory.qml:756
357361msgid "Nothing is playing"
358362msgstr "Ningún contenido en reproducción"
359363
360−#: qml/Panel/Indicators/MenuItemFactory.qml:881
364+#: qml/Panel/Indicators/MenuItemFactory.qml:885
361365#, qt-format
362366msgid "%1 hour"
363367msgid_plural "%1 hours"
364368msgstr[0] "%1 hora"
365369msgstr[1] "%1 horas"
366370
367−#: qml/Panel/Indicators/MenuItemFactory.qml:885
371+#: qml/Panel/Indicators/MenuItemFactory.qml:889
368372#, qt-format
369373msgid "%1 minute"
370374msgid_plural "%1 minutes"
371375msgstr[0] "%1 minuto"
372376msgstr[1] "%1 minutos"
373377
374−#: qml/Panel/Indicators/MenuItemFactory.qml:890
378+#: qml/Panel/Indicators/MenuItemFactory.qml:894
375379#, qt-format
376380msgid "%1 second"
377381msgid_plural "%1 seconds"
378382msgstr[0] "%1 segundo"
379383msgstr[1] "%1 segundos"
380384
381−#: qml/Panel/Indicators/MenuItemFactory.qml:893
385+#: qml/Panel/Indicators/MenuItemFactory.qml:897
382386msgid "0 seconds"
383387msgstr "0 segundos"
384388
385389#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
386−#: qml/Panel/Indicators/MenuItemFactory.qml:895
390+#: qml/Panel/Indicators/MenuItemFactory.qml:899
387391#, qt-format
388392msgid "%1 remaining"
389393msgstr "%1 restante(s)"
390394
391−#: qml/Panel/Indicators/MenuItemFactory.qml:901
395+#: qml/Panel/Indicators/MenuItemFactory.qml:905
392396msgid "In queue…"
393397msgstr "En espera…"
394398
395−#: qml/Panel/Indicators/MenuItemFactory.qml:905
399+#: qml/Panel/Indicators/MenuItemFactory.qml:909
396400msgid "Downloading"
397401msgstr "Descargando"
398402
399−#: qml/Panel/Indicators/MenuItemFactory.qml:907
403+#: qml/Panel/Indicators/MenuItemFactory.qml:911
400404msgid "Paused, tap to resume"
401405msgstr "Pausado, toque para reanudar"
402406
403−#: qml/Panel/Indicators/MenuItemFactory.qml:909
407+#: qml/Panel/Indicators/MenuItemFactory.qml:913
404408msgid "Canceled"
405409msgstr "Cancelado"
406410
407−#: qml/Panel/Indicators/MenuItemFactory.qml:911
411+#: qml/Panel/Indicators/MenuItemFactory.qml:915
408412msgid "Finished"
409413msgstr "Finalizado"
410414
411−#: qml/Panel/Indicators/MenuItemFactory.qml:913
415+#: qml/Panel/Indicators/MenuItemFactory.qml:917
412416msgid "Failed, tap to retry"
413417msgstr "Falló, toque para reintentar"
414418
@@ -481,7 +485,7 @@ msgstr "Deslizamiento largo desde el borde derecho."
481485msgid "View all your running tasks."
482486msgstr "Ver todas las tareas en ejecución."
483487
484−#: qml/Wizard/Page.qml:89
488+#: qml/Wizard/Page.qml:54
485489msgctxt "Button: Go back one page in the Wizard"
486490msgid "Back"
487491msgstr "Atrás"
@@ -513,7 +517,8 @@ msgstr "Inserte una tarjeta SIM y reinicie el dispositivo"
513517msgid "Without it, you won’t be able to make calls or use text messaging."
514518msgstr "Sin ella, no podrá hacer llamadas ni enviar mensajes."
515519
516−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
520+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
521+#: qml/Wizard/Pages/sim.qml:101
517522msgid "Skip"
518523msgstr "Omitir"
519524
@@ -555,7 +560,7 @@ msgctxt "Label: Description of security method"
555560msgid "Numbers and letters"
556561msgstr "Números y letras"
557562
558−#: qml/Wizard/Pages/40-wifi.qml:29
563+#: qml/Wizard/Pages/30-wifi.qml:29
559564msgid "Connect to Wi‑Fi"
560565msgstr "Conectar con wifi"
561566
@@ -630,13 +635,13 @@ msgstr "¡Buen trabajo!"
630635
631636#: qml/Wizard/Pages/80-finished.qml:46
632637msgid "Your device is now ready to use."
633−msgstr "El dispositivo ya está listo."
638+msgstr "El dispositivo está listo para su uso."
634639
635640#: qml/Wizard/Pages/80-finished.qml:53
636641msgid "Finish"
637642msgstr "Finalizar"
638643
639−#: qml/Wizard/Pages/here-terms.qml:27
644+#: qml/Wizard/Pages/here-terms.qml:25
640645msgid "Terms & Conditions"
641646msgstr "Términos y condiciones"
642647
@@ -644,7 +649,8 @@ msgstr "Términos y condiciones"
644649msgid "Confirm passphrase"
645650msgstr "Confirme la contraseña"
646651
647−#: qml/Wizard/Pages/passwd-confirm.qml:50
652+#: qml/Wizard/Pages/passcode-confirm.qml:43
653+#: qml/Wizard/Pages/passcode-desktop.qml:80
648654msgid "Confirm passcode"
649655msgstr "Confirme el código"
650656
@@ -817,15 +823,3 @@ msgstr "%1 〉"
817823
818824#~ msgid "Call back"
819825#~ msgstr "Devolver llamada"
820−
821−#~ msgid "Re-dock, save your work and close these apps to continue."
822−#~ msgstr ""
823−#~ "Re-acople el dispositivo, guarde el trabajo y cierre estas aplicaciones para "
824−#~ "continuar."
825−
826−#~ msgid ""
827−#~ "Your device is now connected to an external display. Use this screen as a "
828−#~ "touch pad to interact with the mouse."
829−#~ msgstr ""
830−#~ "Ahora está conectado a una pantalla externa. Utilice esta pantalla como "
831−#~ "dispositivo táctil para controlar el ratón."
po/hu.po+45−54
@@ -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: 2016-03-10 22:48+0000\n"
11−"PO-Revision-Date: 2016-02-16 07:23+0000\n"
11+"PO-Revision-Date: 2016-03-17 08:46+0000\n"
1212"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
1313"Language-Team: Hungarian <hu@li.org>\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=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-13 05:50+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
18+"X-Launchpad-Export-Date: 2016-03-18 06:08+0000\n"
19+"X-Generator: Launchpad (build 17947)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -73,8 +73,9 @@ msgctxt "Button: Log out from the system"
7373msgid "Log Out"
7474msgstr "Kijelentkezés"
7575
76−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
77−#: qml/Components/Dialogs.qml:253
76+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
77+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
78+#: qml/Wizard/Pages/passcode-set.qml:32
7879msgid "Cancel"
7980msgstr "Mégse"
8081
@@ -97,29 +98,29 @@ msgctxt "Button: Shut down the system"
9798msgid "Shut down"
9899msgstr "Leállítás"
99100
100−#: qml/Components/Dialogs.qml:207
101+#: qml/Components/Dialogs.qml:173
101102msgctxt "Title: Reboot dialog"
102103msgid "Reboot"
103104msgstr "Újraindítás"
104105
105−#: qml/Components/Dialogs.qml:208
106+#: qml/Components/Dialogs.qml:174
106107msgid "Are you sure you want to reboot?"
107108msgstr "Biztosan újra szeretné indítani?"
108109
109−#: qml/Components/Dialogs.qml:210
110+#: qml/Components/Dialogs.qml:176
110111msgid "No"
111112msgstr "Nem"
112113
113−#: qml/Components/Dialogs.qml:217
114+#: qml/Components/Dialogs.qml:183
114115msgid "Yes"
115116msgstr "Igen"
116117
117−#: qml/Components/Dialogs.qml:232
118+#: qml/Components/Dialogs.qml:198
118119msgctxt "Title: Power off/Restart dialog"
119120msgid "Power"
120121msgstr "Menü"
121122
122−#: qml/Components/Dialogs.qml:233
123+#: qml/Components/Dialogs.qml:199
123124msgid ""
124125"Are you sure you would like\n"
125126"to power off?"
@@ -127,12 +128,12 @@ msgstr ""
127128"Biztos benne, hogy ki\n"
128129"szeretné kapcsolni?"
129130
130−#: qml/Components/Dialogs.qml:235
131+#: qml/Components/Dialogs.qml:201
131132msgctxt "Button: Power off the system"
132133msgid "Power off"
133134msgstr "Kikapcsolás"
134135
135−#: qml/Components/Dialogs.qml:244
136+#: qml/Components/Dialogs.qml:210
136137msgctxt "Button: Restart the system"
137138msgid "Restart"
138139msgstr "Újraindítás"
@@ -177,38 +178,38 @@ msgstr "Újracsatlakozás most!"
177178msgid "Close all"
178179msgstr "Minden bezárása"
179180
180−#: qml/Dash/DashPageHeader.qml:270
181+#: qml/Dash/DashPageHeader.qml:337
181182msgctxt "Button: Open the Ubuntu Store"
182183msgid "Store"
183184msgstr "Áruház"
184185
185−#: qml/Dash/DashPageHeader.qml:277
186+#: qml/Dash/DashPageHeader.qml:344
186187msgctxt "Button: Start a search in the current dash scope"
187188msgid "Search"
188189msgstr "Keresés"
189190
190−#: qml/Dash/DashPageHeader.qml:287
191+#: qml/Dash/DashPageHeader.qml:354
191192msgctxt "Button: Show the current dash scope settings"
192193msgid "Settings"
193194msgstr "Beállítások"
194195
195−#: qml/Dash/DashPageHeader.qml:294
196+#: qml/Dash/DashPageHeader.qml:361
196197msgid "Remove from Favorites"
197198msgstr "Eltávolítás a kedvencek közül"
198199
199−#: qml/Dash/DashPageHeader.qml:294
200+#: qml/Dash/DashPageHeader.qml:361
200201msgid "Add to Favorites"
201202msgstr "Hozzáadás a kedvencekhez"
202203
203−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
204+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
204205msgid "See less"
205206msgstr "Kevesebb"
206207
207−#: qml/Dash/GenericScopeView.qml:567
208+#: qml/Dash/GenericScopeView.qml:570
208209msgid "See all"
209210msgstr "Összes megtekintése"
210211
211−#: qml/Dash/GenericScopeView.qml:629
212+#: qml/Dash/GenericScopeView.qml:627
212213msgctxt "Label: Hint for dash search line edit"
213214msgid "Search"
214215msgstr "Keresés"
@@ -268,7 +269,7 @@ msgid ""
268269"touch pad to interact with the pointer."
269270msgstr ""
270271"Az eszköz jelenleg egy külső kijelzőhöz van csatlakoztatva. Használja ezt a "
271−"kijelzőt érintőpadként, hogy irányítsa a mutatót."
272+"kijelzőt érintőtáblaként, melynek segítéségével irányíthatja a mutatót."
272273
273274#: qml/Greeter/CoverPage.qml:118
274275msgid "Unlock"
@@ -282,11 +283,11 @@ msgstr "Újra"
282283msgid "Tap to unlock"
283284msgstr "Koppintson a feloldáshoz"
284285
285−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
286+#: qml/Greeter/NarrowView.qml:54
286287msgid "Sorry, incorrect passphrase."
287288msgstr "Elnézést, helytelen jelmondat."
288289
289−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
290+#: qml/Greeter/NarrowView.qml:55
290291msgid "Sorry, incorrect passcode."
291292msgstr "Elnézést, helytelen jelkód."
292293
@@ -315,7 +316,7 @@ msgstr ""
315316msgid "Enter %1"
316317msgstr "%1 megadása"
317318
318−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
319+#: qml/Greeter/NarrowView.qml:117
319320msgid "Enter passphrase"
320321msgstr "Jelmondat megadása"
321322
@@ -353,62 +354,62 @@ msgstr "Ide koppintva visszatérhet a híváshoz"
353354msgid "Conference"
354355msgstr "Konferencia"
355356
356−#: qml/Panel/Indicators/MenuItemFactory.qml:752
357+#: qml/Panel/Indicators/MenuItemFactory.qml:756
357358msgid "Nothing is playing"
358359msgstr "Nincs lejátszás"
359360
360−#: qml/Panel/Indicators/MenuItemFactory.qml:881
361+#: qml/Panel/Indicators/MenuItemFactory.qml:885
361362#, qt-format
362363msgid "%1 hour"
363364msgid_plural "%1 hours"
364365msgstr[0] "%1 óra"
365366msgstr[1] "%1 óra"
366367
367−#: qml/Panel/Indicators/MenuItemFactory.qml:885
368+#: qml/Panel/Indicators/MenuItemFactory.qml:889
368369#, qt-format
369370msgid "%1 minute"
370371msgid_plural "%1 minutes"
371372msgstr[0] "%1 perc"
372373msgstr[1] "%1 perc"
373374
374−#: qml/Panel/Indicators/MenuItemFactory.qml:890
375+#: qml/Panel/Indicators/MenuItemFactory.qml:894
375376#, qt-format
376377msgid "%1 second"
377378msgid_plural "%1 seconds"
378379msgstr[0] "%1 másodperc"
379380msgstr[1] "%1 másodperc"
380381
381−#: qml/Panel/Indicators/MenuItemFactory.qml:893
382+#: qml/Panel/Indicators/MenuItemFactory.qml:897
382383msgid "0 seconds"
383384msgstr "0 másodperc"
384385
385386#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
386−#: qml/Panel/Indicators/MenuItemFactory.qml:895
387+#: qml/Panel/Indicators/MenuItemFactory.qml:899
387388#, qt-format
388389msgid "%1 remaining"
389390msgstr "%1 van hátra"
390391
391−#: qml/Panel/Indicators/MenuItemFactory.qml:901
392+#: qml/Panel/Indicators/MenuItemFactory.qml:905
392393msgid "In queue…"
393394msgstr "Sorban…"
394395
395−#: qml/Panel/Indicators/MenuItemFactory.qml:905
396+#: qml/Panel/Indicators/MenuItemFactory.qml:909
396397msgid "Downloading"
397398msgstr "Letöltés"
398399
399−#: qml/Panel/Indicators/MenuItemFactory.qml:907
400+#: qml/Panel/Indicators/MenuItemFactory.qml:911
400401msgid "Paused, tap to resume"
401402msgstr "Szüneteltetve, koppintson a folytatáshoz"
402403
403−#: qml/Panel/Indicators/MenuItemFactory.qml:909
404+#: qml/Panel/Indicators/MenuItemFactory.qml:913
404405msgid "Canceled"
405406msgstr "Megszakítva"
406407
407−#: qml/Panel/Indicators/MenuItemFactory.qml:911
408+#: qml/Panel/Indicators/MenuItemFactory.qml:915
408409msgid "Finished"
409410msgstr "Befejeződött"
410411
411−#: qml/Panel/Indicators/MenuItemFactory.qml:913
412+#: qml/Panel/Indicators/MenuItemFactory.qml:917
412413msgid "Failed, tap to retry"
413414msgstr "Sikertelen, koppintson az újrapróbáláshoz"
414415
@@ -481,7 +482,7 @@ msgstr "Húzza az ujját hosszan a kijelző jobboldalától indulva."
481482msgid "View all your running tasks."
482483msgstr "A futó alkalmazások itt tekinthetőek meg."
483484
484−#: qml/Wizard/Page.qml:89
485+#: qml/Wizard/Page.qml:54
485486msgctxt "Button: Go back one page in the Wizard"
486487msgid "Back"
487488msgstr "Vissza"
@@ -515,7 +516,8 @@ msgstr ""
515516"Anélkül nem indíthat vagy fogadhat hívásokat, és nem küldhet vagy fogadhat "
516517"üzeneteket."
517518
518−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
519+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
520+#: qml/Wizard/Pages/sim.qml:101
519521msgid "Skip"
520522msgstr "Kihagyás"
521523
@@ -557,7 +559,7 @@ msgctxt "Label: Description of security method"
557559msgid "Numbers and letters"
558560msgstr "Betűk és számok"
559561
560−#: qml/Wizard/Pages/40-wifi.qml:29
562+#: qml/Wizard/Pages/30-wifi.qml:29
561563msgid "Connect to Wi‑Fi"
562564msgstr "Csatlakozás Wi-Fi hálózathoz"
563565
@@ -638,7 +640,7 @@ msgstr "Az eszköze készen áll a használatra."
638640msgid "Finish"
639641msgstr "Befejezés"
640642
641−#: qml/Wizard/Pages/here-terms.qml:27
643+#: qml/Wizard/Pages/here-terms.qml:25
642644msgid "Terms & Conditions"
643645msgstr "Felhasználási feltételek"
644646
@@ -646,7 +648,8 @@ msgstr "Felhasználási feltételek"
646648msgid "Confirm passphrase"
647649msgstr "Jelmondat megerősítése"
648650
649−#: qml/Wizard/Pages/passwd-confirm.qml:50
651+#: qml/Wizard/Pages/passcode-confirm.qml:43
652+#: qml/Wizard/Pages/passcode-desktop.qml:80
650653msgid "Confirm passcode"
651654msgstr "Jelkód megerősítése"
652655
@@ -818,15 +821,3 @@ msgstr "%1 〉"
818821
819822#~ msgid "%a %d %b %H:%M"
820823#~ msgstr "%b. %d., %a %H.%M"
821−
822−#~ msgid "Re-dock, save your work and close these apps to continue."
823−#~ msgstr ""
824−#~ "Dokkoljon újra, mentse a munkáját, majd zárjon be minden alkalmazást a "
825−#~ "folytatáshoz."
826−
827−#~ msgid ""
828−#~ "Your device is now connected to an external display. Use this screen as a "
829−#~ "touch pad to interact with the mouse."
830−#~ msgstr ""
831−#~ "Egy külső kijelzőhöz csatlakoztatta a készülékét. A telefon kijelzőjén tett "
832−#~ "ujjmozdulatokkal mozgathatja az egeret."
po/unity8.pot+13−13
@@ -8,7 +8,7 @@ msgid ""
88msgstr ""
99"Project-Id-Version: unity8\n"
1010"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2016-03-10 22:48+0000\n"
11+"POT-Creation-Date: 2016-03-18 17:18+0000\n"
1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -343,62 +343,62 @@ msgstr ""
343343msgid "Conference"
344344msgstr ""
345345
346−#: qml/Panel/Indicators/MenuItemFactory.qml:752
346+#: qml/Panel/Indicators/MenuItemFactory.qml:757
347347msgid "Nothing is playing"
348348msgstr ""
349349
350−#: qml/Panel/Indicators/MenuItemFactory.qml:881
350+#: qml/Panel/Indicators/MenuItemFactory.qml:886
351351#, qt-format
352352msgid "%1 hour"
353353msgid_plural "%1 hours"
354354msgstr[0] ""
355355msgstr[1] ""
356356
357−#: qml/Panel/Indicators/MenuItemFactory.qml:885
357+#: qml/Panel/Indicators/MenuItemFactory.qml:890
358358#, qt-format
359359msgid "%1 minute"
360360msgid_plural "%1 minutes"
361361msgstr[0] ""
362362msgstr[1] ""
363363
364−#: qml/Panel/Indicators/MenuItemFactory.qml:890
364+#: qml/Panel/Indicators/MenuItemFactory.qml:895
365365#, qt-format
366366msgid "%1 second"
367367msgid_plural "%1 seconds"
368368msgstr[0] ""
369369msgstr[1] ""
370370
371−#: qml/Panel/Indicators/MenuItemFactory.qml:893
371+#: qml/Panel/Indicators/MenuItemFactory.qml:898
372372msgid "0 seconds"
373373msgstr ""
374374
375375#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
376−#: qml/Panel/Indicators/MenuItemFactory.qml:895
376+#: qml/Panel/Indicators/MenuItemFactory.qml:900
377377#, qt-format
378378msgid "%1 remaining"
379379msgstr ""
380380
381−#: qml/Panel/Indicators/MenuItemFactory.qml:901
381+#: qml/Panel/Indicators/MenuItemFactory.qml:906
382382msgid "In queue…"
383383msgstr ""
384384
385−#: qml/Panel/Indicators/MenuItemFactory.qml:905
385+#: qml/Panel/Indicators/MenuItemFactory.qml:910
386386msgid "Downloading"
387387msgstr ""
388388
389−#: qml/Panel/Indicators/MenuItemFactory.qml:907
389+#: qml/Panel/Indicators/MenuItemFactory.qml:912
390390msgid "Paused, tap to resume"
391391msgstr ""
392392
393−#: qml/Panel/Indicators/MenuItemFactory.qml:909
393+#: qml/Panel/Indicators/MenuItemFactory.qml:914
394394msgid "Canceled"
395395msgstr ""
396396
397−#: qml/Panel/Indicators/MenuItemFactory.qml:911
397+#: qml/Panel/Indicators/MenuItemFactory.qml:916
398398msgid "Finished"
399399msgstr ""
400400
401−#: qml/Panel/Indicators/MenuItemFactory.qml:913
401+#: qml/Panel/Indicators/MenuItemFactory.qml:918
402402msgid "Failed, tap to retry"
403403msgstr ""
404404
qml/Components/ShellDialog.qml+3−1
@@ -17,6 +17,7 @@
1717import QtQuick 2.4
1818
1919import Ubuntu.Components 1.3
20+import Ubuntu.Components.Themes 1.3
2021import Ubuntu.Components.Popups 1.3
2122
2223/*
@@ -41,10 +42,11 @@ Dialog {
4142 // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1555548
4243 ThemeSettings {
4344 id: themeHack
44− name: "Ubuntu.Components.Themes.Ambiance"
4545 }
4646
4747 Component.onCompleted: {
48+ themeHack.palette.normal.overlay = "white";
49+ themeHack.palette.normal.overlayText = UbuntuColors.slate;
4850 __foreground.theme = themeHack
4951 show();
5052 }
qml/Launcher/LauncherPanel.qml+34−30
@@ -767,38 +767,42 @@ Rectangle {
767767 quickList.state = "open";
768768 }
769769
770− Column {
771− id: quickListColumn
770+ StyledItem {
772771 width: parent.width
773− height: childrenRect.height
774−
775− Repeater {
776− id: popoverRepeater
777− model: quickList.model
778−
779− ListItems.Standard {
780− objectName: "quickListEntry" + index
781− text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")
782− highlightWhenPressed: model.clickable
783− selected: index === quickList.selectedIndex
784−
785− // FIXME: This is a workaround for the theme not being context sensitive. I.e. the
786− // ListItems don't know that they are sitting in a themed Popover where the color
787− // needs to be inverted.
788− __foregroundColor: "black"
789−
790− onClicked: {
791− if (!model.clickable) {
792− return;
772+ height: quickListColumn.height
773+
774+ theme: ThemeSettings {
775+ name: "Ubuntu.Components.Themes.Ambiance"
776+ }
777+
778+ Column {
779+ id: quickListColumn
780+ width: parent.width
781+ height: childrenRect.height
782+
783+ Repeater {
784+ id: popoverRepeater
785+ model: quickList.model
786+
787+ ListItems.Standard {
788+ objectName: "quickListEntry" + index
789+ text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")
790+ highlightWhenPressed: model.clickable
791+ selected: index === quickList.selectedIndex
792+
793+ onClicked: {
794+ if (!model.clickable) {
795+ return;
796+ }
797+ Haptics.play();
798+ quickList.state = "";
799+ // Unsetting model to prevent showing changing entries during fading out
800+ // that may happen because of triggering an action.
801+ LauncherModel.quickListActionInvoked(quickList.appId, index);
802+ quickList.focus = false;
803+ root.kbdNavigationCancelled();
804+ quickList.model = undefined;
793805 }
794− Haptics.play();
795− quickList.state = "";
796− // Unsetting model to prevent showing changing entries during fading out
797− // that may happen because of triggering an action.
798− LauncherModel.quickListActionInvoked(quickList.appId, index);
799− quickList.focus = false;
800− root.kbdNavigationCancelled();
801− quickList.model = undefined;
802806 }
803807 }
804808 }
qml/Notifications/Notification.qml+10−16
@@ -41,15 +41,12 @@ StyledItem {
4141 property int maxHeight
4242 property int margins
4343 readonly property bool draggable: (type === Notification.SnapDecision && state === "contracted") || type === Notification.Interactive || type === Notification.Ephemeral
44− readonly property bool darkOnBright: panel.indicators.shown || type === Notification.SnapDecision
45− readonly property color red: "#fc4949"
46− readonly property color green: "#3fb24f"
44+ readonly property bool darkOnBright: inverseMode || type === Notification.SnapDecision
4745 readonly property color sdLightGrey: "#eaeaea"
48− readonly property color sdDarkGrey: "#dddddd"
49− readonly property color sdFontColor: "#5d5d5d"
5046 readonly property real contentSpacing: units.gu(2)
5147 readonly property bool canBeClosed: type === Notification.Ephemeral
5248 property bool hasMouse
49+ property bool inverseMode
5350 property url background: ""
5451
5552 objectName: "background"
@@ -59,7 +56,7 @@ StyledItem {
5956 opacity: 1 - (x / notification.width) // FIXME: non-zero initially because of LP: #1354406 workaround, we want this to start at 0 upon creation eventually
6057
6158 theme: ThemeSettings {
62− name: "Ubuntu.Components.Themes.Ambiance"
59+ name: darkOnBright ? "Ubuntu.Components.Themes.Ambiance" : "Ubuntu.Components.Themes.SuruDark"
6360 }
6461
6562 state: {
@@ -285,7 +282,6 @@ StyledItem {
285282 }
286283 visible: type !== Notification.Confirmation
287284 fontSize: "medium"
288− color: darkOnBright ? sdFontColor : theme.palette.normal.backgroundText
289285 elide: Text.ElideRight
290286 textFormat: Text.PlainText
291287 }
@@ -300,7 +296,6 @@ StyledItem {
300296 }
301297 visible: body != "" && type !== Notification.Confirmation
302298 fontSize: "small"
303− color: darkOnBright ? sdFontColor : theme.palette.normal.backgroundText
304299 wrapMode: Text.Wrap
305300 maximumLineCount: type == Notification.SnapDecision ? 12 : 2
306301 elide: Text.ElideRight
@@ -341,7 +336,6 @@ StyledItem {
341336 anchors.horizontalCenter: parent.horizontalCenter
342337 visible: type === Notification.Confirmation && body !== ""
343338 fontSize: "medium"
344− color: darkOnBright ? sdFontColor : theme.palette.normal.backgroundText
345339 wrapMode: Text.WordWrap
346340 maximumLineCount: 1
347341 elide: Text.ElideRight
@@ -361,7 +355,7 @@ StyledItem {
361355 }
362356
363357 height: units.gu(1)
364− backgroundColor: darkOnBright ? UbuntuColors.darkGrey : UbuntuColors.lightGrey
358+ backgroundColor: theme.palette.normal.background
365359 aspect: UbuntuShape.Flat
366360 radius: "small"
367361
@@ -370,7 +364,7 @@ StyledItem {
370364 objectName: "innerBar"
371365 width: valueIndicator.width * valueIndicator.value / 100
372366 height: units.gu(1)
373− backgroundColor: notification.hints["x-canonical-value-bar-tint"] === "true" ? UbuntuColors.orange : darkOnBright ? UbuntuColors.lightGrey : "white"
367+ backgroundColor: notification.hints["x-canonical-value-bar-tint"] === "true" ? theme.palette.normal.activity : theme.palette.highlighted.foreground
374368 aspect: UbuntuShape.Flat
375369 radius: "small"
376370 }
@@ -447,7 +441,7 @@ StyledItem {
447441 objectName: "notify_oot_button" + index
448442 width: oneOverTwoCase.width
449443 text: oneOverTwoLoaderTop.actionLabel
450− color: notification.hints["x-canonical-private-affirmative-tint"] == "true" ? green : sdDarkGrey
444+ color: notification.hints["x-canonical-private-affirmative-tint"] == "true" ? UbuntuColors.green : theme.palette.normal.baseText
451445 onClicked: notification.notification.invokeAction(oneOverTwoLoaderTop.actionId)
452446 }
453447 }
@@ -475,7 +469,7 @@ StyledItem {
475469 objectName: "notify_oot_button" + index
476470 width: oneOverTwoCase.width / 2 - spacing * 2
477471 text: oneOverTwoLoaderBottom.actionLabel
478− color: index == 1 && notification.hints["x-canonical-private-rejection-tint"] == "true" ? red : sdDarkGrey
472+ color: index == 1 && notification.hints["x-canonical-private-rejection-tint"] == "true" ? UbuntuColors.red : theme.palette.normal.baseText
479473 onClicked: notification.notification.invokeAction(oneOverTwoLoaderBottom.actionId)
480474 }
481475 }
@@ -536,12 +530,12 @@ StyledItem {
536530 width: buttonRow.width / 2 - spacing * 2
537531 text: loader.actionLabel
538532 color: {
539− var result = sdDarkGrey;
533+ var result = theme.palette.normal.baseText;
540534 if (index == 0 && notification.hints["x-canonical-private-affirmative-tint"] == "true") {
541− result = green;
535+ result = UbuntuColors.green;
542536 }
543537 if (index == 1 && notification.hints["x-canonical-private-rejection-tint"] == "true") {
544− result = red;
538+ result = UbuntuColors.red;
545539 }
546540 return result;
547541 }
qml/Notifications/Notifications.qml+2
@@ -29,6 +29,7 @@ ListView {
2929 property real margin
3030 property bool useModal: snapDecisionProxyModel.count > 0
3131 property bool hasMouse
32+ property bool inverseMode
3233 property url background: ""
3334
3435 UnitySortFilterProxyModel {
@@ -61,6 +62,7 @@ ListView {
6162 maxHeight: notificationList.height
6263 margins: notificationList.margin
6364 hasMouse: notificationList.hasMouse
65+ inverseMode: notificationList.inverseMode
6466 background: notificationList.background
6567
6668 // make sure there's no opacity-difference between the several
qml/Notifications/OptionToggle.qml+1−1
@@ -96,7 +96,7 @@ UbuntuShape {
9696
9797 width: parent.width
9898 text: splitLabel[3]
99− color:"#5d5d5d"
99+ color: theme.palette.normal.backgroundText
100100 fontSize: "small"
101101 maximumLineCount: 1
102102 elide: Text.ElideRight
qml/Panel/IndicatorItem.qml−7
@@ -113,13 +113,6 @@ IndicatorDelegate {
113113 source: modelData
114114 color: root.color
115115 Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
116−
117− opacity: {
118− if (!expanded) return 1.0;
119− if (!selected) return 0.6;
120− return 1.0;
121− }
122− Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
123116 }
124117 }
125118 }
qml/Panel/Indicators/MenuItemFactory.qml+5
@@ -228,6 +228,11 @@ Item {
228228 text: menuData && menuData.label || ""
229229 iconSource: menuData && menuData.icon || ""
230230 value : menuData && menuData.actionState || 0.0
231+ enabled: menuData && menuData.sensitive || false
232+ // FIXME: Because of this bug, setting it to the theme foreground color (white)
233+ // currently doesn't work. Let's hack it to be "close enough"
234+ // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1555784
235+ foregroundColor: "#fffffe"
231236 highlightWhenPressed: false
232237 }
233238 }
qml/Panel/IndicatorsMenu.qml+2−3
@@ -38,7 +38,7 @@ Showable {
3838 property bool enableHint: true
3939 property bool contentEnabled: true
4040 property bool showOnClick: true
41− property color panelColor: UbuntuColors.jet
41+ property color panelColor: theme.palette.normal.background
4242
4343 signal showTapped(point position)
4444
@@ -76,7 +76,6 @@ Showable {
7676 MenuContent {
7777 id: content
7878 objectName: "menuContent"
79− color: root.panelColor
8079
8180 anchors {
8281 left: parent.left
@@ -111,7 +110,7 @@ Showable {
111110 height: units.gu(0.5)
112111 gradient: Gradient {
113112 GradientStop { position: 0.0; color: "transparent" }
114− GradientStop { position: 1.0; color: root.panelColor }
113+ GradientStop { position: 1.0; color: theme.palette.normal.background }
115114 }
116115 opacity: 0.3
117116 }
qml/Panel/Panel.qml+1−1
@@ -89,7 +89,7 @@ Item {
8989
9090 Rectangle {
9191 id: indicatorAreaBackground
92− color: callHint.visible ? UbuntuColors.green : indicators.panelColor
92+ color: callHint.visible ? UbuntuColors.green : theme.palette.normal.background
9393 anchors {
9494 top: parent.top
9595 left: parent.left
qml/Shell.qml+1
@@ -663,6 +663,7 @@ Item {
663663 model: NotificationBackend.Model
664664 margin: units.gu(1)
665665 hasMouse: shell.hasMouse
666+ inverseMode: panel.indicators.shown
666667 background: wallpaperResolver.background
667668
668669 y: topmostIsFullscreen ? 0 : panel.panelHeight
qml/Stages/WindowDecoration.qml+1−1
@@ -67,7 +67,7 @@ MouseArea {
6767 anchors.fill: parent
6868 anchors.bottomMargin: -radius
6969 radius: units.gu(.5)
70− color: "#292929"
70+ color: theme.palette.normal.background
7171 }
7272
7373 Row {
tests/qmltests/Notifications/tst_Notifications.qml+13−8
@@ -187,7 +187,8 @@ Item {
187187
188188 anchors.fill: parent
189189 model: mockModel
190− hasMouse: false
190+ hasMouse: fakeMouseCB.checked
191+ inverseMode: inverseModeCB.checked
191192 }
192193 }
193194
@@ -261,19 +262,23 @@ Item {
261262 Layout.fillWidth: true
262263 CheckBox {
263264 id: fakeMouseCB
264− onClicked: {
265− if (checked) {
266− notifications.hasMouse = true;
267− } else {
268− notifications.hasMouse = false;
269− }
270− }
271265 }
272266 Label {
273267 text: "With fake mouse"
274268 anchors.verticalCenter: parent.verticalCenter
275269 }
276270 }
271+
272+ RowLayout {
273+ Layout.fillWidth: true
274+ CheckBox {
275+ id: inverseModeCB
276+ }
277+ Label {
278+ text: "Inverse mode"
279+ anchors.verticalCenter: parent.verticalCenter
280+ }
281+ }
277282 }
278283 }
279284
tests/qmltests/Panel/IndicatorTest.qml+2−1
@@ -24,7 +24,8 @@ import Unity.Indicators 0.1 as Indicators
2424
2525Rectangle {
2626 id: root
27− color: "white"
27+ color: theme.palette.normal.background
28+ Component.onCompleted: theme.name = "Ubuntu.Components.Themes.SuruDark"
2829
2930 property alias indicatorsModel: __indicatorsModel
3031 property alias originalModelData: __indicatorsModel.originalModelData
tests/qmltests/Panel/tst_IndicatorItem.qml−3
@@ -184,21 +184,18 @@ Rectangle {
184184
185185 function test_select() {
186186 tryCompare(findChild(indicatorItem, "icon0"), "color", theme.palette.normal.backgroundText);
187− tryCompare(findChild(indicatorItem, "icon0"), "opacity", 1.0);
188187 tryCompare(findChild(indicatorItem, "leftLabel"), "color", theme.palette.normal.backgroundText);
189188 tryCompare(findChild(indicatorItem, "rightLabel"), "color", theme.palette.normal.backgroundText);
190189 tryCompare(findChild(indicatorItem, "indicatorName"), "color", theme.palette.normal.backgroundText);
191190
192191 indicatorItem.expanded = true;
193192 tryCompare(findChild(indicatorItem, "icon0"), "color", theme.palette.disabled.backgroundText);
194− tryCompare(findChild(indicatorItem, "icon0"), "opacity", 0.6);
195193 tryCompare(findChild(indicatorItem, "leftLabel"), "color", theme.palette.disabled.backgroundText);
196194 tryCompare(findChild(indicatorItem, "rightLabel"), "color", theme.palette.disabled.backgroundText);
197195 tryCompare(findChild(indicatorItem, "indicatorName"), "color", theme.palette.disabled.backgroundText);
198196
199197 indicatorItem.selected = true;
200198 tryCompare(findChild(indicatorItem, "icon0"), "color", theme.palette.normal.backgroundText);
201− tryCompare(findChild(indicatorItem, "icon0"), "opacity", 1.0);
202199 tryCompare(findChild(indicatorItem, "leftLabel"), "color", theme.palette.normal.backgroundText);
203200 tryCompare(findChild(indicatorItem, "rightLabel"), "color", theme.palette.normal.backgroundText);
204201 tryCompare(findChild(indicatorItem, "indicatorName"), "color", theme.palette.normal.backgroundText);
tests/qmltests/Panel/tst_IndicatorItemRow.qml+1−2
@@ -26,7 +26,6 @@ IndicatorTest {
2626 id: root
2727 width: units.gu(120)
2828 height: units.gu(40)
29− color: "white"
3029
3130 RowLayout {
3231 anchors.fill: parent
@@ -40,7 +39,7 @@ IndicatorTest {
4039 color: "blue"
4140
4241 Rectangle {
43− color: "black"
42+ color: theme.palette.normal.background
4443 anchors.fill: indicatorsRow
4544 }
4645
tests/qmltests/Panel/tst_IndicatorsMenu.qml−1
@@ -26,7 +26,6 @@ IndicatorTest {
2626 id: root
2727 width: units.gu(80)
2828 height: units.gu(71)
29− color: "white"
3029
3130 RowLayout {
3231 anchors.fill: parent
tests/qmltests/tst_Shell.qml+13−1
@@ -141,8 +141,10 @@ Rectangle {
141141 anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
142142 spacing: units.gu(1)
143143
144− Row {
144+ Flow {
145145 spacing: units.gu(1)
146+ anchors { left: parent.left; right: parent.right }
147+
146148 Button {
147149 text: "Show Greeter"
148150 activeFocusOnPress: false
@@ -169,6 +171,16 @@ Rectangle {
169171 }
170172 }
171173 }
174+ Button {
175+ text: callManager.foregroundCall ? "Hide Call" : "Show Call"
176+ activeFocusOnPress: false
177+ onClicked: {
178+ if (shellLoader.status !== Loader.Ready)
179+ return;
180+
181+ callManager.foregroundCall = callManager.foregroundCall ? null : phoneCall;
182+ }
183+ }
172184 }
173185 ListItem.ItemSelector {
174186 anchors { left: parent.left; right: parent.right }