git.iko.soy/unity8
on xenial help sign in
Reimplement test
commit6019cf9885313c715ec21f422c8a4fa71e633d41 authorJosh Arenson <joshua.arenson@canonical.com> dateWed 21 Dec 2016, 10:06 (10 years ago) parent746ea24b5651a8
4 files changed+38−27
compare with xenial
unifiedsplit
po/ast.po+11−11 po/gl.po+11−11 qml/Greeter/LoginList.qml−1 qml/Greeter/WideView.qml+16−4
po/ast.po+11−11
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2016-12-07 13:49+0000\n"
11−"PO-Revision-Date: 2016-09-28 13:40+0000\n"
12−"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
11+"PO-Revision-Date: 2016-12-16 02:13+0000\n"
12+"Last-Translator: enolp <enolp@softastur.org>\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"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-12-15 04:56+0000\n"
18+"X-Launchpad-Export-Date: 2016-12-16 05:44+0000\n"
1919"X-Generator: Launchpad (build 18293)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:123
@@ -183,7 +183,7 @@ msgstr ""
183183
184184#: qml/Components/KeyboardShortcutsOverlay.qml:182
185185msgid "Opens the Application Drawer."
186−msgstr ""
186+msgstr "Abre'l caxón d'aplicaciones."
187187
188188#: qml/Components/KeyboardShortcutsOverlay.qml:194
189189msgid "Scopes"
@@ -331,19 +331,19 @@ msgstr ""
331331
332332#: qml/Components/VirtualTouchPad.qml:327
333333msgid "Tap left button to click."
334−msgstr ""
334+msgstr "Calca nel botón esquierdu pa facer clic."
335335
336336#: qml/Components/VirtualTouchPad.qml:339
337337msgid "Tap right button to right click."
338−msgstr ""
338+msgstr "Calca nel botón drechu pa facer clic."
339339
340340#: qml/Components/VirtualTouchPad.qml:351
341341msgid "Swipe with two fingers to scroll."
342−msgstr ""
342+msgstr "Esliza con dos deos pa desplazate."
343343
344344#: qml/Components/VirtualTouchPad.qml:396
345345msgid "Find more settings in the system settings."
346−msgstr ""
346+msgstr "Alcuentra más axustes nos Axustes del Sistema."
347347
348348#: qml/Dash/DashPageHeader.qml:361
349349msgctxt "Button: Open the Ubuntu Store"
@@ -496,16 +496,16 @@ msgstr "Esbillar entornu d'escritoriu"
496496
497497#: qml/Launcher/Drawer.qml:80
498498msgid "Search…"
499−msgstr ""
499+msgstr "Guetar..."
500500
501501#: qml/Launcher/Drawer.qml:101
502502msgctxt "Apps sorted alphabetically"
503503msgid "A-Z"
504−msgstr ""
504+msgstr "A-Z"
505505
506506#: qml/Launcher/MoreAppsHeader.qml:32
507507msgid "More apps in the store"
508−msgstr ""
508+msgstr "Más aplicaciones na tienda"
509509
510510#: qml/Notifications/NotificationMenuItemFactory.qml:124
511511msgid "Show password"
po/gl.po+11−11
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2016-12-07 13:49+0000\n"
11−"PO-Revision-Date: 2016-01-15 14:56+0000\n"
11+"PO-Revision-Date: 2016-12-16 00:21+0000\n"
1212"Last-Translator: Marcos Lans <Unknown>\n"
1313"Language-Team: Galician <gl@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-12-15 04:56+0000\n"
18+"X-Launchpad-Export-Date: 2016-12-16 05:44+0000\n"
1919"X-Generator: Launchpad (build 18293)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:123
@@ -177,11 +177,11 @@ msgstr "Igual que premer nunha icona do Iniciador."
177177
178178#: qml/Components/KeyboardShortcutsOverlay.qml:177
179179msgid "Super + A"
180−msgstr ""
180+msgstr "Super + A"
181181
182182#: qml/Components/KeyboardShortcutsOverlay.qml:182
183183msgid "Opens the Application Drawer."
184−msgstr ""
184+msgstr "Abre o caixón dos aplicativos."
185185
186186#: qml/Components/KeyboardShortcutsOverlay.qml:194
187187msgid "Scopes"
@@ -331,19 +331,19 @@ msgstr ""
331331
332332#: qml/Components/VirtualTouchPad.qml:327
333333msgid "Tap left button to click."
334−msgstr ""
334+msgstr "Toque no botón esquerdo para facer clic."
335335
336336#: qml/Components/VirtualTouchPad.qml:339
337337msgid "Tap right button to right click."
338−msgstr ""
338+msgstr "Toque no botón dereito para clic dereito."
339339
340340#: qml/Components/VirtualTouchPad.qml:351
341341msgid "Swipe with two fingers to scroll."
342−msgstr ""
342+msgstr "Esvare dous dedos para desprazar."
343343
344344#: qml/Components/VirtualTouchPad.qml:396
345345msgid "Find more settings in the system settings."
346−msgstr ""
346+msgstr "Atope máis axustes nos axustes do sistema."
347347
348348#: qml/Dash/DashPageHeader.qml:361
349349msgctxt "Button: Open the Ubuntu Store"
@@ -495,16 +495,16 @@ msgstr "Seleccione o ambiente de escritorio"
495495
496496#: qml/Launcher/Drawer.qml:80
497497msgid "Search…"
498−msgstr ""
498+msgstr "Buscar..."
499499
500500#: qml/Launcher/Drawer.qml:101
501501msgctxt "Apps sorted alphabetically"
502502msgid "A-Z"
503−msgstr ""
503+msgstr "A-Z"
504504
505505#: qml/Launcher/MoreAppsHeader.qml:32
506506msgid "More apps in the store"
507−msgstr ""
507+msgstr "Máis aplicativos na tenda"
508508
509509#: qml/Notifications/NotificationMenuItemFactory.qml:124
510510msgid "Show password"
qml/Greeter/LoginList.qml−1
@@ -36,7 +36,6 @@ StyledItem {
3636 readonly property int cellHeight: units.gu(5)
3737 readonly property int highlightedHeight: units.gu(15)
3838 readonly property int moveDuration: UbuntuAnimation.FastDuration
39− property string selectedSession
4039 property string currentSession
4140 readonly property string currentUser: userList.currentItem.username
4241 property bool wasPrompted: false
qml/Greeter/WideView.qml+16−4
@@ -125,8 +125,6 @@ FocusScope {
125125 id: loginList
126126 objectName: "loginList"
127127
128− property int selectedUserIndex: 0
129−
130128 width: units.gu(40)
131129 anchors {
132130 left: parent.left
@@ -141,15 +139,29 @@ FocusScope {
141139 Behavior on boxVerticalOffset { UbuntuNumberAnimation {} }
142140
143141 model: root.userModel
144− currentSession: LightDMService.users.data(selectedUserIndex, LightDMService.userRoles.SessionRole);
145142 onResponded: root.responded(response)
146143 onSelected: {
147− root.selected(index)
144+ if (LightDMService.users.mock) {
145+ LightDMService.users.mock.currentUsername = currentUser;
146+ }
147+
148148 loginList.selectedUserIndex = index;
149+ root.selected(index)
150+ currentSession = LightDMService.users.data(index, LightDMService.userRoles.SessionRole);
149151 }
150152 onSessionChooserButtonClicked: parent.state = "SessionsList"
151153
152154 Keys.forwardTo: [sessionChooserLoader.item]
155+
156+ // This is only for testing
157+ Connections {
158+ // TODO when Qt 5.7
159+ //enabled: LightDM.Users.mock
160+ target: LightDMService.users
161+ onModelReset: {
162+ loginList.currentSession = LightDMService.users.data(loginList.selectedUserIndex, LightDMService.userRoles.SessionRole);
163+ }
164+ }
153165 }
154166
155167 Loader {