git.iko.soy/unity8
on xenial help sign in
Merge trunk
7621d20Gerry Boland
data/unity8.conf+3
compare with xenial
unifiedsplit
@@ -44,6 +44,8 @@ pre-start script
44 rm "$MIR_SERVER_FILE"
44 rm "$MIR_SERVER_FILE"
45 fi
45 fi
46
46
47+ initctl set-env --global MIR_SERVER_PROMPT_FILE=1
48+
47 initctl emit scope-ui-starting
49 initctl emit scope-ui-starting
48 initctl emit --no-wait indicator-services-start
50 initctl emit --no-wait indicator-services-start
49end script
51end script
@@ -53,4 +55,5 @@ exec ${BINARY:-unity8} $ARGS
53post-stop script
55post-stop script
54 initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET
56 initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET
55 initctl unset-env --global UNITY_MIR_SOCKET
57 initctl unset-env --global UNITY_MIR_SOCKET
58+ initctl unset-env --global MIR_SERVER_PROMPT_FILE
56end script
59end script
debian/changelog+8
@@ -12,6 +12,14 @@ unity8 (8.00) UNRELEASED; urgency=medium
12
12
13 -- Gerry Boland <gerry.boland@canonical.com> Thu, 10 Jul 2014 10:34:18 +0100
13 -- Gerry Boland <gerry.boland@canonical.com> Thu, 10 Jul 2014 10:34:18 +0100
14
14
15+unity8 (7.90+14.10.20140717.3-0ubuntu1) utopic; urgency=low
16+
17+ [ Nick Dedekind ]
18+ * Added environment variable to upstart conf for mir trusted socket
19+ * Removed indicator menu dismissal on menu activation (LP: #1337771)
20+
21+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 17 Jul 2014 16:35:52 +0000
22+
15unity8 (7.90+14.10.20140717.1-0ubuntu1) utopic; urgency=low
23unity8 (7.90+14.10.20140717.1-0ubuntu1) utopic; urgency=low
16
24
17 [ Michał Sawicz ]
25 [ Michał Sawicz ]
po/gl.po+4−4
@@ -8,14 +8,14 @@ msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-07-09 12:17+0000\n"
11+"PO-Revision-Date: 2014-07-17 19:55+0000\n"
12"Last-Translator: Marcos Lans <Unknown>\n"
12"Last-Translator: Marcos Lans <Unknown>\n"
13"Language-Team: Galician <gl@li.org>\n"
13"Language-Team: Galician <gl@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-10 07:29+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-18 05:28+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
18+"X-Generator: Launchpad (build 17114)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -52,7 +52,7 @@ msgstr "Pechar"
52
52
53#: qml/Components/EdgeDemo.qml:172
53#: qml/Components/EdgeDemo.qml:172
54msgid "Swipe up again to close the settings screen"
54msgid "Swipe up again to close the settings screen"
55−msgstr "Esvare o dedo cara a arriba para pechar os axustes"
55+msgstr "Esvare o dedo de novo cara a arriba para pechar os axustes"
56
56
57#: qml/Components/EdgeDemo.qml:199
57#: qml/Components/EdgeDemo.qml:199
58msgid "Left edge"
58msgid "Left edge"
po/ko.po+1−1
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-17 06:38+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-18 05:28+0000\n"
18"X-Generator: Launchpad (build 17114)\n"
18"X-Generator: Launchpad (build 17114)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
po/nl.po+11−9
@@ -8,23 +8,23 @@ msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-07-15 14:11+0000\n"
11+"PO-Revision-Date: 2014-07-17 19:21+0000\n"
12−"Last-Translator: Hannie Dumoleyn <Unknown>\n"
12+"Last-Translator: Pjotr12345 <Unknown>\n"
13"Language-Team: Dutch <nl@li.org>\n"
13"Language-Team: Dutch <nl@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-16 07:27+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-18 05:28+0000\n"
18−"X-Generator: Launchpad (build 17112)\n"
18+"X-Generator: Launchpad (build 17114)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
22msgid "Pin shortcut"
23−msgstr ""
23+msgstr "Snelkoppeling vastzetten"
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27−msgstr ""
27+msgstr "Snelkoppeling losmaken"
28
28
29#: qml/Components/EdgeDemoOverlay.qml:151
29#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
30msgid "Skip intro"
@@ -36,7 +36,7 @@ msgstr "Rechterrand"
36
36
37#: qml/Components/EdgeDemo.qml:114
37#: qml/Components/EdgeDemo.qml:114
38msgid "Try swiping from the right edge to unlock the phone"
38msgid "Try swiping from the right edge to unlock the phone"
39−msgstr ""
39+msgstr "Veeg vanuit de rechterrand om het scherm te ontgrendelen"
40
40
41#: qml/Components/EdgeDemo.qml:145
41#: qml/Components/EdgeDemo.qml:145
42msgid "Top edge"
42msgid "Top edge"
@@ -44,7 +44,7 @@ msgstr "Bovenrand"
44
44
45#: qml/Components/EdgeDemo.qml:146
45#: qml/Components/EdgeDemo.qml:146
46msgid "Try swiping from the top edge to access the indicators"
46msgid "Try swiping from the top edge to access the indicators"
47−msgstr ""
47+msgstr "Veeg vanuit de bovenrand om de indicatoren te bekijken"
48
48
49#: qml/Components/EdgeDemo.qml:171
49#: qml/Components/EdgeDemo.qml:171
50msgid "Close"
50msgid "Close"
@@ -71,6 +71,8 @@ msgid ""
71"You have now mastered the edge gestures and can start using the "
71"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
72"phone<br><br>Tap on the screen to start"
73msgstr ""
73msgstr ""
74+"Nu u de bewegingen vanuit de randen onder de knie heeft, kunt u beginnen met "
75+"het gebruiken van de telefoon<br><br>Tik op het scherm om te beginnen"
74
76
75#: qml/Components/Lockscreen.qml:214
77#: qml/Components/Lockscreen.qml:214
76msgid "Emergency Call"
78msgid "Emergency Call"
@@ -163,7 +165,7 @@ msgstr "Wachtwoord tonen"
163
165
164#: qml/Notifications/NotificationMenuItemFactory.qml:103
166#: qml/Notifications/NotificationMenuItemFactory.qml:103
165msgid "Please enter SIM PIN"
167msgid "Please enter SIM PIN"
166−msgstr "Voer SIM PIN in"
168+msgstr "Voer SIM-pincode in"
167
169
168#: qml/Panel/Indicators/MenuItemFactory.qml:583
170#: qml/Panel/Indicators/MenuItemFactory.qml:583
169msgid "In queue…"
171msgid "In queue…"
po/pt.po+23−23
@@ -8,23 +8,23 @@ msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-01-14 19:18+0000\n"
11+"PO-Revision-Date: 2014-07-18 00:00+0000\n"
12−"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12+"Last-Translator: Nuno André <Unknown>\n"
13"Language-Team: Portuguese <pt@li.org>\n"
13"Language-Team: Portuguese <pt@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-09 06:37+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-18 05:28+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
18+"X-Generator: Launchpad (build 17114)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
22msgid "Pin shortcut"
23−msgstr ""
23+msgstr "Afixar atalho"
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27−msgstr ""
27+msgstr "Remover atalho"
28
28
29#: qml/Components/EdgeDemoOverlay.qml:151
29#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
30msgid "Skip intro"
@@ -64,7 +64,7 @@ msgstr ""
64
64
65#: qml/Components/EdgeDemo.qml:227
65#: qml/Components/EdgeDemo.qml:227
66msgid "Well done"
66msgid "Well done"
67−msgstr ""
67+msgstr "Muito bem"
68
68
69#: qml/Components/EdgeDemo.qml:228
69#: qml/Components/EdgeDemo.qml:228
70msgid ""
70msgid ""
@@ -74,7 +74,7 @@ msgstr ""
74
74
75#: qml/Components/Lockscreen.qml:214
75#: qml/Components/Lockscreen.qml:214
76msgid "Emergency Call"
76msgid "Emergency Call"
77−msgstr ""
77+msgstr "Chamada de emergência"
78
78
79#: qml/Components/Lockscreen.qml:231
79#: qml/Components/Lockscreen.qml:231
80msgid "OK"
80msgid "OK"
@@ -82,16 +82,16 @@ msgstr ""
82
82
83#: qml/Components/PageHeader.qml:366
83#: qml/Components/PageHeader.qml:366
84msgid "Recent searches"
84msgid "Recent searches"
85−msgstr ""
85+msgstr "Pesquisas recentes"
86
86
87#: qml/Components/PassphraseLockscreen.qml:60
87#: qml/Components/PassphraseLockscreen.qml:60
88#, qt-format
88#, qt-format
89msgid "Hello %1"
89msgid "Hello %1"
90−msgstr ""
90+msgstr "Olá %1"
91
91
92#: qml/Components/PassphraseLockscreen.qml:60
92#: qml/Components/PassphraseLockscreen.qml:60
93msgid "Hello"
93msgid "Hello"
94−msgstr ""
94+msgstr "Olá"
95
95
96#: qml/Components/PinLockscreen.qml:198
96#: qml/Components/PinLockscreen.qml:198
97msgid "CANCEL"
97msgid "CANCEL"
@@ -103,11 +103,11 @@ msgstr ""
103
103
104#: qml/Components/SeeMore.qml:35
104#: qml/Components/SeeMore.qml:35
105msgid "See more"
105msgid "See more"
106−msgstr ""
106+msgstr "Ver mais"
107
107
108#: qml/Components/SeeMore.qml:58
108#: qml/Components/SeeMore.qml:58
109msgid "See less"
109msgid "See less"
110−msgstr ""
110+msgstr "Ver menos"
111
111
112#: qml/Dash/DashApps.qml:37
112#: qml/Dash/DashApps.qml:37
113msgid "Recent"
113msgid "Recent"
@@ -115,11 +115,11 @@ msgstr ""
115
115
116#: qml/Dash/Previews/PreviewActionCombo.qml:34
116#: qml/Dash/Previews/PreviewActionCombo.qml:34
117msgid "More..."
117msgid "More..."
118−msgstr ""
118+msgstr "Mais..."
119
119
120#: qml/Dash/Previews/PreviewActionCombo.qml:34
120#: qml/Dash/Previews/PreviewActionCombo.qml:34
121msgid "Less..."
121msgid "Less..."
122−msgstr ""
122+msgstr "Menos..."
123
123
124#: qml/Dash/Previews/PreviewRatingInput.qml:82
124#: qml/Dash/Previews/PreviewRatingInput.qml:82
125msgid "Rate this"
125msgid "Rate this"
@@ -131,7 +131,7 @@ msgstr ""
131
131
132#: qml/Dash/Previews/PreviewRatingInput.qml:168
132#: qml/Dash/Previews/PreviewRatingInput.qml:168
133msgid "Send"
133msgid "Send"
134−msgstr ""
134+msgstr "Enviar"
135
135
136#: qml/Greeter/Greeter.qml:157
136#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
137msgid "Swipe to unlock"
@@ -139,11 +139,11 @@ msgstr ""
139
139
140#: qml/Hud/HudParametrizedActionsPage.qml:132
140#: qml/Hud/HudParametrizedActionsPage.qml:132
141msgid "Confirm"
141msgid "Confirm"
142−msgstr ""
142+msgstr "Confirmar"
143
143
144#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
144#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
145msgid "Type or say a command"
145msgid "Type or say a command"
146−msgstr ""
146+msgstr "Digite ou diga um comando"
147
147
148#: qml/Hud/Hud.qml:84
148#: qml/Hud/Hud.qml:84
149msgid "Loading. Please Wait..."
149msgid "Loading. Please Wait..."
@@ -151,11 +151,11 @@ msgstr ""
151
151
152#: qml/Hud/Hud.qml:89
152#: qml/Hud/Hud.qml:89
153msgid "Speak Now..."
153msgid "Speak Now..."
154−msgstr ""
154+msgstr "Fale agora..."
155
155
156#: qml/Hud/Hud.qml:94
156#: qml/Hud/Hud.qml:94
157msgid "Speaking..."
157msgid "Speaking..."
158−msgstr ""
158+msgstr "A falar..."
159
159
160#: qml/Notifications/NotificationMenuItemFactory.qml:91
160#: qml/Notifications/NotificationMenuItemFactory.qml:91
161msgid "Show password"
161msgid "Show password"
@@ -163,7 +163,7 @@ msgstr ""
163
163
164#: qml/Notifications/NotificationMenuItemFactory.qml:103
164#: qml/Notifications/NotificationMenuItemFactory.qml:103
165msgid "Please enter SIM PIN"
165msgid "Please enter SIM PIN"
166−msgstr ""
166+msgstr "Por favor insira o PIN"
167
167
168#: qml/Panel/Indicators/MenuItemFactory.qml:583
168#: qml/Panel/Indicators/MenuItemFactory.qml:583
169msgid "In queue…"
169msgid "In queue…"
@@ -175,11 +175,11 @@ msgstr ""
175
175
176#: qml/Panel/Indicators/MenuItemFactory.qml:589
176#: qml/Panel/Indicators/MenuItemFactory.qml:589
177msgid "Paused, tap to resume"
177msgid "Paused, tap to resume"
178−msgstr ""
178+msgstr "Parado, toque para continuar"
179
179
180#: qml/Panel/Indicators/MenuItemFactory.qml:591
180#: qml/Panel/Indicators/MenuItemFactory.qml:591
181msgid "Canceled"
181msgid "Canceled"
182−msgstr ""
182+msgstr "Cancelado"
183
183
184#: qml/Panel/Indicators/MenuItemFactory.qml:593
184#: qml/Panel/Indicators/MenuItemFactory.qml:593
185msgid "Finished"
185msgid "Finished"
po/pt_BR.po+1−1
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-17 06:38+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-18 05:28+0000\n"
18"X-Generator: Launchpad (build 17114)\n"
18"X-Generator: Launchpad (build 17114)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
qml/Panel/Indicators.qml+1
@@ -264,6 +264,7 @@ Showable {
264 indicators.calculateCurrentItem(touchX, false);
264 indicators.calculateCurrentItem(touchX, false);
265 } else {
265 } else {
266 indicators.state = "commit";
266 indicators.state = "commit";
267+ indicatorRow.currentItemOffset = 0;
267 }
268 }
268 }
269 }
269
270
qml/Panel/Indicators/MenuItemFactory.qml−6
@@ -140,7 +140,6 @@ Item {
140
140
141 onTriggered: {
141 onTriggered: {
142 menuModel.activate(menuIndex);
142 menuModel.activate(menuIndex);
143− shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
144 }
143 }
145 }
144 }
146 }
145 }
@@ -186,7 +185,6 @@ Item {
186
185
187 onTriggered: {
186 onTriggered: {
188 menuModel.activate(menuIndex);
187 menuModel.activate(menuIndex);
189− shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
190 }
188 }
191 }
189 }
192 }
190 }
@@ -205,7 +203,6 @@ Item {
205
203
206 onTriggered: {
204 onTriggered: {
207 menuModel.activate(menuIndex);
205 menuModel.activate(menuIndex);
208− shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
209 }
206 }
210 }
207 }
211 }
208 }
@@ -226,7 +223,6 @@ Item {
226
223
227 onTriggered: {
224 onTriggered: {
228 menuModel.activate(menuIndex);
225 menuModel.activate(menuIndex);
229− shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
230 }
226 }
231 }
227 }
232 }
228 }
@@ -367,7 +363,6 @@ Item {
367 }
363 }
368 onTriggered: {
364 onTriggered: {
369 menuModel.activate(menuIndex);
365 menuModel.activate(menuIndex);
370− shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
371 }
366 }
372
367
373 function loadAttributes() {
368 function loadAttributes() {
@@ -412,7 +407,6 @@ Item {
412 }
407 }
413 onClicked: {
408 onClicked: {
414 menuModel.activate(menuIndex, true);
409 menuModel.activate(menuIndex, true);
415− shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
416 }
410 }
417 onDismissed: {
411 onDismissed: {
418 menuModel.activate(menuIndex, false);
412 menuModel.activate(menuIndex, false);
qml/Panel/Indicators/MessageMenuItemFactory.qml−3
@@ -95,7 +95,6 @@ Item {
95
95
96 onAppActivated: {
96 onAppActivated: {
97 menuModel.activate(menuIndex, true);
97 menuModel.activate(menuIndex, true);
98− shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
99 }
98 }
100 onDismissed: {
99 onDismissed: {
101 menuModel.activate(menuIndex, false);
100 menuModel.activate(menuIndex, false);
@@ -144,7 +143,6 @@ Item {
144
143
145 onAppActivated: {
144 onAppActivated: {
146 menuModel.activate(menuIndex, true);
145 menuModel.activate(menuIndex, true);
147− shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
148 }
146 }
149 onDismissed: {
147 onDismissed: {
150 menuModel.activate(menuIndex, false);
148 menuModel.activate(menuIndex, false);
@@ -204,7 +202,6 @@ Item {
204
202
205 onAppActivated: {
203 onAppActivated: {
206 menuModel.activate(menuIndex, true);
204 menuModel.activate(menuIndex, true);
207− shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
208 }
205 }
209 onDismissed: {
206 onDismissed: {
210 menuModel.activate(menuIndex, false);
207 menuModel.activate(menuIndex, false);
qml/Panel/Panel.qml−22
@@ -27,28 +27,6 @@ Item {
27 property alias callHint: __callHint
27 property alias callHint: __callHint
28 property bool fullscreenMode: false
28 property bool fullscreenMode: false
29
29
30− function hideIndicatorMenu(delay) {
31− if (delay !== undefined) {
32− hideTimer.interval = delay;
33− hideTimer.start();
34− } else {
35− indicators.hide();
36− }
37− }
38−
39− Timer {
40− id: hideTimer
41− running: false
42− onTriggered: {
43− indicators.hide();
44− }
45− }
46−
47− Connections {
48− target: indicators
49− onShownChanged: hideTimer.stop()
50− }
51−
52 Rectangle {
30 Rectangle {
53 id: darkenedArea
31 id: darkenedArea
54 property real darkenedOpacity: 0.6
32 property real darkenedOpacity: 0.6
qml/Shell.qml−4
@@ -639,10 +639,6 @@ Item {
639 stages.hide()
639 stages.hide()
640 }
640 }
641
641
642− function hideIndicatorMenu(delay) {
643− panel.hideIndicatorMenu(delay);
644− }
645−
646 Item {
642 Item {
647 id: overlay
643 id: overlay
648 z: 10
644 z: 10
tests/qmltests/Panel/tst_Panel.qml−14
@@ -333,19 +333,5 @@ Item {
333
333
334 compare(indicatorRow.currentItem, indicatorItemFirst, "First indicator should still be the current item");
334 compare(indicatorRow.currentItem, indicatorItemFirst, "First indicator should still be the current item");
335 }
335 }
336−
337− function test_hideIndicatorMenu_data() {
338− return [ {tag: "no-delay", delay: undefined },
339− {tag: "delayed", delay: 200 }
340− ];
341− }
342−
343− function test_hideIndicatorMenu(data) {
344− panel.indicators.show();
345− compare(panel.indicators.shown, true);
346−
347− panel.hideIndicatorMenu(data.delay);
348− tryCompare(panel.indicators, "shown", false);
349− }
350 }
336 }
351}
337}