Merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master-3.29.92 into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
- Git
- lp:~3v1n0/ubuntu/+source/gnome-shell
- ubuntu/master-3.29.92
- Merge into ubuntu/master
Proposed by
Marco Trevisan (Treviño)
Status: | Merged |
---|---|
Merged at revision: | 4f6c773df0f7eb1027ab0bfe9d951467849353aa |
Proposed branch: | ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master-3.29.92 |
Merge into: | ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master |
Diff against target: |
24308 lines (+5301/-4892) 97 files modified
NEWS (+34/-0) data/gnome-shell-osk-layouts.gresource.xml (+1/-0) data/gnome-shell-overrides-migration.desktop.in (+1/-1) data/org.gnome.shell.gschema.xml.in (+1/-1) data/osk-layouts/in+mal.json (+559/-0) debian/changelog (+108/-0) debian/control (+34/-23) debian/control.in (+34/-23) debian/gnome-shell-common.install (+0/-1) debian/patches/js-main-Throw-error-if-no-valid-default-stylesheet-is-fou.patch (+1/-1) debian/patches/optional-hot-corner.patch (+4/-4) debian/patches/series (+5/-16) debian/patches/sessionMode-add-support-for-debugFlags-parameter.patch (+1/-1) debian/patches/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch (+6/-69) debian/patches/st-scroll-view-Remove-scrollbars-references-on-dispose.patch (+1/-1) debian/patches/ubuntu/desktop_detect.patch (+2/-2) debian/patches/ubuntu/lightdm-user-switching.patch (+4/-4) dev/null (+0/-158) docs/reference/shell/meson.build (+1/-2) docs/reference/st/meson.build (+1/-2) js/extensionPrefs/main.js (+10/-9) js/gdm/fingerprint.js (+8/-7) js/gdm/oVirt.js (+7/-7) js/gdm/realmd.js (+51/-48) js/js-resources.gresource.xml (+0/-4) js/meson.build (+14/-0) js/misc/gnomeSession.js (+47/-44) js/misc/inputMethod.js (+21/-4) js/misc/loginManager.js (+50/-47) js/misc/modemManager.js (+53/-48) js/misc/objectManager.js (+16/-15) js/misc/permissionStore.js (+25/-24) js/misc/smartcardManager.js (+9/-8) js/misc/systemActions.js (+6/-5) js/portal-resources.gresource.xml (+7/-0) js/portalHelper/main.js (+20/-19) js/prefs-resources.gresource.xml (+11/-0) js/ui/accessDialog.js (+23/-21) js/ui/appDisplay.js (+6/-5) js/ui/audioDeviceSelection.js (+13/-12) js/ui/boxpointer.js (+1/-0) js/ui/calendar.js (+13/-12) js/ui/components/autorunManager.js (+9/-8) js/ui/components/networkAgent.js (+6/-2) js/ui/dash.js (+1/-0) js/ui/dialog.js (+1/-0) js/ui/endSessionDialog.js (+47/-43) js/ui/keyboard.js (+6/-12) js/ui/layout.js (+1/-0) js/ui/magnifierDBus.js (+82/-80) js/ui/mpris.js (+34/-31) js/ui/notificationDaemon.js (+72/-68) js/ui/overview.js (+2/-4) js/ui/overviewControls.js (+17/-2) js/ui/padOsd.js (+9/-8) js/ui/panel.js (+5/-1) js/ui/remoteSearch.js (+49/-47) js/ui/runDialog.js (+8/-10) js/ui/screencast.js (+24/-23) js/ui/screenshot.js (+45/-44) js/ui/scripting.js (+14/-13) js/ui/shellDBus.js (+114/-107) js/ui/shellMountOperation.js (+33/-32) js/ui/status/bluetooth.js (+8/-7) js/ui/status/brightness.js (+6/-5) js/ui/status/location.js (+22/-20) js/ui/status/network.js (+20/-19) js/ui/status/nightLight.js (+7/-6) js/ui/status/power.js (+12/-11) js/ui/status/rfkill.js (+8/-7) js/ui/status/thunderbolt.js (+36/-34) js/ui/viewSelector.js (+2/-2) js/ui/windowManager.js (+16/-15) js/ui/workspace.js (+28/-52) js/ui/workspaceThumbnail.js (+6/-18) meson.build (+3/-3) po/ca.po (+119/-111) po/cs.po (+445/-555) po/de.po (+234/-226) po/en_GB.po (+238/-282) po/fr.po (+119/-112) po/fur.po (+120/-112) po/id.po (+84/-76) po/it.po (+349/-385) po/kk.po (+233/-225) po/ko.po (+142/-173) po/lt.po (+138/-133) po/pl.po (+232/-224) po/pt_BR.po (+334/-369) po/ro.po (+124/-116) po/sl.po (+84/-76) po/tr.po (+245/-236) po/zh_TW.po (+78/-70) src/gnome-shell-extension-prefs.c (+0/-3) src/gnome-shell-portal-helper.c (+0/-3) src/meson.build (+9/-12) src/st/st-entry.c (+12/-11) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Didier Roche-Tolomelli | Approve | ||
Review via email: mp+354045@code.launchpad.net |
This proposal supersedes a proposal from 2018-08-27.
Commit message
Description of the change
Merged with debian 3.29.92-1 and some cleanups and patch refresh.
To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote : Posted in a previous version of this proposal | # |
review:
Needs Fixing
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote : Posted in a previous version of this proposal | # |
> See my comment for the dep, the rest looks good to me :)
Ack, good catch... Sorry, the merge made me loose track of it.
Thanks (and fixed)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote : | # |
LGTM now! Thanks for fixing the dep :)
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/NEWS b/NEWS | |||
2 | index fb971a6..a279db2 100644 | |||
3 | --- a/NEWS | |||
4 | +++ b/NEWS | |||
5 | @@ -1,3 +1,37 @@ | |||
6 | 1 | 3.29.92 | ||
7 | 2 | ======= | ||
8 | 3 | * Choose some actors to cache on the GPU [Daniel; #792633] | ||
9 | 4 | * inputMethod: Hide preedit text if requested [Takao; #431] | ||
10 | 5 | * Fix forced fallback app-menus on wayland [Jonas; #276] | ||
11 | 6 | |||
12 | 7 | Contributors: | ||
13 | 8 | Jonas Ådahl, Takao Fujiwara, Mohammed Sadiq, Marco Trevisan (Treviño), | ||
14 | 9 | Daniel van Vugt | ||
15 | 10 | |||
16 | 11 | Translators: | ||
17 | 12 | Baurzhan Muftakhidinov [kk], Kukuh Syafaat [id], Milo Casagrande [it], | ||
18 | 13 | Changwoo Ryu [ko], Marek Cernocky [cs] | ||
19 | 14 | |||
20 | 15 | 3.29.91 | ||
21 | 16 | ======= | ||
22 | 17 | * Fix handling of 0/false options in ShowOSD D-Bus API [Florian; #791669] | ||
23 | 18 | * overview: Fix handling of confirmation dialogs on wayland [verdre; !180] | ||
24 | 19 | * Avoid some full relayout/redraws [Carlos; !197] | ||
25 | 20 | * Keep workspace switcher slid out when workspaces are in use [Florian; !161] | ||
26 | 21 | * Ignore auto-repeat for some keybindings [Andrea; #373] | ||
27 | 22 | * Misc. bug fixes [Carlos, Florian, Pascal; #464, !189, !191, !192, !162] | ||
28 | 23 | |||
29 | 24 | Contributors: | ||
30 | 25 | Andrea Azzarone, Olivier Blin, Carlos Garnacho, Florian Müllner, | ||
31 | 26 | Pascal Nowack, verdre | ||
32 | 27 | |||
33 | 28 | Translators: | ||
34 | 29 | Bruno Lopes da Silva [pt_BR], Matej Urban�i� [sl], Piotr Drąg [pl], | ||
35 | 30 | Aurimas Černius [lt], Emin Tufan Çetin [tr], Fabio Tomat [fur], | ||
36 | 31 | Alexandre Franke [fr], Yi-Jyun Pan [zh_TW], Bernd Homuth [de], | ||
37 | 32 | Andre Klapper [cs], Jordi Mas [ca], Daniel Șerbănescu [ro], | ||
38 | 33 | Bruce Cowan [en_GB] | ||
39 | 34 | |||
40 | 1 | 3.29.90 | 35 | 3.29.90 |
41 | 2 | ======= | 36 | ======= |
42 | 3 | * Add remote access indication on wayland [Jonas; !160] | 37 | * Add remote access indication on wayland [Jonas; !160] |
43 | diff --git a/data/gnome-shell-osk-layouts.gresource.xml b/data/gnome-shell-osk-layouts.gresource.xml | |||
44 | index 86d6cb9..b7969c7 100644 | |||
45 | --- a/data/gnome-shell-osk-layouts.gresource.xml | |||
46 | +++ b/data/gnome-shell-osk-layouts.gresource.xml | |||
47 | @@ -22,6 +22,7 @@ | |||
48 | 22 | <file>id.json</file> | 22 | <file>id.json</file> |
49 | 23 | <file>il.json</file> | 23 | <file>il.json</file> |
50 | 24 | <file>in+bolnagri.json</file> | 24 | <file>in+bolnagri.json</file> |
51 | 25 | <file>in+mal.json</file> | ||
52 | 25 | <file>ir.json</file> | 26 | <file>ir.json</file> |
53 | 26 | <file>is.json</file> | 27 | <file>is.json</file> |
54 | 27 | <file>it.json</file> | 28 | <file>it.json</file> |
55 | diff --git a/data/gnome-shell-overrides-migration.desktop.in b/data/gnome-shell-overrides-migration.desktop.in | |||
56 | index 8ef86ac..99452e6 100644 | |||
57 | --- a/data/gnome-shell-overrides-migration.desktop.in | |||
58 | +++ b/data/gnome-shell-overrides-migration.desktop.in | |||
59 | @@ -1,5 +1,5 @@ | |||
60 | 1 | [Desktop Entry] | 1 | [Desktop Entry] |
61 | 2 | Type=Application | 2 | Type=Application |
62 | 3 | Name=GNOME settings overrides migration | 3 | Name=GNOME settings overrides migration |
64 | 4 | NoDisplay=True | 4 | NoDisplay=true |
65 | 5 | Exec=@libexecdir@/gnome-shell-overrides-migration.sh | 5 | Exec=@libexecdir@/gnome-shell-overrides-migration.sh |
66 | diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in | |||
67 | index 4ec01a4..a7251cd 100644 | |||
68 | --- a/data/org.gnome.shell.gschema.xml.in | |||
69 | +++ b/data/org.gnome.shell.gschema.xml.in | |||
70 | @@ -190,7 +190,7 @@ | |||
71 | 190 | </key> | 190 | </key> |
72 | 191 | </schema> | 191 | </schema> |
73 | 192 | 192 | ||
75 | 193 | <!-- unused, change 00_org.gnome.shell.gschema.override instead --!> | 193 | <!-- unused, change 00_org.gnome.shell.gschema.override instead --> |
76 | 194 | <schema id="org.gnome.shell.overrides" path="/org/gnome/shell/overrides/" | 194 | <schema id="org.gnome.shell.overrides" path="/org/gnome/shell/overrides/" |
77 | 195 | gettext-domain="@GETTEXT_PACKAGE@"> | 195 | gettext-domain="@GETTEXT_PACKAGE@"> |
78 | 196 | <key name="attach-modal-dialogs" type="b"> | 196 | <key name="attach-modal-dialogs" type="b"> |
79 | diff --git a/data/osk-layouts/in+mal.json b/data/osk-layouts/in+mal.json | |||
80 | 197 | new file mode 100644 | 197 | new file mode 100644 |
81 | index 0000000..bc153be | |||
82 | --- /dev/null | |||
83 | +++ b/data/osk-layouts/in+mal.json | |||
84 | @@ -0,0 +1,559 @@ | |||
85 | 1 | { | ||
86 | 2 | "levels": [ | ||
87 | 3 | { | ||
88 | 4 | "level": "", | ||
89 | 5 | "mode": "default", | ||
90 | 6 | "rows": [ | ||
91 | 7 | [ | ||
92 | 8 | [ | ||
93 | 9 | "െ" | ||
94 | 10 | ], | ||
95 | 11 | [ | ||
96 | 12 | "ൌ" | ||
97 | 13 | ], | ||
98 | 14 | [ | ||
99 | 15 | "ൈ" | ||
100 | 16 | ], | ||
101 | 17 | [ | ||
102 | 18 | "à´¾" | ||
103 | 19 | ], | ||
104 | 20 | [ | ||
105 | 21 | "ീ" | ||
106 | 22 | ], | ||
107 | 23 | [ | ||
108 | 24 | "ൂ" | ||
109 | 25 | ], | ||
110 | 26 | [ | ||
111 | 27 | "à´¬" | ||
112 | 28 | ], | ||
113 | 29 | [ | ||
114 | 30 | "à´¹" | ||
115 | 31 | ], | ||
116 | 32 | [ | ||
117 | 33 | "à´—" | ||
118 | 34 | ], | ||
119 | 35 | [ | ||
120 | 36 | "à´¦" | ||
121 | 37 | ], | ||
122 | 38 | [ | ||
123 | 39 | "ജ" | ||
124 | 40 | ], | ||
125 | 41 | [ | ||
126 | 42 | "à´¡" | ||
127 | 43 | ], | ||
128 | 44 | [ | ||
129 | 45 | "�" | ||
130 | 46 | ] | ||
131 | 47 | ], | ||
132 | 48 | [ | ||
133 | 49 | [ | ||
134 | 50 | "ോ" | ||
135 | 51 | ], | ||
136 | 52 | [ | ||
137 | 53 | "േ" | ||
138 | 54 | ], | ||
139 | 55 | [ | ||
140 | 56 | "�" | ||
141 | 57 | ], | ||
142 | 58 | [ | ||
143 | 59 | "à´¿" | ||
144 | 60 | ], | ||
145 | 61 | [ | ||
146 | 62 | "�" | ||
147 | 63 | ], | ||
148 | 64 | [ | ||
149 | 65 | "à´ª" | ||
150 | 66 | ], | ||
151 | 67 | [ | ||
152 | 68 | "à´°" | ||
153 | 69 | ], | ||
154 | 70 | [ | ||
155 | 71 | "à´•" | ||
156 | 72 | ], | ||
157 | 73 | [ | ||
158 | 74 | "à´¤" | ||
159 | 75 | ], | ||
160 | 76 | [ | ||
161 | 77 | "à´š" | ||
162 | 78 | ], | ||
163 | 79 | [ | ||
164 | 80 | "à´Ÿ" | ||
165 | 81 | ] | ||
166 | 82 | ], | ||
167 | 83 | [ | ||
168 | 84 | [ | ||
169 | 85 | "െ" | ||
170 | 86 | ], | ||
171 | 87 | [ | ||
172 | 88 | "à´‚" | ||
173 | 89 | ], | ||
174 | 90 | [ | ||
175 | 91 | "à´®", | ||
176 | 92 | "ç" | ||
177 | 93 | ], | ||
178 | 94 | [ | ||
179 | 95 | "à´¨" | ||
180 | 96 | ], | ||
181 | 97 | [ | ||
182 | 98 | "à´µ" | ||
183 | 99 | ], | ||
184 | 100 | [ | ||
185 | 101 | "à´²", | ||
186 | 102 | "ñ" | ||
187 | 103 | ], | ||
188 | 104 | [ | ||
189 | 105 | "à´¸" | ||
190 | 106 | ], | ||
191 | 107 | [ | ||
192 | 108 | "à´·" | ||
193 | 109 | ], | ||
194 | 110 | [ | ||
195 | 111 | "à´¯" | ||
196 | 112 | ] | ||
197 | 113 | ], | ||
198 | 114 | [ | ||
199 | 115 | [ | ||
200 | 116 | "," | ||
201 | 117 | ], | ||
202 | 118 | [ | ||
203 | 119 | " " | ||
204 | 120 | ], | ||
205 | 121 | [ | ||
206 | 122 | ".", | ||
207 | 123 | "#", | ||
208 | 124 | "!", | ||
209 | 125 | ",", | ||
210 | 126 | "?", | ||
211 | 127 | "-", | ||
212 | 128 | ":", | ||
213 | 129 | "'", | ||
214 | 130 | "@" | ||
215 | 131 | ] | ||
216 | 132 | ] | ||
217 | 133 | ] | ||
218 | 134 | }, | ||
219 | 135 | { | ||
220 | 136 | "level": "shift", | ||
221 | 137 | "mode": "latched", | ||
222 | 138 | "rows": [ | ||
223 | 139 | [ | ||
224 | 140 | [ | ||
225 | 141 | "à´”" | ||
226 | 142 | ], | ||
227 | 143 | [ | ||
228 | 144 | "à´�" | ||
229 | 145 | ], | ||
230 | 146 | [ | ||
231 | 147 | "à´†" | ||
232 | 148 | ], | ||
233 | 149 | [ | ||
234 | 150 | "à´ˆ" | ||
235 | 151 | ], | ||
236 | 152 | [ | ||
237 | 153 | "à´Š" | ||
238 | 154 | ], | ||
239 | 155 | [ | ||
240 | 156 | "à´" | ||
241 | 157 | ], | ||
242 | 158 | [ | ||
243 | 159 | "à´™" | ||
244 | 160 | ], | ||
245 | 161 | [ | ||
246 | 162 | "à´˜" | ||
247 | 163 | ], | ||
248 | 164 | [ | ||
249 | 165 | "à´§" | ||
250 | 166 | ], | ||
251 | 167 | [ | ||
252 | 168 | "à´�" | ||
253 | 169 | ], | ||
254 | 170 | [ | ||
255 | 171 | "à´¢" | ||
256 | 172 | ], | ||
257 | 173 | [ | ||
258 | 174 | "à´ž" | ||
259 | 175 | ] | ||
260 | 176 | ], | ||
261 | 177 | [ | ||
262 | 178 | [ | ||
263 | 179 | "à´“" | ||
264 | 180 | ], | ||
265 | 181 | [ | ||
266 | 182 | "à´�" | ||
267 | 183 | ], | ||
268 | 184 | [ | ||
269 | 185 | "à´…" | ||
270 | 186 | ], | ||
271 | 187 | [ | ||
272 | 188 | "à´‡" | ||
273 | 189 | ], | ||
274 | 190 | [ | ||
275 | 191 | "à´‰" | ||
276 | 192 | ], | ||
277 | 193 | [ | ||
278 | 194 | "à´«" | ||
279 | 195 | ], | ||
280 | 196 | [ | ||
281 | 197 | "à´±" | ||
282 | 198 | ], | ||
283 | 199 | [ | ||
284 | 200 | "à´–" | ||
285 | 201 | ], | ||
286 | 202 | [ | ||
287 | 203 | "à´¥" | ||
288 | 204 | ], | ||
289 | 205 | [ | ||
290 | 206 | "à´›" | ||
291 | 207 | ], | ||
292 | 208 | [ | ||
293 | 209 | "à´ " | ||
294 | 210 | ] | ||
295 | 211 | ], | ||
296 | 212 | [ | ||
297 | 213 | [ | ||
298 | 214 | "à´Ž" | ||
299 | 215 | ], | ||
300 | 216 | [ | ||
301 | 217 | "​" | ||
302 | 218 | ], | ||
303 | 219 | [ | ||
304 | 220 | "à´£" | ||
305 | 221 | ], | ||
306 | 222 | [ | ||
307 | 223 | "à´¨" | ||
308 | 224 | ], | ||
309 | 225 | [ | ||
310 | 226 | "à´´" | ||
311 | 227 | ], | ||
312 | 228 | [ | ||
313 | 229 | "à´³" | ||
314 | 230 | ], | ||
315 | 231 | [ | ||
316 | 232 | "à´¶" | ||
317 | 233 | ], | ||
318 | 234 | [ | ||
319 | 235 | "à´·" | ||
320 | 236 | ], | ||
321 | 237 | [ | ||
322 | 238 | "à´¯" | ||
323 | 239 | ] | ||
324 | 240 | ], | ||
325 | 241 | [ | ||
326 | 242 | [ | ||
327 | 243 | "," | ||
328 | 244 | ], | ||
329 | 245 | [ | ||
330 | 246 | " " | ||
331 | 247 | ], | ||
332 | 248 | [ | ||
333 | 249 | ".", | ||
334 | 250 | "#", | ||
335 | 251 | "!", | ||
336 | 252 | ",", | ||
337 | 253 | "?", | ||
338 | 254 | "-", | ||
339 | 255 | ":", | ||
340 | 256 | "'", | ||
341 | 257 | "@" | ||
342 | 258 | ] | ||
343 | 259 | ] | ||
344 | 260 | ] | ||
345 | 261 | }, | ||
346 | 262 | { | ||
347 | 263 | "level": "opt", | ||
348 | 264 | "mode": "locked", | ||
349 | 265 | "rows": [ | ||
350 | 266 | [ | ||
351 | 267 | [ | ||
352 | 268 | "൧", | ||
353 | 269 | "1", | ||
354 | 270 | "¹", | ||
355 | 271 | "½", | ||
356 | 272 | "â…“", | ||
357 | 273 | "¼", | ||
358 | 274 | "â…›" | ||
359 | 275 | ], | ||
360 | 276 | [ | ||
361 | 277 | "൨", | ||
362 | 278 | "2", | ||
363 | 279 | "²", | ||
364 | 280 | "â…”" | ||
365 | 281 | ], | ||
366 | 282 | [ | ||
367 | 283 | "൩", | ||
368 | 284 | "3", | ||
369 | 285 | "³", | ||
370 | 286 | "¾", | ||
371 | 287 | "⅜" | ||
372 | 288 | ], | ||
373 | 289 | [ | ||
374 | 290 | "൪", | ||
375 | 291 | "4", | ||
376 | 292 | "�" | ||
377 | 293 | ], | ||
378 | 294 | [ | ||
379 | 295 | "൫", | ||
380 | 296 | "5", | ||
381 | 297 | "â…�" | ||
382 | 298 | ], | ||
383 | 299 | [ | ||
384 | 300 | "൬", | ||
385 | 301 | "6" | ||
386 | 302 | ], | ||
387 | 303 | [ | ||
388 | 304 | "àµ", | ||
389 | 305 | "7", | ||
390 | 306 | "â…ž" | ||
391 | 307 | ], | ||
392 | 308 | [ | ||
393 | 309 | "൮", | ||
394 | 310 | "8" | ||
395 | 311 | ], | ||
396 | 312 | [ | ||
397 | 313 | "൯", | ||
398 | 314 | "9" | ||
399 | 315 | ], | ||
400 | 316 | [ | ||
401 | 317 | "൦", | ||
402 | 318 | "0", | ||
403 | 319 | "�", | ||
404 | 320 | "∅" | ||
405 | 321 | ] | ||
406 | 322 | ], | ||
407 | 323 | [ | ||
408 | 324 | [ | ||
409 | 325 | "@" | ||
410 | 326 | ], | ||
411 | 327 | [ | ||
412 | 328 | "#" | ||
413 | 329 | ], | ||
414 | 330 | [ | ||
415 | 331 | "₹", | ||
416 | 332 | "$", | ||
417 | 333 | "¢", | ||
418 | 334 | "£", | ||
419 | 335 | "€", | ||
420 | 336 | "Â¥", | ||
421 | 337 | "₱" | ||
422 | 338 | ], | ||
423 | 339 | [ | ||
424 | 340 | "%", | ||
425 | 341 | "‰" | ||
426 | 342 | ], | ||
427 | 343 | [ | ||
428 | 344 | "&" | ||
429 | 345 | ], | ||
430 | 346 | [ | ||
431 | 347 | "-", | ||
432 | 348 | "_", | ||
433 | 349 | "–", | ||
434 | 350 | "—", | ||
435 | 351 | "·" | ||
436 | 352 | ], | ||
437 | 353 | [ | ||
438 | 354 | "+", | ||
439 | 355 | "±" | ||
440 | 356 | ], | ||
441 | 357 | [ | ||
442 | 358 | "(", | ||
443 | 359 | "<", | ||
444 | 360 | "{", | ||
445 | 361 | "[" | ||
446 | 362 | ], | ||
447 | 363 | [ | ||
448 | 364 | ")", | ||
449 | 365 | ">", | ||
450 | 366 | "}", | ||
451 | 367 | "]" | ||
452 | 368 | ] | ||
453 | 369 | ], | ||
454 | 370 | [ | ||
455 | 371 | [ | ||
456 | 372 | "*", | ||
457 | 373 | "†", | ||
458 | 374 | "‡", | ||
459 | 375 | "★" | ||
460 | 376 | ], | ||
461 | 377 | [ | ||
462 | 378 | "\"", | ||
463 | 379 | "“", | ||
464 | 380 | "�", | ||
465 | 381 | "«", | ||
466 | 382 | "»" | ||
467 | 383 | ], | ||
468 | 384 | [ | ||
469 | 385 | "'", | ||
470 | 386 | "‘", | ||
471 | 387 | "’", | ||
472 | 388 | "‹", | ||
473 | 389 | "›" | ||
474 | 390 | ], | ||
475 | 391 | [ | ||
476 | 392 | ":" | ||
477 | 393 | ], | ||
478 | 394 | [ | ||
479 | 395 | ";" | ||
480 | 396 | ], | ||
481 | 397 | [ | ||
482 | 398 | "!", | ||
483 | 399 | "¡" | ||
484 | 400 | ], | ||
485 | 401 | [ | ||
486 | 402 | "?", | ||
487 | 403 | "¿" | ||
488 | 404 | ] | ||
489 | 405 | ], | ||
490 | 406 | [ | ||
491 | 407 | [ | ||
492 | 408 | "_" | ||
493 | 409 | ], | ||
494 | 410 | [ | ||
495 | 411 | "/" | ||
496 | 412 | ], | ||
497 | 413 | [ | ||
498 | 414 | " " | ||
499 | 415 | ], | ||
500 | 416 | [ | ||
501 | 417 | "," | ||
502 | 418 | ], | ||
503 | 419 | [ | ||
504 | 420 | ".", | ||
505 | 421 | "…" | ||
506 | 422 | ] | ||
507 | 423 | ] | ||
508 | 424 | ] | ||
509 | 425 | }, | ||
510 | 426 | { | ||
511 | 427 | "level": "opt+shift", | ||
512 | 428 | "mode": "locked", | ||
513 | 429 | "rows": [ | ||
514 | 430 | [ | ||
515 | 431 | [ | ||
516 | 432 | "~" | ||
517 | 433 | ], | ||
518 | 434 | [ | ||
519 | 435 | "`" | ||
520 | 436 | ], | ||
521 | 437 | [ | ||
522 | 438 | "|" | ||
523 | 439 | ], | ||
524 | 440 | [ | ||
525 | 441 | "•", | ||
526 | 442 | "♪", | ||
527 | 443 | "♥", | ||
528 | 444 | "â™ ", | ||
529 | 445 | "♦", | ||
530 | 446 | "♣" | ||
531 | 447 | ], | ||
532 | 448 | [ | ||
533 | 449 | "√" | ||
534 | 450 | ], | ||
535 | 451 | [ | ||
536 | 452 | "Î ", | ||
537 | 453 | "Ï€" | ||
538 | 454 | ], | ||
539 | 455 | [ | ||
540 | 456 | "÷" | ||
541 | 457 | ], | ||
542 | 458 | [ | ||
543 | 459 | "×" | ||
544 | 460 | ], | ||
545 | 461 | [ | ||
546 | 462 | "¶", | ||
547 | 463 | "§" | ||
548 | 464 | ], | ||
549 | 465 | [ | ||
550 | 466 | "∆" | ||
551 | 467 | ] | ||
552 | 468 | ], | ||
553 | 469 | [ | ||
554 | 470 | [ | ||
555 | 471 | "£" | ||
556 | 472 | ], | ||
557 | 473 | [ | ||
558 | 474 | "¢" | ||
559 | 475 | ], | ||
560 | 476 | [ | ||
561 | 477 | "€" | ||
562 | 478 | ], | ||
563 | 479 | [ | ||
564 | 480 | "Â¥" | ||
565 | 481 | ], | ||
566 | 482 | [ | ||
567 | 483 | "^", | ||
568 | 484 | "↑", | ||
569 | 485 | "↓", | ||
570 | 486 | "�", | ||
571 | 487 | "→" | ||
572 | 488 | ], | ||
573 | 489 | [ | ||
574 | 490 | "°", | ||
575 | 491 | "′", | ||
576 | 492 | "″" | ||
577 | 493 | ], | ||
578 | 494 | [ | ||
579 | 495 | "=", | ||
580 | 496 | "≠", | ||
581 | 497 | "≈", | ||
582 | 498 | "∞" | ||
583 | 499 | ], | ||
584 | 500 | [ | ||
585 | 501 | "{" | ||
586 | 502 | ], | ||
587 | 503 | [ | ||
588 | 504 | "}" | ||
589 | 505 | ] | ||
590 | 506 | ], | ||
591 | 507 | [ | ||
592 | 508 | [ | ||
593 | 509 | "\\" | ||
594 | 510 | ], | ||
595 | 511 | [ | ||
596 | 512 | "©" | ||
597 | 513 | ], | ||
598 | 514 | [ | ||
599 | 515 | "®" | ||
600 | 516 | ], | ||
601 | 517 | [ | ||
602 | 518 | "â„¢" | ||
603 | 519 | ], | ||
604 | 520 | [ | ||
605 | 521 | "â„…" | ||
606 | 522 | ], | ||
607 | 523 | [ | ||
608 | 524 | "[" | ||
609 | 525 | ], | ||
610 | 526 | [ | ||
611 | 527 | "]" | ||
612 | 528 | ] | ||
613 | 529 | ], | ||
614 | 530 | [ | ||
615 | 531 | [ | ||
616 | 532 | "<", | ||
617 | 533 | "‹", | ||
618 | 534 | "≤", | ||
619 | 535 | "«" | ||
620 | 536 | ], | ||
621 | 537 | [ | ||
622 | 538 | ">", | ||
623 | 539 | "›", | ||
624 | 540 | "≥", | ||
625 | 541 | "»" | ||
626 | 542 | ], | ||
627 | 543 | [ | ||
628 | 544 | " " | ||
629 | 545 | ], | ||
630 | 546 | [ | ||
631 | 547 | "," | ||
632 | 548 | ], | ||
633 | 549 | [ | ||
634 | 550 | ".", | ||
635 | 551 | "…" | ||
636 | 552 | ] | ||
637 | 553 | ] | ||
638 | 554 | ] | ||
639 | 555 | } | ||
640 | 556 | ], | ||
641 | 557 | "locale": "ml", | ||
642 | 558 | "name": "Malayalam" | ||
643 | 559 | } | ||
644 | diff --git a/debian/changelog b/debian/changelog | |||
645 | index 4e24541..6fbc804 100644 | |||
646 | --- a/debian/changelog | |||
647 | +++ b/debian/changelog | |||
648 | @@ -1,3 +1,111 @@ | |||
649 | 1 | gnome-shell (3.29.92-1ubuntu1) UNRELEASED; urgency=medium | ||
650 | 2 | |||
651 | 3 | * Merge with debian, remaining changes: | ||
652 | 4 | + Replace gnome-backgrounds dep with ubuntu-wallpapers and Suggests | ||
653 | 5 | gnome-themes-standard-data, gnome-backgrounds | ||
654 | 6 | + Add some Recommends: | ||
655 | 7 | - ubuntu-session (| gnome-session) to have the ubuntu session available | ||
656 | 8 | - xserver-xorg-legacy | ||
657 | 9 | - yaru-theme-gnome-shell for the default ubuntu theming | ||
658 | 10 | + Update debian/gbp.conf with Ubuntu settings | ||
659 | 11 | + gnome-shell-common.install: Install Ubuntu mode | ||
660 | 12 | + gnome-shell-common.prerm: Remove deprecated ubuntu theme alternative | ||
661 | 13 | + ubuntu/desktop_detect.patch: | ||
662 | 14 | - add caching for desktop detection to avoid querying the current | ||
663 | 15 | desktop env variable as iterate through the list each time. For the | ||
664 | 16 | time of the Shell process, we can expect this env variable to stay | ||
665 | 17 | stable. | ||
666 | 18 | + ubuntu/smarter_alt_tab.patch: | ||
667 | 19 | - quick alt-tab (without showing up the switcher) switch only between | ||
668 | 20 | the last window of the last 2 applications to be focused instead of | ||
669 | 21 | raising all windows of those apps. | ||
670 | 22 | + ubuntu/lightdm-user-switching.patch: | ||
671 | 23 | - Allow user switching when using LightDM. | ||
672 | 24 | + ubuntu/lock_on_suspend.patch | ||
673 | 25 | - Respect Ubuntu's lock-on-suspend setting. | ||
674 | 26 | + ubuntu/gdm.patch | ||
675 | 27 | - as gdm is system-wide and not session-wide, ensure gdm has an ubuntu | ||
676 | 28 | styling by default, not impacting the gnome user session though. | ||
677 | 29 | + ubuntu/background_login.patch | ||
678 | 30 | - Change default background color as we modified the default GDM color | ||
679 | 31 | for our ubuntu session. Change it as well here, still applying the | ||
680 | 32 | background noise loading. | ||
681 | 33 | + ubuntu/gdm_alternatives.patch | ||
682 | 34 | - Add support for GDM3 theme alternatives | ||
683 | 35 | + ubuntu/block_mode_extension_update.patch | ||
684 | 36 | - Don't allow ubuntu mode extension to update | ||
685 | 37 | + optional-hot-corner.patch | ||
686 | 38 | - enable patch proposed by upstream developer already in package (but | ||
687 | 39 | not in series) to add a settings for optional hot corner activation. | ||
688 | 40 | + volume-Add-back-sound-feedback-on-scroll.patch | ||
689 | 41 | - Fix regression causing missing feedback on volume slider scroll | ||
690 | 42 | + st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch | ||
691 | 43 | - Fix possible crash on cache loading | ||
692 | 44 | + js-ui-Choose-some-actors-to-cache-on-the-GPU.patch | ||
693 | 45 | - Improve rendering of shell elements moving rendering to GPU | ||
694 | 46 | + main-show-an-error-message-on-gnome-shell-crash.patch, | ||
695 | 47 | global-make-possible-to-set-debug-flags-dynamically.patch, | ||
696 | 48 | main-increase-the-granularity-of-backtraces-in-SHELL_DEBU.patch, | ||
697 | 49 | main-add-backtrace-crashes-all-and-backtrace-all.patch, | ||
698 | 50 | sessionMode-add-support-for-debugFlags-parameter.patch: | ||
699 | 51 | - Improve debug JS tracing for crash reports | ||
700 | 52 | + st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch, | ||
701 | 53 | st-scroll-view-Remove-scrollbars-references-on-dispose.patch: | ||
702 | 54 | - Fix crash on theme changes | ||
703 | 55 | + js-main-Throw-error-if-no-valid-default-stylesheet-is-fou.patch: | ||
704 | 56 | - Show errors if no stylesheet is found | ||
705 | 57 | + debian/rules: | ||
706 | 58 | - Run dh_translations and work around an issue with Rosetta and plural | ||
707 | 59 | translations | ||
708 | 60 | - Run dh_install with --fail-missing | ||
709 | 61 | * Refresh patches | ||
710 | 62 | * d/p/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch: | ||
711 | 63 | - Updated as per upstream review | ||
712 | 64 | * d/p/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch: | ||
713 | 65 | - Removed (applied upstream) | ||
714 | 66 | |||
715 | 67 | -- Marco Trevisan (Treviño) <marco@ubuntu.com> Thu, 30 Aug 2018 09:08:20 -0500 | ||
716 | 68 | |||
717 | 69 | gnome-shell (3.29.92-1) experimental; urgency=medium | ||
718 | 70 | |||
719 | 71 | * Team upload | ||
720 | 72 | |||
721 | 73 | [ Marco Trevisan (Treviño) ] | ||
722 | 74 | * New upstream development release | ||
723 | 75 | * Build-depend on mutter 3.29.92 | ||
724 | 76 | |||
725 | 77 | [ Simon McVittie ] | ||
726 | 78 | * Standards-Version: 4.2.1 (no changes required) | ||
727 | 79 | * Add Breaks on older versions of extensions that needed updates for | ||
728 | 80 | this Shell version | ||
729 | 81 | - gnome-shell-extension-autohidetopbar (#905111) | ||
730 | 82 | - gnome-shell-extension-caffeine (#905108) | ||
731 | 83 | - gnome-shell-extension-dashtodock (#905106) | ||
732 | 84 | - gnome-shell-extension-top-icons-plus (#905115) | ||
733 | 85 | * Add Breaks on extensions that still need updates for this version, | ||
734 | 86 | using versions that assume they will be fixed in their next NMU or MU | ||
735 | 87 | - gnome-shell-extension-dash-to-panel (#905110) | ||
736 | 88 | - gnome-shell-extension-multi-monitors (#905114) | ||
737 | 89 | - gnome-shell-extension-pixelsaver (#905109) | ||
738 | 90 | - gnome-shell-extension-taskbar (#905113) | ||
739 | 91 | - gnome-shell-extension-workspaces-to-dock (#905112) | ||
740 | 92 | - gnome-shell-pomodoro (#905107) | ||
741 | 93 | |||
742 | 94 | -- Simon McVittie <smcv@debian.org> Thu, 30 Aug 2018 09:20:35 +0100 | ||
743 | 95 | |||
744 | 96 | gnome-shell (3.29.91-1) experimental; urgency=medium | ||
745 | 97 | |||
746 | 98 | * Team upload | ||
747 | 99 | * New upstream development release | ||
748 | 100 | * Build-depend on mutter 3.29.91 | ||
749 | 101 | * Build-depend on Meson 0.47.0 | ||
750 | 102 | * Rebase patch series, dropping patches that were applied upstream | ||
751 | 103 | * Normalize package lists with wrap-and-sort -ab | ||
752 | 104 | * d/gnome-shell-common.install: Remove commented-out entry | ||
753 | 105 | * Standards-Version: 4.2.0 (no changes required) | ||
754 | 106 | |||
755 | 107 | -- Simon McVittie <smcv@debian.org> Mon, 20 Aug 2018 21:32:20 +0100 | ||
756 | 108 | |||
757 | 1 | gnome-shell (3.29.90-2ubuntu1) cosmic; urgency=medium | 109 | gnome-shell (3.29.90-2ubuntu1) cosmic; urgency=medium |
758 | 2 | 110 | ||
759 | 3 | * Merge with debian, remaining changes | 111 | * Merge with debian, remaining changes |
760 | diff --git a/debian/control b/debian/control | |||
761 | index 9e7f7c0..526848b 100644 | |||
762 | --- a/debian/control | |||
763 | +++ b/debian/control | |||
764 | @@ -9,6 +9,11 @@ Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> | |||
765 | 9 | XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> | 9 | XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> |
766 | 10 | Uploaders: Iain Lane <laney@debian.org>, Jeremy Bicha <jbicha@debian.org>, Michael Biebl <biebl@debian.org> | 10 | Uploaders: Iain Lane <laney@debian.org>, Jeremy Bicha <jbicha@debian.org>, Michael Biebl <biebl@debian.org> |
767 | 11 | Build-Depends: debhelper (>= 11.1.3), | 11 | Build-Depends: debhelper (>= 11.1.3), |
768 | 12 | gir1.2-accountsservice-1.0 <!nocheck>, | ||
769 | 13 | gir1.2-gdm-1.0 (>= 3.18.2) <!nocheck>, | ||
770 | 14 | gir1.2-geoclue-2.0 <!nocheck>, | ||
771 | 15 | gir1.2-gweather-3.0 (>= 3.25.91) <!nocheck>, | ||
772 | 16 | gir1.2-rsvg-2.0 <!nocheck>, | ||
773 | 12 | gnome-control-center-dev (>= 1:3.4), | 17 | gnome-control-center-dev (>= 1:3.4), |
774 | 13 | gnome-pkg-tools (>= 0.11), | 18 | gnome-pkg-tools (>= 0.11), |
775 | 14 | gobject-introspection (>= 1.49.1), | 19 | gobject-introspection (>= 1.49.1), |
776 | @@ -24,6 +29,7 @@ Build-Depends: debhelper (>= 11.1.3), | |||
777 | 24 | libgcr-3-dev (>= 3.7.5), | 29 | libgcr-3-dev (>= 3.7.5), |
778 | 25 | libgirepository1.0-dev (>= 1.29.15), | 30 | libgirepository1.0-dev (>= 1.29.15), |
779 | 26 | libgjs-dev (>= 1.50.2-3~), | 31 | libgjs-dev (>= 1.50.2-3~), |
780 | 32 | libgl1-mesa-dri <!nocheck>, | ||
781 | 27 | libglib2.0-dev (>= 2.57.2), | 33 | libglib2.0-dev (>= 2.57.2), |
782 | 28 | libgnome-bluetooth-dev (>= 3.9.0) [linux-any], | 34 | libgnome-bluetooth-dev (>= 3.9.0) [linux-any], |
783 | 29 | libgnome-desktop-3-dev (>= 3.27.90), | 35 | libgnome-desktop-3-dev (>= 3.27.90), |
784 | @@ -31,7 +37,7 @@ Build-Depends: debhelper (>= 11.1.3), | |||
785 | 31 | libgstreamer1.0-dev (>= 0.11.92), | 37 | libgstreamer1.0-dev (>= 0.11.92), |
786 | 32 | libgtk-3-dev (>= 3.21.6), | 38 | libgtk-3-dev (>= 3.21.6), |
787 | 33 | libibus-1.0-dev, | 39 | libibus-1.0-dev, |
789 | 34 | libmutter-3-dev (>= 3.29.90), | 40 | libmutter-3-dev (>= 3.29.92), |
790 | 35 | libnm-dev (>= 1.10.4) [linux-any], | 41 | libnm-dev (>= 1.10.4) [linux-any], |
791 | 36 | libpolkit-agent-1-dev (>= 0.100), | 42 | libpolkit-agent-1-dev (>= 0.100), |
792 | 37 | libpulse-dev (>= 2.0), | 43 | libpulse-dev (>= 2.0), |
793 | @@ -42,19 +48,13 @@ Build-Depends: debhelper (>= 11.1.3), | |||
794 | 42 | libxfixes-dev, | 48 | libxfixes-dev, |
795 | 43 | libxml2-dev, | 49 | libxml2-dev, |
796 | 44 | mesa-common-dev, | 50 | mesa-common-dev, |
798 | 45 | meson (>= 0.42), | 51 | meson (>= 0.47.0), |
799 | 46 | pkg-config (>= 0.22), | 52 | pkg-config (>= 0.22), |
800 | 47 | sassc, | 53 | sassc, |
801 | 48 | gir1.2-accountsservice-1.0 <!nocheck>, | ||
802 | 49 | gir1.2-gdm-1.0 (>= 3.18.2) <!nocheck>, | ||
803 | 50 | gir1.2-geoclue-2.0 <!nocheck>, | ||
804 | 51 | gir1.2-gweather-3.0 (>= 3.25.91) <!nocheck>, | ||
805 | 52 | gir1.2-rsvg-2.0 <!nocheck>, | ||
806 | 53 | libgl1-mesa-dri <!nocheck>, | ||
807 | 54 | xauth <!nocheck>, | 54 | xauth <!nocheck>, |
808 | 55 | xvfb <!nocheck> | 55 | xvfb <!nocheck> |
809 | 56 | Rules-Requires-Root: no | 56 | Rules-Requires-Root: no |
811 | 57 | Standards-Version: 4.1.5 | 57 | Standards-Version: 4.2.1 |
812 | 58 | Homepage: https://wiki.gnome.org/Projects/GnomeShell | 58 | Homepage: https://wiki.gnome.org/Projects/GnomeShell |
813 | 59 | XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell | 59 | XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell |
814 | 60 | XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell.git -b debian/experimental | 60 | XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell.git -b debian/experimental |
815 | @@ -63,24 +63,21 @@ Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-shel | |||
816 | 63 | 63 | ||
817 | 64 | Package: gnome-shell | 64 | Package: gnome-shell |
818 | 65 | Architecture: linux-any | 65 | Architecture: linux-any |
824 | 66 | Depends: ${gir:Depends}, | 66 | Depends: evolution-data-server (>= 3.17.2), |
820 | 67 | ${misc:Depends}, | ||
821 | 68 | ${shlibs:Depends}, | ||
822 | 69 | evolution-data-server (>= 3.17.2), | ||
823 | 70 | gir1.2-gdm-1.0 (>= 3.18.2), | ||
825 | 71 | gir1.2-accountsservice-1.0, | 67 | gir1.2-accountsservice-1.0, |
826 | 72 | gir1.2-atspi-2.0 (>= 2.9.91), | 68 | gir1.2-atspi-2.0 (>= 2.9.91), |
827 | 73 | gir1.2-freedesktop, | 69 | gir1.2-freedesktop, |
828 | 70 | gir1.2-gcr-3 (>= 3.7.5), | ||
829 | 74 | gir1.2-gdesktopenums-3.0 (>= 3.12), | 71 | gir1.2-gdesktopenums-3.0 (>= 3.12), |
830 | 72 | gir1.2-gdm-1.0 (>= 3.18.2), | ||
831 | 75 | gir1.2-geoclue-2.0, | 73 | gir1.2-geoclue-2.0, |
832 | 76 | gir1.2-gcr-3 (>= 3.7.5), | ||
833 | 77 | gir1.2-glib-2.0 (>= 1.56.0), | 74 | gir1.2-glib-2.0 (>= 1.56.0), |
834 | 78 | gir1.2-gnomebluetooth-1.0 (>= 3.12.0) [linux-any], | 75 | gir1.2-gnomebluetooth-1.0 (>= 3.12.0) [linux-any], |
835 | 79 | gir1.2-gnomedesktop-3.0 (>= 3.27.90), | 76 | gir1.2-gnomedesktop-3.0 (>= 3.27.90), |
836 | 80 | gir1.2-gtk-3.0 (>= 3.16), | 77 | gir1.2-gtk-3.0 (>= 3.16), |
837 | 81 | gir1.2-gweather-3.0 (>= 3.25.91), | 78 | gir1.2-gweather-3.0 (>= 3.25.91), |
838 | 82 | gir1.2-ibus-1.0 (>= 1.5.2), | 79 | gir1.2-ibus-1.0 (>= 1.5.2), |
840 | 83 | gir1.2-mutter-3 (>= 3.29.90), | 80 | gir1.2-mutter-3 (>= 3.29.92), |
841 | 84 | gir1.2-nm-1.0 [linux-any], | 81 | gir1.2-nm-1.0 [linux-any], |
842 | 85 | gir1.2-nma-1.0 [linux-any], | 82 | gir1.2-nma-1.0 [linux-any], |
843 | 86 | gir1.2-pango-1.0, | 83 | gir1.2-pango-1.0, |
844 | @@ -93,14 +90,17 @@ Depends: ${gir:Depends}, | |||
845 | 93 | gnome-shell-common (= ${source:Version}), | 90 | gnome-shell-common (= ${source:Version}), |
846 | 94 | ubuntu-wallpapers, | 91 | ubuntu-wallpapers, |
847 | 95 | gsettings-desktop-schemas (>= 3.27.90), | 92 | gsettings-desktop-schemas (>= 3.27.90), |
848 | 96 | mutter (>= 3.29.90), | ||
849 | 97 | python3, | ||
850 | 98 | libglib2.0-bin (>= 2.53.0), | 93 | libglib2.0-bin (>= 2.53.0), |
851 | 94 | mutter (>= 3.29.92), | ||
852 | 95 | python3, | ||
853 | 96 | ${gir:Depends}, | ||
854 | 97 | ${misc:Depends}, | ||
855 | 98 | ${shlibs:Depends} | ||
856 | 99 | Recommends: bolt (>= 0.3), | 99 | Recommends: bolt (>= 0.3), |
857 | 100 | gdm3 (>= 3.10.0.1-3~), | ||
858 | 100 | gkbd-capplet, | 101 | gkbd-capplet, |
859 | 101 | gnome-control-center (>= 1:3.25.2), | 102 | gnome-control-center (>= 1:3.25.2), |
860 | 102 | gnome-user-docs, | 103 | gnome-user-docs, |
861 | 103 | gdm3 (>= 3.10.0.1-3~), | ||
862 | 104 | iio-sensor-proxy, | 104 | iio-sensor-proxy, |
863 | 105 | switcheroo-control, | 105 | switcheroo-control, |
864 | 106 | ubuntu-session | gnome-session, | 106 | ubuntu-session | gnome-session, |
865 | @@ -113,10 +113,21 @@ Suggests: chrome-gnome-shell, | |||
866 | 113 | gir1.2-telepathylogger-0.2 (>= 0.8.0) | 113 | gir1.2-telepathylogger-0.2 (>= 0.8.0) |
867 | 114 | Breaks: gdm3 (<< 3.19.92), | 114 | Breaks: gdm3 (<< 3.19.92), |
868 | 115 | gnome-session (<< 3.19), | 115 | gnome-session (<< 3.19), |
869 | 116 | gnome-shell-extension-autohidetopbar (<< 20180511-2~), | ||
870 | 117 | gnome-shell-extension-caffeine (<< 0~git20171229-3~), | ||
871 | 118 | gnome-shell-extension-dash-to-panel (<< 15-1.1~), | ||
872 | 119 | gnome-shell-extension-dashtodock (<< 64), | ||
873 | 120 | gnome-shell-extension-multi-monitors (<< 0.00~git20171014.1.df5d6e4-1.1~), | ||
874 | 121 | gnome-shell-extension-pixelsaver (<< 1.10+git20161217-49f47bf-1.1~), | ||
875 | 122 | gnome-shell-extension-taskbar (<< 57.0-2.1~), | ||
876 | 123 | gnome-shell-extension-top-icons-plus (<< 21-4~), | ||
877 | 116 | gnome-shell-extension-ubuntu-dock (<< 63ubuntu1), | 124 | gnome-shell-extension-ubuntu-dock (<< 63ubuntu1), |
879 | 117 | yaru-theme (<< 18.10.1) | 125 | gnome-shell-extension-workspaces-to-dock (<< 45-1.1~), |
880 | 126 | gnome-shell-pomodoro (<< 0.13.4-2.1~), | ||
881 | 127 | yaru-theme (<< 18.10.1), | ||
882 | 118 | Conflicts: gnome-screensaver (<< 3.6) | 128 | Conflicts: gnome-screensaver (<< 3.6) |
884 | 119 | Provides: notification-daemon, polkit-1-auth-agent | 129 | Provides: notification-daemon, |
885 | 130 | polkit-1-auth-agent | ||
886 | 120 | Description: graphical shell for the GNOME desktop | 131 | Description: graphical shell for the GNOME desktop |
887 | 121 | The GNOME Shell provides core interface functions like switching | 132 | The GNOME Shell provides core interface functions like switching |
888 | 122 | windows, launching applications or see your notifications. It takes | 133 | windows, launching applications or see your notifications. It takes |
889 | @@ -129,7 +140,7 @@ Package: gnome-shell-common | |||
890 | 129 | Architecture: all | 140 | Architecture: all |
891 | 130 | Depends: ${misc:Depends} | 141 | Depends: ${misc:Depends} |
892 | 131 | Recommends: yaru-theme-gnome-shell | 142 | Recommends: yaru-theme-gnome-shell |
895 | 132 | Breaks: gnome-tweak-tool (<< 3.21.91), | 143 | Breaks: gnome-calendar (<< 3.21.4), |
896 | 133 | gnome-calendar (<< 3.21.4) | 144 | gnome-tweak-tool (<< 3.21.91) |
897 | 134 | Description: common files for the GNOME graphical shell | 145 | Description: common files for the GNOME graphical shell |
898 | 135 | This package contains translations and data files for the GNOME shell. | 146 | This package contains translations and data files for the GNOME shell. |
899 | diff --git a/debian/control.in b/debian/control.in | |||
900 | index 6d5740c..b8ed60e 100644 | |||
901 | --- a/debian/control.in | |||
902 | +++ b/debian/control.in | |||
903 | @@ -5,6 +5,11 @@ Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> | |||
904 | 5 | XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> | 5 | XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> |
905 | 6 | Uploaders: @GNOME_TEAM@ | 6 | Uploaders: @GNOME_TEAM@ |
906 | 7 | Build-Depends: debhelper (>= 11.1.3), | 7 | Build-Depends: debhelper (>= 11.1.3), |
907 | 8 | gir1.2-accountsservice-1.0 <!nocheck>, | ||
908 | 9 | gir1.2-gdm-1.0 (>= 3.18.2) <!nocheck>, | ||
909 | 10 | gir1.2-geoclue-2.0 <!nocheck>, | ||
910 | 11 | gir1.2-gweather-3.0 (>= 3.25.91) <!nocheck>, | ||
911 | 12 | gir1.2-rsvg-2.0 <!nocheck>, | ||
912 | 8 | gnome-control-center-dev (>= 1:3.4), | 13 | gnome-control-center-dev (>= 1:3.4), |
913 | 9 | gnome-pkg-tools (>= 0.11), | 14 | gnome-pkg-tools (>= 0.11), |
914 | 10 | gobject-introspection (>= 1.49.1), | 15 | gobject-introspection (>= 1.49.1), |
915 | @@ -20,6 +25,7 @@ Build-Depends: debhelper (>= 11.1.3), | |||
916 | 20 | libgcr-3-dev (>= 3.7.5), | 25 | libgcr-3-dev (>= 3.7.5), |
917 | 21 | libgirepository1.0-dev (>= 1.29.15), | 26 | libgirepository1.0-dev (>= 1.29.15), |
918 | 22 | libgjs-dev (>= 1.50.2-3~), | 27 | libgjs-dev (>= 1.50.2-3~), |
919 | 28 | libgl1-mesa-dri <!nocheck>, | ||
920 | 23 | libglib2.0-dev (>= 2.57.2), | 29 | libglib2.0-dev (>= 2.57.2), |
921 | 24 | libgnome-bluetooth-dev (>= 3.9.0) [linux-any], | 30 | libgnome-bluetooth-dev (>= 3.9.0) [linux-any], |
922 | 25 | libgnome-desktop-3-dev (>= 3.27.90), | 31 | libgnome-desktop-3-dev (>= 3.27.90), |
923 | @@ -27,7 +33,7 @@ Build-Depends: debhelper (>= 11.1.3), | |||
924 | 27 | libgstreamer1.0-dev (>= 0.11.92), | 33 | libgstreamer1.0-dev (>= 0.11.92), |
925 | 28 | libgtk-3-dev (>= 3.21.6), | 34 | libgtk-3-dev (>= 3.21.6), |
926 | 29 | libibus-1.0-dev, | 35 | libibus-1.0-dev, |
928 | 30 | libmutter-3-dev (>= 3.29.90), | 36 | libmutter-3-dev (>= 3.29.92), |
929 | 31 | libnm-dev (>= 1.10.4) [linux-any], | 37 | libnm-dev (>= 1.10.4) [linux-any], |
930 | 32 | libpolkit-agent-1-dev (>= 0.100), | 38 | libpolkit-agent-1-dev (>= 0.100), |
931 | 33 | libpulse-dev (>= 2.0), | 39 | libpulse-dev (>= 2.0), |
932 | @@ -38,19 +44,13 @@ Build-Depends: debhelper (>= 11.1.3), | |||
933 | 38 | libxfixes-dev, | 44 | libxfixes-dev, |
934 | 39 | libxml2-dev, | 45 | libxml2-dev, |
935 | 40 | mesa-common-dev, | 46 | mesa-common-dev, |
937 | 41 | meson (>= 0.42), | 47 | meson (>= 0.47.0), |
938 | 42 | pkg-config (>= 0.22), | 48 | pkg-config (>= 0.22), |
939 | 43 | sassc, | 49 | sassc, |
940 | 44 | gir1.2-accountsservice-1.0 <!nocheck>, | ||
941 | 45 | gir1.2-gdm-1.0 (>= 3.18.2) <!nocheck>, | ||
942 | 46 | gir1.2-geoclue-2.0 <!nocheck>, | ||
943 | 47 | gir1.2-gweather-3.0 (>= 3.25.91) <!nocheck>, | ||
944 | 48 | gir1.2-rsvg-2.0 <!nocheck>, | ||
945 | 49 | libgl1-mesa-dri <!nocheck>, | ||
946 | 50 | xauth <!nocheck>, | 50 | xauth <!nocheck>, |
947 | 51 | xvfb <!nocheck> | 51 | xvfb <!nocheck> |
948 | 52 | Rules-Requires-Root: no | 52 | Rules-Requires-Root: no |
950 | 53 | Standards-Version: 4.1.5 | 53 | Standards-Version: 4.2.1 |
951 | 54 | Homepage: https://wiki.gnome.org/Projects/GnomeShell | 54 | Homepage: https://wiki.gnome.org/Projects/GnomeShell |
952 | 55 | XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell | 55 | XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell |
953 | 56 | XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell.git -b debian/experimental | 56 | XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell.git -b debian/experimental |
954 | @@ -59,24 +59,21 @@ Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-shel | |||
955 | 59 | 59 | ||
956 | 60 | Package: gnome-shell | 60 | Package: gnome-shell |
957 | 61 | Architecture: linux-any | 61 | Architecture: linux-any |
963 | 62 | Depends: ${gir:Depends}, | 62 | Depends: evolution-data-server (>= 3.17.2), |
959 | 63 | ${misc:Depends}, | ||
960 | 64 | ${shlibs:Depends}, | ||
961 | 65 | evolution-data-server (>= 3.17.2), | ||
962 | 66 | gir1.2-gdm-1.0 (>= 3.18.2), | ||
964 | 67 | gir1.2-accountsservice-1.0, | 63 | gir1.2-accountsservice-1.0, |
965 | 68 | gir1.2-atspi-2.0 (>= 2.9.91), | 64 | gir1.2-atspi-2.0 (>= 2.9.91), |
966 | 69 | gir1.2-freedesktop, | 65 | gir1.2-freedesktop, |
967 | 66 | gir1.2-gcr-3 (>= 3.7.5), | ||
968 | 70 | gir1.2-gdesktopenums-3.0 (>= 3.12), | 67 | gir1.2-gdesktopenums-3.0 (>= 3.12), |
969 | 68 | gir1.2-gdm-1.0 (>= 3.18.2), | ||
970 | 71 | gir1.2-geoclue-2.0, | 69 | gir1.2-geoclue-2.0, |
971 | 72 | gir1.2-gcr-3 (>= 3.7.5), | ||
972 | 73 | gir1.2-glib-2.0 (>= 1.56.0), | 70 | gir1.2-glib-2.0 (>= 1.56.0), |
973 | 74 | gir1.2-gnomebluetooth-1.0 (>= 3.12.0) [linux-any], | 71 | gir1.2-gnomebluetooth-1.0 (>= 3.12.0) [linux-any], |
974 | 75 | gir1.2-gnomedesktop-3.0 (>= 3.27.90), | 72 | gir1.2-gnomedesktop-3.0 (>= 3.27.90), |
975 | 76 | gir1.2-gtk-3.0 (>= 3.16), | 73 | gir1.2-gtk-3.0 (>= 3.16), |
976 | 77 | gir1.2-gweather-3.0 (>= 3.25.91), | 74 | gir1.2-gweather-3.0 (>= 3.25.91), |
977 | 78 | gir1.2-ibus-1.0 (>= 1.5.2), | 75 | gir1.2-ibus-1.0 (>= 1.5.2), |
979 | 79 | gir1.2-mutter-3 (>= 3.29.90), | 76 | gir1.2-mutter-3 (>= 3.29.92), |
980 | 80 | gir1.2-nm-1.0 [linux-any], | 77 | gir1.2-nm-1.0 [linux-any], |
981 | 81 | gir1.2-nma-1.0 [linux-any], | 78 | gir1.2-nma-1.0 [linux-any], |
982 | 82 | gir1.2-pango-1.0, | 79 | gir1.2-pango-1.0, |
983 | @@ -89,14 +86,17 @@ Depends: ${gir:Depends}, | |||
984 | 89 | gnome-shell-common (= ${source:Version}), | 86 | gnome-shell-common (= ${source:Version}), |
985 | 90 | ubuntu-wallpapers, | 87 | ubuntu-wallpapers, |
986 | 91 | gsettings-desktop-schemas (>= 3.27.90), | 88 | gsettings-desktop-schemas (>= 3.27.90), |
987 | 92 | mutter (>= 3.29.90), | ||
988 | 93 | python3, | ||
989 | 94 | libglib2.0-bin (>= 2.53.0), | 89 | libglib2.0-bin (>= 2.53.0), |
990 | 90 | mutter (>= 3.29.92), | ||
991 | 91 | python3, | ||
992 | 92 | ${gir:Depends}, | ||
993 | 93 | ${misc:Depends}, | ||
994 | 94 | ${shlibs:Depends} | ||
995 | 95 | Recommends: bolt (>= 0.3), | 95 | Recommends: bolt (>= 0.3), |
996 | 96 | gdm3 (>= 3.10.0.1-3~), | ||
997 | 96 | gkbd-capplet, | 97 | gkbd-capplet, |
998 | 97 | gnome-control-center (>= 1:3.25.2), | 98 | gnome-control-center (>= 1:3.25.2), |
999 | 98 | gnome-user-docs, | 99 | gnome-user-docs, |
1000 | 99 | gdm3 (>= 3.10.0.1-3~), | ||
1001 | 100 | iio-sensor-proxy, | 100 | iio-sensor-proxy, |
1002 | 101 | switcheroo-control, | 101 | switcheroo-control, |
1003 | 102 | ubuntu-session | gnome-session, | 102 | ubuntu-session | gnome-session, |
1004 | @@ -109,10 +109,21 @@ Suggests: chrome-gnome-shell, | |||
1005 | 109 | gir1.2-telepathylogger-0.2 (>= 0.8.0) | 109 | gir1.2-telepathylogger-0.2 (>= 0.8.0) |
1006 | 110 | Breaks: gdm3 (<< 3.19.92), | 110 | Breaks: gdm3 (<< 3.19.92), |
1007 | 111 | gnome-session (<< 3.19), | 111 | gnome-session (<< 3.19), |
1008 | 112 | gnome-shell-extension-autohidetopbar (<< 20180511-2~), | ||
1009 | 113 | gnome-shell-extension-caffeine (<< 0~git20171229-3~), | ||
1010 | 114 | gnome-shell-extension-dash-to-panel (<< 15-1.1~), | ||
1011 | 115 | gnome-shell-extension-dashtodock (<< 64), | ||
1012 | 116 | gnome-shell-extension-multi-monitors (<< 0.00~git20171014.1.df5d6e4-1.1~), | ||
1013 | 117 | gnome-shell-extension-pixelsaver (<< 1.10+git20161217-49f47bf-1.1~), | ||
1014 | 118 | gnome-shell-extension-taskbar (<< 57.0-2.1~), | ||
1015 | 119 | gnome-shell-extension-top-icons-plus (<< 21-4~), | ||
1016 | 112 | gnome-shell-extension-ubuntu-dock (<< 63ubuntu1), | 120 | gnome-shell-extension-ubuntu-dock (<< 63ubuntu1), |
1018 | 113 | yaru-theme (<< 18.10.1) | 121 | gnome-shell-extension-workspaces-to-dock (<< 45-1.1~), |
1019 | 122 | gnome-shell-pomodoro (<< 0.13.4-2.1~), | ||
1020 | 123 | yaru-theme (<< 18.10.1), | ||
1021 | 114 | Conflicts: gnome-screensaver (<< 3.6) | 124 | Conflicts: gnome-screensaver (<< 3.6) |
1023 | 115 | Provides: notification-daemon, polkit-1-auth-agent | 125 | Provides: notification-daemon, |
1024 | 126 | polkit-1-auth-agent | ||
1025 | 116 | Description: graphical shell for the GNOME desktop | 127 | Description: graphical shell for the GNOME desktop |
1026 | 117 | The GNOME Shell provides core interface functions like switching | 128 | The GNOME Shell provides core interface functions like switching |
1027 | 118 | windows, launching applications or see your notifications. It takes | 129 | windows, launching applications or see your notifications. It takes |
1028 | @@ -125,7 +136,7 @@ Package: gnome-shell-common | |||
1029 | 125 | Architecture: all | 136 | Architecture: all |
1030 | 126 | Depends: ${misc:Depends} | 137 | Depends: ${misc:Depends} |
1031 | 127 | Recommends: yaru-theme-gnome-shell | 138 | Recommends: yaru-theme-gnome-shell |
1034 | 128 | Breaks: gnome-tweak-tool (<< 3.21.91), | 139 | Breaks: gnome-calendar (<< 3.21.4), |
1035 | 129 | gnome-calendar (<< 3.21.4) | 140 | gnome-tweak-tool (<< 3.21.91) |
1036 | 130 | Description: common files for the GNOME graphical shell | 141 | Description: common files for the GNOME graphical shell |
1037 | 131 | This package contains translations and data files for the GNOME shell. | 142 | This package contains translations and data files for the GNOME shell. |
1038 | diff --git a/debian/gnome-shell-common.install b/debian/gnome-shell-common.install | |||
1039 | index 9d0117e..29e682c 100644 | |||
1040 | --- a/debian/gnome-shell-common.install | |||
1041 | +++ b/debian/gnome-shell-common.install | |||
1042 | @@ -4,7 +4,6 @@ usr/share/GConf | |||
1043 | 4 | usr/share/glib-2.0 | 4 | usr/share/glib-2.0 |
1044 | 5 | usr/share/gnome-control-center | 5 | usr/share/gnome-control-center |
1045 | 6 | usr/share/gnome-shell | 6 | usr/share/gnome-shell |
1046 | 7 | #usr/share/gtk-doc | ||
1047 | 8 | usr/share/locale | 7 | usr/share/locale |
1048 | 9 | debian/ubuntu-session-mods/ubuntu.json usr/share/gnome-shell/modes/ | 8 | debian/ubuntu-session-mods/ubuntu.json usr/share/gnome-shell/modes/ |
1049 | 10 | # install upstream theme for gdm if vanilla gnome theme is selected | 9 | # install upstream theme for gdm if vanilla gnome theme is selected |
1050 | diff --git a/debian/patches/Update-Brazilian-Portuguese-translation.patch b/debian/patches/Update-Brazilian-Portuguese-translation.patch | |||
1051 | 11 | deleted file mode 100644 | 10 | deleted file mode 100644 |
1052 | index 8f0015a..0000000 | |||
1053 | --- a/debian/patches/Update-Brazilian-Portuguese-translation.patch | |||
1054 | +++ /dev/null | |||
1055 | @@ -1,1190 +0,0 @@ | |||
1056 | 1 | From: Bruno Lopes da Silva <brunolopesbldsb@gmail.com> | ||
1057 | 2 | Date: Wed, 1 Aug 2018 10:15:51 +0000 | ||
1058 | 3 | Subject: Update Brazilian Portuguese translation | ||
1059 | 4 | |||
1060 | 5 | Origin: upstream, 3.29.91, commit:eeda54f24d4f14aabedb1a2febbcee2a54db7a5d | ||
1061 | 6 | --- | ||
1062 | 7 | po/pt_BR.po | 703 +++++++++++++++++++++++++++++------------------------------- | ||
1063 | 8 | 1 file changed, 334 insertions(+), 369 deletions(-) | ||
1064 | 9 | |||
1065 | 10 | diff --git a/po/pt_BR.po b/po/pt_BR.po | ||
1066 | 11 | index 4895ab9..5bb28a1 100644 | ||
1067 | 12 | --- a/po/pt_BR.po | ||
1068 | 13 | +++ b/po/pt_BR.po | ||
1069 | 14 | @@ -17,20 +17,21 @@ | ||
1070 | 15 | # Artur de Aquino Morais <artur.morais93@outlook.com>, 2016. | ||
1071 | 16 | # Rafael Fontenelle <rafaelff@gnome.org>, 2013-2018. | ||
1072 | 17 | # Enrico Nicoletto <liverig@gmail.com>, 2013-2018. | ||
1073 | 18 | +# Bruno Lopes da Silva <brunolopesbldsb@gmail.com>, 2018. | ||
1074 | 19 | msgid "" | ||
1075 | 20 | msgstr "" | ||
1076 | 21 | "Project-Id-Version: gnome-shell\n" | ||
1077 | 22 | "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n" | ||
1078 | 23 | -"POT-Creation-Date: 2018-04-13 18:31+0000\n" | ||
1079 | 24 | -"PO-Revision-Date: 2018-05-02 15:45-0200\n" | ||
1080 | 25 | -"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n" | ||
1081 | 26 | +"POT-Creation-Date: 2018-07-31 18:38+0000\n" | ||
1082 | 27 | +"PO-Revision-Date: 2018-08-01 06:56-0300\n" | ||
1083 | 28 | +"Last-Translator: Bruno Lopes da Silva <brunolopesbldsb@gmail.com>\n" | ||
1084 | 29 | "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n" | ||
1085 | 30 | "Language: pt_BR\n" | ||
1086 | 31 | "MIME-Version: 1.0\n" | ||
1087 | 32 | "Content-Type: text/plain; charset=UTF-8\n" | ||
1088 | 33 | "Content-Transfer-Encoding: 8bit\n" | ||
1089 | 34 | "Plural-Forms: nplurals=2; plural=(n > 1);\n" | ||
1090 | 35 | -"X-Generator: Virtaal 1.0.0-beta1\n" | ||
1091 | 36 | +"X-Generator: Virtaal 0.7.1\n" | ||
1092 | 37 | "X-Project-Style: gnome\n" | ||
1093 | 38 | |||
1094 | 39 | #: data/50-gnome-shell-system.xml:6 | ||
1095 | 40 | @@ -74,273 +75,6 @@ msgstr "GNOME Shell" | ||
1096 | 41 | msgid "Window management and application launching" | ||
1097 | 42 | msgstr "Gerenciamento de janelas e lançador de aplicativos" | ||
1098 | 43 | |||
1099 | 44 | -#: data/org.gnome.shell.gschema.xml.in:6 | ||
1100 | 45 | -msgid "Enable internal tools useful for developers and testers from Alt-F2" | ||
1101 | 46 | -msgstr "" | ||
1102 | 47 | -"Habilitar ferramentas internas úteis para desenvolvedores e testadores a " | ||
1103 | 48 | -"partir do Alt-F2" | ||
1104 | 49 | - | ||
1105 | 50 | -#: data/org.gnome.shell.gschema.xml.in:9 | ||
1106 | 51 | -msgid "" | ||
1107 | 52 | -"Allows access to internal debugging and monitoring tools using the Alt-F2 " | ||
1108 | 53 | -"dialog." | ||
1109 | 54 | -msgstr "" | ||
1110 | 55 | -"Permite acesso a ferramentas internas de depuração e monitoramento usando o " | ||
1111 | 56 | -"diálogo Alt-F2." | ||
1112 | 57 | - | ||
1113 | 58 | -#: data/org.gnome.shell.gschema.xml.in:16 | ||
1114 | 59 | -msgid "UUIDs of extensions to enable" | ||
1115 | 60 | -msgstr "UUIDs das extensões para habilitar" | ||
1116 | 61 | - | ||
1117 | 62 | -#: data/org.gnome.shell.gschema.xml.in:17 | ||
1118 | 63 | -msgid "" | ||
1119 | 64 | -"GNOME Shell extensions have a UUID property; this key lists extensions which " | ||
1120 | 65 | -"should be loaded. Any extension that wants to be loaded needs to be in this " | ||
1121 | 66 | -"list. You can also manipulate this list with the EnableExtension and " | ||
1122 | 67 | -"DisableExtension D-Bus methods on org.gnome.Shell." | ||
1123 | 68 | -msgstr "" | ||
1124 | 69 | -"As extensões do GNOME Shell possuem uma propriedade UUID; esta chave lista " | ||
1125 | 70 | -"as extensões que devem ser carregadas. Qualquer extensão que quiser ser " | ||
1126 | 71 | -"carregada precisa estar nesta lista. Você também pode manipular esta lista " | ||
1127 | 72 | -"com os métodos do DBus EnableExtension e DisableExtensions em org.gnome." | ||
1128 | 73 | -"Shell." | ||
1129 | 74 | - | ||
1130 | 75 | -#: data/org.gnome.shell.gschema.xml.in:26 | ||
1131 | 76 | -msgid "Disable user extensions" | ||
1132 | 77 | -msgstr "Desabilitar extensões do usuário" | ||
1133 | 78 | - | ||
1134 | 79 | -#: data/org.gnome.shell.gschema.xml.in:27 | ||
1135 | 80 | -msgid "" | ||
1136 | 81 | -"Disable all extensions the user has enabled without affecting the “enabled-" | ||
1137 | 82 | -"extension� setting." | ||
1138 | 83 | -msgstr "" | ||
1139 | 84 | -"Desabilita todas as extensões que o usuário habilitou sem afetar a definição " | ||
1140 | 85 | -"de “enabled-extension�." | ||
1141 | 86 | - | ||
1142 | 87 | -#: data/org.gnome.shell.gschema.xml.in:34 | ||
1143 | 88 | -msgid "Disables the validation of extension version compatibility" | ||
1144 | 89 | -msgstr "Desabilita a validação de compatibilidade da versão da extensão" | ||
1145 | 90 | - | ||
1146 | 91 | -#: data/org.gnome.shell.gschema.xml.in:35 | ||
1147 | 92 | -msgid "" | ||
1148 | 93 | -"GNOME Shell will only load extensions that claim to support the current " | ||
1149 | 94 | -"running version. Enabling this option will disable this check and try to " | ||
1150 | 95 | -"load all extensions regardless of the versions they claim to support." | ||
1151 | 96 | -msgstr "" | ||
1152 | 97 | -"O GNOME Shell somente carregará extensões que declaram possuir suporte a " | ||
1153 | 98 | -"versão atual em execução. Ao habilitar esta opção, esta verificação será " | ||
1154 | 99 | -"desabilitada e haverá tentativas de carregar todas as extensões independente " | ||
1155 | 100 | -"das versões que estas declaram suportar." | ||
1156 | 101 | - | ||
1157 | 102 | -#: data/org.gnome.shell.gschema.xml.in:43 | ||
1158 | 103 | -msgid "List of desktop file IDs for favorite applications" | ||
1159 | 104 | -msgstr "" | ||
1160 | 105 | -"Lista dos IDs de arquivo de área de trabalho para os aplicativos favoritos" | ||
1161 | 106 | - | ||
1162 | 107 | -#: data/org.gnome.shell.gschema.xml.in:44 | ||
1163 | 108 | -msgid "" | ||
1164 | 109 | -"The applications corresponding to these identifiers will be displayed in the " | ||
1165 | 110 | -"favorites area." | ||
1166 | 111 | -msgstr "" | ||
1167 | 112 | -"Os aplicativos correspondentes a estes identificadores serão exibidos na " | ||
1168 | 113 | -"área de favoritos." | ||
1169 | 114 | - | ||
1170 | 115 | -#: data/org.gnome.shell.gschema.xml.in:51 | ||
1171 | 116 | -msgid "App Picker View" | ||
1172 | 117 | -msgstr "Visualização do seletor de aplicativos" | ||
1173 | 118 | - | ||
1174 | 119 | -#: data/org.gnome.shell.gschema.xml.in:52 | ||
1175 | 120 | -msgid "Index of the currently selected view in the application picker." | ||
1176 | 121 | -msgstr "" | ||
1177 | 122 | -"�ndice da visualização atualmente selecionada no seletor de aplicativos." | ||
1178 | 123 | - | ||
1179 | 124 | -#: data/org.gnome.shell.gschema.xml.in:58 | ||
1180 | 125 | -msgid "History for command (Alt-F2) dialog" | ||
1181 | 126 | -msgstr "Histórico do diálogo de comandos (Alt-F2)" | ||
1182 | 127 | - | ||
1183 | 128 | -#. Translators: looking glass is a debugger and inspector tool, see https://wiki.gnome.org/Projects/GnomeShell/LookingGlass | ||
1184 | 129 | -#: data/org.gnome.shell.gschema.xml.in:63 | ||
1185 | 130 | -msgid "History for the looking glass dialog" | ||
1186 | 131 | -msgstr "Histórico do diálogo do shell looking glass" | ||
1187 | 132 | - | ||
1188 | 133 | -#: data/org.gnome.shell.gschema.xml.in:67 | ||
1189 | 134 | -msgid "Always show the “Log out� menu item in the user menu." | ||
1190 | 135 | -msgstr "Sempre mostrar o item de menu “Encerrar sessão� no menu de usuário." | ||
1191 | 136 | - | ||
1192 | 137 | -#: data/org.gnome.shell.gschema.xml.in:68 | ||
1193 | 138 | -msgid "" | ||
1194 | 139 | -"This key overrides the automatic hiding of the “Log out� menu item in single-" | ||
1195 | 140 | -"user, single-session situations." | ||
1196 | 141 | -msgstr "" | ||
1197 | 142 | -"Essa chave sobrescreve a ocultação automática do item de menu “Encerrar " | ||
1198 | 143 | -"sessão� quando houver somente um usuário, em situações de somente uma sessão." | ||
1199 | 144 | - | ||
1200 | 145 | -#: data/org.gnome.shell.gschema.xml.in:75 | ||
1201 | 146 | -msgid "" | ||
1202 | 147 | -"Whether to remember password for mounting encrypted or remote filesystems" | ||
1203 | 148 | -msgstr "" | ||
1204 | 149 | -"Se lembra ou não as senhas para montar sistemas de arquivos criptografados " | ||
1205 | 150 | -"ou remotos" | ||
1206 | 151 | - | ||
1207 | 152 | -#: data/org.gnome.shell.gschema.xml.in:76 | ||
1208 | 153 | -msgid "" | ||
1209 | 154 | -"The shell will request a password when an encrypted device or a remote " | ||
1210 | 155 | -"filesystem is mounted. If the password can be saved for future use a " | ||
1211 | 156 | -"“Remember Password� checkbox will be present. This key sets the default " | ||
1212 | 157 | -"state of the checkbox." | ||
1213 | 158 | -msgstr "" | ||
1214 | 159 | -"O shell irá pedir uma senha quando um dispositivo criptografado ou um " | ||
1215 | 160 | -"sistema de arquivo remoto for montado. Caso a senha possa ser salva para uso " | ||
1216 | 161 | -"posterior, a caixa de seleção “Lembrar senha� estará presente. Esta chave " | ||
1217 | 162 | -"ajusta o estado padrão da caixa de seleção." | ||
1218 | 163 | - | ||
1219 | 164 | -#: data/org.gnome.shell.gschema.xml.in:85 | ||
1220 | 165 | -msgid "" | ||
1221 | 166 | -"Whether the default Bluetooth adapter had set up devices associated to it" | ||
1222 | 167 | -msgstr "" | ||
1223 | 168 | -"Se o adaptador Bluetooth padrão configurou, ou não, dispositivos associados " | ||
1224 | 169 | -"a ele" | ||
1225 | 170 | - | ||
1226 | 171 | -#: data/org.gnome.shell.gschema.xml.in:86 | ||
1227 | 172 | -msgid "" | ||
1228 | 173 | -"The shell will only show a Bluetooth menu item if a Bluetooth adapter is " | ||
1229 | 174 | -"powered, or if there were devices set up associated with the default " | ||
1230 | 175 | -"adapter. This will be reset if the default adapter is ever seen not to have " | ||
1231 | 176 | -"devices associated to it." | ||
1232 | 177 | -msgstr "" | ||
1233 | 178 | -"O shell irá mostrar apenas um item de menu Bluetooth se um adaptador " | ||
1234 | 179 | -"Bluetooth estiver ligado ou se existirem dispositivos configurados " | ||
1235 | 180 | -"associados ao adaptador padrão. Isto será redefinido caso o adaptador padrão " | ||
1236 | 181 | -"sempre seja visto sem possuir dispositivos associados a ele." | ||
1237 | 182 | - | ||
1238 | 183 | -#: data/org.gnome.shell.gschema.xml.in:101 | ||
1239 | 184 | -msgid "Keybinding to open the application menu" | ||
1240 | 185 | -msgstr "Atalho de teclado para abrir um menu de aplicativo" | ||
1241 | 186 | - | ||
1242 | 187 | -#: data/org.gnome.shell.gschema.xml.in:102 | ||
1243 | 188 | -msgid "Keybinding to open the application menu." | ||
1244 | 189 | -msgstr "Atalho de teclado para abrir um menu de aplicativo." | ||
1245 | 190 | - | ||
1246 | 191 | -#: data/org.gnome.shell.gschema.xml.in:108 | ||
1247 | 192 | -msgid "Keybinding to open the “Show Applications� view" | ||
1248 | 193 | -msgstr "Atalho de teclado para abrir a visualização “Mostrar aplicativos�" | ||
1249 | 194 | - | ||
1250 | 195 | -#: data/org.gnome.shell.gschema.xml.in:109 | ||
1251 | 196 | -msgid "" | ||
1252 | 197 | -"Keybinding to open the “Show Applications� view of the Activities Overview." | ||
1253 | 198 | -msgstr "" | ||
1254 | 199 | -"Atalho de teclado para abrir a visualização “Mostrar aplicativos� do " | ||
1255 | 200 | -"panorama de atividades." | ||
1256 | 201 | - | ||
1257 | 202 | -#: data/org.gnome.shell.gschema.xml.in:116 | ||
1258 | 203 | -msgid "Keybinding to open the overview" | ||
1259 | 204 | -msgstr "Atalho de teclado para abrir o panorama" | ||
1260 | 205 | - | ||
1261 | 206 | -#: data/org.gnome.shell.gschema.xml.in:117 | ||
1262 | 207 | -msgid "Keybinding to open the Activities Overview." | ||
1263 | 208 | -msgstr "Atalho de teclado para abrir o panorama de atividades." | ||
1264 | 209 | - | ||
1265 | 210 | -#: data/org.gnome.shell.gschema.xml.in:123 | ||
1266 | 211 | -msgid "Keybinding to toggle the visibility of the notification list" | ||
1267 | 212 | -msgstr "Atalho de teclado para alternar a visibilidade da lista de notificação" | ||
1268 | 213 | - | ||
1269 | 214 | -#: data/org.gnome.shell.gschema.xml.in:124 | ||
1270 | 215 | -msgid "Keybinding to toggle the visibility of the notification list." | ||
1271 | 216 | -msgstr "" | ||
1272 | 217 | -"Atalho de teclado para alternar a visibilidade da lista de notificação." | ||
1273 | 218 | - | ||
1274 | 219 | -#: data/org.gnome.shell.gschema.xml.in:130 | ||
1275 | 220 | -msgid "Keybinding to focus the active notification" | ||
1276 | 221 | -msgstr "Atalho de teclado para ativar a notificação ativa" | ||
1277 | 222 | - | ||
1278 | 223 | -#: data/org.gnome.shell.gschema.xml.in:131 | ||
1279 | 224 | -msgid "Keybinding to focus the active notification." | ||
1280 | 225 | -msgstr "Atalho de teclado para ativar a notificação ativa." | ||
1281 | 226 | - | ||
1282 | 227 | -# Tween pode significar uma contração de Between ou se referir a um termo "in-between" usado em animação gráfica. -- Enrico | ||
1283 | 228 | -#: data/org.gnome.shell.gschema.xml.in:137 | ||
1284 | 229 | -msgid "" | ||
1285 | 230 | -"Keybinding that pauses and resumes all running tweens, for debugging purposes" | ||
1286 | 231 | -msgstr "" | ||
1287 | 232 | -"Atalho de teclado que pausa e continua todos os intermediários em execução, " | ||
1288 | 233 | -"a fim de depuração" | ||
1289 | 234 | - | ||
1290 | 235 | -#: data/org.gnome.shell.gschema.xml.in:146 | ||
1291 | 236 | -msgid "Which keyboard to use" | ||
1292 | 237 | -msgstr "Qual teclado usar" | ||
1293 | 238 | - | ||
1294 | 239 | -#: data/org.gnome.shell.gschema.xml.in:147 | ||
1295 | 240 | -msgid "The type of keyboard to use." | ||
1296 | 241 | -msgstr "O tipo do teclado para usar." | ||
1297 | 242 | - | ||
1298 | 243 | -#: data/org.gnome.shell.gschema.xml.in:158 | ||
1299 | 244 | -#: data/org.gnome.shell.gschema.xml.in:185 | ||
1300 | 245 | -msgid "Limit switcher to current workspace." | ||
1301 | 246 | -msgstr "Limitar o alternador ao espaço de trabalho atual." | ||
1302 | 247 | - | ||
1303 | 248 | -#: data/org.gnome.shell.gschema.xml.in:159 | ||
1304 | 249 | -msgid "" | ||
1305 | 250 | -"If true, only applications that have windows on the current workspace are " | ||
1306 | 251 | -"shown in the switcher. Otherwise, all applications are included." | ||
1307 | 252 | -msgstr "" | ||
1308 | 253 | -"Se verdadeiro, o alternador mostrará somente os aplicativos que possuem " | ||
1309 | 254 | -"janelas no espaço de trabalho atual. Caso contrário, todos os aplicativos " | ||
1310 | 255 | -"serão incluÃdos." | ||
1311 | 256 | - | ||
1312 | 257 | -#: data/org.gnome.shell.gschema.xml.in:176 | ||
1313 | 258 | -msgid "The application icon mode." | ||
1314 | 259 | -msgstr "O modo Ãcone do aplicativo." | ||
1315 | 260 | - | ||
1316 | 261 | -#: data/org.gnome.shell.gschema.xml.in:177 | ||
1317 | 262 | -msgid "" | ||
1318 | 263 | -"Configures how the windows are shown in the switcher. Valid possibilities " | ||
1319 | 264 | -"are “thumbnail-only� (shows a thumbnail of the window), “app-icon-" | ||
1320 | 265 | -"only� (shows only the application icon) or “both�." | ||
1321 | 266 | -msgstr "" | ||
1322 | 267 | -"Configura como as janelas são mostradas no alternador. As possibilidades " | ||
1323 | 268 | -"válidas são “thumbnail-only� (mostra uma miniatura da janela), “app-icon-" | ||
1324 | 269 | -"onlyâ€� (mostra apenas o Ãcone do aplicativo) ou “bothâ€�." | ||
1325 | 270 | - | ||
1326 | 271 | -#: data/org.gnome.shell.gschema.xml.in:186 | ||
1327 | 272 | -msgid "" | ||
1328 | 273 | -"If true, only windows from the current workspace are shown in the switcher. " | ||
1329 | 274 | -"Otherwise, all windows are included." | ||
1330 | 275 | -msgstr "" | ||
1331 | 276 | -"Se verdadeiro, o alternador mostrará somente as janelas do espaço de " | ||
1332 | 277 | -"trabalho atual. Caso contrário, todos as janelas serão incluÃdas." | ||
1333 | 278 | - | ||
1334 | 279 | -#: data/org.gnome.shell.gschema.xml.in:197 | ||
1335 | 280 | -msgid "Attach modal dialog to the parent window" | ||
1336 | 281 | -msgstr "Anexar diálogo modal à janela pai" | ||
1337 | 282 | - | ||
1338 | 283 | -#: data/org.gnome.shell.gschema.xml.in:198 | ||
1339 | 284 | -#: data/org.gnome.shell.gschema.xml.in:207 | ||
1340 | 285 | -#: data/org.gnome.shell.gschema.xml.in:215 | ||
1341 | 286 | -#: data/org.gnome.shell.gschema.xml.in:223 | ||
1342 | 287 | -#: data/org.gnome.shell.gschema.xml.in:231 | ||
1343 | 288 | -msgid "" | ||
1344 | 289 | -"This key overrides the key in org.gnome.mutter when running GNOME Shell." | ||
1345 | 290 | -msgstr "" | ||
1346 | 291 | -"Esta chave sobrescreve a chave em org.gnome.mutter ao executar o Shell do " | ||
1347 | 292 | -"GNOME." | ||
1348 | 293 | - | ||
1349 | 294 | -#: data/org.gnome.shell.gschema.xml.in:206 | ||
1350 | 295 | -msgid "Enable edge tiling when dropping windows on screen edges" | ||
1351 | 296 | -msgstr "" | ||
1352 | 297 | -"Habilitar contorno ladrilhado ao arrastar janelas sobre as bordas da tela" | ||
1353 | 298 | - | ||
1354 | 299 | -#: data/org.gnome.shell.gschema.xml.in:214 | ||
1355 | 300 | -msgid "Workspaces are managed dynamically" | ||
1356 | 301 | -msgstr "Espaços de trabalho são gerenciados dinamicamente" | ||
1357 | 302 | - | ||
1358 | 303 | -#: data/org.gnome.shell.gschema.xml.in:222 | ||
1359 | 304 | -msgid "Workspaces only on primary monitor" | ||
1360 | 305 | -msgstr "Espaços de trabalho apenas no monitor primário" | ||
1361 | 306 | - | ||
1362 | 307 | -#: data/org.gnome.shell.gschema.xml.in:230 | ||
1363 | 308 | -msgid "Delay focus changes in mouse mode until the pointer stops moving" | ||
1364 | 309 | -msgstr "Atrasar foco altera o modo do mouse até o ponteiro parar de mover" | ||
1365 | 310 | - | ||
1366 | 311 | #: data/org.gnome.Shell.PortalHelper.desktop.in.in:3 | ||
1367 | 312 | msgid "Network Login" | ||
1368 | 313 | msgstr "Sessão de Rede" | ||
1369 | 314 | @@ -376,20 +110,20 @@ msgctxt "button" | ||
1370 | 315 | msgid "Sign In" | ||
1371 | 316 | msgstr "Entrar" | ||
1372 | 317 | |||
1373 | 318 | -#: js/gdm/loginDialog.js:315 | ||
1374 | 319 | +#: js/gdm/loginDialog.js:319 | ||
1375 | 320 | msgid "Choose Session" | ||
1376 | 321 | msgstr "Escolher sessão" | ||
1377 | 322 | |||
1378 | 323 | #. translators: this message is shown below the user list on the | ||
1379 | 324 | #. login screen. It can be activated to reveal an entry for | ||
1380 | 325 | #. manually entering the username. | ||
1381 | 326 | -#: js/gdm/loginDialog.js:458 | ||
1382 | 327 | +#: js/gdm/loginDialog.js:462 | ||
1383 | 328 | msgid "Not listed?" | ||
1384 | 329 | msgstr "Não está listado?" | ||
1385 | 330 | |||
1386 | 331 | #. Translators: this message is shown below the username entry field | ||
1387 | 332 | #. to clue the user in on how to login to the local network realm | ||
1388 | 333 | -#: js/gdm/loginDialog.js:887 | ||
1389 | 334 | +#: js/gdm/loginDialog.js:891 | ||
1390 | 335 | #, javascript-format | ||
1391 | 336 | msgid "(e.g., user or %s)" | ||
1392 | 337 | msgstr "(ex.: usuário ou %s)" | ||
1393 | 338 | @@ -397,12 +131,12 @@ msgstr "(ex.: usuário ou %s)" | ||
1394 | 339 | #. TTLS and PEAP are actually much more complicated, but this complication | ||
1395 | 340 | #. is not visible here since we only care about phase2 authentication | ||
1396 | 341 | #. (and don't even care of which one) | ||
1397 | 342 | -#: js/gdm/loginDialog.js:892 js/ui/components/networkAgent.js:243 | ||
1398 | 343 | +#: js/gdm/loginDialog.js:896 js/ui/components/networkAgent.js:243 | ||
1399 | 344 | #: js/ui/components/networkAgent.js:261 | ||
1400 | 345 | msgid "Username: " | ||
1401 | 346 | msgstr "Nome de usuário: " | ||
1402 | 347 | |||
1403 | 348 | -#: js/gdm/loginDialog.js:1228 | ||
1404 | 349 | +#: js/gdm/loginDialog.js:1234 | ||
1405 | 350 | msgid "Login Window" | ||
1406 | 351 | msgstr "Janela de sessão" | ||
1407 | 352 | |||
1408 | 353 | @@ -415,7 +149,7 @@ msgstr "Erro de autenticação" | ||
1409 | 354 | #. as a cue to display our own message. | ||
1410 | 355 | #. Translators: this message is shown below the password entry field | ||
1411 | 356 | #. to indicate the user can swipe their finger instead | ||
1412 | 357 | -#: js/gdm/util.js:482 | ||
1413 | 358 | +#: js/gdm/util.js:485 | ||
1414 | 359 | msgid "(or swipe finger)" | ||
1415 | 360 | msgstr "(ou deslize o dedo)" | ||
1416 | 361 | |||
1417 | 362 | @@ -656,23 +390,23 @@ msgstr "Frequente" | ||
1418 | 363 | msgid "All" | ||
1419 | 364 | msgstr "Todos" | ||
1420 | 365 | |||
1421 | 366 | -#: js/ui/appDisplay.js:1886 | ||
1422 | 367 | +#: js/ui/appDisplay.js:1890 | ||
1423 | 368 | msgid "New Window" | ||
1424 | 369 | msgstr "Nova janela" | ||
1425 | 370 | |||
1426 | 371 | -#: js/ui/appDisplay.js:1900 | ||
1427 | 372 | +#: js/ui/appDisplay.js:1904 | ||
1428 | 373 | msgid "Launch using Dedicated Graphics Card" | ||
1429 | 374 | msgstr "Inicia usando placa de vÃdeo dedicada" | ||
1430 | 375 | |||
1431 | 376 | -#: js/ui/appDisplay.js:1927 js/ui/dash.js:285 | ||
1432 | 377 | +#: js/ui/appDisplay.js:1931 js/ui/dash.js:285 | ||
1433 | 378 | msgid "Remove from Favorites" | ||
1434 | 379 | msgstr "Remover dos favoritos" | ||
1435 | 380 | |||
1436 | 381 | -#: js/ui/appDisplay.js:1933 | ||
1437 | 382 | +#: js/ui/appDisplay.js:1937 | ||
1438 | 383 | msgid "Add to Favorites" | ||
1439 | 384 | msgstr "Adicionar aos favoritos" | ||
1440 | 385 | |||
1441 | 386 | -#: js/ui/appDisplay.js:1943 | ||
1442 | 387 | +#: js/ui/appDisplay.js:1947 | ||
1443 | 388 | msgid "Show Details" | ||
1444 | 389 | msgstr "Mostrar detalhes" | ||
1445 | 390 | |||
1446 | 391 | @@ -702,7 +436,7 @@ msgstr "Fones de ouvido" | ||
1447 | 392 | msgid "Headset" | ||
1448 | 393 | msgstr "Fone de ouvido com microfone" | ||
1449 | 394 | |||
1450 | 395 | -#: js/ui/audioDeviceSelection.js:82 js/ui/status/volume.js:221 | ||
1451 | 396 | +#: js/ui/audioDeviceSelection.js:82 js/ui/status/volume.js:255 | ||
1452 | 397 | msgid "Microphone" | ||
1453 | 398 | msgstr "Microfone" | ||
1454 | 399 | |||
1455 | 400 | @@ -714,7 +448,7 @@ msgstr "Alterar plano de fundo…" | ||
1456 | 401 | msgid "Display Settings" | ||
1457 | 402 | msgstr "Configurações de exibição" | ||
1458 | 403 | |||
1459 | 404 | -#: js/ui/backgroundMenu.js:22 js/ui/status/system.js:264 | ||
1460 | 405 | +#: js/ui/backgroundMenu.js:22 | ||
1461 | 406 | msgid "Settings" | ||
1462 | 407 | msgstr "Configurações" | ||
1463 | 408 | |||
1464 | 409 | @@ -819,35 +553,35 @@ msgctxt "event list time" | ||
1465 | 410 | msgid "All Day" | ||
1466 | 411 | msgstr "Dia todo" | ||
1467 | 412 | |||
1468 | 413 | -#: js/ui/calendar.js:864 | ||
1469 | 414 | +#: js/ui/calendar.js:866 | ||
1470 | 415 | msgctxt "calendar heading" | ||
1471 | 416 | msgid "%A, %B %d" | ||
1472 | 417 | msgstr "%A, %d de %B" | ||
1473 | 418 | |||
1474 | 419 | -#: js/ui/calendar.js:868 | ||
1475 | 420 | +#: js/ui/calendar.js:870 | ||
1476 | 421 | msgctxt "calendar heading" | ||
1477 | 422 | msgid "%A, %B %d, %Y" | ||
1478 | 423 | msgstr "%A, %d de %B de %Y" | ||
1479 | 424 | |||
1480 | 425 | -#: js/ui/calendar.js:1086 | ||
1481 | 426 | +#: js/ui/calendar.js:1100 | ||
1482 | 427 | msgid "No Notifications" | ||
1483 | 428 | msgstr "Nenhuma notificação" | ||
1484 | 429 | |||
1485 | 430 | -#: js/ui/calendar.js:1089 | ||
1486 | 431 | +#: js/ui/calendar.js:1103 | ||
1487 | 432 | msgid "No Events" | ||
1488 | 433 | msgstr "Nenhum evento" | ||
1489 | 434 | |||
1490 | 435 | -#: js/ui/calendar.js:1117 | ||
1491 | 436 | +#: js/ui/calendar.js:1131 | ||
1492 | 437 | msgid "Clear All" | ||
1493 | 438 | msgstr "Limpar tudo" | ||
1494 | 439 | |||
1495 | 440 | #. Translators: %s is an application name | ||
1496 | 441 | -#: js/ui/closeDialog.js:44 | ||
1497 | 442 | +#: js/ui/closeDialog.js:47 | ||
1498 | 443 | #, javascript-format | ||
1499 | 444 | msgid "“%s� is not responding." | ||
1500 | 445 | msgstr "“%s� não está respondendo." | ||
1501 | 446 | |||
1502 | 447 | -#: js/ui/closeDialog.js:45 | ||
1503 | 448 | +#: js/ui/closeDialog.js:48 | ||
1504 | 449 | msgid "" | ||
1505 | 450 | "You may choose to wait a short while for it to continue or force the " | ||
1506 | 451 | "application to quit entirely." | ||
1507 | 452 | @@ -855,11 +589,11 @@ msgstr "" | ||
1508 | 453 | "Você pode escolher esperar por um breve tempo para que continue ou force o " | ||
1509 | 454 | "aplicativo a sair totalmente." | ||
1510 | 455 | |||
1511 | 456 | -#: js/ui/closeDialog.js:61 | ||
1512 | 457 | +#: js/ui/closeDialog.js:64 | ||
1513 | 458 | msgid "Force Quit" | ||
1514 | 459 | msgstr "Forçar sair" | ||
1515 | 460 | |||
1516 | 461 | -#: js/ui/closeDialog.js:64 | ||
1517 | 462 | +#: js/ui/closeDialog.js:67 | ||
1518 | 463 | msgid "Wait" | ||
1519 | 464 | msgstr "Esperar" | ||
1520 | 465 | |||
1521 | 466 | @@ -876,7 +610,7 @@ msgstr "Unidade externa desconectada" | ||
1522 | 467 | msgid "Open with %s" | ||
1523 | 468 | msgstr "Abrir com %s" | ||
1524 | 469 | |||
1525 | 470 | -#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:295 | ||
1526 | 471 | +#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:297 | ||
1527 | 472 | msgid "Password:" | ||
1528 | 473 | msgstr "Senha:" | ||
1529 | 474 | |||
1530 | 475 | @@ -913,11 +647,11 @@ msgstr "Senha da chave privada: " | ||
1531 | 476 | msgid "Service: " | ||
1532 | 477 | msgstr "Serviço: " | ||
1533 | 478 | |||
1534 | 479 | -#: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:659 | ||
1535 | 480 | +#: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:664 | ||
1536 | 481 | msgid "Authentication required by wireless network" | ||
1537 | 482 | msgstr "Autenticação requisitada pela rede sem fio" | ||
1538 | 483 | |||
1539 | 484 | -#: js/ui/components/networkAgent.js:293 js/ui/components/networkAgent.js:660 | ||
1540 | 485 | +#: js/ui/components/networkAgent.js:293 js/ui/components/networkAgent.js:665 | ||
1541 | 486 | #, javascript-format | ||
1542 | 487 | msgid "" | ||
1543 | 488 | "Passwords or encryption keys are required to access the wireless network " | ||
1544 | 489 | @@ -926,7 +660,7 @@ msgstr "" | ||
1545 | 490 | "Senhas ou chaves criptografadas são necessárias para acessar a rede sem fio " | ||
1546 | 491 | "“%s�." | ||
1547 | 492 | |||
1548 | 493 | -#: js/ui/components/networkAgent.js:297 js/ui/components/networkAgent.js:663 | ||
1549 | 494 | +#: js/ui/components/networkAgent.js:297 js/ui/components/networkAgent.js:668 | ||
1550 | 495 | msgid "Wired 802.1X authentication" | ||
1551 | 496 | msgstr "Autenticação 802.1X cabeada" | ||
1552 | 497 | |||
1553 | 498 | @@ -934,15 +668,15 @@ msgstr "Autenticação 802.1X cabeada" | ||
1554 | 499 | msgid "Network name: " | ||
1555 | 500 | msgstr "Nome da rede: " | ||
1556 | 501 | |||
1557 | 502 | -#: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:667 | ||
1558 | 503 | +#: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:672 | ||
1559 | 504 | msgid "DSL authentication" | ||
1560 | 505 | msgstr "Autenticação DSL" | ||
1561 | 506 | |||
1562 | 507 | -#: js/ui/components/networkAgent.js:311 js/ui/components/networkAgent.js:673 | ||
1563 | 508 | +#: js/ui/components/networkAgent.js:311 js/ui/components/networkAgent.js:678 | ||
1564 | 509 | msgid "PIN code required" | ||
1565 | 510 | msgstr "Código PIN requisitado" | ||
1566 | 511 | |||
1567 | 512 | -#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:674 | ||
1568 | 513 | +#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:679 | ||
1569 | 514 | msgid "PIN code is needed for the mobile broadband device" | ||
1570 | 515 | msgstr "O código PIN é necessário para o dispositivo móvel de banda larga" | ||
1571 | 516 | |||
1572 | 517 | @@ -950,17 +684,17 @@ msgstr "O código PIN é necessário para o dispositivo móvel de banda larga" | ||
1573 | 518 | msgid "PIN: " | ||
1574 | 519 | msgstr "PIN: " | ||
1575 | 520 | |||
1576 | 521 | -#: js/ui/components/networkAgent.js:320 js/ui/components/networkAgent.js:680 | ||
1577 | 522 | +#: js/ui/components/networkAgent.js:320 js/ui/components/networkAgent.js:685 | ||
1578 | 523 | msgid "Mobile broadband network password" | ||
1579 | 524 | msgstr "Senha da rede de banda larga móvel" | ||
1580 | 525 | |||
1581 | 526 | -#: js/ui/components/networkAgent.js:321 js/ui/components/networkAgent.js:664 | ||
1582 | 527 | -#: js/ui/components/networkAgent.js:668 js/ui/components/networkAgent.js:681 | ||
1583 | 528 | +#: js/ui/components/networkAgent.js:321 js/ui/components/networkAgent.js:669 | ||
1584 | 529 | +#: js/ui/components/networkAgent.js:673 js/ui/components/networkAgent.js:686 | ||
1585 | 530 | #, javascript-format | ||
1586 | 531 | msgid "A password is required to connect to “%s�." | ||
1587 | 532 | msgstr "Uma senha é necessária para se conectar a “%s�." | ||
1588 | 533 | |||
1589 | 534 | -#: js/ui/components/networkAgent.js:648 js/ui/status/network.js:1691 | ||
1590 | 535 | +#: js/ui/components/networkAgent.js:653 js/ui/status/network.js:1704 | ||
1591 | 536 | msgid "Network Manager" | ||
1592 | 537 | msgstr "Gerenciador de rede" | ||
1593 | 538 | |||
1594 | 539 | @@ -980,7 +714,7 @@ msgstr "Autenticação" | ||
1595 | 540 | #. * requested authentication was not gained; this can happen | ||
1596 | 541 | #. * because of an authentication error (like invalid password), | ||
1597 | 542 | #. * for instance. | ||
1598 | 543 | -#: js/ui/components/polkitAgent.js:281 js/ui/shellMountOperation.js:327 | ||
1599 | 544 | +#: js/ui/components/polkitAgent.js:283 js/ui/shellMountOperation.js:327 | ||
1600 | 545 | msgid "Sorry, that didn’t work. Please try again." | ||
1601 | 546 | msgstr "Desculpe, isto não funcionou. Por favor, tente novamente." | ||
1602 | 547 | |||
1603 | 548 | @@ -1313,13 +1047,13 @@ msgid "Leave On" | ||
1604 | 549 | msgstr "Deixar ativado" | ||
1605 | 550 | |||
1606 | 551 | #: js/ui/kbdA11yDialog.js:59 js/ui/status/bluetooth.js:143 | ||
1607 | 552 | -#: js/ui/status/network.js:1281 | ||
1608 | 553 | +#: js/ui/status/network.js:1294 | ||
1609 | 554 | msgid "Turn On" | ||
1610 | 555 | msgstr "Ligar" | ||
1611 | 556 | |||
1612 | 557 | #: js/ui/kbdA11yDialog.js:67 js/ui/status/bluetooth.js:143 | ||
1613 | 558 | #: js/ui/status/network.js:154 js/ui/status/network.js:337 | ||
1614 | 559 | -#: js/ui/status/network.js:1281 js/ui/status/network.js:1396 | ||
1615 | 560 | +#: js/ui/status/network.js:1294 js/ui/status/network.js:1409 | ||
1616 | 561 | #: js/ui/status/nightLight.js:47 js/ui/status/rfkill.js:90 | ||
1617 | 562 | #: js/ui/status/rfkill.js:117 | ||
1618 | 563 | msgid "Turn Off" | ||
1619 | 564 | @@ -1381,7 +1115,7 @@ msgstr "Ver fonte" | ||
1620 | 565 | msgid "Web Page" | ||
1621 | 566 | msgstr "Página web" | ||
1622 | 567 | |||
1623 | 568 | -#: js/ui/messageTray.js:1493 | ||
1624 | 569 | +#: js/ui/messageTray.js:1495 | ||
1625 | 570 | msgid "System Information" | ||
1626 | 571 | msgstr "Informações do sistema" | ||
1627 | 572 | |||
1628 | 573 | @@ -1435,42 +1169,42 @@ msgstr "Atribuir atalho" | ||
1629 | 574 | msgid "Done" | ||
1630 | 575 | msgstr "ConcluÃdo" | ||
1631 | 576 | |||
1632 | 577 | -#: js/ui/padOsd.js:740 | ||
1633 | 578 | +#: js/ui/padOsd.js:742 | ||
1634 | 579 | msgid "Edit…" | ||
1635 | 580 | msgstr "Editar…" | ||
1636 | 581 | |||
1637 | 582 | -#: js/ui/padOsd.js:782 js/ui/padOsd.js:887 | ||
1638 | 583 | +#: js/ui/padOsd.js:784 js/ui/padOsd.js:889 | ||
1639 | 584 | msgid "None" | ||
1640 | 585 | msgstr "Nenhum" | ||
1641 | 586 | |||
1642 | 587 | -#: js/ui/padOsd.js:841 | ||
1643 | 588 | +#: js/ui/padOsd.js:843 | ||
1644 | 589 | msgid "Press a button to configure" | ||
1645 | 590 | msgstr "Pressione um botão para configurar" | ||
1646 | 591 | |||
1647 | 592 | -#: js/ui/padOsd.js:842 | ||
1648 | 593 | +#: js/ui/padOsd.js:844 | ||
1649 | 594 | msgid "Press Esc to exit" | ||
1650 | 595 | msgstr "Pressione Esc para sair" | ||
1651 | 596 | |||
1652 | 597 | -#: js/ui/padOsd.js:845 | ||
1653 | 598 | +#: js/ui/padOsd.js:847 | ||
1654 | 599 | msgid "Press any key to exit" | ||
1655 | 600 | msgstr "Pressione qualquer tecla para sair" | ||
1656 | 601 | |||
1657 | 602 | -#: js/ui/panel.js:355 | ||
1658 | 603 | +#: js/ui/panel.js:356 | ||
1659 | 604 | msgid "Quit" | ||
1660 | 605 | msgstr "Sair" | ||
1661 | 606 | |||
1662 | 607 | #. Translators: If there is no suitable word for "Activities" | ||
1663 | 608 | #. in your language, you can use the word for "Overview". | ||
1664 | 609 | -#: js/ui/panel.js:411 | ||
1665 | 610 | +#: js/ui/panel.js:412 | ||
1666 | 611 | msgid "Activities" | ||
1667 | 612 | msgstr "Atividades" | ||
1668 | 613 | |||
1669 | 614 | -#: js/ui/panel.js:692 | ||
1670 | 615 | +#: js/ui/panel.js:693 | ||
1671 | 616 | msgctxt "System menu in the top bar" | ||
1672 | 617 | msgid "System" | ||
1673 | 618 | msgstr "Sistema" | ||
1674 | 619 | |||
1675 | 620 | -#: js/ui/panel.js:811 | ||
1676 | 621 | +#: js/ui/panel.js:816 | ||
1677 | 622 | msgid "Top Bar" | ||
1678 | 623 | msgstr "Barra superior" | ||
1679 | 624 | |||
1680 | 625 | @@ -1479,23 +1213,23 @@ msgstr "Barra superior" | ||
1681 | 626 | #. "ON" and "OFF") or "toggle-switch-intl" (for toggle | ||
1682 | 627 | #. switches containing "â—¯" and "|"). Other values will | ||
1683 | 628 | #. simply result in invisible toggle switches. | ||
1684 | 629 | -#: js/ui/popupMenu.js:291 | ||
1685 | 630 | +#: js/ui/popupMenu.js:300 | ||
1686 | 631 | msgid "toggle-switch-us" | ||
1687 | 632 | msgstr "toggle-switch-intl" | ||
1688 | 633 | |||
1689 | 634 | -#: js/ui/runDialog.js:70 | ||
1690 | 635 | +#: js/ui/runDialog.js:74 | ||
1691 | 636 | msgid "Enter a Command" | ||
1692 | 637 | msgstr "Digite um comando" | ||
1693 | 638 | |||
1694 | 639 | -#: js/ui/runDialog.js:110 js/ui/windowMenu.js:175 | ||
1695 | 640 | +#: js/ui/runDialog.js:114 js/ui/windowMenu.js:174 | ||
1696 | 641 | msgid "Close" | ||
1697 | 642 | msgstr "Fechar" | ||
1698 | 643 | |||
1699 | 644 | -#: js/ui/runDialog.js:273 | ||
1700 | 645 | +#: js/ui/runDialog.js:278 | ||
1701 | 646 | msgid "Restart is not available on Wayland" | ||
1702 | 647 | msgstr "ReinÃcio não está disponÃvel no Wayland" | ||
1703 | 648 | |||
1704 | 649 | -#: js/ui/runDialog.js:278 | ||
1705 | 650 | +#: js/ui/runDialog.js:283 | ||
1706 | 651 | msgid "Restarting…" | ||
1707 | 652 | msgstr "Reiniciando…" | ||
1708 | 653 | |||
1709 | 654 | @@ -1519,7 +1253,7 @@ msgid_plural "%d new notifications" | ||
1710 | 655 | msgstr[0] "%d nova notificação" | ||
1711 | 656 | msgstr[1] "%d novas notificações" | ||
1712 | 657 | |||
1713 | 658 | -#: js/ui/screenShield.js:451 js/ui/status/system.js:283 | ||
1714 | 659 | +#: js/ui/screenShield.js:451 js/ui/status/system.js:294 | ||
1715 | 660 | msgid "Lock" | ||
1716 | 661 | msgstr "Bloquear" | ||
1717 | 662 | |||
1718 | 663 | @@ -1702,7 +1436,7 @@ msgid "<unknown>" | ||
1719 | 664 | msgstr "<desconhecido>" | ||
1720 | 665 | |||
1721 | 666 | #. Translators: %s is a network identifier | ||
1722 | 667 | -#: js/ui/status/network.js:441 js/ui/status/network.js:1310 | ||
1723 | 668 | +#: js/ui/status/network.js:441 js/ui/status/network.js:1323 | ||
1724 | 669 | #, javascript-format | ||
1725 | 670 | msgid "%s Off" | ||
1726 | 671 | msgstr "%s desligado" | ||
1727 | 672 | @@ -1729,7 +1463,7 @@ msgid "%s Disconnecting" | ||
1728 | 673 | msgstr "Desconectando de %s" | ||
1729 | 674 | |||
1730 | 675 | #. Translators: %s is a network identifier | ||
1731 | 676 | -#: js/ui/status/network.js:459 js/ui/status/network.js:1302 | ||
1732 | 677 | +#: js/ui/status/network.js:459 js/ui/status/network.js:1315 | ||
1733 | 678 | #, javascript-format | ||
1734 | 679 | msgid "%s Connecting" | ||
1735 | 680 | msgstr "Conectando a %s" | ||
1736 | 681 | @@ -1769,7 +1503,7 @@ msgid "Mobile Broadband Settings" | ||
1737 | 682 | msgstr "Configurações de banda larga móvel" | ||
1738 | 683 | |||
1739 | 684 | #. Translators: %s is a network identifier | ||
1740 | 685 | -#: js/ui/status/network.js:578 js/ui/status/network.js:1307 | ||
1741 | 686 | +#: js/ui/status/network.js:578 js/ui/status/network.js:1320 | ||
1742 | 687 | #, javascript-format | ||
1743 | 688 | msgid "%s Hardware Disabled" | ||
1744 | 689 | msgstr "Hardware de %s desabilitado" | ||
1745 | 690 | @@ -1825,81 +1559,81 @@ msgstr "Nenhuma rede" | ||
1746 | 691 | msgid "Use hardware switch to turn off" | ||
1747 | 692 | msgstr "Usar alternador de hardware para desligar" | ||
1748 | 693 | |||
1749 | 694 | -#: js/ui/status/network.js:1173 | ||
1750 | 695 | +#: js/ui/status/network.js:1186 | ||
1751 | 696 | msgid "Select Network" | ||
1752 | 697 | msgstr "Selecione a rede" | ||
1753 | 698 | |||
1754 | 699 | -#: js/ui/status/network.js:1179 | ||
1755 | 700 | +#: js/ui/status/network.js:1192 | ||
1756 | 701 | msgid "Wi-Fi Settings" | ||
1757 | 702 | msgstr "Configurações de Wi-Fi" | ||
1758 | 703 | |||
1759 | 704 | #. Translators: %s is a network identifier | ||
1760 | 705 | -#: js/ui/status/network.js:1298 | ||
1761 | 706 | +#: js/ui/status/network.js:1311 | ||
1762 | 707 | #, javascript-format | ||
1763 | 708 | msgid "%s Hotspot Active" | ||
1764 | 709 | msgstr "Ponto de acesso %s está ativo" | ||
1765 | 710 | |||
1766 | 711 | #. Translators: %s is a network identifier | ||
1767 | 712 | -#: js/ui/status/network.js:1313 | ||
1768 | 713 | +#: js/ui/status/network.js:1326 | ||
1769 | 714 | #, javascript-format | ||
1770 | 715 | msgid "%s Not Connected" | ||
1771 | 716 | msgstr "%s não está conectado" | ||
1772 | 717 | |||
1773 | 718 | -#: js/ui/status/network.js:1413 | ||
1774 | 719 | +#: js/ui/status/network.js:1426 | ||
1775 | 720 | msgid "connecting…" | ||
1776 | 721 | msgstr "conectando…" | ||
1777 | 722 | |||
1778 | 723 | #. Translators: this is for network connections that require some kind of key or password | ||
1779 | 724 | -#: js/ui/status/network.js:1416 | ||
1780 | 725 | +#: js/ui/status/network.js:1429 | ||
1781 | 726 | msgid "authentication required" | ||
1782 | 727 | msgstr "autenticação necessária" | ||
1783 | 728 | |||
1784 | 729 | -#: js/ui/status/network.js:1418 | ||
1785 | 730 | +#: js/ui/status/network.js:1431 | ||
1786 | 731 | msgid "connection failed" | ||
1787 | 732 | msgstr "conexão falhou" | ||
1788 | 733 | |||
1789 | 734 | -#: js/ui/status/network.js:1472 | ||
1790 | 735 | +#: js/ui/status/network.js:1485 | ||
1791 | 736 | msgid "VPN Settings" | ||
1792 | 737 | msgstr "Configurações de VPN" | ||
1793 | 738 | |||
1794 | 739 | -#: js/ui/status/network.js:1485 | ||
1795 | 740 | +#: js/ui/status/network.js:1498 | ||
1796 | 741 | msgid "VPN" | ||
1797 | 742 | msgstr "VPN" | ||
1798 | 743 | |||
1799 | 744 | -#: js/ui/status/network.js:1495 | ||
1800 | 745 | +#: js/ui/status/network.js:1508 | ||
1801 | 746 | msgid "VPN Off" | ||
1802 | 747 | msgstr "VPN desligada" | ||
1803 | 748 | |||
1804 | 749 | -#: js/ui/status/network.js:1559 js/ui/status/rfkill.js:93 | ||
1805 | 750 | +#: js/ui/status/network.js:1572 js/ui/status/rfkill.js:93 | ||
1806 | 751 | msgid "Network Settings" | ||
1807 | 752 | msgstr "Configurações de rede" | ||
1808 | 753 | |||
1809 | 754 | -#: js/ui/status/network.js:1588 | ||
1810 | 755 | +#: js/ui/status/network.js:1601 | ||
1811 | 756 | #, javascript-format | ||
1812 | 757 | msgid "%s Wired Connection" | ||
1813 | 758 | msgid_plural "%s Wired Connections" | ||
1814 | 759 | msgstr[0] "%s conexão cabeada" | ||
1815 | 760 | msgstr[1] "%s conexões cabeadas" | ||
1816 | 761 | |||
1817 | 762 | -#: js/ui/status/network.js:1592 | ||
1818 | 763 | +#: js/ui/status/network.js:1605 | ||
1819 | 764 | #, javascript-format | ||
1820 | 765 | msgid "%s Wi-Fi Connection" | ||
1821 | 766 | msgid_plural "%s Wi-Fi Connections" | ||
1822 | 767 | msgstr[0] "%s conexão Wi-Fi" | ||
1823 | 768 | msgstr[1] "%s conexões Wi-Fi" | ||
1824 | 769 | |||
1825 | 770 | -#: js/ui/status/network.js:1596 | ||
1826 | 771 | +#: js/ui/status/network.js:1609 | ||
1827 | 772 | #, javascript-format | ||
1828 | 773 | msgid "%s Modem Connection" | ||
1829 | 774 | msgid_plural "%s Modem Connections" | ||
1830 | 775 | msgstr[0] "%s conexão por modem" | ||
1831 | 776 | msgstr[1] "%s conexões por modems" | ||
1832 | 777 | |||
1833 | 778 | -#: js/ui/status/network.js:1728 | ||
1834 | 779 | +#: js/ui/status/network.js:1741 | ||
1835 | 780 | msgid "Connection failed" | ||
1836 | 781 | msgstr "Falha de conexão" | ||
1837 | 782 | |||
1838 | 783 | -#: js/ui/status/network.js:1729 | ||
1839 | 784 | +#: js/ui/status/network.js:1742 | ||
1840 | 785 | msgid "Activation of network connection failed" | ||
1841 | 786 | msgstr "Falha ao ativar a conexão da rede" | ||
1842 | 787 | |||
1843 | 788 | @@ -1950,6 +1684,15 @@ msgstr "%d:%02d até completamente carregada (%d %%)" | ||
1844 | 789 | msgid "%d %%" | ||
1845 | 790 | msgstr "%d %%" | ||
1846 | 791 | |||
1847 | 792 | +#: js/ui/status/remoteAccess.js:46 | ||
1848 | 793 | +msgid "Screen is Being Shared" | ||
1849 | 794 | +msgstr "A tela está sendo compartilhada" | ||
1850 | 795 | + | ||
1851 | 796 | +#: js/ui/status/remoteAccess.js:48 | ||
1852 | 797 | +#| msgid "Turn Off" | ||
1853 | 798 | +msgid "Turn off" | ||
1854 | 799 | +msgstr "Desativar" | ||
1855 | 800 | + | ||
1856 | 801 | #. The menu only appears when airplane mode is on, so just | ||
1857 | 802 | #. statically build it as if it was on, rather than dynamically | ||
1858 | 803 | #. changing the menu contents. | ||
1859 | 804 | @@ -1969,28 +1712,28 @@ msgstr "Encerrar sessão" | ||
1860 | 805 | msgid "Account Settings" | ||
1861 | 806 | msgstr "Configurações de conta" | ||
1862 | 807 | |||
1863 | 808 | -#: js/ui/status/system.js:268 | ||
1864 | 809 | +#: js/ui/status/system.js:279 | ||
1865 | 810 | msgid "Orientation Lock" | ||
1866 | 811 | msgstr "Bloqueio de orientação" | ||
1867 | 812 | |||
1868 | 813 | -#: js/ui/status/system.js:294 | ||
1869 | 814 | +#: js/ui/status/system.js:305 | ||
1870 | 815 | msgid "Suspend" | ||
1871 | 816 | msgstr "Suspender" | ||
1872 | 817 | |||
1873 | 818 | -#: js/ui/status/system.js:304 | ||
1874 | 819 | +#: js/ui/status/system.js:315 | ||
1875 | 820 | msgid "Power Off" | ||
1876 | 821 | msgstr "Desligar" | ||
1877 | 822 | |||
1878 | 823 | -#: js/ui/status/thunderbolt.js:294 | ||
1879 | 824 | +#: js/ui/status/thunderbolt.js:298 | ||
1880 | 825 | msgid "Thunderbolt" | ||
1881 | 826 | msgstr "Thunderbolt" | ||
1882 | 827 | |||
1883 | 828 | #. we are done | ||
1884 | 829 | -#: js/ui/status/thunderbolt.js:350 | ||
1885 | 830 | +#: js/ui/status/thunderbolt.js:354 | ||
1886 | 831 | msgid "Unknown Thunderbolt device" | ||
1887 | 832 | msgstr "Dispositivo Thunderbolt desconhecido" | ||
1888 | 833 | |||
1889 | 834 | -#: js/ui/status/thunderbolt.js:351 | ||
1890 | 835 | +#: js/ui/status/thunderbolt.js:355 | ||
1891 | 836 | msgid "" | ||
1892 | 837 | "New device has been detected while you were away. Please disconnect and " | ||
1893 | 838 | "reconnect the device to start using it." | ||
1894 | 839 | @@ -1998,20 +1741,21 @@ msgstr "" | ||
1895 | 840 | "Um novo dispositivo foi detectado enquanto você estava ausente. Por " | ||
1896 | 841 | "gentileza, desconecte e reconecte o dispositivo para começar a usá-lo." | ||
1897 | 842 | |||
1898 | 843 | -#: js/ui/status/thunderbolt.js:356 | ||
1899 | 844 | +#: js/ui/status/thunderbolt.js:360 | ||
1900 | 845 | msgid "Thunderbolt authorization error" | ||
1901 | 846 | msgstr "Erro de autorização de thunderbolt" | ||
1902 | 847 | |||
1903 | 848 | -#: js/ui/status/thunderbolt.js:357 | ||
1904 | 849 | +#: js/ui/status/thunderbolt.js:361 | ||
1905 | 850 | #, javascript-format | ||
1906 | 851 | -msgid "Could not authorize the thunderbolt device: %s" | ||
1907 | 852 | -msgstr "Não foi possÃvel autorizar o dispositivo thunderbolt: %s" | ||
1908 | 853 | +#| msgid "Could not authorize the thunderbolt device: %s" | ||
1909 | 854 | +msgid "Could not authorize the Thunderbolt device: %s" | ||
1910 | 855 | +msgstr "Não foi possÃvel autorizar o dispositivo Thunderbolt: %s" | ||
1911 | 856 | |||
1912 | 857 | -#: js/ui/status/volume.js:128 | ||
1913 | 858 | +#: js/ui/status/volume.js:135 | ||
1914 | 859 | msgid "Volume changed" | ||
1915 | 860 | msgstr "Volume alterado" | ||
1916 | 861 | |||
1917 | 862 | -#: js/ui/status/volume.js:170 | ||
1918 | 863 | +#: js/ui/status/volume.js:204 | ||
1919 | 864 | msgid "Volume" | ||
1920 | 865 | msgstr "Volume" | ||
1921 | 866 | |||
1922 | 867 | @@ -2066,22 +1810,22 @@ msgstr "“%s� está pronto" | ||
1923 | 868 | |||
1924 | 869 | # TÃtulo de janela de confirmação; Se grande demais, pode ser exibida com "..." | ||
1925 | 870 | # Vide: https://bugzilla.gnome.org/show_bug.cgi?id=786331 | ||
1926 | 871 | -#: js/ui/windowManager.js:72 | ||
1927 | 872 | +#: js/ui/windowManager.js:74 | ||
1928 | 873 | msgid "Do you want to keep these display settings?" | ||
1929 | 874 | msgstr "Deseja manter essas configurações da tela?" | ||
1930 | 875 | |||
1931 | 876 | #. Translators: this and the following message should be limited in lenght, | ||
1932 | 877 | #. to avoid ellipsizing the labels. | ||
1933 | 878 | #. | ||
1934 | 879 | -#: js/ui/windowManager.js:84 | ||
1935 | 880 | +#: js/ui/windowManager.js:86 | ||
1936 | 881 | msgid "Revert Settings" | ||
1937 | 882 | msgstr "Reverter configurações" | ||
1938 | 883 | |||
1939 | 884 | -#: js/ui/windowManager.js:87 | ||
1940 | 885 | +#: js/ui/windowManager.js:89 | ||
1941 | 886 | msgid "Keep Changes" | ||
1942 | 887 | msgstr "Manter alterações" | ||
1943 | 888 | |||
1944 | 889 | -#: js/ui/windowManager.js:105 | ||
1945 | 890 | +#: js/ui/windowManager.js:107 | ||
1946 | 891 | #, javascript-format | ||
1947 | 892 | msgid "Settings changes will revert in %d second" | ||
1948 | 893 | msgid_plural "Settings changes will revert in %d seconds" | ||
1949 | 894 | @@ -2090,7 +1834,7 @@ msgstr[1] "Alterações nas configurações serão revertidas em %d segundos" | ||
1950 | 895 | |||
1951 | 896 | #. Translators: This represents the size of a window. The first number is | ||
1952 | 897 | #. * the width of the window and the second is the height. | ||
1953 | 898 | -#: js/ui/windowManager.js:660 | ||
1954 | 899 | +#: js/ui/windowManager.js:689 | ||
1955 | 900 | #, javascript-format | ||
1956 | 901 | msgid "%d × %d" | ||
1957 | 902 | msgstr "%d × %d" | ||
1958 | 903 | @@ -2143,19 +1887,19 @@ msgstr "Mover para a área de trabalho acima" | ||
1959 | 904 | msgid "Move to Workspace Down" | ||
1960 | 905 | msgstr "Mover para a área de trabalho abaixo" | ||
1961 | 906 | |||
1962 | 907 | -#: js/ui/windowMenu.js:140 | ||
1963 | 908 | +#: js/ui/windowMenu.js:139 | ||
1964 | 909 | msgid "Move to Monitor Up" | ||
1965 | 910 | msgstr "Mover para o monitor acima" | ||
1966 | 911 | |||
1967 | 912 | -#: js/ui/windowMenu.js:149 | ||
1968 | 913 | +#: js/ui/windowMenu.js:148 | ||
1969 | 914 | msgid "Move to Monitor Down" | ||
1970 | 915 | msgstr "Mover para o monitor abaixo" | ||
1971 | 916 | |||
1972 | 917 | -#: js/ui/windowMenu.js:158 | ||
1973 | 918 | +#: js/ui/windowMenu.js:157 | ||
1974 | 919 | msgid "Move to Monitor Left" | ||
1975 | 920 | msgstr "Mover para o monitor à esquerda" | ||
1976 | 921 | |||
1977 | 922 | -#: js/ui/windowMenu.js:167 | ||
1978 | 923 | +#: js/ui/windowMenu.js:166 | ||
1979 | 924 | msgid "Move to Monitor Right" | ||
1980 | 925 | msgstr "Mover para o monitor à direita" | ||
1981 | 926 | |||
1982 | 927 | @@ -2168,29 +1912,29 @@ msgstr "Agenda do Evolution" | ||
1983 | 928 | msgid "evolution" | ||
1984 | 929 | msgstr "evolution" | ||
1985 | 930 | |||
1986 | 931 | -#: src/main.c:432 | ||
1987 | 932 | +#: src/main.c:410 | ||
1988 | 933 | msgid "Print version" | ||
1989 | 934 | msgstr "Versão de impressão" | ||
1990 | 935 | |||
1991 | 936 | -#: src/main.c:438 | ||
1992 | 937 | +#: src/main.c:416 | ||
1993 | 938 | msgid "Mode used by GDM for login screen" | ||
1994 | 939 | msgstr "Modo usado pelo GDM para a tela de inÃcio de sessão" | ||
1995 | 940 | |||
1996 | 941 | -#: src/main.c:444 | ||
1997 | 942 | +#: src/main.c:422 | ||
1998 | 943 | msgid "Use a specific mode, e.g. “gdm� for login screen" | ||
1999 | 944 | msgstr "" | ||
2000 | 945 | "Utilizar um modo especÃfico, ex.: “gdmâ€� para a tela de inÃcio de sessão" | ||
2001 | 946 | |||
2002 | 947 | -#: src/main.c:450 | ||
2003 | 948 | +#: src/main.c:428 | ||
2004 | 949 | msgid "List possible modes" | ||
2005 | 950 | msgstr "Listar modos possÃveis" | ||
2006 | 951 | |||
2007 | 952 | -#: src/shell-app.c:270 | ||
2008 | 953 | +#: src/shell-app.c:272 | ||
2009 | 954 | msgctxt "program" | ||
2010 | 955 | msgid "Unknown" | ||
2011 | 956 | msgstr "Desconhecido" | ||
2012 | 957 | |||
2013 | 958 | -#: src/shell-app.c:511 | ||
2014 | 959 | +#: src/shell-app.c:523 | ||
2015 | 960 | #, c-format | ||
2016 | 961 | msgid "Failed to launch “%s�" | ||
2017 | 962 | msgstr "Erro ao lançar “%s�" | ||
2018 | 963 | @@ -2229,6 +1973,227 @@ msgstr[1] "%u entradas" | ||
2019 | 964 | msgid "System Sounds" | ||
2020 | 965 | msgstr "Sons do sistema" | ||
2021 | 966 | |||
2022 | 967 | +#~ msgid "Enable internal tools useful for developers and testers from Alt-F2" | ||
2023 | 968 | +#~ msgstr "" | ||
2024 | 969 | +#~ "Habilitar ferramentas internas úteis para desenvolvedores e testadores a " | ||
2025 | 970 | +#~ "partir do Alt-F2" | ||
2026 | 971 | + | ||
2027 | 972 | +#~ msgid "" | ||
2028 | 973 | +#~ "Allows access to internal debugging and monitoring tools using the Alt-F2 " | ||
2029 | 974 | +#~ "dialog." | ||
2030 | 975 | +#~ msgstr "" | ||
2031 | 976 | +#~ "Permite acesso a ferramentas internas de depuração e monitoramento usando " | ||
2032 | 977 | +#~ "o diálogo Alt-F2." | ||
2033 | 978 | + | ||
2034 | 979 | +#~ msgid "UUIDs of extensions to enable" | ||
2035 | 980 | +#~ msgstr "UUIDs das extensões para habilitar" | ||
2036 | 981 | + | ||
2037 | 982 | +#~ msgid "" | ||
2038 | 983 | +#~ "GNOME Shell extensions have a UUID property; this key lists extensions " | ||
2039 | 984 | +#~ "which should be loaded. Any extension that wants to be loaded needs to be " | ||
2040 | 985 | +#~ "in this list. You can also manipulate this list with the EnableExtension " | ||
2041 | 986 | +#~ "and DisableExtension D-Bus methods on org.gnome.Shell." | ||
2042 | 987 | +#~ msgstr "" | ||
2043 | 988 | +#~ "As extensões do GNOME Shell possuem uma propriedade UUID; esta chave " | ||
2044 | 989 | +#~ "lista as extensões que devem ser carregadas. Qualquer extensão que quiser " | ||
2045 | 990 | +#~ "ser carregada precisa estar nesta lista. Você também pode manipular esta " | ||
2046 | 991 | +#~ "lista com os métodos do DBus EnableExtension e DisableExtensions em org." | ||
2047 | 992 | +#~ "gnome.Shell." | ||
2048 | 993 | + | ||
2049 | 994 | +#~ msgid "Disable user extensions" | ||
2050 | 995 | +#~ msgstr "Desabilitar extensões do usuário" | ||
2051 | 996 | + | ||
2052 | 997 | +#~ msgid "" | ||
2053 | 998 | +#~ "Disable all extensions the user has enabled without affecting the " | ||
2054 | 999 | +#~ "“enabled-extension� setting." | ||
2055 | 1000 | +#~ msgstr "" | ||
2056 | 1001 | +#~ "Desabilita todas as extensões que o usuário habilitou sem afetar a " | ||
2057 | 1002 | +#~ "definição de “enabled-extension�." | ||
2058 | 1003 | + | ||
2059 | 1004 | +#~ msgid "Disables the validation of extension version compatibility" | ||
2060 | 1005 | +#~ msgstr "Desabilita a validação de compatibilidade da versão da extensão" | ||
2061 | 1006 | + | ||
2062 | 1007 | +#~ msgid "" | ||
2063 | 1008 | +#~ "GNOME Shell will only load extensions that claim to support the current " | ||
2064 | 1009 | +#~ "running version. Enabling this option will disable this check and try to " | ||
2065 | 1010 | +#~ "load all extensions regardless of the versions they claim to support." | ||
2066 | 1011 | +#~ msgstr "" | ||
2067 | 1012 | +#~ "O GNOME Shell somente carregará extensões que declaram possuir suporte a " | ||
2068 | 1013 | +#~ "versão atual em execução. Ao habilitar esta opção, esta verificação será " | ||
2069 | 1014 | +#~ "desabilitada e haverá tentativas de carregar todas as extensões " | ||
2070 | 1015 | +#~ "independente das versões que estas declaram suportar." | ||
2071 | 1016 | + | ||
2072 | 1017 | +#~ msgid "List of desktop file IDs for favorite applications" | ||
2073 | 1018 | +#~ msgstr "" | ||
2074 | 1019 | +#~ "Lista dos IDs de arquivo de área de trabalho para os aplicativos favoritos" | ||
2075 | 1020 | + | ||
2076 | 1021 | +#~ msgid "" | ||
2077 | 1022 | +#~ "The applications corresponding to these identifiers will be displayed in " | ||
2078 | 1023 | +#~ "the favorites area." | ||
2079 | 1024 | +#~ msgstr "" | ||
2080 | 1025 | +#~ "Os aplicativos correspondentes a estes identificadores serão exibidos na " | ||
2081 | 1026 | +#~ "área de favoritos." | ||
2082 | 1027 | + | ||
2083 | 1028 | +#~ msgid "App Picker View" | ||
2084 | 1029 | +#~ msgstr "Visualização do seletor de aplicativos" | ||
2085 | 1030 | + | ||
2086 | 1031 | +#~ msgid "Index of the currently selected view in the application picker." | ||
2087 | 1032 | +#~ msgstr "" | ||
2088 | 1033 | +#~ "�ndice da visualização atualmente selecionada no seletor de aplicativos." | ||
2089 | 1034 | + | ||
2090 | 1035 | +#~ msgid "History for command (Alt-F2) dialog" | ||
2091 | 1036 | +#~ msgstr "Histórico do diálogo de comandos (Alt-F2)" | ||
2092 | 1037 | + | ||
2093 | 1038 | +#~ msgid "History for the looking glass dialog" | ||
2094 | 1039 | +#~ msgstr "Histórico do diálogo do shell looking glass" | ||
2095 | 1040 | + | ||
2096 | 1041 | +#~ msgid "Always show the “Log out� menu item in the user menu." | ||
2097 | 1042 | +#~ msgstr "Sempre mostrar o item de menu “Encerrar sessão� no menu de usuário." | ||
2098 | 1043 | + | ||
2099 | 1044 | +#~ msgid "" | ||
2100 | 1045 | +#~ "This key overrides the automatic hiding of the “Log out� menu item in " | ||
2101 | 1046 | +#~ "single-user, single-session situations." | ||
2102 | 1047 | +#~ msgstr "" | ||
2103 | 1048 | +#~ "Essa chave sobrescreve a ocultação automática do item de menu “Encerrar " | ||
2104 | 1049 | +#~ "sessão� quando houver somente um usuário, em situações de somente uma " | ||
2105 | 1050 | +#~ "sessão." | ||
2106 | 1051 | + | ||
2107 | 1052 | +#~ msgid "" | ||
2108 | 1053 | +#~ "Whether to remember password for mounting encrypted or remote filesystems" | ||
2109 | 1054 | +#~ msgstr "" | ||
2110 | 1055 | +#~ "Se lembra ou não as senhas para montar sistemas de arquivos " | ||
2111 | 1056 | +#~ "criptografados ou remotos" | ||
2112 | 1057 | + | ||
2113 | 1058 | +#~ msgid "" | ||
2114 | 1059 | +#~ "The shell will request a password when an encrypted device or a remote " | ||
2115 | 1060 | +#~ "filesystem is mounted. If the password can be saved for future use a " | ||
2116 | 1061 | +#~ "“Remember Password� checkbox will be present. This key sets the default " | ||
2117 | 1062 | +#~ "state of the checkbox." | ||
2118 | 1063 | +#~ msgstr "" | ||
2119 | 1064 | +#~ "O shell irá pedir uma senha quando um dispositivo criptografado ou um " | ||
2120 | 1065 | +#~ "sistema de arquivo remoto for montado. Caso a senha possa ser salva para " | ||
2121 | 1066 | +#~ "uso posterior, a caixa de seleção “Lembrar senha� estará presente. Esta " | ||
2122 | 1067 | +#~ "chave ajusta o estado padrão da caixa de seleção." | ||
2123 | 1068 | + | ||
2124 | 1069 | +#~ msgid "" | ||
2125 | 1070 | +#~ "Whether the default Bluetooth adapter had set up devices associated to it" | ||
2126 | 1071 | +#~ msgstr "" | ||
2127 | 1072 | +#~ "Se o adaptador Bluetooth padrão configurou, ou não, dispositivos " | ||
2128 | 1073 | +#~ "associados a ele" | ||
2129 | 1074 | + | ||
2130 | 1075 | +#~ msgid "" | ||
2131 | 1076 | +#~ "The shell will only show a Bluetooth menu item if a Bluetooth adapter is " | ||
2132 | 1077 | +#~ "powered, or if there were devices set up associated with the default " | ||
2133 | 1078 | +#~ "adapter. This will be reset if the default adapter is ever seen not to " | ||
2134 | 1079 | +#~ "have devices associated to it." | ||
2135 | 1080 | +#~ msgstr "" | ||
2136 | 1081 | +#~ "O shell irá mostrar apenas um item de menu Bluetooth se um adaptador " | ||
2137 | 1082 | +#~ "Bluetooth estiver ligado ou se existirem dispositivos configurados " | ||
2138 | 1083 | +#~ "associados ao adaptador padrão. Isto será redefinido caso o adaptador " | ||
2139 | 1084 | +#~ "padrão sempre seja visto sem possuir dispositivos associados a ele." | ||
2140 | 1085 | + | ||
2141 | 1086 | +#~ msgid "Keybinding to open the application menu" | ||
2142 | 1087 | +#~ msgstr "Atalho de teclado para abrir um menu de aplicativo" | ||
2143 | 1088 | + | ||
2144 | 1089 | +#~ msgid "Keybinding to open the application menu." | ||
2145 | 1090 | +#~ msgstr "Atalho de teclado para abrir um menu de aplicativo." | ||
2146 | 1091 | + | ||
2147 | 1092 | +#~ msgid "Keybinding to open the “Show Applications� view" | ||
2148 | 1093 | +#~ msgstr "Atalho de teclado para abrir a visualização “Mostrar aplicativos�" | ||
2149 | 1094 | + | ||
2150 | 1095 | +#~ msgid "" | ||
2151 | 1096 | +#~ "Keybinding to open the “Show Applications� view of the Activities " | ||
2152 | 1097 | +#~ "Overview." | ||
2153 | 1098 | +#~ msgstr "" | ||
2154 | 1099 | +#~ "Atalho de teclado para abrir a visualização “Mostrar aplicativos� do " | ||
2155 | 1100 | +#~ "panorama de atividades." | ||
2156 | 1101 | + | ||
2157 | 1102 | +#~ msgid "Keybinding to open the overview" | ||
2158 | 1103 | +#~ msgstr "Atalho de teclado para abrir o panorama" | ||
2159 | 1104 | + | ||
2160 | 1105 | +#~ msgid "Keybinding to open the Activities Overview." | ||
2161 | 1106 | +#~ msgstr "Atalho de teclado para abrir o panorama de atividades." | ||
2162 | 1107 | + | ||
2163 | 1108 | +#~ msgid "Keybinding to toggle the visibility of the notification list" | ||
2164 | 1109 | +#~ msgstr "" | ||
2165 | 1110 | +#~ "Atalho de teclado para alternar a visibilidade da lista de notificação" | ||
2166 | 1111 | + | ||
2167 | 1112 | +#~ msgid "Keybinding to toggle the visibility of the notification list." | ||
2168 | 1113 | +#~ msgstr "" | ||
2169 | 1114 | +#~ "Atalho de teclado para alternar a visibilidade da lista de notificação." | ||
2170 | 1115 | + | ||
2171 | 1116 | +#~ msgid "Keybinding to focus the active notification" | ||
2172 | 1117 | +#~ msgstr "Atalho de teclado para ativar a notificação ativa" | ||
2173 | 1118 | + | ||
2174 | 1119 | +#~ msgid "Keybinding to focus the active notification." | ||
2175 | 1120 | +#~ msgstr "Atalho de teclado para ativar a notificação ativa." | ||
2176 | 1121 | + | ||
2177 | 1122 | +# Tween pode significar uma contração de Between ou se referir a um termo "in-between" usado em animação gráfica. -- Enrico | ||
2178 | 1123 | +#~ msgid "" | ||
2179 | 1124 | +#~ "Keybinding that pauses and resumes all running tweens, for debugging " | ||
2180 | 1125 | +#~ "purposes" | ||
2181 | 1126 | +#~ msgstr "" | ||
2182 | 1127 | +#~ "Atalho de teclado que pausa e continua todos os intermediários em " | ||
2183 | 1128 | +#~ "execução, a fim de depuração" | ||
2184 | 1129 | + | ||
2185 | 1130 | +#~ msgid "Which keyboard to use" | ||
2186 | 1131 | +#~ msgstr "Qual teclado usar" | ||
2187 | 1132 | + | ||
2188 | 1133 | +#~ msgid "The type of keyboard to use." | ||
2189 | 1134 | +#~ msgstr "O tipo do teclado para usar." | ||
2190 | 1135 | + | ||
2191 | 1136 | +#~ msgid "Limit switcher to current workspace." | ||
2192 | 1137 | +#~ msgstr "Limitar o alternador ao espaço de trabalho atual." | ||
2193 | 1138 | + | ||
2194 | 1139 | +#~ msgid "" | ||
2195 | 1140 | +#~ "If true, only applications that have windows on the current workspace are " | ||
2196 | 1141 | +#~ "shown in the switcher. Otherwise, all applications are included." | ||
2197 | 1142 | +#~ msgstr "" | ||
2198 | 1143 | +#~ "Se verdadeiro, o alternador mostrará somente os aplicativos que possuem " | ||
2199 | 1144 | +#~ "janelas no espaço de trabalho atual. Caso contrário, todos os aplicativos " | ||
2200 | 1145 | +#~ "serão incluÃdos." | ||
2201 | 1146 | + | ||
2202 | 1147 | +#~ msgid "The application icon mode." | ||
2203 | 1148 | +#~ msgstr "O modo Ãcone do aplicativo." | ||
2204 | 1149 | + | ||
2205 | 1150 | +#~ msgid "" | ||
2206 | 1151 | +#~ "Configures how the windows are shown in the switcher. Valid possibilities " | ||
2207 | 1152 | +#~ "are “thumbnail-only� (shows a thumbnail of the window), “app-icon-" | ||
2208 | 1153 | +#~ "only� (shows only the application icon) or “both�." | ||
2209 | 1154 | +#~ msgstr "" | ||
2210 | 1155 | +#~ "Configura como as janelas são mostradas no alternador. As possibilidades " | ||
2211 | 1156 | +#~ "válidas são “thumbnail-only� (mostra uma miniatura da janela), “app-icon-" | ||
2212 | 1157 | +#~ "onlyâ€� (mostra apenas o Ãcone do aplicativo) ou “bothâ€�." | ||
2213 | 1158 | + | ||
2214 | 1159 | +#~ msgid "" | ||
2215 | 1160 | +#~ "If true, only windows from the current workspace are shown in the " | ||
2216 | 1161 | +#~ "switcher. Otherwise, all windows are included." | ||
2217 | 1162 | +#~ msgstr "" | ||
2218 | 1163 | +#~ "Se verdadeiro, o alternador mostrará somente as janelas do espaço de " | ||
2219 | 1164 | +#~ "trabalho atual. Caso contrário, todos as janelas serão incluÃdas." | ||
2220 | 1165 | + | ||
2221 | 1166 | +#~ msgid "Attach modal dialog to the parent window" | ||
2222 | 1167 | +#~ msgstr "Anexar diálogo modal à janela pai" | ||
2223 | 1168 | + | ||
2224 | 1169 | +#~ msgid "" | ||
2225 | 1170 | +#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell." | ||
2226 | 1171 | +#~ msgstr "" | ||
2227 | 1172 | +#~ "Esta chave sobrescreve a chave em org.gnome.mutter ao executar o Shell do " | ||
2228 | 1173 | +#~ "GNOME." | ||
2229 | 1174 | + | ||
2230 | 1175 | +#~ msgid "Enable edge tiling when dropping windows on screen edges" | ||
2231 | 1176 | +#~ msgstr "" | ||
2232 | 1177 | +#~ "Habilitar contorno ladrilhado ao arrastar janelas sobre as bordas da tela" | ||
2233 | 1178 | + | ||
2234 | 1179 | +#~ msgid "Workspaces are managed dynamically" | ||
2235 | 1180 | +#~ msgstr "Espaços de trabalho são gerenciados dinamicamente" | ||
2236 | 1181 | + | ||
2237 | 1182 | +#~ msgid "Workspaces only on primary monitor" | ||
2238 | 1183 | +#~ msgstr "Espaços de trabalho apenas no monitor primário" | ||
2239 | 1184 | + | ||
2240 | 1185 | +#~ msgid "Delay focus changes in mouse mode until the pointer stops moving" | ||
2241 | 1186 | +#~ msgstr "Atrasar foco altera o modo do mouse até o ponteiro parar de mover" | ||
2242 | 1187 | + | ||
2243 | 1188 | #~| msgid "Power Off" | ||
2244 | 1189 | #~ msgctxt "search-result" | ||
2245 | 1190 | #~ msgid "Power off" | ||
2246 | diff --git a/debian/patches/Updated-Slovenian-translation.patch b/debian/patches/Updated-Slovenian-translation.patch | |||
2247 | 1191 | deleted file mode 100644 | 0 | deleted file mode 100644 |
2248 | index 9f8881d..0000000 | |||
2249 | --- a/debian/patches/Updated-Slovenian-translation.patch | |||
2250 | +++ /dev/null | |||
2251 | @@ -1,545 +0,0 @@ | |||
2252 | 1 | From: =?utf-8?q?Matej_Urban=C4=8Di=C4=8D?= <mateju@svn.gnome.org> | ||
2253 | 2 | Date: Fri, 3 Aug 2018 11:17:49 +0200 | ||
2254 | 3 | Subject: Updated Slovenian translation | ||
2255 | 4 | |||
2256 | 5 | Origin: upstream, 3.29.91, commit:6b41f823464380c2018f3431edf61bc6ff11354f | ||
2257 | 6 | --- | ||
2258 | 7 | po/sl.po | 160 +++++++++++++++++++++++++++++++++------------------------------ | ||
2259 | 8 | 1 file changed, 84 insertions(+), 76 deletions(-) | ||
2260 | 9 | |||
2261 | 10 | diff --git a/po/sl.po b/po/sl.po | ||
2262 | 11 | index b943c4a..2d37f35 100644 | ||
2263 | 12 | --- a/po/sl.po | ||
2264 | 13 | +++ b/po/sl.po | ||
2265 | 14 | @@ -8,8 +8,8 @@ msgid "" | ||
2266 | 15 | msgstr "" | ||
2267 | 16 | "Project-Id-Version: gnome-shell master\n" | ||
2268 | 17 | "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n" | ||
2269 | 18 | -"POT-Creation-Date: 2018-04-17 15:11+0000\n" | ||
2270 | 19 | -"PO-Revision-Date: 2018-04-17 18:32+0200\n" | ||
2271 | 20 | +"POT-Creation-Date: 2018-07-30 17:00+0000\n" | ||
2272 | 21 | +"PO-Revision-Date: 2018-07-30 22:14+0200\n" | ||
2273 | 22 | "Last-Translator: Matej Urban�i� <mateju@svn.gnome.org>\n" | ||
2274 | 23 | "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n" | ||
2275 | 24 | "Language: sl\n" | ||
2276 | 25 | @@ -352,20 +352,20 @@ msgctxt "button" | ||
2277 | 26 | msgid "Sign In" | ||
2278 | 27 | msgstr "Prijava" | ||
2279 | 28 | |||
2280 | 29 | -#: js/gdm/loginDialog.js:315 | ||
2281 | 30 | +#: js/gdm/loginDialog.js:319 | ||
2282 | 31 | msgid "Choose Session" | ||
2283 | 32 | msgstr "Izbor seje" | ||
2284 | 33 | |||
2285 | 34 | #. translators: this message is shown below the user list on the | ||
2286 | 35 | #. login screen. It can be activated to reveal an entry for | ||
2287 | 36 | #. manually entering the username. | ||
2288 | 37 | -#: js/gdm/loginDialog.js:458 | ||
2289 | 38 | +#: js/gdm/loginDialog.js:462 | ||
2290 | 39 | msgid "Not listed?" | ||
2291 | 40 | msgstr "Ali uporabniškega imena ni na seznamu?" | ||
2292 | 41 | |||
2293 | 42 | #. Translators: this message is shown below the username entry field | ||
2294 | 43 | #. to clue the user in on how to login to the local network realm | ||
2295 | 44 | -#: js/gdm/loginDialog.js:887 | ||
2296 | 45 | +#: js/gdm/loginDialog.js:891 | ||
2297 | 46 | #, javascript-format | ||
2298 | 47 | msgid "(e.g., user or %s)" | ||
2299 | 48 | msgstr "(na primer, uporabnika ali %s)" | ||
2300 | 49 | @@ -373,12 +373,12 @@ msgstr "(na primer, uporabnika ali %s)" | ||
2301 | 50 | #. TTLS and PEAP are actually much more complicated, but this complication | ||
2302 | 51 | #. is not visible here since we only care about phase2 authentication | ||
2303 | 52 | #. (and don't even care of which one) | ||
2304 | 53 | -#: js/gdm/loginDialog.js:892 js/ui/components/networkAgent.js:243 | ||
2305 | 54 | +#: js/gdm/loginDialog.js:896 js/ui/components/networkAgent.js:243 | ||
2306 | 55 | #: js/ui/components/networkAgent.js:261 | ||
2307 | 56 | msgid "Username: " | ||
2308 | 57 | msgstr "Uporabniško ime: " | ||
2309 | 58 | |||
2310 | 59 | -#: js/gdm/loginDialog.js:1228 | ||
2311 | 60 | +#: js/gdm/loginDialog.js:1234 | ||
2312 | 61 | msgid "Login Window" | ||
2313 | 62 | msgstr "Prijavno okno" | ||
2314 | 63 | |||
2315 | 64 | @@ -391,7 +391,7 @@ msgstr "Napaka overitve" | ||
2316 | 65 | #. as a cue to display our own message. | ||
2317 | 66 | #. Translators: this message is shown below the password entry field | ||
2318 | 67 | #. to indicate the user can swipe their finger instead | ||
2319 | 68 | -#: js/gdm/util.js:482 | ||
2320 | 69 | +#: js/gdm/util.js:485 | ||
2321 | 70 | msgid "(or swipe finger)" | ||
2322 | 71 | msgstr "(ali pa povlecite prst)" | ||
2323 | 72 | |||
2324 | 73 | @@ -643,23 +643,23 @@ msgstr "Pogosti" | ||
2325 | 74 | msgid "All" | ||
2326 | 75 | msgstr "Vsi" | ||
2327 | 76 | |||
2328 | 77 | -#: js/ui/appDisplay.js:1886 | ||
2329 | 78 | +#: js/ui/appDisplay.js:1890 | ||
2330 | 79 | msgid "New Window" | ||
2331 | 80 | msgstr "Novo okno" | ||
2332 | 81 | |||
2333 | 82 | -#: js/ui/appDisplay.js:1900 | ||
2334 | 83 | +#: js/ui/appDisplay.js:1904 | ||
2335 | 84 | msgid "Launch using Dedicated Graphics Card" | ||
2336 | 85 | msgstr "Zaženi z uporabo dolo�ene grafi�ne kartice" | ||
2337 | 86 | |||
2338 | 87 | -#: js/ui/appDisplay.js:1927 js/ui/dash.js:285 | ||
2339 | 88 | +#: js/ui/appDisplay.js:1931 js/ui/dash.js:285 | ||
2340 | 89 | msgid "Remove from Favorites" | ||
2341 | 90 | msgstr "Odstrani iz priljubljenih" | ||
2342 | 91 | |||
2343 | 92 | -#: js/ui/appDisplay.js:1933 | ||
2344 | 93 | +#: js/ui/appDisplay.js:1937 | ||
2345 | 94 | msgid "Add to Favorites" | ||
2346 | 95 | msgstr "Dodaj med priljubljene" | ||
2347 | 96 | |||
2348 | 97 | -#: js/ui/appDisplay.js:1943 | ||
2349 | 98 | +#: js/ui/appDisplay.js:1947 | ||
2350 | 99 | msgid "Show Details" | ||
2351 | 100 | msgstr "Pokaži besedilo" | ||
2352 | 101 | |||
2353 | 102 | @@ -806,35 +806,35 @@ msgctxt "event list time" | ||
2354 | 103 | msgid "All Day" | ||
2355 | 104 | msgstr "Celodnevno" | ||
2356 | 105 | |||
2357 | 106 | -#: js/ui/calendar.js:864 | ||
2358 | 107 | +#: js/ui/calendar.js:866 | ||
2359 | 108 | msgctxt "calendar heading" | ||
2360 | 109 | msgid "%A, %B %d" | ||
2361 | 110 | msgstr "%A, %d. %m." | ||
2362 | 111 | |||
2363 | 112 | -#: js/ui/calendar.js:868 | ||
2364 | 113 | +#: js/ui/calendar.js:870 | ||
2365 | 114 | msgctxt "calendar heading" | ||
2366 | 115 | msgid "%A, %B %d, %Y" | ||
2367 | 116 | msgstr "%A, %d %B %Y" | ||
2368 | 117 | |||
2369 | 118 | -#: js/ui/calendar.js:1086 | ||
2370 | 119 | +#: js/ui/calendar.js:1100 | ||
2371 | 120 | msgid "No Notifications" | ||
2372 | 121 | msgstr "Ni obvestil" | ||
2373 | 122 | |||
2374 | 123 | -#: js/ui/calendar.js:1089 | ||
2375 | 124 | +#: js/ui/calendar.js:1103 | ||
2376 | 125 | msgid "No Events" | ||
2377 | 126 | msgstr "Ni dogodkov" | ||
2378 | 127 | |||
2379 | 128 | -#: js/ui/calendar.js:1117 | ||
2380 | 129 | +#: js/ui/calendar.js:1131 | ||
2381 | 130 | msgid "Clear All" | ||
2382 | 131 | msgstr "Po�isti vse" | ||
2383 | 132 | |||
2384 | 133 | #. Translators: %s is an application name | ||
2385 | 134 | -#: js/ui/closeDialog.js:44 | ||
2386 | 135 | +#: js/ui/closeDialog.js:47 | ||
2387 | 136 | #, javascript-format | ||
2388 | 137 | msgid "“%s� is not responding." | ||
2389 | 138 | msgstr "Program »%s« se ne odziva." | ||
2390 | 139 | |||
2391 | 140 | -#: js/ui/closeDialog.js:45 | ||
2392 | 141 | +#: js/ui/closeDialog.js:48 | ||
2393 | 142 | msgid "" | ||
2394 | 143 | "You may choose to wait a short while for it to continue or force the " | ||
2395 | 144 | "application to quit entirely." | ||
2396 | 145 | @@ -842,11 +842,11 @@ msgstr "" | ||
2397 | 146 | "Lahko po�akate, �e se program morda za�ne spet odzivati, lahko pa vsilite " | ||
2398 | 147 | "kon�anje delovanja." | ||
2399 | 148 | |||
2400 | 149 | -#: js/ui/closeDialog.js:61 | ||
2401 | 150 | +#: js/ui/closeDialog.js:64 | ||
2402 | 151 | msgid "Force Quit" | ||
2403 | 152 | msgstr "Vsili kon�anje" | ||
2404 | 153 | |||
2405 | 154 | -#: js/ui/closeDialog.js:64 | ||
2406 | 155 | +#: js/ui/closeDialog.js:67 | ||
2407 | 156 | msgid "Wait" | ||
2408 | 157 | msgstr "Po�akaj" | ||
2409 | 158 | |||
2410 | 159 | @@ -863,7 +863,7 @@ msgstr "Zunanji pogon je odklopljen" | ||
2411 | 160 | msgid "Open with %s" | ||
2412 | 161 | msgstr "Odpri s programom %s" | ||
2413 | 162 | |||
2414 | 163 | -#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:295 | ||
2415 | 164 | +#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:297 | ||
2416 | 165 | msgid "Password:" | ||
2417 | 166 | msgstr "Geslo:" | ||
2418 | 167 | |||
2419 | 168 | @@ -900,11 +900,11 @@ msgstr "Geslo zasebnega klju�a: " | ||
2420 | 169 | msgid "Service: " | ||
2421 | 170 | msgstr "Storitev: " | ||
2422 | 171 | |||
2423 | 172 | -#: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:659 | ||
2424 | 173 | +#: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:664 | ||
2425 | 174 | msgid "Authentication required by wireless network" | ||
2426 | 175 | msgstr "Zahtevana overitev za brezži�no omrežje" | ||
2427 | 176 | |||
2428 | 177 | -#: js/ui/components/networkAgent.js:293 js/ui/components/networkAgent.js:660 | ||
2429 | 178 | +#: js/ui/components/networkAgent.js:293 js/ui/components/networkAgent.js:665 | ||
2430 | 179 | #, javascript-format | ||
2431 | 180 | msgid "" | ||
2432 | 181 | "Passwords or encryption keys are required to access the wireless network " | ||
2433 | 182 | @@ -913,7 +913,7 @@ msgstr "" | ||
2434 | 183 | "Za povezavo v brezži�no omrežje »%s« je zahtevano geslo oziroma šifrirni " | ||
2435 | 184 | "klju�." | ||
2436 | 185 | |||
2437 | 186 | -#: js/ui/components/networkAgent.js:297 js/ui/components/networkAgent.js:663 | ||
2438 | 187 | +#: js/ui/components/networkAgent.js:297 js/ui/components/networkAgent.js:668 | ||
2439 | 188 | msgid "Wired 802.1X authentication" | ||
2440 | 189 | msgstr "Ži�na overitev 802.1X" | ||
2441 | 190 | |||
2442 | 191 | @@ -921,15 +921,15 @@ msgstr "Ži�na overitev 802.1X" | ||
2443 | 192 | msgid "Network name: " | ||
2444 | 193 | msgstr "Naziv omrežja: " | ||
2445 | 194 | |||
2446 | 195 | -#: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:667 | ||
2447 | 196 | +#: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:672 | ||
2448 | 197 | msgid "DSL authentication" | ||
2449 | 198 | msgstr "Overitev DSL" | ||
2450 | 199 | |||
2451 | 200 | -#: js/ui/components/networkAgent.js:311 js/ui/components/networkAgent.js:673 | ||
2452 | 201 | +#: js/ui/components/networkAgent.js:311 js/ui/components/networkAgent.js:678 | ||
2453 | 202 | msgid "PIN code required" | ||
2454 | 203 | msgstr "Zahtevana koda PIN" | ||
2455 | 204 | |||
2456 | 205 | -#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:674 | ||
2457 | 206 | +#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:679 | ||
2458 | 207 | msgid "PIN code is needed for the mobile broadband device" | ||
2459 | 208 | msgstr "Za napravo mobilnega Å¡irokopasovnega dostopa je zahtevana koda PIN." | ||
2460 | 209 | |||
2461 | 210 | @@ -937,17 +937,17 @@ msgstr "Za napravo mobilnega Å¡irokopasovnega dostopa je zahtevana koda PIN." | ||
2462 | 211 | msgid "PIN: " | ||
2463 | 212 | msgstr "Koda PIN: " | ||
2464 | 213 | |||
2465 | 214 | -#: js/ui/components/networkAgent.js:320 js/ui/components/networkAgent.js:680 | ||
2466 | 215 | +#: js/ui/components/networkAgent.js:320 js/ui/components/networkAgent.js:685 | ||
2467 | 216 | msgid "Mobile broadband network password" | ||
2468 | 217 | msgstr "Geslo mobilnega Å¡irokopasovnega dostopa" | ||
2469 | 218 | |||
2470 | 219 | -#: js/ui/components/networkAgent.js:321 js/ui/components/networkAgent.js:664 | ||
2471 | 220 | -#: js/ui/components/networkAgent.js:668 js/ui/components/networkAgent.js:681 | ||
2472 | 221 | +#: js/ui/components/networkAgent.js:321 js/ui/components/networkAgent.js:669 | ||
2473 | 222 | +#: js/ui/components/networkAgent.js:673 js/ui/components/networkAgent.js:686 | ||
2474 | 223 | #, javascript-format | ||
2475 | 224 | msgid "A password is required to connect to “%s�." | ||
2476 | 225 | msgstr "Za povezavo z omrežjem »%s« je zahtevano geslo." | ||
2477 | 226 | |||
2478 | 227 | -#: js/ui/components/networkAgent.js:648 js/ui/status/network.js:1691 | ||
2479 | 228 | +#: js/ui/components/networkAgent.js:653 js/ui/status/network.js:1704 | ||
2480 | 229 | msgid "Network Manager" | ||
2481 | 230 | msgstr "Upravljalnik omrežij" | ||
2482 | 231 | |||
2483 | 232 | @@ -967,7 +967,7 @@ msgstr "Overi" | ||
2484 | 233 | #. * requested authentication was not gained; this can happen | ||
2485 | 234 | #. * because of an authentication error (like invalid password), | ||
2486 | 235 | #. * for instance. | ||
2487 | 236 | -#: js/ui/components/polkitAgent.js:281 js/ui/shellMountOperation.js:327 | ||
2488 | 237 | +#: js/ui/components/polkitAgent.js:283 js/ui/shellMountOperation.js:327 | ||
2489 | 238 | msgid "Sorry, that didn’t work. Please try again." | ||
2490 | 239 | msgstr "Overitev je spodletela.. Poskusite znova." | ||
2491 | 240 | |||
2492 | 241 | @@ -1309,13 +1309,13 @@ msgid "Leave On" | ||
2493 | 242 | msgstr "Pusti omogo�eno" | ||
2494 | 243 | |||
2495 | 244 | #: js/ui/kbdA11yDialog.js:59 js/ui/status/bluetooth.js:143 | ||
2496 | 245 | -#: js/ui/status/network.js:1281 | ||
2497 | 246 | +#: js/ui/status/network.js:1294 | ||
2498 | 247 | msgid "Turn On" | ||
2499 | 248 | msgstr "Omogo�i" | ||
2500 | 249 | |||
2501 | 250 | #: js/ui/kbdA11yDialog.js:67 js/ui/status/bluetooth.js:143 | ||
2502 | 251 | #: js/ui/status/network.js:154 js/ui/status/network.js:337 | ||
2503 | 252 | -#: js/ui/status/network.js:1281 js/ui/status/network.js:1396 | ||
2504 | 253 | +#: js/ui/status/network.js:1294 js/ui/status/network.js:1409 | ||
2505 | 254 | #: js/ui/status/nightLight.js:47 js/ui/status/rfkill.js:90 | ||
2506 | 255 | #: js/ui/status/rfkill.js:117 | ||
2507 | 256 | msgid "Turn Off" | ||
2508 | 257 | @@ -1377,7 +1377,7 @@ msgstr "Poglej vir" | ||
2509 | 258 | msgid "Web Page" | ||
2510 | 259 | msgstr "Spletna stran" | ||
2511 | 260 | |||
2512 | 261 | -#: js/ui/messageTray.js:1493 | ||
2513 | 262 | +#: js/ui/messageTray.js:1495 | ||
2514 | 263 | msgid "System Information" | ||
2515 | 264 | msgstr "Podrobnosti sistema" | ||
2516 | 265 | |||
2517 | 266 | @@ -1451,22 +1451,22 @@ msgstr "Pritisnite tipko Esc za kon�anje" | ||
2518 | 267 | msgid "Press any key to exit" | ||
2519 | 268 | msgstr "Pritisnite katerokoli tipko za kon�anje" | ||
2520 | 269 | |||
2521 | 270 | -#: js/ui/panel.js:355 | ||
2522 | 271 | +#: js/ui/panel.js:356 | ||
2523 | 272 | msgid "Quit" | ||
2524 | 273 | msgstr "Kon�aj" | ||
2525 | 274 | |||
2526 | 275 | #. Translators: If there is no suitable word for "Activities" | ||
2527 | 276 | #. in your language, you can use the word for "Overview". | ||
2528 | 277 | -#: js/ui/panel.js:411 | ||
2529 | 278 | +#: js/ui/panel.js:412 | ||
2530 | 279 | msgid "Activities" | ||
2531 | 280 | msgstr "Dejavnosti" | ||
2532 | 281 | |||
2533 | 282 | -#: js/ui/panel.js:692 | ||
2534 | 283 | +#: js/ui/panel.js:693 | ||
2535 | 284 | msgctxt "System menu in the top bar" | ||
2536 | 285 | msgid "System" | ||
2537 | 286 | msgstr "Sistem" | ||
2538 | 287 | |||
2539 | 288 | -#: js/ui/panel.js:811 | ||
2540 | 289 | +#: js/ui/panel.js:816 | ||
2541 | 290 | msgid "Top Bar" | ||
2542 | 291 | msgstr "Vrhnja vrstica" | ||
2543 | 292 | |||
2544 | 293 | @@ -1475,7 +1475,7 @@ msgstr "Vrhnja vrstica" | ||
2545 | 294 | #. "ON" and "OFF") or "toggle-switch-intl" (for toggle | ||
2546 | 295 | #. switches containing "â—¯" and "|"). Other values will | ||
2547 | 296 | #. simply result in invisible toggle switches. | ||
2548 | 297 | -#: js/ui/popupMenu.js:291 | ||
2549 | 298 | +#: js/ui/popupMenu.js:300 | ||
2550 | 299 | msgid "toggle-switch-us" | ||
2551 | 300 | msgstr "toggle-switch-intl" | ||
2552 | 301 | |||
2553 | 302 | @@ -1483,15 +1483,15 @@ msgstr "toggle-switch-intl" | ||
2554 | 303 | msgid "Enter a Command" | ||
2555 | 304 | msgstr "Vnos ukaza" | ||
2556 | 305 | |||
2557 | 306 | -#: js/ui/runDialog.js:110 js/ui/windowMenu.js:175 | ||
2558 | 307 | +#: js/ui/runDialog.js:110 js/ui/windowMenu.js:174 | ||
2559 | 308 | msgid "Close" | ||
2560 | 309 | msgstr "Zapri" | ||
2561 | 310 | |||
2562 | 311 | -#: js/ui/runDialog.js:273 | ||
2563 | 312 | +#: js/ui/runDialog.js:274 | ||
2564 | 313 | msgid "Restart is not available on Wayland" | ||
2565 | 314 | msgstr "Na sistemu Wayland je na voljo ponovni zagon" | ||
2566 | 315 | |||
2567 | 316 | -#: js/ui/runDialog.js:278 | ||
2568 | 317 | +#: js/ui/runDialog.js:279 | ||
2569 | 318 | msgid "Restarting…" | ||
2570 | 319 | msgstr "Ponovno zaganjanje ...." | ||
2571 | 320 | |||
2572 | 321 | @@ -1706,7 +1706,7 @@ msgid "<unknown>" | ||
2573 | 322 | msgstr "<neznano>" | ||
2574 | 323 | |||
2575 | 324 | #. Translators: %s is a network identifier | ||
2576 | 325 | -#: js/ui/status/network.js:441 js/ui/status/network.js:1310 | ||
2577 | 326 | +#: js/ui/status/network.js:441 js/ui/status/network.js:1323 | ||
2578 | 327 | #, javascript-format | ||
2579 | 328 | msgid "%s Off" | ||
2580 | 329 | msgstr "%s izklopljeno" | ||
2581 | 330 | @@ -1732,7 +1732,7 @@ msgid "%s Disconnecting" | ||
2582 | 331 | msgstr "%s poteka prekinjanje povezave" | ||
2583 | 332 | |||
2584 | 333 | #. Translators: %s is a network identifier | ||
2585 | 334 | -#: js/ui/status/network.js:459 js/ui/status/network.js:1302 | ||
2586 | 335 | +#: js/ui/status/network.js:459 js/ui/status/network.js:1315 | ||
2587 | 336 | #, javascript-format | ||
2588 | 337 | msgid "%s Connecting" | ||
2589 | 338 | msgstr "%s poteka vzpostavljanje povezave" | ||
2590 | 339 | @@ -1772,7 +1772,7 @@ msgid "Mobile Broadband Settings" | ||
2591 | 340 | msgstr "Nastavitve mobilnega Å¡irokopasovnega dostopa" | ||
2592 | 341 | |||
2593 | 342 | #. Translators: %s is a network identifier | ||
2594 | 343 | -#: js/ui/status/network.js:578 js/ui/status/network.js:1307 | ||
2595 | 344 | +#: js/ui/status/network.js:578 js/ui/status/network.js:1320 | ||
2596 | 345 | #, javascript-format | ||
2597 | 346 | msgid "%s Hardware Disabled" | ||
2598 | 347 | msgstr "%s strojno onemogo�eno" | ||
2599 | 348 | @@ -1828,56 +1828,56 @@ msgstr "Ni zaznanih omrežij" | ||
2600 | 349 | msgid "Use hardware switch to turn off" | ||
2601 | 350 | msgstr "Uporabite strojni gumb za izklop" | ||
2602 | 351 | |||
2603 | 352 | -#: js/ui/status/network.js:1173 | ||
2604 | 353 | +#: js/ui/status/network.js:1186 | ||
2605 | 354 | msgid "Select Network" | ||
2606 | 355 | msgstr "Izbor omrežja" | ||
2607 | 356 | |||
2608 | 357 | -#: js/ui/status/network.js:1179 | ||
2609 | 358 | +#: js/ui/status/network.js:1192 | ||
2610 | 359 | msgid "Wi-Fi Settings" | ||
2611 | 360 | msgstr "Nastavitve Wi-Fi" | ||
2612 | 361 | |||
2613 | 362 | #. Translators: %s is a network identifier | ||
2614 | 363 | -#: js/ui/status/network.js:1298 | ||
2615 | 364 | +#: js/ui/status/network.js:1311 | ||
2616 | 365 | #, javascript-format | ||
2617 | 366 | msgid "%s Hotspot Active" | ||
2618 | 367 | msgstr "%s vro�a to�ka je dejavna" | ||
2619 | 368 | |||
2620 | 369 | #. Translators: %s is a network identifier | ||
2621 | 370 | -#: js/ui/status/network.js:1313 | ||
2622 | 371 | +#: js/ui/status/network.js:1326 | ||
2623 | 372 | #, javascript-format | ||
2624 | 373 | msgid "%s Not Connected" | ||
2625 | 374 | msgstr "%s brez povezave" | ||
2626 | 375 | |||
2627 | 376 | -#: js/ui/status/network.js:1413 | ||
2628 | 377 | +#: js/ui/status/network.js:1426 | ||
2629 | 378 | msgid "connecting…" | ||
2630 | 379 | msgstr "vzpostavljanje povezave …" | ||
2631 | 380 | |||
2632 | 381 | #. Translators: this is for network connections that require some kind of key or password | ||
2633 | 382 | -#: js/ui/status/network.js:1416 | ||
2634 | 383 | +#: js/ui/status/network.js:1429 | ||
2635 | 384 | msgid "authentication required" | ||
2636 | 385 | msgstr "zahtevana je overitev" | ||
2637 | 386 | |||
2638 | 387 | -#: js/ui/status/network.js:1418 | ||
2639 | 388 | +#: js/ui/status/network.js:1431 | ||
2640 | 389 | msgid "connection failed" | ||
2641 | 390 | msgstr "povezovanje je spodletelo" | ||
2642 | 391 | |||
2643 | 392 | -#: js/ui/status/network.js:1472 | ||
2644 | 393 | +#: js/ui/status/network.js:1485 | ||
2645 | 394 | msgid "VPN Settings" | ||
2646 | 395 | msgstr "Nastavitve VPN" | ||
2647 | 396 | |||
2648 | 397 | -#: js/ui/status/network.js:1485 | ||
2649 | 398 | +#: js/ui/status/network.js:1498 | ||
2650 | 399 | msgid "VPN" | ||
2651 | 400 | msgstr "VPN" | ||
2652 | 401 | |||
2653 | 402 | -#: js/ui/status/network.js:1495 | ||
2654 | 403 | +#: js/ui/status/network.js:1508 | ||
2655 | 404 | msgid "VPN Off" | ||
2656 | 405 | msgstr "Onemogo�en VPN" | ||
2657 | 406 | |||
2658 | 407 | -#: js/ui/status/network.js:1559 js/ui/status/rfkill.js:93 | ||
2659 | 408 | +#: js/ui/status/network.js:1572 js/ui/status/rfkill.js:93 | ||
2660 | 409 | msgid "Network Settings" | ||
2661 | 410 | msgstr "Omrežne nastavitve" | ||
2662 | 411 | |||
2663 | 412 | -#: js/ui/status/network.js:1588 | ||
2664 | 413 | +#: js/ui/status/network.js:1601 | ||
2665 | 414 | #, javascript-format | ||
2666 | 415 | msgid "%s Wired Connection" | ||
2667 | 416 | msgid_plural "%s Wired Connections" | ||
2668 | 417 | @@ -1886,7 +1886,7 @@ msgstr[1] "%s ži�na povezava" | ||
2669 | 418 | msgstr[2] "%s ži�ni povezavi" | ||
2670 | 419 | msgstr[3] "%s ži�ne povezave" | ||
2671 | 420 | |||
2672 | 421 | -#: js/ui/status/network.js:1592 | ||
2673 | 422 | +#: js/ui/status/network.js:1605 | ||
2674 | 423 | #, javascript-format | ||
2675 | 424 | msgid "%s Wi-Fi Connection" | ||
2676 | 425 | msgid_plural "%s Wi-Fi Connections" | ||
2677 | 426 | @@ -1895,7 +1895,7 @@ msgstr[1] "%s povezava Wi-Fi" | ||
2678 | 427 | msgstr[2] "%s povezavi Wi-Fi" | ||
2679 | 428 | msgstr[3] "%s povezave Wi-Fi" | ||
2680 | 429 | |||
2681 | 430 | -#: js/ui/status/network.js:1596 | ||
2682 | 431 | +#: js/ui/status/network.js:1609 | ||
2683 | 432 | #, javascript-format | ||
2684 | 433 | msgid "%s Modem Connection" | ||
2685 | 434 | msgid_plural "%s Modem Connections" | ||
2686 | 435 | @@ -1904,11 +1904,11 @@ msgstr[1] "%s modemska povezava" | ||
2687 | 436 | msgstr[2] "%s modemski povezavi" | ||
2688 | 437 | msgstr[3] "%s modemske povezave" | ||
2689 | 438 | |||
2690 | 439 | -#: js/ui/status/network.js:1728 | ||
2691 | 440 | +#: js/ui/status/network.js:1741 | ||
2692 | 441 | msgid "Connection failed" | ||
2693 | 442 | msgstr "Povezovanje je spodletelo" | ||
2694 | 443 | |||
2695 | 444 | -#: js/ui/status/network.js:1729 | ||
2696 | 445 | +#: js/ui/status/network.js:1742 | ||
2697 | 446 | msgid "Activation of network connection failed" | ||
2698 | 447 | msgstr "Omogo�anje omrežne povezave je spodletelo." | ||
2699 | 448 | |||
2700 | 449 | @@ -1959,6 +1959,14 @@ msgstr "%d∶%02d do polnosti (%d %%)" | ||
2701 | 450 | msgid "%d %%" | ||
2702 | 451 | msgstr "%d %%" | ||
2703 | 452 | |||
2704 | 453 | +#: js/ui/status/remoteAccess.js:46 | ||
2705 | 454 | +msgid "Screen is Being Shared" | ||
2706 | 455 | +msgstr "Zaslon je v na�inu souporabe" | ||
2707 | 456 | + | ||
2708 | 457 | +#: js/ui/status/remoteAccess.js:48 | ||
2709 | 458 | +msgid "Turn off" | ||
2710 | 459 | +msgstr "Izklopi" | ||
2711 | 460 | + | ||
2712 | 461 | #. The menu only appears when airplane mode is on, so just | ||
2713 | 462 | #. statically build it as if it was on, rather than dynamically | ||
2714 | 463 | #. changing the menu contents. | ||
2715 | 464 | @@ -1990,16 +1998,16 @@ msgstr "V pripravljenost" | ||
2716 | 465 | msgid "Power Off" | ||
2717 | 466 | msgstr "Izklop" | ||
2718 | 467 | |||
2719 | 468 | -#: js/ui/status/thunderbolt.js:294 | ||
2720 | 469 | +#: js/ui/status/thunderbolt.js:298 | ||
2721 | 470 | msgid "Thunderbolt" | ||
2722 | 471 | msgstr "Thunderbolt" | ||
2723 | 472 | |||
2724 | 473 | #. we are done | ||
2725 | 474 | -#: js/ui/status/thunderbolt.js:350 | ||
2726 | 475 | +#: js/ui/status/thunderbolt.js:354 | ||
2727 | 476 | msgid "Unknown Thunderbolt device" | ||
2728 | 477 | msgstr "Neznana naprava Thunderbolt" | ||
2729 | 478 | |||
2730 | 479 | -#: js/ui/status/thunderbolt.js:351 | ||
2731 | 480 | +#: js/ui/status/thunderbolt.js:355 | ||
2732 | 481 | msgid "" | ||
2733 | 482 | "New device has been detected while you were away. Please disconnect and " | ||
2734 | 483 | "reconnect the device to start using it." | ||
2735 | 484 | @@ -2007,11 +2015,11 @@ msgstr "" | ||
2736 | 485 | "Med nedejavnostjo je bila zaznana nova. Odklopite napravo in jo znova " | ||
2737 | 486 | "priklopite za uporabo." | ||
2738 | 487 | |||
2739 | 488 | -#: js/ui/status/thunderbolt.js:356 | ||
2740 | 489 | +#: js/ui/status/thunderbolt.js:360 | ||
2741 | 490 | msgid "Thunderbolt authorization error" | ||
2742 | 491 | msgstr "Napaka overitve naprave Thunderbolt" | ||
2743 | 492 | |||
2744 | 493 | -#: js/ui/status/thunderbolt.js:357 | ||
2745 | 494 | +#: js/ui/status/thunderbolt.js:361 | ||
2746 | 495 | #, javascript-format | ||
2747 | 496 | msgid "Could not authorize the Thunderbolt device: %s" | ||
2748 | 497 | msgstr "Naprave Thunderbolt ni mogo�e overiti: %s" | ||
2749 | 498 | @@ -2099,7 +2107,7 @@ msgstr[3] "Spremembe nastavitev bodo povrnjene v %d sekundah." | ||
2750 | 499 | |||
2751 | 500 | #. Translators: This represents the size of a window. The first number is | ||
2752 | 501 | #. * the width of the window and the second is the height. | ||
2753 | 502 | -#: js/ui/windowManager.js:660 | ||
2754 | 503 | +#: js/ui/windowManager.js:668 | ||
2755 | 504 | #, javascript-format | ||
2756 | 505 | msgid "%d × %d" | ||
2757 | 506 | msgstr "%d × %d" | ||
2758 | 507 | @@ -2152,19 +2160,19 @@ msgstr "Premakni na zgornjo delovno površino" | ||
2759 | 508 | msgid "Move to Workspace Down" | ||
2760 | 509 | msgstr "Premakni na spodnjo delovno površino" | ||
2761 | 510 | |||
2762 | 511 | -#: js/ui/windowMenu.js:140 | ||
2763 | 512 | +#: js/ui/windowMenu.js:139 | ||
2764 | 513 | msgid "Move to Monitor Up" | ||
2765 | 514 | msgstr "Premakni na zaslon zgoraj" | ||
2766 | 515 | |||
2767 | 516 | -#: js/ui/windowMenu.js:149 | ||
2768 | 517 | +#: js/ui/windowMenu.js:148 | ||
2769 | 518 | msgid "Move to Monitor Down" | ||
2770 | 519 | msgstr "Premakni na zaslon spodaj" | ||
2771 | 520 | |||
2772 | 521 | -#: js/ui/windowMenu.js:158 | ||
2773 | 522 | +#: js/ui/windowMenu.js:157 | ||
2774 | 523 | msgid "Move to Monitor Left" | ||
2775 | 524 | msgstr "Premakni na zaslon levo" | ||
2776 | 525 | |||
2777 | 526 | -#: js/ui/windowMenu.js:167 | ||
2778 | 527 | +#: js/ui/windowMenu.js:166 | ||
2779 | 528 | msgid "Move to Monitor Right" | ||
2780 | 529 | msgstr "Premakni na zaslon desno" | ||
2781 | 530 | |||
2782 | 531 | @@ -2193,12 +2201,12 @@ msgstr "Uporabi poseben na�in, na primer »gdm« za prijavni zaslon" | ||
2783 | 532 | msgid "List possible modes" | ||
2784 | 533 | msgstr "Seznam mogo�ih na�inov" | ||
2785 | 534 | |||
2786 | 535 | -#: src/shell-app.c:270 | ||
2787 | 536 | +#: src/shell-app.c:272 | ||
2788 | 537 | msgctxt "program" | ||
2789 | 538 | msgid "Unknown" | ||
2790 | 539 | msgstr "Neznano" | ||
2791 | 540 | |||
2792 | 541 | -#: src/shell-app.c:511 | ||
2793 | 542 | +#: src/shell-app.c:523 | ||
2794 | 543 | #, c-format | ||
2795 | 544 | msgid "Failed to launch “%s�" | ||
2796 | 545 | msgstr "Zaganjanje »%s« je spodletelo" | ||
2797 | diff --git a/debian/patches/data-Fix-comment-in-schema.patch b/debian/patches/data-Fix-comment-in-schema.patch | |||
2798 | 546 | deleted file mode 100644 | 0 | deleted file mode 100644 |
2799 | index cfc1170..0000000 | |||
2800 | --- a/debian/patches/data-Fix-comment-in-schema.patch | |||
2801 | +++ /dev/null | |||
2802 | @@ -1,22 +0,0 @@ | |||
2803 | 1 | From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org> | ||
2804 | 2 | Date: Wed, 1 Aug 2018 20:03:03 +0200 | ||
2805 | 3 | Subject: data: Fix comment in schema | ||
2806 | 4 | |||
2807 | 5 | Origin: upstream, 3.29.91, commit:9f436ce3734b889afcff1880f6fed884196b92c5 | ||
2808 | 6 | --- | ||
2809 | 7 | data/org.gnome.shell.gschema.xml.in | 2 +- | ||
2810 | 8 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
2811 | 9 | |||
2812 | 10 | diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in | ||
2813 | 11 | index 3e258e2..8e6b990 100644 | ||
2814 | 12 | --- a/data/org.gnome.shell.gschema.xml.in | ||
2815 | 13 | +++ b/data/org.gnome.shell.gschema.xml.in | ||
2816 | 14 | @@ -198,7 +198,7 @@ | ||
2817 | 15 | </key> | ||
2818 | 16 | </schema> | ||
2819 | 17 | |||
2820 | 18 | - <!-- unused, change 00_org.gnome.shell.gschema.override instead --!> | ||
2821 | 19 | + <!-- unused, change 00_org.gnome.shell.gschema.override instead --> | ||
2822 | 20 | <schema id="org.gnome.shell.overrides" path="/org/gnome/shell/overrides/" | ||
2823 | 21 | gettext-domain="@GETTEXT_PACKAGE@"> | ||
2824 | 22 | <key name="attach-modal-dialogs" type="b"> | ||
2825 | diff --git a/debian/patches/js-main-Throw-error-if-no-valid-default-stylesheet-is-fou.patch b/debian/patches/js-main-Throw-error-if-no-valid-default-stylesheet-is-fou.patch | |||
2826 | index 98403a4..c246360 100644 | |||
2827 | --- a/debian/patches/js-main-Throw-error-if-no-valid-default-stylesheet-is-fou.patch | |||
2828 | +++ b/debian/patches/js-main-Throw-error-if-no-valid-default-stylesheet-is-fou.patch | |||
2829 | @@ -11,7 +11,7 @@ Forwarded: not-needed, upstream does not support custom modes/themes officially. | |||
2830 | 11 | 1 file changed, 3 insertions(+) | 11 | 1 file changed, 3 insertions(+) |
2831 | 12 | 12 | ||
2832 | 13 | diff --git a/js/ui/main.js b/js/ui/main.js | 13 | diff --git a/js/ui/main.js b/js/ui/main.js |
2834 | 14 | index aa1de83..92e61c8 100644 | 14 | index 68c3a0c..ce57421 100644 |
2835 | 15 | --- a/js/ui/main.js | 15 | --- a/js/ui/main.js |
2836 | 16 | +++ b/js/ui/main.js | 16 | +++ b/js/ui/main.js |
2837 | 17 | @@ -346,6 +346,9 @@ function loadTheme() { | 17 | @@ -346,6 +346,9 @@ function loadTheme() { |
2838 | diff --git a/debian/patches/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch b/debian/patches/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch | |||
2839 | 18 | deleted file mode 100644 | 18 | deleted file mode 100644 |
2840 | index f9971bf..0000000 | |||
2841 | --- a/debian/patches/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch | |||
2842 | +++ /dev/null | |||
2843 | @@ -1,133 +0,0 @@ | |||
2844 | 1 | From: Daniel van Vugt <daniel.van.vugt@canonical.com> | ||
2845 | 2 | Date: Fri, 6 Apr 2018 12:26:58 +0200 | ||
2846 | 3 | Subject: js/ui: Choose some actors to cache on the GPU | ||
2847 | 4 | |||
2848 | 5 | Adds a wrapper function to flag actors that are good candidates for | ||
2849 | 6 | caching in texture memory (what Clutter calls "offscreen redirect"), | ||
2850 | 7 | thereby mostly eliminating their repaint overhead. | ||
2851 | 8 | |||
2852 | 9 | This isn't exactly groundbreaking, it's how you're meant to use | ||
2853 | 10 | OpenGL in the first place. But the difficulty is in the design of | ||
2854 | 11 | Clutter which has some peculiarities making universal caching | ||
2855 | 12 | inefficient at the moment: | ||
2856 | 13 | |||
2857 | 14 | * Repainting an offscreen actor is measurably slower than repainting | ||
2858 | 15 | the same actor if it was uncached. But only by less than 100%, | ||
2859 | 16 | so if an actor can avoid changing every frame then caching is usually | ||
2860 | 17 | more efficient over that timeframe. | ||
2861 | 18 | |||
2862 | 19 | * The cached painting from a container typically includes its children, | ||
2863 | 20 | so you can't cache containers whose children are usually animating at | ||
2864 | 21 | full frame rate. That results in a performance loss. | ||
2865 | 22 | This could be remedied in future by Clutter explicitly separating a | ||
2866 | 23 | container's background painting from its child painting and always | ||
2867 | 24 | caching the background (as StWidget tries to in some cases already). | ||
2868 | 25 | |||
2869 | 26 | So this commit selects just a few areas where caching has been verified | ||
2870 | 27 | to be beneficial, and many use cases now see their CPU usage halved: | ||
2871 | 28 | |||
2872 | 29 | One small window active...... 10% -> 7% (-30%) | ||
2873 | 30 | ...under a panel menu........ 23% -> 9% (-61%) | ||
2874 | 31 | One maximized window active.. 12% -> 9% (-25%) | ||
2875 | 32 | ...under a panel menu........ 23% -> 11% (-52%) | ||
2876 | 33 | ...under a shell dialog...... 22% -> 12% (-45%) | ||
2877 | 34 | ...in activities overview.... 32% -> 17% (-47%) | ||
2878 | 35 | (on an i7-7700) | ||
2879 | 36 | |||
2880 | 37 | Also a couple of bugs are fixed by this: | ||
2881 | 38 | |||
2882 | 39 | https://bugzilla.gnome.org/show_bug.cgi?id=792634 | ||
2883 | 40 | https://bugzilla.gnome.org/show_bug.cgi?id=792633 | ||
2884 | 41 | |||
2885 | 42 | Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=792634 | ||
2886 | 43 | Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=792633 | ||
2887 | 44 | Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1744001 | ||
2888 | 45 | Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/73 | ||
2889 | 46 | --- | ||
2890 | 47 | js/ui/boxpointer.js | 1 + | ||
2891 | 48 | js/ui/dash.js | 1 + | ||
2892 | 49 | js/ui/dialog.js | 2 ++ | ||
2893 | 50 | js/ui/main.js | 16 ++++++++++++++++ | ||
2894 | 51 | js/ui/panel.js | 1 + | ||
2895 | 52 | 5 files changed, 21 insertions(+) | ||
2896 | 53 | |||
2897 | 54 | diff --git a/js/ui/boxpointer.js b/js/ui/boxpointer.js | ||
2898 | 55 | index 47f718a..602646a 100644 | ||
2899 | 56 | --- a/js/ui/boxpointer.js | ||
2900 | 57 | +++ b/js/ui/boxpointer.js | ||
2901 | 58 | @@ -44,6 +44,7 @@ var BoxPointer = new Lang.Class({ | ||
2902 | 59 | y_fill: true }); | ||
2903 | 60 | this._container = new Shell.GenericContainer(); | ||
2904 | 61 | this.actor.set_child(this._container); | ||
2905 | 62 | + Main.hintActorSeldomChanges(this.actor); | ||
2906 | 63 | this._container.connect('get-preferred-width', this._getPreferredWidth.bind(this)); | ||
2907 | 64 | this._container.connect('get-preferred-height', this._getPreferredHeight.bind(this)); | ||
2908 | 65 | this._container.connect('allocate', this._allocate.bind(this)); | ||
2909 | 66 | diff --git a/js/ui/dash.js b/js/ui/dash.js | ||
2910 | 67 | index 5ee2476..14864f1 100644 | ||
2911 | 68 | --- a/js/ui/dash.js | ||
2912 | 69 | +++ b/js/ui/dash.js | ||
2913 | 70 | @@ -402,6 +402,7 @@ var Dash = new Lang.Class({ | ||
2914 | 71 | clip_to_allocation: true }); | ||
2915 | 72 | this._box._delegate = this; | ||
2916 | 73 | this._container.add_actor(this._box); | ||
2917 | 74 | + Main.hintActorSeldomChanges(this._container); | ||
2918 | 75 | |||
2919 | 76 | this._showAppsIcon = new ShowAppsIcon(); | ||
2920 | 77 | this._showAppsIcon.childScale = 1; | ||
2921 | 78 | diff --git a/js/ui/dialog.js b/js/ui/dialog.js | ||
2922 | 79 | index cfa192d..89db963 100644 | ||
2923 | 80 | --- a/js/ui/dialog.js | ||
2924 | 81 | +++ b/js/ui/dialog.js | ||
2925 | 82 | @@ -6,6 +6,7 @@ const GObject = imports.gi.GObject; | ||
2926 | 83 | const Pango = imports.gi.Pango; | ||
2927 | 84 | const St = imports.gi.St; | ||
2928 | 85 | const Lang = imports.lang; | ||
2929 | 86 | +const Main = imports.ui.main; | ||
2930 | 87 | |||
2931 | 88 | var Dialog = new Lang.Class({ | ||
2932 | 89 | Name: 'Dialog', | ||
2933 | 90 | @@ -40,6 +41,7 @@ var Dialog = new Lang.Class({ | ||
2934 | 91 | // mode accordingly so wrapped labels are handled correctly during | ||
2935 | 92 | // size requests. | ||
2936 | 93 | this._dialog.request_mode = Clutter.RequestMode.HEIGHT_FOR_WIDTH; | ||
2937 | 94 | + Main.hintActorSeldomChanges(this._dialog); | ||
2938 | 95 | |||
2939 | 96 | this.contentLayout = new St.BoxLayout({ vertical: true, | ||
2940 | 97 | style_class: "modal-dialog-content-box" }); | ||
2941 | 98 | diff --git a/js/ui/main.js b/js/ui/main.js | ||
2942 | 99 | index e107de7..6e3c971 100644 | ||
2943 | 100 | --- a/js/ui/main.js | ||
2944 | 101 | +++ b/js/ui/main.js | ||
2945 | 102 | @@ -717,3 +717,19 @@ function showRestartMessage(message) { | ||
2946 | 103 | let restartMessage = new RestartMessage(message); | ||
2947 | 104 | restartMessage.open(); | ||
2948 | 105 | } | ||
2949 | 106 | + | ||
2950 | 107 | +/** | ||
2951 | 108 | + * hintActorSeldomChanges: | ||
2952 | 109 | + * @actor: A clutter actor | ||
2953 | 110 | + * | ||
2954 | 111 | + * Flag an actor as known to not need repainting very often. Such actors can | ||
2955 | 112 | + * have their painting cached in GPU memory so that future repaints triggered | ||
2956 | 113 | + * by other actors don't incur a repaint of @actor. This can provide dramatic | ||
2957 | 114 | + * performance benefits if used wisely. | ||
2958 | 115 | + * | ||
2959 | 116 | + * This hint needs to be provided manually because clutter presently lacks | ||
2960 | 117 | + * a good enough heuristic to toggle the optimization automatically. | ||
2961 | 118 | + */ | ||
2962 | 119 | +function hintActorSeldomChanges(actor) { | ||
2963 | 120 | + actor.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS); | ||
2964 | 121 | +} | ||
2965 | 122 | diff --git a/js/ui/panel.js b/js/ui/panel.js | ||
2966 | 123 | index 05241ab..513ad3e 100644 | ||
2967 | 124 | --- a/js/ui/panel.js | ||
2968 | 125 | +++ b/js/ui/panel.js | ||
2969 | 126 | @@ -776,6 +776,7 @@ var Panel = new Lang.Class({ | ||
2970 | 127 | this.actor = new Shell.GenericContainer({ name: 'panel', | ||
2971 | 128 | reactive: true }); | ||
2972 | 129 | this.actor._delegate = this; | ||
2973 | 130 | + Main.hintActorSeldomChanges(this.actor); | ||
2974 | 131 | |||
2975 | 132 | this._sessionStyle = null; | ||
2976 | 133 | |||
2977 | diff --git a/debian/patches/keyboard-Refactor-code-resetting-IM-on-window-drags.patch b/debian/patches/keyboard-Refactor-code-resetting-IM-on-window-drags.patch | |||
2978 | 134 | deleted file mode 100644 | 0 | deleted file mode 100644 |
2979 | index 63d72a6..0000000 | |||
2980 | --- a/debian/patches/keyboard-Refactor-code-resetting-IM-on-window-drags.patch | |||
2981 | +++ /dev/null | |||
2982 | @@ -1,53 +0,0 @@ | |||
2983 | 1 | From: Carlos Garnacho <carlosg@gnome.org> | ||
2984 | 2 | Date: Fri, 3 Aug 2018 16:01:48 +0200 | ||
2985 | 3 | Subject: keyboard: Refactor code resetting IM on window drags | ||
2986 | 4 | |||
2987 | 5 | When a window is dragged, the OSK should get hidden. Just | ||
2988 | 6 | do this in a nicer way. | ||
2989 | 7 | |||
2990 | 8 | Origin: upstream, 3.29.91, commit:6b610b26f8bc2a9ef2ab121a1c6a55bf277d52b7 | ||
2991 | 9 | --- | ||
2992 | 10 | js/ui/keyboard.js | 16 ++++++---------- | ||
2993 | 11 | 1 file changed, 6 insertions(+), 10 deletions(-) | ||
2994 | 12 | |||
2995 | 13 | diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js | ||
2996 | 14 | index 4a24940..5d5f0e2 100644 | ||
2997 | 15 | --- a/js/ui/keyboard.js | ||
2998 | 16 | +++ b/js/ui/keyboard.js | ||
2999 | 17 | @@ -492,13 +492,18 @@ var FocusTracker = new Lang.Class({ | ||
3000 | 18 | |||
3001 | 19 | _init() { | ||
3002 | 20 | this._currentWindow = null; | ||
3003 | 21 | - this._currentWindowPositionId = 0; | ||
3004 | 22 | |||
3005 | 23 | global.display.connect('notify::focus-window', () => { | ||
3006 | 24 | this._setCurrentWindow(global.display.focus_window); | ||
3007 | 25 | this.emit('window-changed', this._currentWindow); | ||
3008 | 26 | }); | ||
3009 | 27 | |||
3010 | 28 | + global.display.connect('grab-op-begin', (display, window, op) => { | ||
3011 | 29 | + if (window == this._currentWindow && | ||
3012 | 30 | + (op == Meta.GrabOp.MOVING || op == Meta.GrabOp.KEYBOARD_MOVING)) | ||
3013 | 31 | + this.emit('reset'); | ||
3014 | 32 | + }); | ||
3015 | 33 | + | ||
3016 | 34 | /* Valid for wayland clients */ | ||
3017 | 35 | Main.inputMethod.connect('cursor-location-changed', (o, rect) => { | ||
3018 | 36 | let newRect = { x: rect.get_x(), y: rect.get_y(), width: rect.get_width(), height: rect.get_height() }; | ||
3019 | 37 | @@ -520,16 +525,7 @@ var FocusTracker = new Lang.Class({ | ||
3020 | 38 | }, | ||
3021 | 39 | |||
3022 | 40 | _setCurrentWindow(window) { | ||
3023 | 41 | - if (this._currentWindow) | ||
3024 | 42 | - this._currentWindow.disconnect(this._currentWindowPositionId); | ||
3025 | 43 | - | ||
3026 | 44 | this._currentWindow = window; | ||
3027 | 45 | - if (window) { | ||
3028 | 46 | - this._currentWindowPositionId = this._currentWindow.connect('position-changed', () => { | ||
3029 | 47 | - if (global.display.get_grab_op() != Meta.GrabOp.NONE) | ||
3030 | 48 | - this.emit('reset'); | ||
3031 | 49 | - }); | ||
3032 | 50 | - } | ||
3033 | 51 | }, | ||
3034 | 52 | |||
3035 | 53 | _setCurrentRect(rect) { | ||
3036 | diff --git a/debian/patches/keyboard-defer-position-changed-till-we-have-a-rect.patch b/debian/patches/keyboard-defer-position-changed-till-we-have-a-rect.patch | |||
3037 | 54 | deleted file mode 100644 | 0 | deleted file mode 100644 |
3038 | index e44c1bf..0000000 | |||
3039 | --- a/debian/patches/keyboard-defer-position-changed-till-we-have-a-rect.patch | |||
3040 | +++ /dev/null | |||
3041 | @@ -1,29 +0,0 @@ | |||
3042 | 1 | From: Carlos Garnacho <carlosg@gnome.org> | ||
3043 | 2 | Date: Sat, 14 Jul 2018 00:14:07 +0200 | ||
3044 | 3 | Subject: keyboard: defer position-changed till we have a rect | ||
3045 | 4 | |||
3046 | 5 | Emitting it that soon results in JS warnings, as we don't have | ||
3047 | 6 | everything in place yet. The position-changed signal will be | ||
3048 | 7 | emitted from other locations as soon as we have it. | ||
3049 | 8 | |||
3050 | 9 | Bug: https://gitlab.gnome.org/GNOME/gnome-shell/issues/464 | ||
3051 | 10 | Origin: upstream, 3.29.91, commit:81956e9b84a751e0aae739ef08017d3bfef907c8 | ||
3052 | 11 | --- | ||
3053 | 12 | js/ui/keyboard.js | 4 +--- | ||
3054 | 13 | 1 file changed, 1 insertion(+), 3 deletions(-) | ||
3055 | 14 | |||
3056 | 15 | diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js | ||
3057 | 16 | index 1666a50..4a24940 100644 | ||
3058 | 17 | --- a/js/ui/keyboard.js | ||
3059 | 18 | +++ b/js/ui/keyboard.js | ||
3060 | 19 | @@ -526,9 +526,7 @@ var FocusTracker = new Lang.Class({ | ||
3061 | 20 | this._currentWindow = window; | ||
3062 | 21 | if (window) { | ||
3063 | 22 | this._currentWindowPositionId = this._currentWindow.connect('position-changed', () => { | ||
3064 | 23 | - if (global.display.get_grab_op() == Meta.GrabOp.NONE) | ||
3065 | 24 | - this.emit('position-changed'); | ||
3066 | 25 | - else | ||
3067 | 26 | + if (global.display.get_grab_op() != Meta.GrabOp.NONE) | ||
3068 | 27 | this.emit('reset'); | ||
3069 | 28 | }); | ||
3070 | 29 | } | ||
3071 | diff --git a/debian/patches/optional-hot-corner.patch b/debian/patches/optional-hot-corner.patch | |||
3072 | index f26f031..b5b8a2b 100644 | |||
3073 | --- a/debian/patches/optional-hot-corner.patch | |||
3074 | +++ b/debian/patches/optional-hot-corner.patch | |||
3075 | @@ -14,7 +14,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=688320 | |||
3076 | 14 | 2 files changed, 16 insertions(+) | 14 | 2 files changed, 16 insertions(+) |
3077 | 15 | 15 | ||
3078 | 16 | diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in | 16 | diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in |
3080 | 17 | index 4ec01a4..3e258e2 100644 | 17 | index a7251cd..8e6b990 100644 |
3081 | 18 | --- a/data/org.gnome.shell.gschema.xml.in | 18 | --- a/data/org.gnome.shell.gschema.xml.in |
3082 | 19 | +++ b/data/org.gnome.shell.gschema.xml.in | 19 | +++ b/data/org.gnome.shell.gschema.xml.in |
3083 | 20 | @@ -38,6 +38,14 @@ | 20 | @@ -38,6 +38,14 @@ |
3084 | @@ -33,10 +33,10 @@ index 4ec01a4..3e258e2 100644 | |||
3085 | 33 | <default>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default> | 33 | <default>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default> |
3086 | 34 | <summary>List of desktop file IDs for favorite applications</summary> | 34 | <summary>List of desktop file IDs for favorite applications</summary> |
3087 | 35 | diff --git a/js/ui/layout.js b/js/ui/layout.js | 35 | diff --git a/js/ui/layout.js b/js/ui/layout.js |
3089 | 36 | index 210fb66..eb8a6e1 100644 | 36 | index 7a3cb22..08e7495 100644 |
3090 | 37 | --- a/js/ui/layout.js | 37 | --- a/js/ui/layout.js |
3091 | 38 | +++ b/js/ui/layout.js | 38 | +++ b/js/ui/layout.js |
3093 | 39 | @@ -269,6 +269,9 @@ var LayoutManager = new Lang.Class({ | 39 | @@ -270,6 +270,9 @@ var LayoutManager = new Lang.Class({ |
3094 | 40 | this._backgroundGroup.lower_bottom(); | 40 | this._backgroundGroup.lower_bottom(); |
3095 | 41 | this._bgManagers = []; | 41 | this._bgManagers = []; |
3096 | 42 | 42 | ||
3097 | @@ -46,7 +46,7 @@ index 210fb66..eb8a6e1 100644 | |||
3098 | 46 | // Need to update struts on new workspaces when they are added | 46 | // Need to update struts on new workspaces when they are added |
3099 | 47 | let workspaceManager = global.workspace_manager; | 47 | let workspaceManager = global.workspace_manager; |
3100 | 48 | workspaceManager.connect('notify::n-workspaces', | 48 | workspaceManager.connect('notify::n-workspaces', |
3102 | 49 | @@ -370,6 +373,11 @@ var LayoutManager = new Lang.Class({ | 49 | @@ -371,6 +374,11 @@ var LayoutManager = new Lang.Class({ |
3103 | 50 | }); | 50 | }); |
3104 | 51 | this.hotCorners = []; | 51 | this.hotCorners = []; |
3105 | 52 | 52 | ||
3106 | diff --git a/debian/patches/series b/debian/patches/series | |||
3107 | index b0aa083..c198fe6 100644 | |||
3108 | --- a/debian/patches/series | |||
3109 | +++ b/debian/patches/series | |||
3110 | @@ -8,22 +8,7 @@ ubuntu/gdm_alternatives.patch | |||
3111 | 8 | ubuntu/block_mode_extension_update.patch | 8 | ubuntu/block_mode_extension_update.patch |
3112 | 9 | optional-hot-corner.patch | 9 | optional-hot-corner.patch |
3113 | 10 | volume-Add-back-sound-feedback-on-scroll.patch | 10 | volume-Add-back-sound-feedback-on-scroll.patch |
3114 | 11 | Update-Brazilian-Portuguese-translation.patch | ||
3115 | 12 | showOSD-Fix-handling-of-defined-falsy-parameters.patch | ||
3116 | 13 | data-Fix-comment-in-schema.patch | ||
3117 | 14 | workspace-Fix-infinite-loop-when-finding-parent-window-of.patch | ||
3118 | 15 | workspace-Simplify-detecting-added-dialogs-after-closing-.patch | ||
3119 | 16 | tools-fix-XDG-desktop-syntax-in-gnome-shell-overrides-mig.patch | ||
3120 | 17 | Updated-Slovenian-translation.patch | ||
3121 | 18 | keyboard-defer-position-changed-till-we-have-a-rect.patch | ||
3122 | 19 | keyboard-Refactor-code-resetting-IM-on-window-drags.patch | ||
3123 | 20 | tweener-Save-handlers-on-target-and-remove-them-on-destro.patch | ||
3124 | 21 | dnd-Nullify-_dragActor-after-we-ve-destroyed-it-and-avoid.patch | ||
3125 | 22 | messageList-stop-syncing-if-closeButton-has-been-destroye.patch | ||
3126 | 23 | automountManager-remove-allowAutorun-expire-timeout-on-vo.patch | ||
3127 | 24 | st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch | 11 | st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch |
3128 | 25 | js-ui-Choose-some-actors-to-cache-on-the-GPU.patch | ||
3129 | 26 | workaround_crasher_fractional_scaling.patch | ||
3130 | 27 | main-show-an-error-message-on-gnome-shell-crash.patch | 12 | main-show-an-error-message-on-gnome-shell-crash.patch |
3131 | 28 | global-make-possible-to-set-debug-flags-dynamically.patch | 13 | global-make-possible-to-set-debug-flags-dynamically.patch |
3132 | 29 | main-increase-the-granularity-of-backtraces-in-SHELL_DEBU.patch | 14 | main-increase-the-granularity-of-backtraces-in-SHELL_DEBU.patch |
3133 | @@ -32,4 +17,8 @@ sessionMode-add-support-for-debugFlags-parameter.patch | |||
3134 | 32 | st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch | 17 | st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch |
3135 | 33 | st-scroll-view-Remove-scrollbars-references-on-dispose.patch | 18 | st-scroll-view-Remove-scrollbars-references-on-dispose.patch |
3136 | 34 | js-main-Throw-error-if-no-valid-default-stylesheet-is-fou.patch | 19 | js-main-Throw-error-if-no-valid-default-stylesheet-is-fou.patch |
3138 | 35 | 20 | tweener-Save-handlers-on-target-and-remove-them-on-destro.patch | |
3139 | 21 | dnd-Nullify-_dragActor-after-we-ve-destroyed-it-and-avoid.patch | ||
3140 | 22 | messageList-stop-syncing-if-closeButton-has-been-destroye.patch | ||
3141 | 23 | automountManager-remove-allowAutorun-expire-timeout-on-vo.patch | ||
3142 | 24 | workaround_crasher_fractional_scaling.patch | ||
3143 | diff --git a/debian/patches/sessionMode-add-support-for-debugFlags-parameter.patch b/debian/patches/sessionMode-add-support-for-debugFlags-parameter.patch | |||
3144 | index fec593e..afa4447 100644 | |||
3145 | --- a/debian/patches/sessionMode-add-support-for-debugFlags-parameter.patch | |||
3146 | +++ b/debian/patches/sessionMode-add-support-for-debugFlags-parameter.patch | |||
3147 | @@ -15,7 +15,7 @@ Forwarded: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/6 | |||
3148 | 15 | 2 files changed, 4 insertions(+) | 15 | 2 files changed, 4 insertions(+) |
3149 | 16 | 16 | ||
3150 | 17 | diff --git a/js/ui/main.js b/js/ui/main.js | 17 | diff --git a/js/ui/main.js b/js/ui/main.js |
3152 | 18 | index 6e3c971..aa1de83 100644 | 18 | index e107de7..68c3a0c 100644 |
3153 | 19 | --- a/js/ui/main.js | 19 | --- a/js/ui/main.js |
3154 | 20 | +++ b/js/ui/main.js | 20 | +++ b/js/ui/main.js |
3155 | 21 | @@ -111,6 +111,9 @@ function _sessionUpdated() { | 21 | @@ -111,6 +111,9 @@ function _sessionUpdated() { |
3156 | diff --git a/debian/patches/showOSD-Fix-handling-of-defined-falsy-parameters.patch b/debian/patches/showOSD-Fix-handling-of-defined-falsy-parameters.patch | |||
3157 | 22 | deleted file mode 100644 | 22 | deleted file mode 100644 |
3158 | index d2613a0..0000000 | |||
3159 | --- a/debian/patches/showOSD-Fix-handling-of-defined-falsy-parameters.patch | |||
3160 | +++ /dev/null | |||
3161 | @@ -1,51 +0,0 @@ | |||
3162 | 1 | From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org> | ||
3163 | 2 | Date: Wed, 1 Aug 2018 13:27:07 +0200 | ||
3164 | 3 | Subject: showOSD: Fix handling of defined 'falsy' parameters | ||
3165 | 4 | |||
3166 | 5 | For the OSD, all parameters except for the icon are optional - if the | ||
3167 | 6 | caller doesn't include the 'label' option, the OSD won't show a label | ||
3168 | 7 | etc. | ||
3169 | 8 | |||
3170 | 9 | While this makes sense for an API, it means that we have to be careful | ||
3171 | 10 | to correctly differentiate an option that was omitted and an option | ||
3172 | 11 | that has a 'falsy' value like false or 0. | ||
3173 | 12 | |||
3174 | 13 | Unfortunately since commit ccaae5d3c we no longer do, with the result | ||
3175 | 14 | that OSDs meant for the first monitor will show up on all, and a level | ||
3176 | 15 | of 0 is presented as no level bar instead of an empty one, whoops. | ||
3177 | 16 | |||
3178 | 17 | Bug: https://bugzilla.gnome.org/show_bug.cgi?id=791669 | ||
3179 | 18 | Origin: upstream, 3.29.91, commit:d908940ef37dd6a5b72148ded8b995c17a01604a | ||
3180 | 19 | --- | ||
3181 | 20 | js/ui/shellDBus.js | 16 ++++++++++------ | ||
3182 | 21 | 1 file changed, 10 insertions(+), 6 deletions(-) | ||
3183 | 22 | |||
3184 | 23 | diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js | ||
3185 | 24 | index 55e1e57..4d60ef4 100644 | ||
3186 | 25 | --- a/js/ui/shellDBus.js | ||
3187 | 26 | +++ b/js/ui/shellDBus.js | ||
3188 | 27 | @@ -145,14 +145,18 @@ var GnomeShell = new Lang.Class({ | ||
3189 | 28 | for (let param in params) | ||
3190 | 29 | params[param] = params[param].deep_unpack(); | ||
3191 | 30 | |||
3192 | 31 | - let monitorIndex = params['monitor'] || -1; | ||
3193 | 32 | - let label = params['label'] || undefined; | ||
3194 | 33 | - let level = params['level'] || undefined; | ||
3195 | 34 | - let maxLevel = params['max_level'] || undefined; | ||
3196 | 35 | + let { monitor: monitorIndex, | ||
3197 | 36 | + label, | ||
3198 | 37 | + level, | ||
3199 | 38 | + max_level: maxLevel, | ||
3200 | 39 | + icon: serializedIcon } = params; | ||
3201 | 40 | + | ||
3202 | 41 | + if (monitorIndex === undefined) | ||
3203 | 42 | + monitorIndex = -1; | ||
3204 | 43 | |||
3205 | 44 | let icon = null; | ||
3206 | 45 | - if (params['icon']) | ||
3207 | 46 | - icon = Gio.Icon.new_for_string(params['icon']); | ||
3208 | 47 | + if (serializedIcon) | ||
3209 | 48 | + icon = Gio.Icon.new_for_string(serializedIcon); | ||
3210 | 49 | |||
3211 | 50 | Main.osdWindowManager.show(monitorIndex, icon, label, level, maxLevel); | ||
3212 | 51 | }, | ||
3213 | diff --git a/debian/patches/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch b/debian/patches/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch | |||
3214 | index fce7e26..0c5e93d 100644 | |||
3215 | --- a/debian/patches/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch | |||
3216 | +++ b/debian/patches/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch | |||
3217 | @@ -6,9 +6,8 @@ The scrollbars actors in a scroll view can be NULL, in case they get removed | |||
3218 | 6 | with a call to `clutter_actor_remove_child` on a scroll-view (and this is | 6 | with a call to `clutter_actor_remove_child` on a scroll-view (and this is |
3219 | 7 | implemented in st_scroll_view_remove). | 7 | implemented in st_scroll_view_remove). |
3220 | 8 | 8 | ||
3224 | 9 | So, we should support the case where `priv->{h,v}scroll` are NULL, without | 9 | So, we should support the case where `priv->{h,v}scroll` are NULL, not to crash |
3225 | 10 | relying on called functions, as they might spam the log with unexpected | 10 | in `st_widget_style_changed`. |
3223 | 11 | warnings or at worse, crashing (as it happens with `st_widget_style_changed`). | ||
3226 | 12 | 11 | ||
3227 | 13 | Fixes #467 | 12 | Fixes #467 |
3228 | 14 | 13 | ||
3229 | @@ -16,76 +15,14 @@ Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/467 | |||
3230 | 16 | BUG-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1725312 | 15 | BUG-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1725312 |
3231 | 17 | Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/190 | 16 | Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/190 |
3232 | 18 | --- | 17 | --- |
3235 | 19 | src/st/st-scroll-view.c | 25 +++++++++++++++---------- | 18 | src/st/st-scroll-view.c | 7 +++++-- |
3236 | 20 | 1 file changed, 15 insertions(+), 10 deletions(-) | 19 | 1 file changed, 5 insertions(+), 2 deletions(-) |
3237 | 21 | 20 | ||
3238 | 22 | diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c | 21 | diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c |
3240 | 23 | index fc0db1c..b9aaff2 100644 | 22 | index fc0db1c..a8b6d2e 100644 |
3241 | 24 | --- a/src/st/st-scroll-view.c | 23 | --- a/src/st/st-scroll-view.c |
3242 | 25 | +++ b/src/st/st-scroll-view.c | 24 | +++ b/src/st/st-scroll-view.c |
3306 | 26 | @@ -281,9 +281,9 @@ st_scroll_view_paint (ClutterActor *actor) | 25 | @@ -741,8 +741,11 @@ st_scroll_view_style_changed (StWidget *widget) |
3244 | 27 | |||
3245 | 28 | if (priv->child) | ||
3246 | 29 | clutter_actor_paint (priv->child); | ||
3247 | 30 | - if (priv->hscrollbar_visible) | ||
3248 | 31 | + if (priv->hscroll && priv->hscrollbar_visible) | ||
3249 | 32 | clutter_actor_paint (priv->hscroll); | ||
3250 | 33 | - if (priv->vscrollbar_visible) | ||
3251 | 34 | + if (priv->vscroll && priv->vscrollbar_visible) | ||
3252 | 35 | clutter_actor_paint (priv->vscroll); | ||
3253 | 36 | } | ||
3254 | 37 | |||
3255 | 38 | @@ -298,9 +298,9 @@ st_scroll_view_pick (ClutterActor *actor, | ||
3256 | 39 | |||
3257 | 40 | if (priv->child) | ||
3258 | 41 | clutter_actor_paint (priv->child); | ||
3259 | 42 | - if (priv->hscrollbar_visible) | ||
3260 | 43 | + if (priv->hscroll && priv->hscrollbar_visible) | ||
3261 | 44 | clutter_actor_paint (priv->hscroll); | ||
3262 | 45 | - if (priv->vscrollbar_visible) | ||
3263 | 46 | + if (priv->vscroll && priv->vscrollbar_visible) | ||
3264 | 47 | clutter_actor_paint (priv->vscroll); | ||
3265 | 48 | } | ||
3266 | 49 | |||
3267 | 50 | @@ -317,7 +317,7 @@ get_scrollbar_width (StScrollView *scroll, | ||
3268 | 51 | { | ||
3269 | 52 | StScrollViewPrivate *priv = scroll->priv; | ||
3270 | 53 | |||
3271 | 54 | - if (clutter_actor_is_visible (priv->vscroll)) | ||
3272 | 55 | + if (priv->vscroll && clutter_actor_is_visible (priv->vscroll)) | ||
3273 | 56 | { | ||
3274 | 57 | gfloat min_size; | ||
3275 | 58 | |||
3276 | 59 | @@ -335,7 +335,7 @@ get_scrollbar_height (StScrollView *scroll, | ||
3277 | 60 | { | ||
3278 | 61 | StScrollViewPrivate *priv = scroll->priv; | ||
3279 | 62 | |||
3280 | 63 | - if (clutter_actor_is_visible (priv->hscroll)) | ||
3281 | 64 | + if (priv->hscroll && clutter_actor_is_visible (priv->hscroll)) | ||
3282 | 65 | { | ||
3283 | 66 | gfloat min_size; | ||
3284 | 67 | |||
3285 | 68 | @@ -637,7 +637,8 @@ st_scroll_view_allocate (ClutterActor *actor, | ||
3286 | 69 | child_box.y1 = content_box.y1; | ||
3287 | 70 | child_box.y2 = content_box.y2 - (hscrollbar_visible ? sb_height : 0); | ||
3288 | 71 | |||
3289 | 72 | - clutter_actor_allocate (priv->vscroll, &child_box, flags); | ||
3290 | 73 | + if (priv->vscroll) | ||
3291 | 74 | + clutter_actor_allocate (priv->vscroll, &child_box, flags); | ||
3292 | 75 | |||
3293 | 76 | /* Horizontal scrollbar */ | ||
3294 | 77 | if (clutter_actor_get_text_direction (actor) == CLUTTER_TEXT_DIRECTION_RTL) | ||
3295 | 78 | @@ -653,7 +654,8 @@ st_scroll_view_allocate (ClutterActor *actor, | ||
3296 | 79 | child_box.y1 = content_box.y2 - sb_height; | ||
3297 | 80 | child_box.y2 = content_box.y2; | ||
3298 | 81 | |||
3299 | 82 | - clutter_actor_allocate (priv->hscroll, &child_box, flags); | ||
3300 | 83 | + if (priv->hscroll) | ||
3301 | 84 | + clutter_actor_allocate (priv->hscroll, &child_box, flags); | ||
3302 | 85 | |||
3303 | 86 | /* In case the scrollbar policy is NEVER or EXTERNAL or scrollbars | ||
3304 | 87 | * should be overlayed, we don't trim the content box allocation by | ||
3305 | 88 | @@ -741,8 +743,11 @@ st_scroll_view_style_changed (StWidget *widget) | ||
3307 | 89 | gdouble hfade_offset = st_theme_node_get_length (theme_node, "-st-hfade-offset"); | 26 | gdouble hfade_offset = st_theme_node_get_length (theme_node, "-st-hfade-offset"); |
3308 | 90 | st_scroll_view_update_fade_effect (self, vfade_offset, hfade_offset); | 27 | st_scroll_view_update_fade_effect (self, vfade_offset, hfade_offset); |
3309 | 91 | 28 | ||
3310 | diff --git a/debian/patches/st-scroll-view-Remove-scrollbars-references-on-dispose.patch b/debian/patches/st-scroll-view-Remove-scrollbars-references-on-dispose.patch | |||
3311 | index fe8ec0b..f5f49be 100644 | |||
3312 | --- a/debian/patches/st-scroll-view-Remove-scrollbars-references-on-dispose.patch | |||
3313 | +++ b/debian/patches/st-scroll-view-Remove-scrollbars-references-on-dispose.patch | |||
3314 | @@ -14,7 +14,7 @@ Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/190 | |||
3315 | 14 | 1 file changed, 2 insertions(+), 5 deletions(-) | 14 | 1 file changed, 2 insertions(+), 5 deletions(-) |
3316 | 15 | 15 | ||
3317 | 16 | diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c | 16 | diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c |
3319 | 17 | index b9aaff2..6a0928a 100644 | 17 | index a8b6d2e..cb38aef 100644 |
3320 | 18 | --- a/src/st/st-scroll-view.c | 18 | --- a/src/st/st-scroll-view.c |
3321 | 19 | +++ b/src/st/st-scroll-view.c | 19 | +++ b/src/st/st-scroll-view.c |
3322 | 20 | @@ -244,11 +244,8 @@ st_scroll_view_dispose (GObject *object) | 20 | @@ -244,11 +244,8 @@ st_scroll_view_dispose (GObject *object) |
3323 | diff --git a/debian/patches/tools-fix-XDG-desktop-syntax-in-gnome-shell-overrides-mig.patch b/debian/patches/tools-fix-XDG-desktop-syntax-in-gnome-shell-overrides-mig.patch | |||
3324 | 21 | deleted file mode 100644 | 21 | deleted file mode 100644 |
3325 | index 30b0f83..0000000 | |||
3326 | --- a/debian/patches/tools-fix-XDG-desktop-syntax-in-gnome-shell-overrides-mig.patch | |||
3327 | +++ /dev/null | |||
3328 | @@ -1,25 +0,0 @@ | |||
3329 | 1 | From: Olivier Blin <dev@blino.org> | ||
3330 | 2 | Date: Fri, 3 Aug 2018 00:35:24 +0200 | ||
3331 | 3 | Subject: tools: fix XDG desktop syntax in gnome-shell-overrides-migration | ||
3332 | 4 | |||
3333 | 5 | Reported by desktop-file-validate: | ||
3334 | 6 | error: value "True" for boolean key "NoDisplay" in group "Desktop | ||
3335 | 7 | Entry" contains invalid characters, boolean values must be "false" or | ||
3336 | 8 | "true" | ||
3337 | 9 | |||
3338 | 10 | Origin: upstream, 3.29.91, commit:1fca09037416659e452bd722574e1d5a248f522d | ||
3339 | 11 | --- | ||
3340 | 12 | data/gnome-shell-overrides-migration.desktop.in | 2 +- | ||
3341 | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
3342 | 14 | |||
3343 | 15 | diff --git a/data/gnome-shell-overrides-migration.desktop.in b/data/gnome-shell-overrides-migration.desktop.in | ||
3344 | 16 | index 8ef86ac..99452e6 100644 | ||
3345 | 17 | --- a/data/gnome-shell-overrides-migration.desktop.in | ||
3346 | 18 | +++ b/data/gnome-shell-overrides-migration.desktop.in | ||
3347 | 19 | @@ -1,5 +1,5 @@ | ||
3348 | 20 | [Desktop Entry] | ||
3349 | 21 | Type=Application | ||
3350 | 22 | Name=GNOME settings overrides migration | ||
3351 | 23 | -NoDisplay=True | ||
3352 | 24 | +NoDisplay=true | ||
3353 | 25 | Exec=@libexecdir@/gnome-shell-overrides-migration.sh | ||
3354 | diff --git a/debian/patches/ubuntu/desktop_detect.patch b/debian/patches/ubuntu/desktop_detect.patch | |||
3355 | index fd5f6df..c245854 100644 | |||
3356 | --- a/debian/patches/ubuntu/desktop_detect.patch | |||
3357 | +++ b/debian/patches/ubuntu/desktop_detect.patch | |||
3358 | @@ -14,10 +14,10 @@ Origin: ubuntu | |||
3359 | 14 | create mode 100644 js/misc/desktop.js | 14 | create mode 100644 js/misc/desktop.js |
3360 | 15 | 15 | ||
3361 | 16 | diff --git a/js/js-resources.gresource.xml b/js/js-resources.gresource.xml | 16 | diff --git a/js/js-resources.gresource.xml b/js/js-resources.gresource.xml |
3363 | 17 | index 3c0feab..a4d0e4d 100644 | 17 | index 75a6c3b..c42e4a3 100644 |
3364 | 18 | --- a/js/js-resources.gresource.xml | 18 | --- a/js/js-resources.gresource.xml |
3365 | 19 | +++ b/js/js-resources.gresource.xml | 19 | +++ b/js/js-resources.gresource.xml |
3367 | 20 | @@ -13,6 +13,7 @@ | 20 | @@ -11,6 +11,7 @@ |
3368 | 21 | 21 | ||
3369 | 22 | <file>misc/config.js</file> | 22 | <file>misc/config.js</file> |
3370 | 23 | <file>misc/extensionUtils.js</file> | 23 | <file>misc/extensionUtils.js</file> |
3371 | diff --git a/debian/patches/ubuntu/lightdm-user-switching.patch b/debian/patches/ubuntu/lightdm-user-switching.patch | |||
3372 | index 0ef5155..628934d 100644 | |||
3373 | --- a/debian/patches/ubuntu/lightdm-user-switching.patch | |||
3374 | +++ b/debian/patches/ubuntu/lightdm-user-switching.patch | |||
3375 | @@ -12,10 +12,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685794 | |||
3376 | 12 | 1 file changed, 27 insertions(+), 7 deletions(-) | 12 | 1 file changed, 27 insertions(+), 7 deletions(-) |
3377 | 13 | 13 | ||
3378 | 14 | diff --git a/js/misc/systemActions.js b/js/misc/systemActions.js | 14 | diff --git a/js/misc/systemActions.js b/js/misc/systemActions.js |
3380 | 15 | index bf8b460..fffa567 100644 | 15 | index 434dd95..2be7c0e 100644 |
3381 | 16 | --- a/js/misc/systemActions.js | 16 | --- a/js/misc/systemActions.js |
3382 | 17 | +++ b/js/misc/systemActions.js | 17 | +++ b/js/misc/systemActions.js |
3384 | 18 | @@ -218,6 +218,21 @@ const SystemActions = new Lang.Class({ | 18 | @@ -219,6 +219,21 @@ const SystemActions = new Lang.Class({ |
3385 | 19 | return this._actions.get(LOCK_ORIENTATION_ACTION_ID).iconName; | 19 | return this._actions.get(LOCK_ORIENTATION_ACTION_ID).iconName; |
3386 | 20 | }, | 20 | }, |
3387 | 21 | 21 | ||
3388 | @@ -37,7 +37,7 @@ index bf8b460..fffa567 100644 | |||
3389 | 37 | _sensorProxyAppeared() { | 37 | _sensorProxyAppeared() { |
3390 | 38 | this._sensorProxy = new SensorProxy(Gio.DBus.system, SENSOR_BUS_NAME, SENSOR_OBJECT_PATH, | 38 | this._sensorProxy = new SensorProxy(Gio.DBus.system, SENSOR_BUS_NAME, SENSOR_OBJECT_PATH, |
3391 | 39 | (proxy, error) => { | 39 | (proxy, error) => { |
3393 | 40 | @@ -313,7 +328,7 @@ const SystemActions = new Lang.Class({ | 40 | @@ -314,7 +329,7 @@ const SystemActions = new Lang.Class({ |
3394 | 41 | _updateLockScreen() { | 41 | _updateLockScreen() { |
3395 | 42 | let showLock = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter; | 42 | let showLock = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter; |
3396 | 43 | let allowLockScreen = !this._lockdownSettings.get_boolean(DISABLE_LOCK_SCREEN_KEY); | 43 | let allowLockScreen = !this._lockdownSettings.get_boolean(DISABLE_LOCK_SCREEN_KEY); |
3397 | @@ -46,7 +46,7 @@ index bf8b460..fffa567 100644 | |||
3398 | 46 | this.notify('can-lock-screen'); | 46 | this.notify('can-lock-screen'); |
3399 | 47 | }, | 47 | }, |
3400 | 48 | 48 | ||
3402 | 49 | @@ -400,20 +415,25 @@ const SystemActions = new Lang.Class({ | 49 | @@ -401,20 +416,25 @@ const SystemActions = new Lang.Class({ |
3403 | 50 | if (!this._actions.get(LOCK_SCREEN_ACTION_ID).available) | 50 | if (!this._actions.get(LOCK_SCREEN_ACTION_ID).available) |
3404 | 51 | throw new Error('The lock-screen action is not available!'); | 51 | throw new Error('The lock-screen action is not available!'); |
3405 | 52 | 52 | ||
3406 | diff --git a/debian/patches/workspace-Fix-infinite-loop-when-finding-parent-window-of.patch b/debian/patches/workspace-Fix-infinite-loop-when-finding-parent-window-of.patch | |||
3407 | 53 | deleted file mode 100644 | 53 | deleted file mode 100644 |
3408 | index a9dd41a..0000000 | |||
3409 | --- a/debian/patches/workspace-Fix-infinite-loop-when-finding-parent-window-of.patch | |||
3410 | +++ /dev/null | |||
3411 | @@ -1,46 +0,0 @@ | |||
3412 | 1 | From: verdre <gitlab@v0yd.nl> | ||
3413 | 2 | Date: Mon, 23 Jul 2018 14:22:34 +0200 | ||
3414 | 3 | Subject: workspace: Fix infinite loop when finding parent window of dialogs | ||
3415 | 4 | |||
3416 | 5 | When a dialog is added to a window while the overview is shown, we get | ||
3417 | 6 | its parent using get_transient_for() so we can add it to the right | ||
3418 | 7 | window clone. | ||
3419 | 8 | |||
3420 | 9 | If we have multiple layers of dialogs we have to do this recursively | ||
3421 | 10 | until we find the root ancestor. This case currently results in an | ||
3422 | 11 | infinite loop: Since parent is always set to the same window, the | ||
3423 | 12 | while-condition will always be true. | ||
3424 | 13 | |||
3425 | 14 | Bug: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/180 | ||
3426 | 15 | Origin: upstream, 3.29.91, commit:52cbc299a795b4573a7558982115354cfa7a4e61 | ||
3427 | 16 | --- | ||
3428 | 17 | js/ui/workspace.js | 2 +- | ||
3429 | 18 | js/ui/workspaceThumbnail.js | 2 +- | ||
3430 | 19 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
3431 | 20 | |||
3432 | 21 | diff --git a/js/ui/workspace.js b/js/ui/workspace.js | ||
3433 | 22 | index a183e07..6a8e924 100644 | ||
3434 | 23 | --- a/js/ui/workspace.js | ||
3435 | 24 | +++ b/js/ui/workspace.js | ||
3436 | 25 | @@ -1519,7 +1519,7 @@ var Workspace = new Lang.Class({ | ||
3437 | 26 | if (metaWin.is_attached_dialog()) { | ||
3438 | 27 | let parent = metaWin.get_transient_for(); | ||
3439 | 28 | while (parent.is_attached_dialog()) | ||
3440 | 29 | - parent = metaWin.get_transient_for(); | ||
3441 | 30 | + parent = parent.get_transient_for(); | ||
3442 | 31 | |||
3443 | 32 | let idx = this._lookupIndex (parent); | ||
3444 | 33 | if (idx < 0) { | ||
3445 | 34 | diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js | ||
3446 | 35 | index b1fa587..cf21e13 100644 | ||
3447 | 36 | --- a/js/ui/workspaceThumbnail.js | ||
3448 | 37 | +++ b/js/ui/workspaceThumbnail.js | ||
3449 | 38 | @@ -416,7 +416,7 @@ var WorkspaceThumbnail = new Lang.Class({ | ||
3450 | 39 | } else if (metaWin.is_attached_dialog()) { | ||
3451 | 40 | let parent = metaWin.get_transient_for(); | ||
3452 | 41 | while (parent.is_attached_dialog()) | ||
3453 | 42 | - parent = metaWin.get_transient_for(); | ||
3454 | 43 | + parent = parent.get_transient_for(); | ||
3455 | 44 | |||
3456 | 45 | let idx = this._lookupIndex (parent); | ||
3457 | 46 | if (idx < 0) { | ||
3458 | diff --git a/debian/patches/workspace-Simplify-detecting-added-dialogs-after-closing-.patch b/debian/patches/workspace-Simplify-detecting-added-dialogs-after-closing-.patch | |||
3459 | 47 | deleted file mode 100644 | 0 | deleted file mode 100644 |
3460 | index 2952a0e..0000000 | |||
3461 | --- a/debian/patches/workspace-Simplify-detecting-added-dialogs-after-closing-.patch | |||
3462 | +++ /dev/null | |||
3463 | @@ -1,158 +0,0 @@ | |||
3464 | 1 | From: verdre <gitlab@v0yd.nl> | ||
3465 | 2 | Date: Tue, 19 Jun 2018 12:45:18 +0200 | ||
3466 | 3 | Subject: workspace: Simplify detecting added dialogs after closing a window | ||
3467 | 4 | |||
3468 | 5 | When trying to close a window in the overview by clicking the close | ||
3469 | 6 | button and the window doesn't get closed but a dialog is added to the | ||
3470 | 7 | window afterwards, we close the overview and show the dialog. | ||
3471 | 8 | |||
3472 | 9 | Instead of adding a separate listener for the window-added signal to the | ||
3473 | 10 | WindowOverlay, let the WindowClones remember that the close button was | ||
3474 | 11 | pressed and activate themselves if a dialog is added after that. | ||
3475 | 12 | |||
3476 | 13 | Bug: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/180 | ||
3477 | 14 | Origin: upstream, 3.29.91, commit:da2fc2c9d3135d59bb355e739f24d540f844fb3d | ||
3478 | 15 | --- | ||
3479 | 16 | js/ui/workspace.js | 80 +++++++++++++++++++----------------------------------- | ||
3480 | 17 | 1 file changed, 28 insertions(+), 52 deletions(-) | ||
3481 | 18 | |||
3482 | 19 | diff --git a/js/ui/workspace.js b/js/ui/workspace.js | ||
3483 | 20 | index 6a8e924..5aa9ba6 100644 | ||
3484 | 21 | --- a/js/ui/workspace.js | ||
3485 | 22 | +++ b/js/ui/workspace.js | ||
3486 | 23 | @@ -179,6 +179,7 @@ var WindowClone = new Lang.Class({ | ||
3487 | 24 | this.inDrag = false; | ||
3488 | 25 | |||
3489 | 26 | this._selected = false; | ||
3490 | 27 | + this._closeRequested = false; | ||
3491 | 28 | }, | ||
3492 | 29 | |||
3493 | 30 | set slot(slot) { | ||
3494 | 31 | @@ -194,7 +195,6 @@ var WindowClone = new Lang.Class({ | ||
3495 | 32 | |||
3496 | 33 | deleteAll() { | ||
3497 | 34 | // Delete all windows, starting from the bottom-most (most-modal) one | ||
3498 | 35 | - | ||
3499 | 36 | let windows = this.actor.get_children(); | ||
3500 | 37 | for (let i = windows.length - 1; i >= 1; i--) { | ||
3501 | 38 | let realWindow = windows[i].source; | ||
3502 | 39 | @@ -204,11 +204,24 @@ var WindowClone = new Lang.Class({ | ||
3503 | 40 | } | ||
3504 | 41 | |||
3505 | 42 | this.metaWindow.delete(global.get_current_time()); | ||
3506 | 43 | + this._closeRequested = true; | ||
3507 | 44 | }, | ||
3508 | 45 | |||
3509 | 46 | - addAttachedDialog(win) { | ||
3510 | 47 | - this._doAddAttachedDialog(win, win.get_compositor_private()); | ||
3511 | 48 | - this._onMetaWindowSizeChanged(); | ||
3512 | 49 | + addDialog(win) { | ||
3513 | 50 | + let parent = win.get_transient_for(); | ||
3514 | 51 | + while (parent.is_attached_dialog()) | ||
3515 | 52 | + parent = parent.get_transient_for(); | ||
3516 | 53 | + | ||
3517 | 54 | + // Display dialog if it is attached to our metaWindow | ||
3518 | 55 | + if (win.is_attached_dialog() && parent == this.metaWindow) { | ||
3519 | 56 | + this._doAddAttachedDialog(win, win.get_compositor_private()); | ||
3520 | 57 | + this._onMetaWindowSizeChanged(); | ||
3521 | 58 | + } | ||
3522 | 59 | + | ||
3523 | 60 | + // The dialog popped up after the user tried to close the window, | ||
3524 | 61 | + // assume it's a close confirmation and leave the overview | ||
3525 | 62 | + if (this._closeRequested) | ||
3526 | 63 | + this._activate(); | ||
3527 | 64 | }, | ||
3528 | 65 | |||
3529 | 66 | hasAttachedDialogs() { | ||
3530 | 67 | @@ -462,14 +475,12 @@ var WindowOverlay = new Lang.Class({ | ||
3531 | 68 | button._overlap = 0; | ||
3532 | 69 | |||
3533 | 70 | this._idleToggleCloseId = 0; | ||
3534 | 71 | - button.connect('clicked', this._closeWindow.bind(this)); | ||
3535 | 72 | + button.connect('clicked', () => this._windowClone.deleteAll()); | ||
3536 | 73 | |||
3537 | 74 | windowClone.actor.connect('destroy', this._onDestroy.bind(this)); | ||
3538 | 75 | windowClone.connect('show-chrome', this._onShowChrome.bind(this)); | ||
3539 | 76 | windowClone.connect('hide-chrome', this._onHideChrome.bind(this)); | ||
3540 | 77 | |||
3541 | 78 | - this._windowAddedId = 0; | ||
3542 | 79 | - | ||
3543 | 80 | button.hide(); | ||
3544 | 81 | title.hide(); | ||
3545 | 82 | |||
3546 | 83 | @@ -590,43 +601,12 @@ var WindowOverlay = new Lang.Class({ | ||
3547 | 84 | Tweener.addTween(actor, params); | ||
3548 | 85 | }, | ||
3549 | 86 | |||
3550 | 87 | - _closeWindow(actor) { | ||
3551 | 88 | - let metaWindow = this._windowClone.metaWindow; | ||
3552 | 89 | - this._workspace = metaWindow.get_workspace(); | ||
3553 | 90 | - | ||
3554 | 91 | - this._windowAddedId = this._workspace.connect('window-added', | ||
3555 | 92 | - this._onWindowAdded.bind(this)); | ||
3556 | 93 | - | ||
3557 | 94 | - this._windowClone.deleteAll(); | ||
3558 | 95 | - }, | ||
3559 | 96 | - | ||
3560 | 97 | _windowCanClose() { | ||
3561 | 98 | return this._windowClone.metaWindow.can_close() && | ||
3562 | 99 | !this._windowClone.hasAttachedDialogs(); | ||
3563 | 100 | }, | ||
3564 | 101 | |||
3565 | 102 | - _onWindowAdded(workspace, win) { | ||
3566 | 103 | - let metaWindow = this._windowClone.metaWindow; | ||
3567 | 104 | - | ||
3568 | 105 | - if (win.get_transient_for() == metaWindow) { | ||
3569 | 106 | - workspace.disconnect(this._windowAddedId); | ||
3570 | 107 | - this._windowAddedId = 0; | ||
3571 | 108 | - | ||
3572 | 109 | - // use an idle handler to avoid mapping problems - | ||
3573 | 110 | - // see comment in Workspace._windowAdded | ||
3574 | 111 | - let id = Mainloop.idle_add(() => { | ||
3575 | 112 | - this._windowClone.emit('selected'); | ||
3576 | 113 | - return GLib.SOURCE_REMOVE; | ||
3577 | 114 | - }); | ||
3578 | 115 | - GLib.Source.set_name_by_id(id, '[gnome-shell] this._windowClone.emit'); | ||
3579 | 116 | - } | ||
3580 | 117 | - }, | ||
3581 | 118 | - | ||
3582 | 119 | _onDestroy() { | ||
3583 | 120 | - if (this._windowAddedId > 0) { | ||
3584 | 121 | - this._workspace.disconnect(this._windowAddedId); | ||
3585 | 122 | - this._windowAddedId = 0; | ||
3586 | 123 | - } | ||
3587 | 124 | if (this._idleToggleCloseId > 0) { | ||
3588 | 125 | Mainloop.source_remove(this._idleToggleCloseId); | ||
3589 | 126 | this._idleToggleCloseId = 0; | ||
3590 | 127 | @@ -1516,21 +1496,17 @@ var Workspace = new Lang.Class({ | ||
3591 | 128 | return; | ||
3592 | 129 | |||
3593 | 130 | if (!this._isOverviewWindow(win)) { | ||
3594 | 131 | - if (metaWin.is_attached_dialog()) { | ||
3595 | 132 | - let parent = metaWin.get_transient_for(); | ||
3596 | 133 | - while (parent.is_attached_dialog()) | ||
3597 | 134 | - parent = parent.get_transient_for(); | ||
3598 | 135 | - | ||
3599 | 136 | - let idx = this._lookupIndex (parent); | ||
3600 | 137 | - if (idx < 0) { | ||
3601 | 138 | - // parent was not created yet, it will take care | ||
3602 | 139 | - // of the dialog when created | ||
3603 | 140 | - return; | ||
3604 | 141 | - } | ||
3605 | 142 | + if (metaWin.get_transient_for() == null) | ||
3606 | 143 | + return; | ||
3607 | 144 | |||
3608 | 145 | - let clone = this._windows[idx]; | ||
3609 | 146 | - clone.addAttachedDialog(metaWin); | ||
3610 | 147 | - } | ||
3611 | 148 | + // Let the top-most ancestor handle all transients | ||
3612 | 149 | + let parent = metaWin.find_root_ancestor(); | ||
3613 | 150 | + let clone = this._windows.find(c => c.metaWindow == parent); | ||
3614 | 151 | + | ||
3615 | 152 | + // If no clone was found, the parent hasn't been created yet | ||
3616 | 153 | + // and will take care of the dialog when added | ||
3617 | 154 | + if (clone) | ||
3618 | 155 | + clone.addDialog(metaWin); | ||
3619 | 156 | |||
3620 | 157 | return; | ||
3621 | 158 | } | ||
3622 | diff --git a/docs/reference/shell/meson.build b/docs/reference/shell/meson.build | |||
3623 | index 1469ed4..a32d6a5 100644 | |||
3624 | --- a/docs/reference/shell/meson.build | |||
3625 | +++ b/docs/reference/shell/meson.build | |||
3626 | @@ -50,8 +50,7 @@ gnome.gtkdoc('shell', | |||
3627 | 50 | join_paths(meson.build_root(), 'src') | 50 | join_paths(meson.build_root(), 'src') |
3628 | 51 | ], | 51 | ], |
3629 | 52 | scan_args: [ | 52 | scan_args: [ |
3632 | 53 | '--ignore-headers=' + ' '.join(private_headers + exclude_directories), | 53 | '--ignore-headers=' + ' '.join(private_headers + exclude_directories) |
3631 | 54 | '--rebuild-types' | ||
3633 | 55 | ], | 54 | ], |
3634 | 56 | install: true | 55 | install: true |
3635 | 57 | ) | 56 | ) |
3636 | diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build | |||
3637 | index fe89b53..3e9e9ab 100644 | |||
3638 | --- a/docs/reference/st/meson.build | |||
3639 | +++ b/docs/reference/st/meson.build | |||
3640 | @@ -17,8 +17,7 @@ gnome.gtkdoc('st', | |||
3641 | 17 | ], | 17 | ], |
3642 | 18 | scan_args: [ | 18 | scan_args: [ |
3643 | 19 | '--ignore-headers=' + ' '.join(private_headers), | 19 | '--ignore-headers=' + ' '.join(private_headers), |
3646 | 20 | '--rebuild-sections', | 20 | '--rebuild-sections' |
3645 | 21 | '--rebuild-types' | ||
3647 | 22 | ], | 21 | ], |
3648 | 23 | install: true | 22 | install: true |
3649 | 24 | ) | 23 | ) |
3650 | diff --git a/js/extensionPrefs/main.js b/js/extensionPrefs/main.js | |||
3651 | index a30b46b..80b8d5c 100644 | |||
3652 | --- a/js/extensionPrefs/main.js | |||
3653 | +++ b/js/extensionPrefs/main.js | |||
3654 | @@ -14,15 +14,16 @@ const _ = Gettext.gettext; | |||
3655 | 14 | const Config = imports.misc.config; | 14 | const Config = imports.misc.config; |
3656 | 15 | const ExtensionUtils = imports.misc.extensionUtils; | 15 | const ExtensionUtils = imports.misc.extensionUtils; |
3657 | 16 | 16 | ||
3667 | 17 | const GnomeShellIface = '<node> \ | 17 | const GnomeShellIface = ` |
3668 | 18 | <interface name="org.gnome.Shell.Extensions"> \ | 18 | <node> |
3669 | 19 | <signal name="ExtensionStatusChanged"> \ | 19 | <interface name="org.gnome.Shell.Extensions"> |
3670 | 20 | <arg type="s" name="uuid"/> \ | 20 | <signal name="ExtensionStatusChanged"> |
3671 | 21 | <arg type="i" name="state"/> \ | 21 | <arg type="s" name="uuid"/> |
3672 | 22 | <arg type="s" name="error"/> \ | 22 | <arg type="i" name="state"/> |
3673 | 23 | </signal> \ | 23 | <arg type="s" name="error"/> |
3674 | 24 | </interface> \ | 24 | </signal> |
3675 | 25 | </node>'; | 25 | </interface> |
3676 | 26 | </node>`; | ||
3677 | 26 | 27 | ||
3678 | 27 | const GnomeShellProxy = Gio.DBusProxy.makeProxyWrapper(GnomeShellIface); | 28 | const GnomeShellProxy = Gio.DBusProxy.makeProxyWrapper(GnomeShellIface); |
3679 | 28 | 29 | ||
3680 | diff --git a/js/gdm/fingerprint.js b/js/gdm/fingerprint.js | |||
3681 | index 2aeb377..91025b9 100644 | |||
3682 | --- a/js/gdm/fingerprint.js | |||
3683 | +++ b/js/gdm/fingerprint.js | |||
3684 | @@ -5,13 +5,14 @@ const Lang = imports.lang; | |||
3685 | 5 | const Shell = imports.gi.Shell; | 5 | const Shell = imports.gi.Shell; |
3686 | 6 | const Signals = imports.signals; | 6 | const Signals = imports.signals; |
3687 | 7 | 7 | ||
3695 | 8 | const FprintManagerIface = '<node> \ | 8 | const FprintManagerIface = ` |
3696 | 9 | <interface name="net.reactivated.Fprint.Manager"> \ | 9 | <node> |
3697 | 10 | <method name="GetDefaultDevice"> \ | 10 | <interface name="net.reactivated.Fprint.Manager"> |
3698 | 11 | <arg type="o" direction="out" /> \ | 11 | <method name="GetDefaultDevice"> |
3699 | 12 | </method> \ | 12 | <arg type="o" direction="out" /> |
3700 | 13 | </interface> \ | 13 | </method> |
3701 | 14 | </node>'; | 14 | </interface> |
3702 | 15 | </node>`; | ||
3703 | 15 | 16 | ||
3704 | 16 | const FprintManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(FprintManagerIface); | 17 | const FprintManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(FprintManagerIface); |
3705 | 17 | 18 | ||
3706 | diff --git a/js/gdm/oVirt.js b/js/gdm/oVirt.js | |||
3707 | index 8a6a545..8194c20 100644 | |||
3708 | --- a/js/gdm/oVirt.js | |||
3709 | +++ b/js/gdm/oVirt.js | |||
3710 | @@ -4,13 +4,13 @@ const Gio = imports.gi.Gio; | |||
3711 | 4 | const Lang = imports.lang; | 4 | const Lang = imports.lang; |
3712 | 5 | const Signals = imports.signals; | 5 | const Signals = imports.signals; |
3713 | 6 | 6 | ||
3721 | 7 | const OVirtCredentialsIface = '<node> \ | 7 | const OVirtCredentialsIface =`<node> |
3722 | 8 | <interface name="org.ovirt.vdsm.Credentials"> \ | 8 | <interface name="org.ovirt.vdsm.Credentials"> |
3723 | 9 | <signal name="UserAuthenticated"> \ | 9 | <signal name="UserAuthenticated"> |
3724 | 10 | <arg type="s" name="token"/> \ | 10 | <arg type="s" name="token"/> |
3725 | 11 | </signal> \ | 11 | </signal> |
3726 | 12 | </interface> \ | 12 | </interface> |
3727 | 13 | </node>'; | 13 | </node>`; |
3728 | 14 | 14 | ||
3729 | 15 | const OVirtCredentialsInfo = Gio.DBusInterfaceInfo.new_for_xml(OVirtCredentialsIface); | 15 | const OVirtCredentialsInfo = Gio.DBusInterfaceInfo.new_for_xml(OVirtCredentialsIface); |
3730 | 16 | 16 | ||
3731 | diff --git a/js/gdm/realmd.js b/js/gdm/realmd.js | |||
3732 | index 9aa27d9..ae87aa1 100644 | |||
3733 | --- a/js/gdm/realmd.js | |||
3734 | +++ b/js/gdm/realmd.js | |||
3735 | @@ -5,58 +5,61 @@ const Lang = imports.lang; | |||
3736 | 5 | const Shell = imports.gi.Shell; | 5 | const Shell = imports.gi.Shell; |
3737 | 6 | const Signals = imports.signals; | 6 | const Signals = imports.signals; |
3738 | 7 | 7 | ||
3752 | 8 | const ProviderIface = '<node> \ | 8 | const ProviderIface = ` |
3753 | 9 | <interface name="org.freedesktop.realmd.Provider"> \ | 9 | <node> |
3754 | 10 | <property name="Name" type="s" access="read"/> \ | 10 | <interface name="org.freedesktop.realmd.Provider"> |
3755 | 11 | <property name="Version" type="s" access="read"/> \ | 11 | <property name="Name" type="s" access="read"/> |
3756 | 12 | <property name="Realms" type="ao" access="read"/> \ | 12 | <property name="Version" type="s" access="read"/> |
3757 | 13 | <method name="Discover"> \ | 13 | <property name="Realms" type="ao" access="read"/> |
3758 | 14 | <arg name="string" type="s" direction="in"/> \ | 14 | <method name="Discover"> |
3759 | 15 | <arg name="options" type="a{sv}" direction="in"/> \ | 15 | <arg name="string" type="s" direction="in"/> |
3760 | 16 | <arg name="relevance" type="i" direction="out"/> \ | 16 | <arg name="options" type="a{sv}" direction="in"/> |
3761 | 17 | <arg name="realm" type="ao" direction="out"/> \ | 17 | <arg name="relevance" type="i" direction="out"/> |
3762 | 18 | </method> \ | 18 | <arg name="realm" type="ao" direction="out"/> |
3763 | 19 | </interface> \ | 19 | </method> |
3764 | 20 | </node>'; | 20 | </interface> |
3765 | 21 | </node>`; | ||
3766 | 21 | const Provider = Gio.DBusProxy.makeProxyWrapper(ProviderIface); | 22 | const Provider = Gio.DBusProxy.makeProxyWrapper(ProviderIface); |
3767 | 22 | 23 | ||
3783 | 23 | const ServiceIface = '<node> \ | 24 | const ServiceIface = ` |
3784 | 24 | <interface name="org.freedesktop.realmd.Service"> \ | 25 | <node> |
3785 | 25 | <method name="Cancel"> \ | 26 | <interface name="org.freedesktop.realmd.Service"> |
3786 | 26 | <arg name="operation" type="s" direction="in"/> \ | 27 | <method name="Cancel"> |
3787 | 27 | </method> \ | 28 | <arg name="operation" type="s" direction="in"/> |
3788 | 28 | <method name="Release" /> \ | 29 | </method> |
3789 | 29 | <method name="SetLocale"> \ | 30 | <method name="Release" /> |
3790 | 30 | <arg name="locale" type="s" direction="in"/> \ | 31 | <method name="SetLocale"> |
3791 | 31 | </method> \ | 32 | <arg name="locale" type="s" direction="in"/> |
3792 | 32 | <signal name="Diagnostics"> \ | 33 | </method> |
3793 | 33 | <arg name="data" type="s"/> \ | 34 | <signal name="Diagnostics"> |
3794 | 34 | <arg name="operation" type="s"/> \ | 35 | <arg name="data" type="s"/> |
3795 | 35 | </signal> \ | 36 | <arg name="operation" type="s"/> |
3796 | 36 | </interface> \ | 37 | </signal> |
3797 | 37 | </node>'; | 38 | </interface> |
3798 | 39 | </node>`; | ||
3799 | 38 | const Service = Gio.DBusProxy.makeProxyWrapper(ServiceIface); | 40 | const Service = Gio.DBusProxy.makeProxyWrapper(ServiceIface); |
3800 | 39 | 41 | ||
3821 | 40 | const RealmIface = '<node> \ | 42 | const RealmIface = ` |
3822 | 41 | <interface name="org.freedesktop.realmd.Realm"> \ | 43 | <node> |
3823 | 42 | <property name="Name" type="s" access="read"/> \ | 44 | <interface name="org.freedesktop.realmd.Realm"> |
3824 | 43 | <property name="Configured" type="s" access="read"/> \ | 45 | <property name="Name" type="s" access="read"/> |
3825 | 44 | <property name="Details" type="a(ss)" access="read"/> \ | 46 | <property name="Configured" type="s" access="read"/> |
3826 | 45 | <property name="LoginFormats" type="as" access="read"/> \ | 47 | <property name="Details" type="a(ss)" access="read"/> |
3827 | 46 | <property name="LoginPolicy" type="s" access="read"/> \ | 48 | <property name="LoginFormats" type="as" access="read"/> |
3828 | 47 | <property name="PermittedLogins" type="as" access="read"/> \ | 49 | <property name="LoginPolicy" type="s" access="read"/> |
3829 | 48 | <property name="SupportedInterfaces" type="as" access="read"/> \ | 50 | <property name="PermittedLogins" type="as" access="read"/> |
3830 | 49 | <method name="ChangeLoginPolicy"> \ | 51 | <property name="SupportedInterfaces" type="as" access="read"/> |
3831 | 50 | <arg name="login_policy" type="s" direction="in"/> \ | 52 | <method name="ChangeLoginPolicy"> |
3832 | 51 | <arg name="permitted_add" type="as" direction="in"/> \ | 53 | <arg name="login_policy" type="s" direction="in"/> |
3833 | 52 | <arg name="permitted_remove" type="as" direction="in"/> \ | 54 | <arg name="permitted_add" type="as" direction="in"/> |
3834 | 53 | <arg name="options" type="a{sv}" direction="in"/> \ | 55 | <arg name="permitted_remove" type="as" direction="in"/> |
3835 | 54 | </method> \ | 56 | <arg name="options" type="a{sv}" direction="in"/> |
3836 | 55 | <method name="Deconfigure"> \ | 57 | </method> |
3837 | 56 | <arg name="options" type="a{sv}" direction="in"/> \ | 58 | <method name="Deconfigure"> |
3838 | 57 | </method> \ | 59 | <arg name="options" type="a{sv}" direction="in"/> |
3839 | 58 | </interface> \ | 60 | </method> |
3840 | 59 | </node>'; | 61 | </interface> |
3841 | 62 | </node>`; | ||
3842 | 60 | const Realm = Gio.DBusProxy.makeProxyWrapper(RealmIface); | 63 | const Realm = Gio.DBusProxy.makeProxyWrapper(RealmIface); |
3843 | 61 | 64 | ||
3844 | 62 | var Manager = new Lang.Class({ | 65 | var Manager = new Lang.Class({ |
3845 | diff --git a/js/js-resources.gresource.xml b/js/js-resources.gresource.xml | |||
3846 | index 3c0feab..75a6c3b 100644 | |||
3847 | --- a/js/js-resources.gresource.xml | |||
3848 | +++ b/js/js-resources.gresource.xml | |||
3849 | @@ -9,8 +9,6 @@ | |||
3850 | 9 | <file>gdm/realmd.js</file> | 9 | <file>gdm/realmd.js</file> |
3851 | 10 | <file>gdm/util.js</file> | 10 | <file>gdm/util.js</file> |
3852 | 11 | 11 | ||
3853 | 12 | <file>extensionPrefs/main.js</file> | ||
3854 | 13 | |||
3855 | 14 | <file>misc/config.js</file> | 12 | <file>misc/config.js</file> |
3856 | 15 | <file>misc/extensionUtils.js</file> | 13 | <file>misc/extensionUtils.js</file> |
3857 | 16 | <file>misc/fileUtils.js</file> | 14 | <file>misc/fileUtils.js</file> |
3858 | @@ -33,8 +31,6 @@ | |||
3859 | 33 | <file>perf/core.js</file> | 31 | <file>perf/core.js</file> |
3860 | 34 | <file>perf/hwtest.js</file> | 32 | <file>perf/hwtest.js</file> |
3861 | 35 | 33 | ||
3862 | 36 | <file>portalHelper/main.js</file> | ||
3863 | 37 | |||
3864 | 38 | <file>ui/accessDialog.js</file> | 34 | <file>ui/accessDialog.js</file> |
3865 | 39 | <file>ui/altTab.js</file> | 35 | <file>ui/altTab.js</file> |
3866 | 40 | <file>ui/animation.js</file> | 36 | <file>ui/animation.js</file> |
3867 | diff --git a/js/meson.build b/js/meson.build | |||
3868 | index dd8ca3f..4a572c5 100644 | |||
3869 | --- a/js/meson.build | |||
3870 | +++ b/js/meson.build | |||
3871 | @@ -6,3 +6,17 @@ js_resources = gnome.compile_resources( | |||
3872 | 6 | c_name: 'shell_js_resources', | 6 | c_name: 'shell_js_resources', |
3873 | 7 | dependencies: [config_js] | 7 | dependencies: [config_js] |
3874 | 8 | ) | 8 | ) |
3875 | 9 | |||
3876 | 10 | portal_resources = gnome.compile_resources( | ||
3877 | 11 | 'portal-resources', 'portal-resources.gresource.xml', | ||
3878 | 12 | source_dir: ['.', meson.current_build_dir()], | ||
3879 | 13 | c_name: 'portal_js_resources', | ||
3880 | 14 | dependencies: [config_js] | ||
3881 | 15 | ) | ||
3882 | 16 | |||
3883 | 17 | prefs_resources = gnome.compile_resources( | ||
3884 | 18 | 'prefs-resources', 'prefs-resources.gresource.xml', | ||
3885 | 19 | source_dir: ['.', meson.current_build_dir()], | ||
3886 | 20 | c_name: 'prefs_js_resources', | ||
3887 | 21 | dependencies: [config_js] | ||
3888 | 22 | ) | ||
3889 | diff --git a/js/misc/gnomeSession.js b/js/misc/gnomeSession.js | |||
3890 | index 4c5d7f2..15a2202 100644 | |||
3891 | --- a/js/misc/gnomeSession.js | |||
3892 | +++ b/js/misc/gnomeSession.js | |||
3893 | @@ -4,17 +4,18 @@ const Gio = imports.gi.Gio; | |||
3894 | 4 | const Lang = imports.lang; | 4 | const Lang = imports.lang; |
3895 | 5 | const Signals = imports.signals; | 5 | const Signals = imports.signals; |
3896 | 6 | 6 | ||
3908 | 7 | const PresenceIface = '<node> \ | 7 | const PresenceIface = ` |
3909 | 8 | <interface name="org.gnome.SessionManager.Presence"> \ | 8 | <node> |
3910 | 9 | <method name="SetStatus"> \ | 9 | <interface name="org.gnome.SessionManager.Presence"> |
3911 | 10 | <arg type="u" direction="in"/> \ | 10 | <method name="SetStatus"> |
3912 | 11 | </method> \ | 11 | <arg type="u" direction="in"/> |
3913 | 12 | <property name="status" type="u" access="readwrite"/> \ | 12 | </method> |
3914 | 13 | <signal name="StatusChanged"> \ | 13 | <property name="status" type="u" access="readwrite"/> |
3915 | 14 | <arg type="u" direction="out"/> \ | 14 | <signal name="StatusChanged"> |
3916 | 15 | </signal> \ | 15 | <arg type="u" direction="out"/> |
3917 | 16 | </interface> \ | 16 | </signal> |
3918 | 17 | </node>'; | 17 | </interface> |
3919 | 18 | </node>`; | ||
3920 | 18 | 19 | ||
3921 | 19 | var PresenceStatus = { | 20 | var PresenceStatus = { |
3922 | 20 | AVAILABLE: 0, | 21 | AVAILABLE: 0, |
3923 | @@ -32,16 +33,17 @@ function Presence(initCallback, cancellable) { | |||
3924 | 32 | // Note inhibitors are immutable objects, so they don't | 33 | // Note inhibitors are immutable objects, so they don't |
3925 | 33 | // change at runtime (changes always come in the form | 34 | // change at runtime (changes always come in the form |
3926 | 34 | // of new inhibitors) | 35 | // of new inhibitors) |
3937 | 35 | const InhibitorIface = '<node> \ | 36 | const InhibitorIface = ` |
3938 | 36 | <interface name="org.gnome.SessionManager.Inhibitor"> \ | 37 | <node> |
3939 | 37 | <method name="GetAppId"> \ | 38 | <interface name="org.gnome.SessionManager.Inhibitor"> |
3940 | 38 | <arg type="s" direction="out" /> \ | 39 | <method name="GetAppId"> |
3941 | 39 | </method> \ | 40 | <arg type="s" direction="out" /> |
3942 | 40 | <method name="GetReason"> \ | 41 | </method> |
3943 | 41 | <arg type="s" direction="out" /> \ | 42 | <method name="GetReason"> |
3944 | 42 | </method> \ | 43 | <arg type="s" direction="out" /> |
3945 | 43 | </interface> \ | 44 | </method> |
3946 | 44 | </node>'; | 45 | </interface> |
3947 | 46 | </node>`; | ||
3948 | 45 | 47 | ||
3949 | 46 | var InhibitorProxy = Gio.DBusProxy.makeProxyWrapper(InhibitorIface); | 48 | var InhibitorProxy = Gio.DBusProxy.makeProxyWrapper(InhibitorIface); |
3950 | 47 | function Inhibitor(objectPath, initCallback, cancellable) { | 49 | function Inhibitor(objectPath, initCallback, cancellable) { |
3951 | @@ -49,29 +51,30 @@ function Inhibitor(objectPath, initCallback, cancellable) { | |||
3952 | 49 | } | 51 | } |
3953 | 50 | 52 | ||
3954 | 51 | // Not the full interface, only the methods we use | 53 | // Not the full interface, only the methods we use |
3978 | 52 | const SessionManagerIface = '<node> \ | 54 | const SessionManagerIface = ` |
3979 | 53 | <interface name="org.gnome.SessionManager"> \ | 55 | <node> |
3980 | 54 | <method name="Logout"> \ | 56 | <interface name="org.gnome.SessionManager"> |
3981 | 55 | <arg type="u" direction="in" /> \ | 57 | <method name="Logout"> |
3982 | 56 | </method> \ | 58 | <arg type="u" direction="in" /> |
3983 | 57 | <method name="Shutdown" /> \ | 59 | </method> |
3984 | 58 | <method name="Reboot" /> \ | 60 | <method name="Shutdown" /> |
3985 | 59 | <method name="CanShutdown"> \ | 61 | <method name="Reboot" /> |
3986 | 60 | <arg type="b" direction="out" /> \ | 62 | <method name="CanShutdown"> |
3987 | 61 | </method> \ | 63 | <arg type="b" direction="out" /> |
3988 | 62 | <method name="IsInhibited"> \ | 64 | </method> |
3989 | 63 | <arg type="u" direction="in" /> \ | 65 | <method name="IsInhibited"> |
3990 | 64 | <arg type="b" direction="out" /> \ | 66 | <arg type="u" direction="in" /> |
3991 | 65 | </method> \ | 67 | <arg type="b" direction="out" /> |
3992 | 66 | <property name="SessionIsActive" type="b" access="read"/> \ | 68 | </method> |
3993 | 67 | <signal name="InhibitorAdded"> \ | 69 | <property name="SessionIsActive" type="b" access="read"/> |
3994 | 68 | <arg type="o" direction="out"/> \ | 70 | <signal name="InhibitorAdded"> |
3995 | 69 | </signal> \ | 71 | <arg type="o" direction="out"/> |
3996 | 70 | <signal name="InhibitorRemoved"> \ | 72 | </signal> |
3997 | 71 | <arg type="o" direction="out"/> \ | 73 | <signal name="InhibitorRemoved"> |
3998 | 72 | </signal> \ | 74 | <arg type="o" direction="out"/> |
3999 | 73 | </interface> \ | 75 | </signal> |
4000 | 74 | </node>'; | 76 | </interface> |
4001 | 77 | </node>`; | ||
4002 | 75 | 78 | ||
4003 | 76 | var SessionManagerProxy = Gio.DBusProxy.makeProxyWrapper(SessionManagerIface); | 79 | var SessionManagerProxy = Gio.DBusProxy.makeProxyWrapper(SessionManagerIface); |
4004 | 77 | function SessionManager(initCallback, cancellable) { | 80 | function SessionManager(initCallback, cancellable) { |
4005 | diff --git a/js/misc/inputMethod.js b/js/misc/inputMethod.js | |||
4006 | index 59b3d78..320a6cc 100644 | |||
4007 | --- a/js/misc/inputMethod.js | |||
4008 | +++ b/js/misc/inputMethod.js | |||
4009 | @@ -17,6 +17,8 @@ var InputMethod = new Lang.Class({ | |||
4010 | 17 | this._currentFocus = null; | 17 | this._currentFocus = null; |
4011 | 18 | this._currentEvent = null; | 18 | this._currentEvent = null; |
4012 | 19 | this._doForwardEvent = false; | 19 | this._doForwardEvent = false; |
4013 | 20 | this._preeditStr = ''; | ||
4014 | 21 | this._preeditPos = 0; | ||
4015 | 20 | this._ibus = IBus.Bus.new_async(); | 22 | this._ibus = IBus.Bus.new_async(); |
4016 | 21 | this._ibus.connect('connected', this._onConnected.bind(this)); | 23 | this._ibus.connect('connected', this._onConnected.bind(this)); |
4017 | 22 | this._ibus.connect('disconnected', this._clear.bind(this)); | 24 | this._ibus.connect('disconnected', this._clear.bind(this)); |
4018 | @@ -69,6 +71,8 @@ var InputMethod = new Lang.Class({ | |||
4019 | 69 | this._context.connect('commit-text', this._onCommitText.bind(this)); | 71 | this._context.connect('commit-text', this._onCommitText.bind(this)); |
4020 | 70 | this._context.connect('delete-surrounding-text', this._onDeleteSurroundingText.bind(this)); | 72 | this._context.connect('delete-surrounding-text', this._onDeleteSurroundingText.bind(this)); |
4021 | 71 | this._context.connect('update-preedit-text', this._onUpdatePreeditText.bind(this)); | 73 | this._context.connect('update-preedit-text', this._onUpdatePreeditText.bind(this)); |
4022 | 74 | this._context.connect('show-preedit-text', this._onShowPreeditText.bind(this)); | ||
4023 | 75 | this._context.connect('hide-preedit-text', this._onHidePreeditText.bind(this)); | ||
4024 | 72 | this._context.connect('forward-key-event', this._onForwardKeyEvent.bind(this)); | 76 | this._context.connect('forward-key-event', this._onForwardKeyEvent.bind(this)); |
4025 | 73 | 77 | ||
4026 | 74 | this._updateCapabilities(); | 78 | this._updateCapabilities(); |
4027 | @@ -79,6 +83,8 @@ var InputMethod = new Lang.Class({ | |||
4028 | 79 | this._hints = 0; | 83 | this._hints = 0; |
4029 | 80 | this._purpose = 0; | 84 | this._purpose = 0; |
4030 | 81 | this._enabled = false; | 85 | this._enabled = false; |
4031 | 86 | this._preeditStr = '' | ||
4032 | 87 | this._preeditPos = 0; | ||
4033 | 82 | }, | 88 | }, |
4034 | 83 | 89 | ||
4035 | 84 | _emitRequestSurrounding() { | 90 | _emitRequestSurrounding() { |
4036 | @@ -95,11 +101,22 @@ var InputMethod = new Lang.Class({ | |||
4037 | 95 | }, | 101 | }, |
4038 | 96 | 102 | ||
4039 | 97 | _onUpdatePreeditText(context, text, pos, visible) { | 103 | _onUpdatePreeditText(context, text, pos, visible) { |
4043 | 98 | let str = null; | 104 | if (text == null) |
4044 | 99 | if (visible && text != null) | 105 | return; |
4045 | 100 | str = text.get_text(); | 106 | this._preeditStr = text.get_text(); |
4046 | 107 | this._preeditPos = pos; | ||
4047 | 108 | if (visible) | ||
4048 | 109 | this.set_preedit_text(this._preeditStr, pos); | ||
4049 | 110 | else | ||
4050 | 111 | this.set_preedit_text(null, pos); | ||
4051 | 112 | }, | ||
4052 | 113 | |||
4053 | 114 | _onShowPreeditText(context) { | ||
4054 | 115 | this.set_preedit_text(this._preeditStr, this._preeditPos); | ||
4055 | 116 | }, | ||
4056 | 101 | 117 | ||
4058 | 102 | this.set_preedit_text(str, pos); | 118 | _onHidePreeditText(context) { |
4059 | 119 | this.set_preedit_text(null, this._preeditPos); | ||
4060 | 103 | }, | 120 | }, |
4061 | 104 | 121 | ||
4062 | 105 | _onForwardKeyEvent(context, keyval, keycode, state) { | 122 | _onForwardKeyEvent(context, keyval, keycode, state) { |
4063 | diff --git a/js/misc/loginManager.js b/js/misc/loginManager.js | |||
4064 | index ccda382..b5891a3 100644 | |||
4065 | --- a/js/misc/loginManager.js | |||
4066 | +++ b/js/misc/loginManager.js | |||
4067 | @@ -7,53 +7,56 @@ const Mainloop = imports.mainloop; | |||
4068 | 7 | const Shell = imports.gi.Shell; | 7 | const Shell = imports.gi.Shell; |
4069 | 8 | const Signals = imports.signals; | 8 | const Signals = imports.signals; |
4070 | 9 | 9 | ||
4118 | 10 | const SystemdLoginManagerIface = '<node> \ | 10 | const SystemdLoginManagerIface = ` |
4119 | 11 | <interface name="org.freedesktop.login1.Manager"> \ | 11 | <node> |
4120 | 12 | <method name="Suspend"> \ | 12 | <interface name="org.freedesktop.login1.Manager"> |
4121 | 13 | <arg type="b" direction="in"/> \ | 13 | <method name="Suspend"> |
4122 | 14 | </method> \ | 14 | <arg type="b" direction="in"/> |
4123 | 15 | <method name="CanSuspend"> \ | 15 | </method> |
4124 | 16 | <arg type="s" direction="out"/> \ | 16 | <method name="CanSuspend"> |
4125 | 17 | </method> \ | 17 | <arg type="s" direction="out"/> |
4126 | 18 | <method name="Inhibit"> \ | 18 | </method> |
4127 | 19 | <arg type="s" direction="in"/> \ | 19 | <method name="Inhibit"> |
4128 | 20 | <arg type="s" direction="in"/> \ | 20 | <arg type="s" direction="in"/> |
4129 | 21 | <arg type="s" direction="in"/> \ | 21 | <arg type="s" direction="in"/> |
4130 | 22 | <arg type="s" direction="in"/> \ | 22 | <arg type="s" direction="in"/> |
4131 | 23 | <arg type="h" direction="out"/> \ | 23 | <arg type="s" direction="in"/> |
4132 | 24 | </method> \ | 24 | <arg type="h" direction="out"/> |
4133 | 25 | <method name="GetSession"> \ | 25 | </method> |
4134 | 26 | <arg type="s" direction="in"/> \ | 26 | <method name="GetSession"> |
4135 | 27 | <arg type="o" direction="out"/> \ | 27 | <arg type="s" direction="in"/> |
4136 | 28 | </method> \ | 28 | <arg type="o" direction="out"/> |
4137 | 29 | <method name="ListSessions"> \ | 29 | </method> |
4138 | 30 | <arg name="sessions" type="a(susso)" direction="out"/> \ | 30 | <method name="ListSessions"> |
4139 | 31 | </method> \ | 31 | <arg name="sessions" type="a(susso)" direction="out"/> |
4140 | 32 | <signal name="PrepareForSleep"> \ | 32 | </method> |
4141 | 33 | <arg type="b" direction="out"/> \ | 33 | <signal name="PrepareForSleep"> |
4142 | 34 | </signal> \ | 34 | <arg type="b" direction="out"/> |
4143 | 35 | </interface> \ | 35 | </signal> |
4144 | 36 | </node>'; | 36 | </interface> |
4145 | 37 | 37 | </node>`; | |
4146 | 38 | const SystemdLoginSessionIface = '<node> \ | 38 | |
4147 | 39 | <interface name="org.freedesktop.login1.Session"> \ | 39 | const SystemdLoginSessionIface = ` |
4148 | 40 | <signal name="Lock" /> \ | 40 | <node> |
4149 | 41 | <signal name="Unlock" /> \ | 41 | <interface name="org.freedesktop.login1.Session"> |
4150 | 42 | <property name="Active" type="b" access="read" /> \ | 42 | <signal name="Lock" /> |
4151 | 43 | <property name="Class" type="s" access="read" /> \ | 43 | <signal name="Unlock" /> |
4152 | 44 | <property name="Id" type="s" access="read" /> \ | 44 | <property name="Active" type="b" access="read" /> |
4153 | 45 | <method name="SetLockedHint"> \ | 45 | <property name="Class" type="s" access="read" /> |
4154 | 46 | <arg type="b" direction="in"/> \ | 46 | <property name="Id" type="s" access="read" /> |
4155 | 47 | </method> \ | 47 | <method name="SetLockedHint"> |
4156 | 48 | </interface> \ | 48 | <arg type="b" direction="in"/> |
4157 | 49 | </node>'; | 49 | </method> |
4158 | 50 | 50 | </interface> | |
4159 | 51 | const SystemdLoginUserIface = '<node> \ | 51 | </node>`; |
4160 | 52 | <interface name="org.freedesktop.login1.User"> \ | 52 | |
4161 | 53 | <property name="Display" type="(so)" access="read" /> \ | 53 | const SystemdLoginUserIface = ` |
4162 | 54 | <property name="Sessions" type="a(so)" access="read" /> \ | 54 | <node> |
4163 | 55 | </interface> \ | 55 | <interface name="org.freedesktop.login1.User"> |
4164 | 56 | </node>'; | 56 | <property name="Display" type="(so)" access="read" /> |
4165 | 57 | <property name="Sessions" type="a(so)" access="read" /> | ||
4166 | 58 | </interface> | ||
4167 | 59 | </node>`; | ||
4168 | 57 | 60 | ||
4169 | 58 | const SystemdLoginManager = Gio.DBusProxy.makeProxyWrapper(SystemdLoginManagerIface); | 61 | const SystemdLoginManager = Gio.DBusProxy.makeProxyWrapper(SystemdLoginManagerIface); |
4170 | 59 | const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface); | 62 | const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface); |
4171 | diff --git a/js/misc/modemManager.js b/js/misc/modemManager.js | |||
4172 | index 7ef265a..c473937 100644 | |||
4173 | --- a/js/misc/modemManager.js | |||
4174 | +++ b/js/misc/modemManager.js | |||
4175 | @@ -92,41 +92,43 @@ function _findProviderForSid(sid) { | |||
4176 | 92 | // The following are not the complete interfaces, just the methods we need | 92 | // The following are not the complete interfaces, just the methods we need |
4177 | 93 | // (or may need in the future) | 93 | // (or may need in the future) |
4178 | 94 | 94 | ||
4198 | 95 | const ModemGsmNetworkInterface = '<node> \ | 95 | const ModemGsmNetworkInterface = ` |
4199 | 96 | <interface name="org.freedesktop.ModemManager.Modem.Gsm.Network"> \ | 96 | <node> |
4200 | 97 | <method name="GetRegistrationInfo"> \ | 97 | <interface name="org.freedesktop.ModemManager.Modem.Gsm.Network"> |
4201 | 98 | <arg type="(uss)" direction="out" /> \ | 98 | <method name="GetRegistrationInfo"> |
4202 | 99 | </method> \ | 99 | <arg type="(uss)" direction="out" /> |
4203 | 100 | <method name="GetSignalQuality"> \ | 100 | </method> |
4204 | 101 | <arg type="u" direction="out" /> \ | 101 | <method name="GetSignalQuality"> |
4205 | 102 | </method> \ | 102 | <arg type="u" direction="out" /> |
4206 | 103 | <property name="AccessTechnology" type="u" access="read" /> \ | 103 | </method> |
4207 | 104 | <signal name="SignalQuality"> \ | 104 | <property name="AccessTechnology" type="u" access="read" /> |
4208 | 105 | <arg type="u" direction="out" /> \ | 105 | <signal name="SignalQuality"> |
4209 | 106 | </signal> \ | 106 | <arg type="u" direction="out" /> |
4210 | 107 | <signal name="RegistrationInfo"> \ | 107 | </signal> |
4211 | 108 | <arg type="u" direction="out" /> \ | 108 | <signal name="RegistrationInfo"> |
4212 | 109 | <arg type="s" direction="out" /> \ | 109 | <arg type="u" direction="out" /> |
4213 | 110 | <arg type="s" direction="out" /> \ | 110 | <arg type="s" direction="out" /> |
4214 | 111 | </signal> \ | 111 | <arg type="s" direction="out" /> |
4215 | 112 | </interface> \ | 112 | </signal> |
4216 | 113 | </node>'; | 113 | </interface> |
4217 | 114 | </node>`; | ||
4218 | 114 | 115 | ||
4219 | 115 | const ModemGsmNetworkProxy = Gio.DBusProxy.makeProxyWrapper(ModemGsmNetworkInterface); | 116 | const ModemGsmNetworkProxy = Gio.DBusProxy.makeProxyWrapper(ModemGsmNetworkInterface); |
4220 | 116 | 117 | ||
4234 | 117 | const ModemCdmaInterface = '<node> \ | 118 | const ModemCdmaInterface = ` |
4235 | 118 | <interface name="org.freedesktop.ModemManager.Modem.Cdma"> \ | 119 | <node> |
4236 | 119 | <method name="GetSignalQuality"> \ | 120 | <interface name="org.freedesktop.ModemManager.Modem.Cdma"> |
4237 | 120 | <arg type="u" direction="out" /> \ | 121 | <method name="GetSignalQuality"> |
4238 | 121 | </method> \ | 122 | <arg type="u" direction="out" /> |
4239 | 122 | <method name="GetServingSystem"> \ | 123 | </method> |
4240 | 123 | <arg type="(usu)" direction="out" /> \ | 124 | <method name="GetServingSystem"> |
4241 | 124 | </method> \ | 125 | <arg type="(usu)" direction="out" /> |
4242 | 125 | <signal name="SignalQuality"> \ | 126 | </method> |
4243 | 126 | <arg type="u" direction="out" /> \ | 127 | <signal name="SignalQuality"> |
4244 | 127 | </signal> \ | 128 | <arg type="u" direction="out" /> |
4245 | 128 | </interface> \ | 129 | </signal> |
4246 | 129 | </node>'; | 130 | </interface> |
4247 | 131 | </node>`; | ||
4248 | 130 | 132 | ||
4249 | 131 | const ModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(ModemCdmaInterface); | 133 | const ModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(ModemCdmaInterface); |
4250 | 132 | 134 | ||
4251 | @@ -222,26 +224,29 @@ Signals.addSignalMethods(ModemCdma.prototype); | |||
4252 | 222 | // Support for the new ModemManager1 interface (MM >= 0.7) | 224 | // Support for the new ModemManager1 interface (MM >= 0.7) |
4253 | 223 | //------------------------------------------------------------------------------ | 225 | //------------------------------------------------------------------------------ |
4254 | 224 | 226 | ||
4260 | 225 | const BroadbandModemInterface = '<node> \ | 227 | const BroadbandModemInterface = ` |
4261 | 226 | <interface name="org.freedesktop.ModemManager1.Modem"> \ | 228 | <node> |
4262 | 227 | <property name="SignalQuality" type="(ub)" access="read" /> \ | 229 | <interface name="org.freedesktop.ModemManager1.Modem"> |
4263 | 228 | </interface> \ | 230 | <property name="SignalQuality" type="(ub)" access="read" /> |
4264 | 229 | </node>'; | 231 | </interface> |
4265 | 232 | </node>`; | ||
4266 | 230 | const BroadbandModemProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemInterface); | 233 | const BroadbandModemProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemInterface); |
4267 | 231 | 234 | ||
4274 | 232 | const BroadbandModem3gppInterface = '<node> \ | 235 | const BroadbandModem3gppInterface = ` |
4275 | 233 | <interface name="org.freedesktop.ModemManager1.Modem.Modem3gpp"> \ | 236 | <node> |
4276 | 234 | <property name="OperatorCode" type="s" access="read" /> \ | 237 | <interface name="org.freedesktop.ModemManager1.Modem.Modem3gpp"> |
4277 | 235 | <property name="OperatorName" type="s" access="read" /> \ | 238 | <property name="OperatorCode" type="s" access="read" /> |
4278 | 236 | </interface> \ | 239 | <property name="OperatorName" type="s" access="read" /> |
4279 | 237 | </node>'; | 240 | </interface> |
4280 | 241 | </node>`; | ||
4281 | 238 | const BroadbandModem3gppProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModem3gppInterface); | 242 | const BroadbandModem3gppProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModem3gppInterface); |
4282 | 239 | 243 | ||
4288 | 240 | const BroadbandModemCdmaInterface = '<node> \ | 244 | const BroadbandModemCdmaInterface = ` |
4289 | 241 | <interface name="org.freedesktop.ModemManager1.Modem.ModemCdma"> \ | 245 | <node> |
4290 | 242 | <property name="Sid" type="u" access="read" /> \ | 246 | <interface name="org.freedesktop.ModemManager1.Modem.ModemCdma"> |
4291 | 243 | </interface> \ | 247 | <property name="Sid" type="u" access="read" /> |
4292 | 244 | </node>'; | 248 | </interface> |
4293 | 249 | </node>`; | ||
4294 | 245 | const BroadbandModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemCdmaInterface); | 250 | const BroadbandModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemCdmaInterface); |
4295 | 246 | 251 | ||
4296 | 247 | var BroadbandModem = new Lang.Class({ | 252 | var BroadbandModem = new Lang.Class({ |
4297 | diff --git a/js/misc/objectManager.js b/js/misc/objectManager.js | |||
4298 | index 1ce4f83..efe669b 100644 | |||
4299 | --- a/js/misc/objectManager.js | |||
4300 | +++ b/js/misc/objectManager.js | |||
4301 | @@ -8,21 +8,22 @@ const Signals = imports.signals; | |||
4302 | 8 | 8 | ||
4303 | 9 | // Specified in the D-Bus specification here: | 9 | // Specified in the D-Bus specification here: |
4304 | 10 | // http://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces-objectmanager | 10 | // http://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces-objectmanager |
4320 | 11 | const ObjectManagerIface = '<node> \ | 11 | const ObjectManagerIface = ` |
4321 | 12 | <interface name="org.freedesktop.DBus.ObjectManager"> \ | 12 | <node> |
4322 | 13 | <method name="GetManagedObjects"> \ | 13 | <interface name="org.freedesktop.DBus.ObjectManager"> |
4323 | 14 | <arg name="objects" type="a{oa{sa{sv}}}" direction="out"/> \ | 14 | <method name="GetManagedObjects"> |
4324 | 15 | </method> \ | 15 | <arg name="objects" type="a{oa{sa{sv}}}" direction="out"/> |
4325 | 16 | <signal name="InterfacesAdded"> \ | 16 | </method> |
4326 | 17 | <arg name="objectPath" type="o"/> \ | 17 | <signal name="InterfacesAdded"> |
4327 | 18 | <arg name="interfaces" type="a{sa{sv}}" /> \ | 18 | <arg name="objectPath" type="o"/> |
4328 | 19 | </signal> \ | 19 | <arg name="interfaces" type="a{sa{sv}}" /> |
4329 | 20 | <signal name="InterfacesRemoved"> \ | 20 | </signal> |
4330 | 21 | <arg name="objectPath" type="o"/> \ | 21 | <signal name="InterfacesRemoved"> |
4331 | 22 | <arg name="interfaces" type="as" /> \ | 22 | <arg name="objectPath" type="o"/> |
4332 | 23 | </signal> \ | 23 | <arg name="interfaces" type="as" /> |
4333 | 24 | </interface> \ | 24 | </signal> |
4334 | 25 | </node>'; | 25 | </interface> |
4335 | 26 | </node>`; | ||
4336 | 26 | 27 | ||
4337 | 27 | const ObjectManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ObjectManagerIface); | 28 | const ObjectManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ObjectManagerIface); |
4338 | 28 | 29 | ||
4339 | diff --git a/js/misc/permissionStore.js b/js/misc/permissionStore.js | |||
4340 | index 86c0cd8..6126e1f 100644 | |||
4341 | --- a/js/misc/permissionStore.js | |||
4342 | +++ b/js/misc/permissionStore.js | |||
4343 | @@ -2,30 +2,31 @@ | |||
4344 | 2 | 2 | ||
4345 | 3 | const Gio = imports.gi.Gio; | 3 | const Gio = imports.gi.Gio; |
4346 | 4 | 4 | ||
4371 | 5 | const PermissionStoreIface = '<node> \ | 5 | const PermissionStoreIface = ` |
4372 | 6 | <interface name="org.freedesktop.impl.portal.PermissionStore"> \ | 6 | <node> |
4373 | 7 | <method name="Lookup"> \ | 7 | <interface name="org.freedesktop.impl.portal.PermissionStore"> |
4374 | 8 | <arg name="table" type="s" direction="in"/> \ | 8 | <method name="Lookup"> |
4375 | 9 | <arg name="id" type="s" direction="in"/> \ | 9 | <arg name="table" type="s" direction="in"/> |
4376 | 10 | <arg name="permissions" type="a{sas}" direction="out"/> \ | 10 | <arg name="id" type="s" direction="in"/> |
4377 | 11 | <arg name="data" type="v" direction="out"/> \ | 11 | <arg name="permissions" type="a{sas}" direction="out"/> |
4378 | 12 | </method> \ | 12 | <arg name="data" type="v" direction="out"/> |
4379 | 13 | <method name="Set"> \ | 13 | </method> |
4380 | 14 | <arg name="table" type="s" direction="in"/> \ | 14 | <method name="Set"> |
4381 | 15 | <arg name="create" type="b" direction="in"/> \ | 15 | <arg name="table" type="s" direction="in"/> |
4382 | 16 | <arg name="id" type="s" direction="in"/> \ | 16 | <arg name="create" type="b" direction="in"/> |
4383 | 17 | <arg name="app_permissions" type="a{sas}" direction="in"/> \ | 17 | <arg name="id" type="s" direction="in"/> |
4384 | 18 | <arg name="data" type="v" direction="in"/> \ | 18 | <arg name="app_permissions" type="a{sas}" direction="in"/> |
4385 | 19 | </method> \ | 19 | <arg name="data" type="v" direction="in"/> |
4386 | 20 | <signal name="Changed"> \ | 20 | </method> |
4387 | 21 | <arg name="table" type="s" direction="out"/> \ | 21 | <signal name="Changed"> |
4388 | 22 | <arg name="id" type="s" direction="out"/> \ | 22 | <arg name="table" type="s" direction="out"/> |
4389 | 23 | <arg name="deleted" type="b" direction="out"/> \ | 23 | <arg name="id" type="s" direction="out"/> |
4390 | 24 | <arg name="data" type="v" direction="out"/> \ | 24 | <arg name="deleted" type="b" direction="out"/> |
4391 | 25 | <arg name="permissions" type="a{sas}" direction="out"/> \ | 25 | <arg name="data" type="v" direction="out"/> |
4392 | 26 | </signal> \ | 26 | <arg name="permissions" type="a{sas}" direction="out"/> |
4393 | 27 | </interface> \ | 27 | </signal> |
4394 | 28 | </node>'; | 28 | </interface> |
4395 | 29 | </node>`; | ||
4396 | 29 | 30 | ||
4397 | 30 | const PermissionStoreProxy = Gio.DBusProxy.makeProxyWrapper(PermissionStoreIface); | 31 | const PermissionStoreProxy = Gio.DBusProxy.makeProxyWrapper(PermissionStoreIface); |
4398 | 31 | 32 | ||
4399 | diff --git a/js/misc/smartcardManager.js b/js/misc/smartcardManager.js | |||
4400 | index 60808b3..51d2ea9 100644 | |||
4401 | --- a/js/misc/smartcardManager.js | |||
4402 | +++ b/js/misc/smartcardManager.js | |||
4403 | @@ -7,14 +7,15 @@ const Signals = imports.signals; | |||
4404 | 7 | 7 | ||
4405 | 8 | const ObjectManager = imports.misc.objectManager; | 8 | const ObjectManager = imports.misc.objectManager; |
4406 | 9 | 9 | ||
4415 | 10 | const SmartcardTokenIface = '<node> \ | 10 | const SmartcardTokenIface = ` |
4416 | 11 | <interface name="org.gnome.SettingsDaemon.Smartcard.Token"> \ | 11 | <node> |
4417 | 12 | <property name="Name" type="s" access="read"/> \ | 12 | <interface name="org.gnome.SettingsDaemon.Smartcard.Token"> |
4418 | 13 | <property name="Driver" type="o" access="read"/> \ | 13 | <property name="Name" type="s" access="read"/> |
4419 | 14 | <property name="IsInserted" type="b" access="read"/> \ | 14 | <property name="Driver" type="o" access="read"/> |
4420 | 15 | <property name="UsedToLogin" type="b" access="read"/> \ | 15 | <property name="IsInserted" type="b" access="read"/> |
4421 | 16 | </interface> \ | 16 | <property name="UsedToLogin" type="b" access="read"/> |
4422 | 17 | </node>'; | 17 | </interface> |
4423 | 18 | </node>`; | ||
4424 | 18 | 19 | ||
4425 | 19 | let _smartcardManager = null; | 20 | let _smartcardManager = null; |
4426 | 20 | 21 | ||
4427 | diff --git a/js/misc/systemActions.js b/js/misc/systemActions.js | |||
4428 | index bf8b460..434dd95 100644 | |||
4429 | --- a/js/misc/systemActions.js | |||
4430 | +++ b/js/misc/systemActions.js | |||
4431 | @@ -22,11 +22,12 @@ const ALWAYS_SHOW_LOG_OUT_KEY = 'always-show-log-out'; | |||
4432 | 22 | const SENSOR_BUS_NAME = 'net.hadess.SensorProxy'; | 22 | const SENSOR_BUS_NAME = 'net.hadess.SensorProxy'; |
4433 | 23 | const SENSOR_OBJECT_PATH = '/net/hadess/SensorProxy'; | 23 | const SENSOR_OBJECT_PATH = '/net/hadess/SensorProxy'; |
4434 | 24 | 24 | ||
4440 | 25 | const SensorProxyInterface = '<node> \ | 25 | const SensorProxyInterface = ` |
4441 | 26 | <interface name="net.hadess.SensorProxy"> \ | 26 | <node> |
4442 | 27 | <property name="HasAccelerometer" type="b" access="read"/> \ | 27 | <interface name="net.hadess.SensorProxy"> |
4443 | 28 | </interface> \ | 28 | <property name="HasAccelerometer" type="b" access="read"/> |
4444 | 29 | </node>'; | 29 | </interface> |
4445 | 30 | </node>`; | ||
4446 | 30 | 31 | ||
4447 | 31 | const POWER_OFF_ACTION_ID = 'power-off'; | 32 | const POWER_OFF_ACTION_ID = 'power-off'; |
4448 | 32 | const LOCK_SCREEN_ACTION_ID = 'lock-screen'; | 33 | const LOCK_SCREEN_ACTION_ID = 'lock-screen'; |
4449 | diff --git a/js/portal-resources.gresource.xml b/js/portal-resources.gresource.xml | |||
4450 | 33 | new file mode 100644 | 34 | new file mode 100644 |
4451 | index 0000000..3a06747 | |||
4452 | --- /dev/null | |||
4453 | +++ b/js/portal-resources.gresource.xml | |||
4454 | @@ -0,0 +1,7 @@ | |||
4455 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
4456 | 2 | <gresources> | ||
4457 | 3 | <gresource prefix="/org/gnome/shell"> | ||
4458 | 4 | <file>misc/config.js</file> | ||
4459 | 5 | <file>portalHelper/main.js</file> | ||
4460 | 6 | </gresource> | ||
4461 | 7 | </gresources> | ||
4462 | diff --git a/js/portalHelper/main.js b/js/portalHelper/main.js | |||
4463 | index 838af46..e112f82 100644 | |||
4464 | --- a/js/portalHelper/main.js | |||
4465 | +++ b/js/portalHelper/main.js | |||
4466 | @@ -30,25 +30,26 @@ const CONNECTIVITY_CHECK_HOST = 'nmcheck.gnome.org'; | |||
4467 | 30 | const CONNECTIVITY_CHECK_URI = 'http://' + CONNECTIVITY_CHECK_HOST; | 30 | const CONNECTIVITY_CHECK_URI = 'http://' + CONNECTIVITY_CHECK_HOST; |
4468 | 31 | const CONNECTIVITY_RECHECK_RATELIMIT_TIMEOUT = 30 * GLib.USEC_PER_SEC; | 31 | const CONNECTIVITY_RECHECK_RATELIMIT_TIMEOUT = 30 * GLib.USEC_PER_SEC; |
4469 | 32 | 32 | ||
4489 | 33 | const HelperDBusInterface = '<node> \ | 33 | const HelperDBusInterface = ` |
4490 | 34 | <interface name="org.gnome.Shell.PortalHelper"> \ | 34 | <node> |
4491 | 35 | <method name="Authenticate"> \ | 35 | <interface name="org.gnome.Shell.PortalHelper"> |
4492 | 36 | <arg type="o" direction="in" name="connection" /> \ | 36 | <method name="Authenticate"> |
4493 | 37 | <arg type="s" direction="in" name="url" /> \ | 37 | <arg type="o" direction="in" name="connection" /> |
4494 | 38 | <arg type="u" direction="in" name="timestamp" /> \ | 38 | <arg type="s" direction="in" name="url" /> |
4495 | 39 | </method> \ | 39 | <arg type="u" direction="in" name="timestamp" /> |
4496 | 40 | <method name="Close"> \ | 40 | </method> |
4497 | 41 | <arg type="o" direction="in" name="connection" /> \ | 41 | <method name="Close"> |
4498 | 42 | </method> \ | 42 | <arg type="o" direction="in" name="connection" /> |
4499 | 43 | <method name="Refresh"> \ | 43 | </method> |
4500 | 44 | <arg type="o" direction="in" name="connection" /> \ | 44 | <method name="Refresh"> |
4501 | 45 | </method> \ | 45 | <arg type="o" direction="in" name="connection" /> |
4502 | 46 | <signal name="Done"> \ | 46 | </method> |
4503 | 47 | <arg type="o" name="connection" /> \ | 47 | <signal name="Done"> |
4504 | 48 | <arg type="u" name="result" /> \ | 48 | <arg type="o" name="connection" /> |
4505 | 49 | </signal> \ | 49 | <arg type="u" name="result" /> |
4506 | 50 | </interface> \ | 50 | </signal> |
4507 | 51 | </node>'; | 51 | </interface> |
4508 | 52 | </node>`; | ||
4509 | 52 | 53 | ||
4510 | 53 | var PortalHeaderBar = new Lang.Class({ | 54 | var PortalHeaderBar = new Lang.Class({ |
4511 | 54 | Name: 'PortalHeaderBar', | 55 | Name: 'PortalHeaderBar', |
4512 | diff --git a/js/prefs-resources.gresource.xml b/js/prefs-resources.gresource.xml | |||
4513 | 55 | new file mode 100644 | 56 | new file mode 100644 |
4514 | index 0000000..653c4cb | |||
4515 | --- /dev/null | |||
4516 | +++ b/js/prefs-resources.gresource.xml | |||
4517 | @@ -0,0 +1,11 @@ | |||
4518 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
4519 | 2 | <gresources> | ||
4520 | 3 | <gresource prefix="/org/gnome/shell"> | ||
4521 | 4 | <file>extensionPrefs/main.js</file> | ||
4522 | 5 | |||
4523 | 6 | <file>misc/config.js</file> | ||
4524 | 7 | <file>misc/extensionUtils.js</file> | ||
4525 | 8 | <file>misc/fileUtils.js</file> | ||
4526 | 9 | <file>misc/params.js</file> | ||
4527 | 10 | </gresource> | ||
4528 | 11 | </gresources> | ||
4529 | diff --git a/js/ui/accessDialog.js b/js/ui/accessDialog.js | |||
4530 | index 1bd9004..bb59ee5 100644 | |||
4531 | --- a/js/ui/accessDialog.js | |||
4532 | +++ b/js/ui/accessDialog.js | |||
4533 | @@ -10,27 +10,29 @@ const CheckBox = imports.ui.checkBox; | |||
4534 | 10 | const Dialog = imports.ui.dialog; | 10 | const Dialog = imports.ui.dialog; |
4535 | 11 | const ModalDialog = imports.ui.modalDialog; | 11 | const ModalDialog = imports.ui.modalDialog; |
4536 | 12 | 12 | ||
4558 | 13 | const RequestIface = '<node> \ | 13 | const RequestIface = ` |
4559 | 14 | <interface name="org.freedesktop.impl.portal.Request"> \ | 14 | <node> |
4560 | 15 | <method name="Close"/> \ | 15 | <interface name="org.freedesktop.impl.portal.Request"> |
4561 | 16 | </interface> \ | 16 | <method name="Close"/> |
4562 | 17 | </node>'; | 17 | </interface> |
4563 | 18 | 18 | </node>`; | |
4564 | 19 | const AccessIface = '<node> \ | 19 | |
4565 | 20 | <interface name="org.freedesktop.impl.portal.Access"> \ | 20 | const AccessIface = ` |
4566 | 21 | <method name="AccessDialog"> \ | 21 | <node> |
4567 | 22 | <arg type="o" name="handle" direction="in"/> \ | 22 | <interface name="org.freedesktop.impl.portal.Access"> |
4568 | 23 | <arg type="s" name="app_id" direction="in"/> \ | 23 | <method name="AccessDialog"> |
4569 | 24 | <arg type="s" name="parent_window" direction="in"/> \ | 24 | <arg type="o" name="handle" direction="in"/> |
4570 | 25 | <arg type="s" name="title" direction="in"/> \ | 25 | <arg type="s" name="app_id" direction="in"/> |
4571 | 26 | <arg type="s" name="subtitle" direction="in"/> \ | 26 | <arg type="s" name="parent_window" direction="in"/> |
4572 | 27 | <arg type="s" name="body" direction="in"/> \ | 27 | <arg type="s" name="title" direction="in"/> |
4573 | 28 | <arg type="a{sv}" name="options" direction="in"/> \ | 28 | <arg type="s" name="subtitle" direction="in"/> |
4574 | 29 | <arg type="u" name="response" direction="out"/> \ | 29 | <arg type="s" name="body" direction="in"/> |
4575 | 30 | <arg type="a{sv}" name="results" direction="out"/> \ | 30 | <arg type="a{sv}" name="options" direction="in"/> |
4576 | 31 | </method> \ | 31 | <arg type="u" name="response" direction="out"/> |
4577 | 32 | </interface> \ | 32 | <arg type="a{sv}" name="results" direction="out"/> |
4578 | 33 | </node>'; | 33 | </method> |
4579 | 34 | </interface> | ||
4580 | 35 | </node>`; | ||
4581 | 34 | 36 | ||
4582 | 35 | var DialogResponse = { | 37 | var DialogResponse = { |
4583 | 36 | OK: 0, | 38 | OK: 0, |
4584 | diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js | |||
4585 | index 785b9f7..623dc6f 100644 | |||
4586 | --- a/js/ui/appDisplay.js | |||
4587 | +++ b/js/ui/appDisplay.js | |||
4588 | @@ -66,11 +66,12 @@ var PAGE_SWITCH_TIME = 0.3; | |||
4589 | 66 | const SWITCHEROO_BUS_NAME = 'net.hadess.SwitcherooControl'; | 66 | const SWITCHEROO_BUS_NAME = 'net.hadess.SwitcherooControl'; |
4590 | 67 | const SWITCHEROO_OBJECT_PATH = '/net/hadess/SwitcherooControl'; | 67 | const SWITCHEROO_OBJECT_PATH = '/net/hadess/SwitcherooControl'; |
4591 | 68 | 68 | ||
4597 | 69 | const SwitcherooProxyInterface = '<node> \ | 69 | const SwitcherooProxyInterface = ` |
4598 | 70 | <interface name="net.hadess.SwitcherooControl"> \ | 70 | <node> |
4599 | 71 | <property name="HasDualGpu" type="b" access="read"/> \ | 71 | <interface name="net.hadess.SwitcherooControl"> |
4600 | 72 | </interface> \ | 72 | <property name="HasDualGpu" type="b" access="read"/> |
4601 | 73 | </node>'; | 73 | </interface> |
4602 | 74 | </node>`; | ||
4603 | 74 | 75 | ||
4604 | 75 | const SwitcherooProxy = Gio.DBusProxy.makeProxyWrapper(SwitcherooProxyInterface); | 76 | const SwitcherooProxy = Gio.DBusProxy.makeProxyWrapper(SwitcherooProxyInterface); |
4605 | 76 | let discreteGpuAvailable = false; | 77 | let discreteGpuAvailable = false; |
4606 | diff --git a/js/ui/audioDeviceSelection.js b/js/ui/audioDeviceSelection.js | |||
4607 | index de8af09..8010ec1 100644 | |||
4608 | --- a/js/ui/audioDeviceSelection.js | |||
4609 | +++ b/js/ui/audioDeviceSelection.js | |||
4610 | @@ -15,18 +15,19 @@ var AudioDevice = { | |||
4611 | 15 | MICROPHONE: 1 << 2 | 15 | MICROPHONE: 1 << 2 |
4612 | 16 | }; | 16 | }; |
4613 | 17 | 17 | ||
4626 | 18 | const AudioDeviceSelectionIface = '<node> \ | 18 | const AudioDeviceSelectionIface = ` |
4627 | 19 | <interface name="org.gnome.Shell.AudioDeviceSelection"> \ | 19 | <node> |
4628 | 20 | <method name="Open"> \ | 20 | <interface name="org.gnome.Shell.AudioDeviceSelection"> |
4629 | 21 | <arg name="devices" direction="in" type="as" /> \ | 21 | <method name="Open"> |
4630 | 22 | </method> \ | 22 | <arg name="devices" direction="in" type="as" /> |
4631 | 23 | <method name="Close"> \ | 23 | </method> |
4632 | 24 | </method> \ | 24 | <method name="Close"> |
4633 | 25 | <signal name="DeviceSelected"> \ | 25 | </method> |
4634 | 26 | <arg name="device" type="s" /> \ | 26 | <signal name="DeviceSelected"> |
4635 | 27 | </signal> \ | 27 | <arg name="device" type="s" /> |
4636 | 28 | </interface> \ | 28 | </signal> |
4637 | 29 | </node>'; | 29 | </interface> |
4638 | 30 | </node>`; | ||
4639 | 30 | 31 | ||
4640 | 31 | var AudioDeviceSelectionDialog = new Lang.Class({ | 32 | var AudioDeviceSelectionDialog = new Lang.Class({ |
4641 | 32 | Name: 'AudioDeviceSelectionDialog', | 33 | Name: 'AudioDeviceSelectionDialog', |
4642 | diff --git a/js/ui/boxpointer.js b/js/ui/boxpointer.js | |||
4643 | index 47f718a..d51877d 100644 | |||
4644 | --- a/js/ui/boxpointer.js | |||
4645 | +++ b/js/ui/boxpointer.js | |||
4646 | @@ -44,6 +44,7 @@ var BoxPointer = new Lang.Class({ | |||
4647 | 44 | y_fill: true }); | 44 | y_fill: true }); |
4648 | 45 | this._container = new Shell.GenericContainer(); | 45 | this._container = new Shell.GenericContainer(); |
4649 | 46 | this.actor.set_child(this._container); | 46 | this.actor.set_child(this._container); |
4650 | 47 | this.actor.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS); | ||
4651 | 47 | this._container.connect('get-preferred-width', this._getPreferredWidth.bind(this)); | 48 | this._container.connect('get-preferred-width', this._getPreferredWidth.bind(this)); |
4652 | 48 | this._container.connect('get-preferred-height', this._getPreferredHeight.bind(this)); | 49 | this._container.connect('get-preferred-height', this._getPreferredHeight.bind(this)); |
4653 | 49 | this._container.connect('allocate', this._allocate.bind(this)); | 50 | this._container.connect('allocate', this._allocate.bind(this)); |
4654 | diff --git a/js/ui/calendar.js b/js/ui/calendar.js | |||
4655 | index 651aac6..990cac2 100644 | |||
4656 | --- a/js/ui/calendar.js | |||
4657 | +++ b/js/ui/calendar.js | |||
4658 | @@ -134,18 +134,19 @@ var EmptyEventSource = new Lang.Class({ | |||
4659 | 134 | }); | 134 | }); |
4660 | 135 | Signals.addSignalMethods(EmptyEventSource.prototype); | 135 | Signals.addSignalMethods(EmptyEventSource.prototype); |
4661 | 136 | 136 | ||
4674 | 137 | const CalendarServerIface = '<node> \ | 137 | const CalendarServerIface = ` |
4675 | 138 | <interface name="org.gnome.Shell.CalendarServer"> \ | 138 | <node> |
4676 | 139 | <method name="GetEvents"> \ | 139 | <interface name="org.gnome.Shell.CalendarServer"> |
4677 | 140 | <arg type="x" direction="in" /> \ | 140 | <method name="GetEvents"> |
4678 | 141 | <arg type="x" direction="in" /> \ | 141 | <arg type="x" direction="in" /> |
4679 | 142 | <arg type="b" direction="in" /> \ | 142 | <arg type="x" direction="in" /> |
4680 | 143 | <arg type="a(sssbxxa{sv})" direction="out" /> \ | 143 | <arg type="b" direction="in" /> |
4681 | 144 | </method> \ | 144 | <arg type="a(sssbxxa{sv})" direction="out" /> |
4682 | 145 | <property name="HasCalendars" type="b" access="read" /> \ | 145 | </method> |
4683 | 146 | <signal name="Changed" /> \ | 146 | <property name="HasCalendars" type="b" access="read" /> |
4684 | 147 | </interface> \ | 147 | <signal name="Changed" /> |
4685 | 148 | </node>'; | 148 | </interface> |
4686 | 149 | </node>`; | ||
4687 | 149 | 150 | ||
4688 | 150 | const CalendarServerInfo = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIface); | 151 | const CalendarServerInfo = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIface); |
4689 | 151 | 152 | ||
4690 | diff --git a/js/ui/components/autorunManager.js b/js/ui/components/autorunManager.js | |||
4691 | index bbd7328..37c774c 100644 | |||
4692 | --- a/js/ui/components/autorunManager.js | |||
4693 | +++ b/js/ui/components/autorunManager.js | |||
4694 | @@ -74,14 +74,15 @@ function startAppForMount(app, mount) { | |||
4695 | 74 | 74 | ||
4696 | 75 | /******************************************/ | 75 | /******************************************/ |
4697 | 76 | 76 | ||
4706 | 77 | const HotplugSnifferIface = '<node> \ | 77 | const HotplugSnifferIface = ` |
4707 | 78 | <interface name="org.gnome.Shell.HotplugSniffer"> \ | 78 | <node> |
4708 | 79 | <method name="SniffURI"> \ | 79 | <interface name="org.gnome.Shell.HotplugSniffer"> |
4709 | 80 | <arg type="s" direction="in" /> \ | 80 | <method name="SniffURI"> |
4710 | 81 | <arg type="as" direction="out" /> \ | 81 | <arg type="s" direction="in" /> |
4711 | 82 | </method> \ | 82 | <arg type="as" direction="out" /> |
4712 | 83 | </interface> \ | 83 | </method> |
4713 | 84 | </node>'; | 84 | </interface> |
4714 | 85 | </node>`; | ||
4715 | 85 | 86 | ||
4716 | 86 | const HotplugSnifferProxy = Gio.DBusProxy.makeProxyWrapper(HotplugSnifferIface); | 87 | const HotplugSnifferProxy = Gio.DBusProxy.makeProxyWrapper(HotplugSnifferIface); |
4717 | 87 | function HotplugSniffer() { | 88 | function HotplugSniffer() { |
4718 | diff --git a/js/ui/components/networkAgent.js b/js/ui/components/networkAgent.js | |||
4719 | index 5bd648a..998fcb7 100644 | |||
4720 | --- a/js/ui/components/networkAgent.js | |||
4721 | +++ b/js/ui/components/networkAgent.js | |||
4722 | @@ -506,8 +506,12 @@ var VPNRequestHandler = new Lang.Class({ | |||
4723 | 506 | try { | 506 | try { |
4724 | 507 | data = this._dataStdout.peek_buffer(); | 507 | data = this._dataStdout.peek_buffer(); |
4725 | 508 | 508 | ||
4728 | 509 | keyfile.load_from_data(data.toString(), data.length, | 509 | if (data instanceof Uint8Array) |
4729 | 510 | GLib.KeyFileFlags.NONE); | 510 | data = imports.byteArray.toGBytes(data); |
4730 | 511 | else | ||
4731 | 512 | data = data.toGBytes(); | ||
4732 | 513 | |||
4733 | 514 | keyfile.load_from_bytes(data, GLib.KeyFileFlags.NONE); | ||
4734 | 511 | 515 | ||
4735 | 512 | if (keyfile.get_integer(VPN_UI_GROUP, 'Version') != 2) | 516 | if (keyfile.get_integer(VPN_UI_GROUP, 'Version') != 2) |
4736 | 513 | throw new Error('Invalid plugin keyfile version, is %d'); | 517 | throw new Error('Invalid plugin keyfile version, is %d'); |
4737 | diff --git a/js/ui/dash.js b/js/ui/dash.js | |||
4738 | index 5ee2476..9b8bfdd 100644 | |||
4739 | --- a/js/ui/dash.js | |||
4740 | +++ b/js/ui/dash.js | |||
4741 | @@ -402,6 +402,7 @@ var Dash = new Lang.Class({ | |||
4742 | 402 | clip_to_allocation: true }); | 402 | clip_to_allocation: true }); |
4743 | 403 | this._box._delegate = this; | 403 | this._box._delegate = this; |
4744 | 404 | this._container.add_actor(this._box); | 404 | this._container.add_actor(this._box); |
4745 | 405 | this._container.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS); | ||
4746 | 405 | 406 | ||
4747 | 406 | this._showAppsIcon = new ShowAppsIcon(); | 407 | this._showAppsIcon = new ShowAppsIcon(); |
4748 | 407 | this._showAppsIcon.childScale = 1; | 408 | this._showAppsIcon.childScale = 1; |
4749 | diff --git a/js/ui/dialog.js b/js/ui/dialog.js | |||
4750 | index cfa192d..0dd3370 100644 | |||
4751 | --- a/js/ui/dialog.js | |||
4752 | +++ b/js/ui/dialog.js | |||
4753 | @@ -40,6 +40,7 @@ var Dialog = new Lang.Class({ | |||
4754 | 40 | // mode accordingly so wrapped labels are handled correctly during | 40 | // mode accordingly so wrapped labels are handled correctly during |
4755 | 41 | // size requests. | 41 | // size requests. |
4756 | 42 | this._dialog.request_mode = Clutter.RequestMode.HEIGHT_FOR_WIDTH; | 42 | this._dialog.request_mode = Clutter.RequestMode.HEIGHT_FOR_WIDTH; |
4757 | 43 | this._dialog.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS); | ||
4758 | 43 | 44 | ||
4759 | 44 | this.contentLayout = new St.BoxLayout({ vertical: true, | 45 | this.contentLayout = new St.BoxLayout({ vertical: true, |
4760 | 45 | style_class: "modal-dialog-content-box" }); | 46 | style_class: "modal-dialog-content-box" }); |
4761 | diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js | |||
4762 | index 5491fbb..a6b928c 100644 | |||
4763 | --- a/js/ui/endSessionDialog.js | |||
4764 | +++ b/js/ui/endSessionDialog.js | |||
4765 | @@ -43,22 +43,23 @@ const _DIALOG_ICON_SIZE = 48; | |||
4766 | 43 | 43 | ||
4767 | 44 | var GSM_SESSION_MANAGER_LOGOUT_FORCE = 2; | 44 | var GSM_SESSION_MANAGER_LOGOUT_FORCE = 2; |
4768 | 45 | 45 | ||
4785 | 46 | const EndSessionDialogIface = '<node> \ | 46 | const EndSessionDialogIface = ` |
4786 | 47 | <interface name="org.gnome.SessionManager.EndSessionDialog"> \ | 47 | <node> |
4787 | 48 | <method name="Open"> \ | 48 | <interface name="org.gnome.SessionManager.EndSessionDialog"> |
4788 | 49 | <arg type="u" direction="in" /> \ | 49 | <method name="Open"> |
4789 | 50 | <arg type="u" direction="in" /> \ | 50 | <arg type="u" direction="in" /> |
4790 | 51 | <arg type="u" direction="in" /> \ | 51 | <arg type="u" direction="in" /> |
4791 | 52 | <arg type="ao" direction="in" /> \ | 52 | <arg type="u" direction="in" /> |
4792 | 53 | </method> \ | 53 | <arg type="ao" direction="in" /> |
4793 | 54 | <method name="Close" /> \ | 54 | </method> |
4794 | 55 | <signal name="ConfirmedLogout" /> \ | 55 | <method name="Close" /> |
4795 | 56 | <signal name="ConfirmedReboot" /> \ | 56 | <signal name="ConfirmedLogout" /> |
4796 | 57 | <signal name="ConfirmedShutdown" /> \ | 57 | <signal name="ConfirmedReboot" /> |
4797 | 58 | <signal name="Canceled" /> \ | 58 | <signal name="ConfirmedShutdown" /> |
4798 | 59 | <signal name="Closed" /> \ | 59 | <signal name="Canceled" /> |
4799 | 60 | </interface> \ | 60 | <signal name="Closed" /> |
4800 | 61 | </node>'; | 61 | </interface> |
4801 | 62 | </node>`; | ||
4802 | 62 | 63 | ||
4803 | 63 | const logoutDialogContent = { | 64 | const logoutDialogContent = { |
4804 | 64 | subjectWithUser: C_("title", "Log Out %s"), | 65 | subjectWithUser: C_("title", "Log Out %s"), |
4805 | @@ -168,39 +169,42 @@ const DialogContent = { | |||
4806 | 168 | 169 | ||
4807 | 169 | var MAX_USERS_IN_SESSION_DIALOG = 5; | 170 | var MAX_USERS_IN_SESSION_DIALOG = 5; |
4808 | 170 | 171 | ||
4818 | 171 | const LogindSessionIface = '<node> \ | 172 | const LogindSessionIface = ` |
4819 | 172 | <interface name="org.freedesktop.login1.Session"> \ | 173 | <node> |
4820 | 173 | <property name="Id" type="s" access="read"/> \ | 174 | <interface name="org.freedesktop.login1.Session"> |
4821 | 174 | <property name="Remote" type="b" access="read"/> \ | 175 | <property name="Id" type="s" access="read"/> |
4822 | 175 | <property name="Class" type="s" access="read"/> \ | 176 | <property name="Remote" type="b" access="read"/> |
4823 | 176 | <property name="Type" type="s" access="read"/> \ | 177 | <property name="Class" type="s" access="read"/> |
4824 | 177 | <property name="State" type="s" access="read"/> \ | 178 | <property name="Type" type="s" access="read"/> |
4825 | 178 | </interface> \ | 179 | <property name="State" type="s" access="read"/> |
4826 | 179 | </node>'; | 180 | </interface> |
4827 | 181 | </node>`; | ||
4828 | 180 | 182 | ||
4829 | 181 | const LogindSession = Gio.DBusProxy.makeProxyWrapper(LogindSessionIface); | 183 | const LogindSession = Gio.DBusProxy.makeProxyWrapper(LogindSessionIface); |
4830 | 182 | 184 | ||
4844 | 183 | const PkOfflineIface = '<node> \ | 185 | const PkOfflineIface = ` |
4845 | 184 | <interface name="org.freedesktop.PackageKit.Offline"> \ | 186 | <node> |
4846 | 185 | <property name="UpdatePrepared" type="b" access="read"/> \ | 187 | <interface name="org.freedesktop.PackageKit.Offline"> |
4847 | 186 | <property name="UpdateTriggered" type="b" access="read"/> \ | 188 | <property name="UpdatePrepared" type="b" access="read"/> |
4848 | 187 | <property name="UpgradePrepared" type="b" access="read"/> \ | 189 | <property name="UpdateTriggered" type="b" access="read"/> |
4849 | 188 | <property name="UpgradeTriggered" type="b" access="read"/> \ | 190 | <property name="UpgradePrepared" type="b" access="read"/> |
4850 | 189 | <property name="PreparedUpgrade" type="a{sv}" access="read"/> \ | 191 | <property name="UpgradeTriggered" type="b" access="read"/> |
4851 | 190 | <method name="Trigger"> \ | 192 | <property name="PreparedUpgrade" type="a{sv}" access="read"/> |
4852 | 191 | <arg type="s" name="action" direction="in"/> \ | 193 | <method name="Trigger"> |
4853 | 192 | </method> \ | 194 | <arg type="s" name="action" direction="in"/> |
4854 | 193 | <method name="Cancel"/> \ | 195 | </method> |
4855 | 194 | </interface> \ | 196 | <method name="Cancel"/> |
4856 | 195 | </node>'; | 197 | </interface> |
4857 | 198 | </node>`; | ||
4858 | 196 | 199 | ||
4859 | 197 | const PkOfflineProxy = Gio.DBusProxy.makeProxyWrapper(PkOfflineIface); | 200 | const PkOfflineProxy = Gio.DBusProxy.makeProxyWrapper(PkOfflineIface); |
4860 | 198 | 201 | ||
4866 | 199 | const UPowerIface = '<node> \ | 202 | const UPowerIface = ` |
4867 | 200 | <interface name="org.freedesktop.UPower"> \ | 203 | <node> |
4868 | 201 | <property name="OnBattery" type="b" access="read"/> \ | 204 | <interface name="org.freedesktop.UPower"> |
4869 | 202 | </interface> \ | 205 | <property name="OnBattery" type="b" access="read"/> |
4870 | 203 | </node>'; | 206 | </interface> |
4871 | 207 | </node>`; | ||
4872 | 204 | 208 | ||
4873 | 205 | const UPowerProxy = Gio.DBusProxy.makeProxyWrapper(UPowerIface); | 209 | const UPowerProxy = Gio.DBusProxy.makeProxyWrapper(UPowerIface); |
4874 | 206 | 210 | ||
4875 | diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js | |||
4876 | index 1666a50..5d5f0e2 100644 | |||
4877 | --- a/js/ui/keyboard.js | |||
4878 | +++ b/js/ui/keyboard.js | |||
4879 | @@ -492,13 +492,18 @@ var FocusTracker = new Lang.Class({ | |||
4880 | 492 | 492 | ||
4881 | 493 | _init() { | 493 | _init() { |
4882 | 494 | this._currentWindow = null; | 494 | this._currentWindow = null; |
4883 | 495 | this._currentWindowPositionId = 0; | ||
4884 | 496 | 495 | ||
4885 | 497 | global.display.connect('notify::focus-window', () => { | 496 | global.display.connect('notify::focus-window', () => { |
4886 | 498 | this._setCurrentWindow(global.display.focus_window); | 497 | this._setCurrentWindow(global.display.focus_window); |
4887 | 499 | this.emit('window-changed', this._currentWindow); | 498 | this.emit('window-changed', this._currentWindow); |
4888 | 500 | }); | 499 | }); |
4889 | 501 | 500 | ||
4890 | 501 | global.display.connect('grab-op-begin', (display, window, op) => { | ||
4891 | 502 | if (window == this._currentWindow && | ||
4892 | 503 | (op == Meta.GrabOp.MOVING || op == Meta.GrabOp.KEYBOARD_MOVING)) | ||
4893 | 504 | this.emit('reset'); | ||
4894 | 505 | }); | ||
4895 | 506 | |||
4896 | 502 | /* Valid for wayland clients */ | 507 | /* Valid for wayland clients */ |
4897 | 503 | Main.inputMethod.connect('cursor-location-changed', (o, rect) => { | 508 | Main.inputMethod.connect('cursor-location-changed', (o, rect) => { |
4898 | 504 | let newRect = { x: rect.get_x(), y: rect.get_y(), width: rect.get_width(), height: rect.get_height() }; | 509 | let newRect = { x: rect.get_x(), y: rect.get_y(), width: rect.get_width(), height: rect.get_height() }; |
4899 | @@ -520,18 +525,7 @@ var FocusTracker = new Lang.Class({ | |||
4900 | 520 | }, | 525 | }, |
4901 | 521 | 526 | ||
4902 | 522 | _setCurrentWindow(window) { | 527 | _setCurrentWindow(window) { |
4903 | 523 | if (this._currentWindow) | ||
4904 | 524 | this._currentWindow.disconnect(this._currentWindowPositionId); | ||
4905 | 525 | |||
4906 | 526 | this._currentWindow = window; | 528 | this._currentWindow = window; |
4907 | 527 | if (window) { | ||
4908 | 528 | this._currentWindowPositionId = this._currentWindow.connect('position-changed', () => { | ||
4909 | 529 | if (global.display.get_grab_op() == Meta.GrabOp.NONE) | ||
4910 | 530 | this.emit('position-changed'); | ||
4911 | 531 | else | ||
4912 | 532 | this.emit('reset'); | ||
4913 | 533 | }); | ||
4914 | 534 | } | ||
4915 | 535 | }, | 529 | }, |
4916 | 536 | 530 | ||
4917 | 537 | _setCurrentRect(rect) { | 531 | _setCurrentRect(rect) { |
4918 | diff --git a/js/ui/layout.js b/js/ui/layout.js | |||
4919 | index 210fb66..7a3cb22 100644 | |||
4920 | --- a/js/ui/layout.js | |||
4921 | +++ b/js/ui/layout.js | |||
4922 | @@ -204,6 +204,7 @@ var LayoutManager = new Lang.Class({ | |||
4923 | 204 | 204 | ||
4924 | 205 | // Set up stage hierarchy to group all UI actors under one container. | 205 | // Set up stage hierarchy to group all UI actors under one container. |
4925 | 206 | this.uiGroup = new Shell.GenericContainer({ name: 'uiGroup' }); | 206 | this.uiGroup = new Shell.GenericContainer({ name: 'uiGroup' }); |
4926 | 207 | this.uiGroup.set_flags(Clutter.ActorFlags.NO_LAYOUT); | ||
4927 | 207 | this.uiGroup.connect('allocate', (actor, box, flags) => { | 208 | this.uiGroup.connect('allocate', (actor, box, flags) => { |
4928 | 208 | let children = actor.get_children(); | 209 | let children = actor.get_children(); |
4929 | 209 | for (let i = 0; i < children.length; i++) | 210 | for (let i = 0; i < children.length; i++) |
4930 | diff --git a/js/ui/magnifierDBus.js b/js/ui/magnifierDBus.js | |||
4931 | index cf8b430..c796d07 100644 | |||
4932 | --- a/js/ui/magnifierDBus.js | |||
4933 | +++ b/js/ui/magnifierDBus.js | |||
4934 | @@ -9,89 +9,91 @@ const ZOOM_SERVICE_PATH = '/org/gnome/Magnifier/ZoomRegion'; | |||
4935 | 9 | 9 | ||
4936 | 10 | // Subset of gnome-mag's Magnifier dbus interface -- to be expanded. See: | 10 | // Subset of gnome-mag's Magnifier dbus interface -- to be expanded. See: |
4937 | 11 | // http://git.gnome.org/browse/gnome-mag/tree/xml/...Magnifier.xml | 11 | // http://git.gnome.org/browse/gnome-mag/tree/xml/...Magnifier.xml |
4992 | 12 | const MagnifierIface = '<node> \ | 12 | const MagnifierIface = ` |
4993 | 13 | <interface name="org.gnome.Magnifier"> \ | 13 | <node> |
4994 | 14 | <method name="setActive"> \ | 14 | <interface name="org.gnome.Magnifier"> |
4995 | 15 | <arg type="b" direction="in" /> \ | 15 | <method name="setActive"> |
4996 | 16 | </method> \ | 16 | <arg type="b" direction="in" /> |
4997 | 17 | <method name="isActive"> \ | 17 | </method> |
4998 | 18 | <arg type="b" direction="out" /> \ | 18 | <method name="isActive"> |
4999 | 19 | </method> \ | 19 | <arg type="b" direction="out" /> |
5000 | 20 | <method name="showCursor" /> \ | 20 | </method> |
4947 | 21 | <method name="hideCursor" /> \ | ||
4948 | 22 | <method name="createZoomRegion"> \ | ||
4949 | 23 | <arg type="d" direction="in" /> \ | ||
4950 | 24 | <arg type="d" direction="in" /> \ | ||
4951 | 25 | <arg type="ai" direction="in" /> \ | ||
4952 | 26 | <arg type="ai" direction="in" /> \ | ||
4953 | 27 | <arg type="o" direction="out" /> \ | ||
4954 | 28 | </method> \ | ||
4955 | 29 | <method name="addZoomRegion"> \ | ||
4956 | 30 | <arg type="o" direction="in" /> \ | ||
4957 | 31 | <arg type="b" direction="out" /> \ | ||
4958 | 32 | </method> \ | ||
4959 | 33 | <method name="getZoomRegions"> \ | ||
4960 | 34 | <arg type="ao" direction="out" /> \ | ||
4961 | 35 | </method> \ | ||
4962 | 36 | <method name="clearAllZoomRegions" /> \ | ||
4963 | 37 | <method name="fullScreenCapable"> \ | ||
4964 | 38 | <arg type="b" direction="out" /> \ | ||
4965 | 39 | </method> \ | ||
4966 | 40 | <method name="setCrosswireSize"> \ | ||
4967 | 41 | <arg type="i" direction="in" /> \ | ||
4968 | 42 | </method> \ | ||
4969 | 43 | <method name="getCrosswireSize"> \ | ||
4970 | 44 | <arg type="i" direction="out" /> \ | ||
4971 | 45 | </method> \ | ||
4972 | 46 | <method name="setCrosswireLength"> \ | ||
4973 | 47 | <arg type="i" direction="in" /> \ | ||
4974 | 48 | </method> \ | ||
4975 | 49 | <method name="getCrosswireLength"> \ | ||
4976 | 50 | <arg type="i" direction="out" /> \ | ||
4977 | 51 | </method> \ | ||
4978 | 52 | <method name="setCrosswireClip"> \ | ||
4979 | 53 | <arg type="b" direction="in" /> \ | ||
4980 | 54 | </method> \ | ||
4981 | 55 | <method name="getCrosswireClip"> \ | ||
4982 | 56 | <arg type="b" direction="out" /> \ | ||
4983 | 57 | </method> \ | ||
4984 | 58 | <method name="setCrosswireColor"> \ | ||
4985 | 59 | <arg type="u" direction="in" /> \ | ||
4986 | 60 | </method> \ | ||
4987 | 61 | <method name="getCrosswireColor"> \ | ||
4988 | 62 | <arg type="u" direction="out" /> \ | ||
4989 | 63 | </method> \ | ||
4990 | 64 | </interface> \ | ||
4991 | 65 | </node>'; |
The diff has been truncated for viewing.
See my comment for the dep, the rest looks good to me :)