1
=== modified file 'po/ast.po'
2
--- po/ast.po	2016-12-23 05:00:28 +0000
3
+++ po/ast.po	2017-01-04 12:10:40 +0000
4
@@ -7,16 +7,27 @@
5
7
msgstr ""
7
msgstr ""
6
8
"Project-Id-Version: unity8\n"
8
"Project-Id-Version: unity8\n"
7
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
8
10
<<<<<<< TREE
9
10
"POT-Creation-Date: 2016-12-15 16:17+0000\n"
11
"POT-Creation-Date: 2016-12-15 16:17+0000\n"
10
11
"PO-Revision-Date: 2016-12-16 02:13+0000\n"
12
"PO-Revision-Date: 2016-12-16 02:13+0000\n"
11
12
"Last-Translator: enolp <enolp@softastur.org>\n"
13
"Last-Translator: enolp <enolp@softastur.org>\n"
12
14
=======
13
15
"POT-Creation-Date: 2016-12-07 13:49+0000\n"
14
16
"PO-Revision-Date: 2016-12-16 02:13+0000\n"
15
17
"Last-Translator: enolp <enolp@softastur.org>\n"
16
18
>>>>>>> MERGE-SOURCE
17
13
"Language-Team: Asturian <ast@li.org>\n"
19
"Language-Team: Asturian <ast@li.org>\n"
18
14
"MIME-Version: 1.0\n"
20
"MIME-Version: 1.0\n"
19
15
"Content-Type: text/plain; charset=UTF-8\n"
21
"Content-Type: text/plain; charset=UTF-8\n"
20
16
"Content-Transfer-Encoding: 8bit\n"
22
"Content-Transfer-Encoding: 8bit\n"
21
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
23
"Plural-Forms: nplurals=2; plural=n != 1;\n"
22
24
<<<<<<< TREE
23
18
"X-Launchpad-Export-Date: 2016-12-23 04:58+0000\n"
25
"X-Launchpad-Export-Date: 2016-12-23 04:58+0000\n"
24
19
"X-Generator: Launchpad (build 18298)\n"
26
"X-Generator: Launchpad (build 18298)\n"
25
27
=======
26
28
"X-Launchpad-Export-Date: 2016-12-17 05:27+0000\n"
27
29
"X-Generator: Launchpad (build 18298)\n"
28
30
>>>>>>> MERGE-SOURCE
29
20
31
30
21
#: plugins/LightDM/Greeter.cpp:123
32
#: plugins/LightDM/Greeter.cpp:123
31
22
msgid "Password: "
33
msgid "Password: "
32
23
34
33
=== modified file 'po/fr.po'
34
--- po/fr.po	2016-12-23 05:00:28 +0000
35
+++ po/fr.po	2017-01-04 12:10:40 +0000
36
@@ -7,16 +7,27 @@
37
7
msgstr ""
7
msgstr ""
38
8
"Project-Id-Version: unity\n"
8
"Project-Id-Version: unity\n"
39
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
40
10
<<<<<<< TREE
41
10
"POT-Creation-Date: 2016-12-15 16:17+0000\n"
11
"POT-Creation-Date: 2016-12-15 16:17+0000\n"
42
11
"PO-Revision-Date: 2016-12-17 14:32+0000\n"
12
"PO-Revision-Date: 2016-12-17 14:32+0000\n"
43
12
"Last-Translator: Anne017 <anneonyme017@openmailbox.org>\n"
13
"Last-Translator: Anne017 <anneonyme017@openmailbox.org>\n"
44
14
=======
45
15
"POT-Creation-Date: 2016-12-07 13:49+0000\n"
46
16
"PO-Revision-Date: 2016-12-17 14:32+0000\n"
47
17
"Last-Translator: Anne017 <anneonyme017@openmailbox.org>\n"
48
18
>>>>>>> MERGE-SOURCE
49
13
"Language-Team: French <fr@li.org>\n"
19
"Language-Team: French <fr@li.org>\n"
50
14
"MIME-Version: 1.0\n"
20
"MIME-Version: 1.0\n"
51
15
"Content-Type: text/plain; charset=UTF-8\n"
21
"Content-Type: text/plain; charset=UTF-8\n"
52
16
"Content-Transfer-Encoding: 8bit\n"
22
"Content-Transfer-Encoding: 8bit\n"
53
17
"Plural-Forms: nplurals=2; plural=n > 1;\n"
23
"Plural-Forms: nplurals=2; plural=n > 1;\n"
54
24
<<<<<<< TREE
55
18
"X-Launchpad-Export-Date: 2016-12-23 04:59+0000\n"
25
"X-Launchpad-Export-Date: 2016-12-23 04:59+0000\n"
56
19
"X-Generator: Launchpad (build 18298)\n"
26
"X-Generator: Launchpad (build 18298)\n"
57
27
=======
58
28
"X-Launchpad-Export-Date: 2016-12-18 05:20+0000\n"
59
29
"X-Generator: Launchpad (build 18298)\n"
60
30
>>>>>>> MERGE-SOURCE
61
20
31
62
21
#: plugins/LightDM/Greeter.cpp:123
32
#: plugins/LightDM/Greeter.cpp:123
63
22
msgid "Password: "
33
msgid "Password: "
64
23
34
65
=== modified file 'po/gl.po'
66
--- po/gl.po	2016-12-23 05:00:28 +0000
67
+++ po/gl.po	2017-01-04 12:10:40 +0000
68
@@ -7,16 +7,26 @@
69
7
msgstr ""
7
msgstr ""
70
8
"Project-Id-Version: unity\n"
8
"Project-Id-Version: unity\n"
71
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
72
10
<<<<<<< TREE
73
10
"POT-Creation-Date: 2016-12-15 16:17+0000\n"
11
"POT-Creation-Date: 2016-12-15 16:17+0000\n"
74
11
"PO-Revision-Date: 2016-12-16 00:21+0000\n"
12
"PO-Revision-Date: 2016-12-16 00:21+0000\n"
75
13
=======
76
14
"POT-Creation-Date: 2016-12-07 13:49+0000\n"
77
15
"PO-Revision-Date: 2016-12-16 00:21+0000\n"
78
16
>>>>>>> MERGE-SOURCE
79
12
"Last-Translator: Marcos Lans <Unknown>\n"
17
"Last-Translator: Marcos Lans <Unknown>\n"
80
13
"Language-Team: Galician <gl@li.org>\n"
18
"Language-Team: Galician <gl@li.org>\n"
81
14
"MIME-Version: 1.0\n"
19
"MIME-Version: 1.0\n"
82
15
"Content-Type: text/plain; charset=UTF-8\n"
20
"Content-Type: text/plain; charset=UTF-8\n"
83
16
"Content-Transfer-Encoding: 8bit\n"
21
"Content-Transfer-Encoding: 8bit\n"
84
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
22
"Plural-Forms: nplurals=2; plural=n != 1;\n"
85
23
<<<<<<< TREE
86
18
"X-Launchpad-Export-Date: 2016-12-23 04:59+0000\n"
24
"X-Launchpad-Export-Date: 2016-12-23 04:59+0000\n"
87
19
"X-Generator: Launchpad (build 18298)\n"
25
"X-Generator: Launchpad (build 18298)\n"
88
26
=======
89
27
"X-Launchpad-Export-Date: 2016-12-17 05:27+0000\n"
90
28
"X-Generator: Launchpad (build 18298)\n"
91
29
>>>>>>> MERGE-SOURCE
92
20
30
93
21
#: plugins/LightDM/Greeter.cpp:123
31
#: plugins/LightDM/Greeter.cpp:123
94
22
msgid "Password: "
32
msgid "Password: "
95
23
33
96
=== modified file 'po/ms.po'
97
--- po/ms.po	2016-12-23 05:00:28 +0000
98
+++ po/ms.po	2017-01-04 12:10:40 +0000
99
@@ -7,16 +7,26 @@
100
7
msgstr ""
7
msgstr ""
101
8
"Project-Id-Version: unity8\n"
8
"Project-Id-Version: unity8\n"
102
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
103
10
<<<<<<< TREE
104
10
"POT-Creation-Date: 2016-12-15 16:17+0000\n"
11
"POT-Creation-Date: 2016-12-15 16:17+0000\n"
105
11
"PO-Revision-Date: 2016-12-20 14:02+0000\n"
12
"PO-Revision-Date: 2016-12-20 14:02+0000\n"
106
13
=======
107
14
"POT-Creation-Date: 2016-12-07 13:49+0000\n"
108
15
"PO-Revision-Date: 2016-12-20 14:02+0000\n"
109
16
>>>>>>> MERGE-SOURCE
110
12
"Last-Translator: abuyop <Unknown>\n"
17
"Last-Translator: abuyop <Unknown>\n"
111
13
"Language-Team: Malay <ms@li.org>\n"
18
"Language-Team: Malay <ms@li.org>\n"
112
14
"MIME-Version: 1.0\n"
19
"MIME-Version: 1.0\n"
113
15
"Content-Type: text/plain; charset=UTF-8\n"
20
"Content-Type: text/plain; charset=UTF-8\n"
114
16
"Content-Transfer-Encoding: 8bit\n"
21
"Content-Transfer-Encoding: 8bit\n"
115
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
22
"Plural-Forms: nplurals=2; plural=n != 1;\n"
116
23
<<<<<<< TREE
117
18
"X-Launchpad-Export-Date: 2016-12-23 04:59+0000\n"
24
"X-Launchpad-Export-Date: 2016-12-23 04:59+0000\n"
118
19
"X-Generator: Launchpad (build 18298)\n"
25
"X-Generator: Launchpad (build 18298)\n"
119
26
=======
120
27
"X-Launchpad-Export-Date: 2016-12-21 05:34+0000\n"
121
28
"X-Generator: Launchpad (build 18298)\n"
122
29
>>>>>>> MERGE-SOURCE
123
20
30
124
21
#: plugins/LightDM/Greeter.cpp:123
31
#: plugins/LightDM/Greeter.cpp:123
125
22
msgid "Password: "
32
msgid "Password: "
126
23
33
127
=== modified file 'qml/Panel/IndicatorsBar.qml'
128
--- qml/Panel/IndicatorsBar.qml	2015-09-02 07:42:27 +0000
129
+++ qml/Panel/IndicatorsBar.qml	2017-01-04 12:10:40 +0000
130
@@ -43,6 +43,7 @@
131
43
            row.resetCurrentItem();
43
            row.resetCurrentItem();
132
44
        }
44
        }
133
45
        row.setCurrentItemIndex(index);
45
        row.setCurrentItemIndex(index);
134
46
        d.alignIndicators();
135
46
    }
47
    }
136
47
48
137
48
    function addScrollOffset(scrollAmmout) {
49
    function addScrollOffset(scrollAmmout) {
138
49
50
139
=== modified file 'qml/Panel/IndicatorsMenu.qml'
140
--- qml/Panel/IndicatorsMenu.qml	2016-06-15 14:36:15 +0000
141
+++ qml/Panel/IndicatorsMenu.qml	2017-01-04 12:10:40 +0000
142
@@ -131,6 +131,19 @@
143
131
        color: panelColor
131
        color: panelColor
144
132
    }
132
    }
145
133
133
146
134
    Keys.onPressed: {
147
135
        if (event.key === Qt.Key_Left) {
148
136
            bar.setCurrentItemIndex(bar.currentItemIndex - 1);
149
137
            event.accepted = true;
150
138
        } else if (event.key === Qt.Key_Right) {
151
139
            bar.setCurrentItemIndex(bar.currentItemIndex + 1);
152
140
            event.accepted = true;
153
141
        } else if (event.key === Qt.Key_Escape) {
154
142
            root.hide();
155
143
            event.accepted = true;
156
144
        }
157
145
    }
158
146
159
134
    IndicatorsBar {
147
    IndicatorsBar {
160
135
        id: bar
148
        id: bar
161
136
        objectName: "indicatorsBar"
149
        objectName: "indicatorsBar"
162
@@ -356,6 +369,7 @@
163
356
        State {
369
        State {
164
357
            name: "commit"
370
            name: "commit"
165
358
            extend: "locked"
371
            extend: "locked"
166
372
            PropertyChanges { target: root; focus: true }
167
359
            PropertyChanges { target: bar; interactive: true }
373
            PropertyChanges { target: bar; interactive: true }
168
360
            PropertyChanges {
374
            PropertyChanges {
169
361
                target: d;
375
                target: d;
170
362
376
171
=== modified file 'tests/qmltests/Panel/tst_IndicatorsMenu.qml'
172
--- tests/qmltests/Panel/tst_IndicatorsMenu.qml	2016-09-24 04:31:04 +0000
173
+++ tests/qmltests/Panel/tst_IndicatorsMenu.qml	2017-01-04 12:10:40 +0000
174
@@ -303,5 +303,39 @@
175
303
            indicatorsMenu.available = true;
303
            indicatorsMenu.available = true;
176
304
            indicatorsMenu.hide();
304
            indicatorsMenu.hide();
177
305
        }
305
        }
178
306
179
307
        function test_keyboardNavigation_data() {
180
308
            return [
181
309
                {tag: "tab to start", doTab: false},
182
310
                {tag: "no tab to start", doTab: true}
183
311
            ]
184
312
        }
185
313
186
314
        function test_keyboardNavigation(data) {
187
315
            var indicatorsBar = findChild(indicatorsMenu, "indicatorsBar");
188
316
189
317
            indicatorsMenu.show();
190
318
            indicatorsBar.setCurrentItemIndex(0);
191
319
            tryCompare(indicatorsMenu, "fullyOpened", true);
192
320
193
321
            if (data.doTab) {
194
322
                keyClick(Qt.Key_Tab);
195
323
            }
196
324
197
325
            keyClick(Qt.Key_Right);
198
326
            tryCompare(indicatorsBar, "currentItemIndex", 1);
199
327
200
328
            keyClick(Qt.Key_Right);
201
329
            tryCompare(indicatorsBar, "currentItemIndex", 2);
202
330
203
331
            keyClick(Qt.Key_Left);
204
332
            tryCompare(indicatorsBar, "currentItemIndex", 1);
205
333
206
334
            keyClick(Qt.Key_Left);
207
335
            tryCompare(indicatorsBar, "currentItemIndex", 0);
208
336
209
337
            keyClick(Qt.Key_Escape);
210
338
            tryCompare(indicatorsMenu, "fullyClosed", true);
211
339
        }
212
306
    }
340
    }
213
307
}
341
}
Status:	Superseded
Proposed branch:	lp:~aacid/unity8/indicator_keyboard_navigation
Merge into:	lp:unity8
Prerequisite:	lp:~ci-train-bot/unity8/unity8-ubuntu-zesty-2160
Diff against target:	213 lines (+91/-0) (has conflicts) 7 files modified po/ast.po (+11/-0) po/fr.po (+11/-0) po/gl.po (+10/-0) po/ms.po (+10/-0) qml/Panel/IndicatorsBar.qml (+1/-0) qml/Panel/IndicatorsMenu.qml (+14/-0) tests/qmltests/Panel/tst_IndicatorsMenu.qml (+34/-0) Text conflict in po/ast.po Text conflict in po/fr.po Text conflict in po/gl.po Text conflict in po/ms.po
To merge this branch:	bzr merge lp:~aacid/unity8/indicator_keyboard_navigation
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2017-01-04
Michael Zanetti (community)		2016-12-21	Needs Fixing on 2017-01-03
Review via email: mp+313711@code.launchpad.net