Merge lp:~unity-team/unity/7.2.2 into lp:unity

Proposed by Christopher Townsend on 2014-07-01
Status: Superseded
Proposed branch: lp:~unity-team/unity/7.2.2
Merge into: lp:unity
Diff against target: 1674 lines (+1380/-30) (has conflicts)
7 files modified
CMakeLists.txt (+5/-0)
ChangeLog (+1162/-0)
debian/changelog (+77/-26)
debian/control (+1/-1)
po/unity.pot (+70/-3)
shutdown/SessionView.cpp (+55/-0)
shutdown/SessionView.h (+10/-0)
Text conflict in CMakeLists.txt
Text conflict in ChangeLog
Text conflict in debian/changelog
Text conflict in shutdown/SessionView.cpp
Text conflict in shutdown/SessionView.h
To merge this branch: bzr merge lp:~unity-team/unity/7.2.2
Reviewer Review Type Date Requested Status
Unity Team 2014-07-01 Pending
Review via email: mp+225183@code.launchpad.net

Commit message

Prepare for upstream micro-release 7.2.2. Fixes bugs:
Bug #607796: Launcher, Window management - Dragging and holding a selection over an entry in the Launcher should spread out windows belonging to that application
Bug #727902: Launcher icon highlighting should not switch off as soon the cursor moves after the app spread appears.
Bug #741869: Unity/compiz intercepts Super and Alt keypresses from grabbed windows like VMs.
Bug #754580: Cannot move tabs between multiple Firefox or Chromium windows while using Unity unless windows are both unmaximized, unminimized, and visible.
Bug #839728: Launcher - dragging a item on top of a launcher tile that is a valid drop receptacle in the Launcher should cause that launcher tile to glow
Bug #924840: Keyboard shortcuts overlay text too long
Bug #1281058: [UIFe] The system shutdowns when multiple accounts are open
Bug #1283775: Launcher: icon pips are not always updated properly
Bug #1304882: [Regression] Launcher doesn't reappear fully after hiding from DND
Bug #1305586: Lock screen is unusable when some windows have a keyboard/mouse grab
Bug #1307738: Lockscreen caps lock icon drawn under text entry, should be a white icon.
Bug #1308288: Lockscreen warning icon has no tooltip
Bug #1308323: Shutdown/reboot/login/logout dialogs not scaled after toggling UI scale Edit
Bug #1308911: Clipboard contents are accessible within lockscreen
Bug #1309739: Unity launcher icon edge illumination is offset
Bug #1310200: Indicators disappear at the panel (clementine, dropbox, skype etc)
Bug #1313280: Fullscreen window set to "Always on Top" in single-monitor will hide the lockscreen
Bug #1316005: Panel shadow appears over full screen applications w/ locally integrated menus enabled
Bug #1317348: Switcher (Alt-Tab) does not respect monitor-defined scaling factor
Bug #1317356: Shortcut hint does not respect monitor scaling factor
Bug #1317869: Keyboard shortcuts overlay does not show up when workspaces are enabled at 1366x768
Bug #1320438: Unity launcher auto hide fails on screen unlock using "Super+L"
Bug #1321043: [regression] lock screen bypass with touchpad

Description of the change

Prepare for upstream micro-release 7.2.2.

To post a comment you must log in.

Unmerged revisions

3832. By Christopher Townsend on 2014-07-01

Add changelog entry for lp:1281058.

3831. By Andrea Azzarone on 2014-07-01

Add a warning in the session dialog if other sessions are still open.

3830. By Marco Trevisan (Treviño) on 2014-06-23

PluginAdapter: pass the state to compiz plugins activations

Fixes Scale triggering on DnD

3829. By Christopher Townsend on 2014-06-23

Added changelog entry for lp:1310200.

3828. By Andrea Azzarone on 2014-06-23

Fix skype indicator blinking.

3827. By Christopher Townsend on 2014-06-23

Added changelog entry for lp:1316005.

3826. By Christopher Townsend on 2014-06-23

Fix issue where the Panel shadow would get drawn over drop down windows in full screen windows.

3825. By Christopher Townsend on 2014-06-23

Added changelog entry for lp:1283775.

3824. By Christopher Townsend on 2014-06-23

Fix issue where the number of Launcher icon pips are not always properly updated when a new window of an already running application is opened.

3823. By Christopher Townsend on 2014-06-23

Added changelog entry for lp:1320438.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-06-18 13:07:37 +0000
3+++ CMakeLists.txt 2014-07-01 15:43:33 +0000
4@@ -9,8 +9,13 @@
5 #
6 set (PROJECT_NAME "unity")
7 set (UNITY_MAJOR 7)
8+<<<<<<< TREE
9 set (UNITY_MINOR 3)
10 set (UNITY_MICRO 0)
11+=======
12+set (UNITY_MINOR 2)
13+set (UNITY_MICRO 1)
14+>>>>>>> MERGE-SOURCE
15 set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
16 set (UNITY_API_VERSION "6.0")
17 set (UNITY_COMPONENTS_VERSION "6")
18
19=== modified file 'ChangeLog'
20--- ChangeLog 2014-06-18 14:37:16 +0000
21+++ ChangeLog 2014-07-01 15:43:33 +0000
22@@ -1,3 +1,4 @@
23+<<<<<<< TREE
24 2014-06-18 Stephen M. Webb <stephen.webb@canonical.com>
25
26 bump upstream to 7.3.0
27@@ -1648,6 +1649,1167 @@
28 Since alpha windows might have custom shapes, it's safer not to shadow-decorate them
29 unless they don't provide, for sure, a full decoration.
30
31+=======
32+2014-05-13 Stephen M. Webb <stephen.webb@canonical.com>
33+
34+ debian/changelog: updated with additional lockscreen changes
35+
36+2014-05-13 Stephen M. Webb <stephen.webb@canonical.com>
37+
38+ added changelog for #1317276
39+
40+2014-05-13 Stephen M. Webb <stephen.webb@canonical.com>
41+
42+ disabled precompiled headers on arm64 Ubuntu package builds
43+
44+2014-05-12 Stephen M. Webb <stephen.webb@canonical.com>
45+
46+ disabled precompiled headers for arm64 arch, it seems to cause random ICEs
47+
48+2014-05-13 Stephen M. Webb <stephen.webb@canonical.com>
49+
50+ lockscreen/LockScreenAccelerators.h: added required header for std:vector definition
51+
52+2014-05-12 Stephen M. Webb <stephen.webb@canonical.com>
53+
54+ added missing header for std::vector definition
55+
56+2014-05-13 Stephen M. Webb <stephen.webb@canonical.com>
57+
58+ added changelog for #1312749
59+
60+2014-05-13 Brandon Schaefer <brandontschaefer@gmail.com>
61+
62+ Set the max width, so our static text wraps. So we don't end up rendering text out of the view area.
63+
64+2014-04-25 Jonas Schwabe
65+
66+ * Set the max width, so the static text wraps (and doesn't go out of the view!)
67+
68+2014-05-13 Stephen M. Webb <stephen.webb@canonical.com>
69+
70+ added changelog for #1307748
71+
72+2014-05-13 Marco Trevisan (Treviño) <mail@3v1n0.net>
73+
74+ DebugDBusInterface: match properties if they are in the AP array form [<type>, <value>]
75+
76+2014-04-24 Marco Trevisan (Treviño) <mail@3v1n0.net>
77+
78+ DebugDBusInterface: GetPropertyValue should return a proper value only if we've a valid array
79+
80+ Improve debugging messages and fix leaks.
81+
82+2014-04-16 Marco Trevisan (Treviño) <mail@3v1n0.net>
83+
84+ DebugDBusInterface: match properties if they are in the AP array form [<type>, <value>]
85+
86+2014-05-13 Stephen M. Webb <stephen.webb@canonical.com>
87+
88+ added changelog for #1221673
89+
90+2014-05-13 Marco Trevisan (Treviño) <mail@3v1n0.net>
91+
92+ PluginAdapter: make sure we don't try to call an invalid initiate/terminate callback function
93+
94+2014-04-30 Marco Trevisan (Treviño) <mail@3v1n0.net>
95+
96+ PluginAdapter: make sure we don't try to call an invalid initiate/terminate callback function
97+
98+2014-05-13 Stephen M. Webb <stephen.webb@canonical.com>
99+
100+ added changelog for #1313280
101+
102+2014-05-13 Marco Trevisan (Treviño) <mail@3v1n0.net>
103+
104+ UnityScreen: always paint the lockscreen above, just add menu and onboard as exceptions
105+
106+ Some code cleanup, factorizing similar code.
107+
108+2014-05-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
109+
110+ Mergin with trunk
111+
112+2014-04-29 Marco Trevisan (Treviño) <mail@3v1n0.net>
113+
114+ Merging with lp:~3v1n0/unity/lockscreen-keys-disable
115+
116+2014-04-25 Marco Trevisan (Treviño) <mail@3v1n0.net>
117+
118+ UnityScreen: Get the Hud initialization event if unity is locked
119+
120+2014-04-25 Marco Trevisan (Treviño) <mail@3v1n0.net>
121+
122+ UnityScreen: if the screen is grabbed when showing the Hud, wait for ungrab for a couple of seconds
123+
124+2014-04-25 Marco Trevisan (Treviño) <mail@3v1n0.net>
125+
126+ UnityScreen: don't try to show Dash/Hud if the screen is grabbed
127+
128+ Also move the dash opening out from LauncherController, and get rid of UBus
129+ as first initialization source, that can only slow things down here.
130+
131+2014-04-25 Marco Trevisan (Treviño) <mail@3v1n0.net>
132+
133+ DashController: return a bool in ShowDash, wait for ungrab for 2 seconds maximum
134+
135+ Now if the screen is grabbed, we just wait a couple of seconds the ungrab-event.
136+ If that happens in such timeframe then we show the dash, otherwise we ignore the request.
137+
138+ Also return a bool weather we've shown the dash or not.
139+
140+2014-04-24 Marco Trevisan (Treviño) <mail@3v1n0.net>
141+
142+ UnityScreen: notify grab also when the screen is not grabbed but we got a NotifyWhileGrabbed event
143+
144+2014-05-13 Stephen M. Webb <stephen.webb@canonical.com>
145+
146+ added changelog for #1251193
147+
148+2014-05-13 Jinkyu Yi <jincreator@jincreator.net>
149+
150+ Dash: Fix problem at checking blacklisted unicode range
151+
152+2014-05-04 Jinkyu Yi <jincreator@jincreator.net>
153+
154+ Dash: Fix problem at checking blacklisted unicode range. Fixes: 1251193
155+
156+2014-05-13 Stephen M. Webb <stephen.webb@canonical.com>
157+
158+ added changelog for #1291461
159+
160+2014-05-13 William Hua <william.hua@canonical.com>
161+
162+ added proper support for modifier-only shortcuts on the lock screen
163+
164+2014-04-30 William Hua <william.hua@canonical.com>
165+
166+ Treat Meta modifier as Alt.
167+
168+2014-04-30 William Hua <william.hua@canonical.com>
169+
170+ Minor revisions.
171+
172+2014-04-29 William Hua <william.hua@canonical.com>
173+
174+ Destroy accelerator controller between locks.
175+
176+2014-04-29 William Hua <william.hua@canonical.com>
177+
178+ Remove gotos.
179+
180+2014-04-18 William Hua <william.hua@canonical.com>
181+
182+ Make a separate controller just for accelerators.
183+
184+2014-04-18 William Hua <william.hua@canonical.com>
185+
186+ Rip everything out and start anew.
187+
188+2014-04-15 William Hua <william.hua@canonical.com>
189+
190+ Add proper support for modifier-only shortcuts on the lock screen.
191+
192+2014-05-02 Marc Deslauriers <marc.deslauriers@ubuntu.com>
193+
194+ debian/changelog: sync with distro
195+
196+2014-05-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
197+
198+ PanelService: emit an invalid EntryActivated signal if the menu hasn't actually been shown
199+
200+ In addition, if the menu is not visible after the first popup call, try to show a menu
201+ without keyboard focus. This will make possible to see menus also when there's a key-grab
202+ (although they will be without keyboard support).
203+
204+ Finally, reset the menu state, if that failed.
205+
206+2014-04-29 Marco Trevisan (Treviño) <mail@3v1n0.net>
207+
208+ LockScreenPanel: if a menu is opened, and the screen is not grabbed, give the grab back to the Shield.
209+
210+2014-04-29 Marco Trevisan (Treviño) <mail@3v1n0.net>
211+
212+ PanelService: cleanup the menu popup code, avoid unnecessary calls to gtk_widget_is_visible
213+
214+2014-04-29 Marco Trevisan (Treviño) <mail@3v1n0.net>
215+
216+ PanelService: if the menu is not visible, try to show a menu without keyboard focus
217+
218+ This will make possible to see menus also when there's a key-grab.
219+
220+2014-04-29 Marco Trevisan (Treviño) <mail@3v1n0.net>
221+
222+ PanelService: emit an invalid EntryActivated signal if the menu has not actually been shown
223+
224+ And also reset the menu state, if that failed
225+
226+2014-05-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
227+
228+ UnityScreen: toggle activation of all the unity compiz actions when locking the screen
229+
230+ Also, make sure that the lockscreen views are treated as "always-on-front" windows by nux
231+ (and this applies to both visibility and events).
232+
233+2014-04-30 Marco Trevisan (Treviño) <mail@3v1n0.net>
234+
235+ TestSessionController: verify correctly the new Hide method
236+
237+2014-04-30 Marco Trevisan (Treviño) <mail@3v1n0.net>
238+
239+ LockScreenController: set the primary shield as the always on front window when another basewindow hides
240+
241+ That window might have set itself as the always on front window, so we should restore our role
242+
243+2014-04-30 Marco Trevisan (Treviño) <mail@3v1n0.net>
244+
245+ SessionController: set the dialog as the nux always on front view
246+
247+2014-04-30 Marco Trevisan (Treviño) <mail@3v1n0.net>
248+
249+ SessionController: delete the views when hidden, we don't need to keep them around
250+
251+2014-04-30 Marco Trevisan (Treviño) <mail@3v1n0.net>
252+
253+ UnityScreen: make sure we reset all the unity views before locking
254+
255+2014-04-30 Marco Trevisan (Treviño) <mail@3v1n0.net>
256+
257+ UnityScreen: also send the terminate action to Alt pressure on lock
258+
259+2014-04-30 Marco Trevisan (Treviño) <mail@3v1n0.net>
260+
261+ UnityScreen: toggle all the unity (and thus the Gnome) key bindings when locking
262+
263+2014-04-29 Marco Trevisan (Treviño) <mail@3v1n0.net>
264+
265+ LockScreenShield: don't try to regrab again if we've been just requested to ungrab
266+
267+2014-04-29 Marco Trevisan (Treviño) <mail@3v1n0.net>
268+
269+ LockScreenShield: wait for the next ungrab-event if we can't grab when panel is not active anymore
270+
271+2014-04-29 Marco Trevisan (Treviño) <mail@3v1n0.net>
272+
273+ UnityScreen: toggle activation of all the unity compiz actions when locking the screen
274+
275+2014-04-29 Marco Trevisan (Treviño) <mail@3v1n0.net>
276+
277+ LockScreenController: set the blank window or the primary shield as the always-on-front window
278+
279+ In this way nux won't draw anything above it, nor will pass events to the underneath windows
280+
281+2014-04-23 CI bot <ps-jenkins@lists.canonical.com>
282+
283+ Releasing 7.2.0+14.04.20140423-0ubuntu1
284+
285+2014-04-23 Chris Townsend <christopher.townsend@canonical.com>
286+
287+ When setting the STARTING quirk for Application Launcher icons, only do it for the monitor specified in the passed in args. Fixes: 1291362
288+
289+2014-04-21 Chris Townsend <christopher.townsend@canonical.com>
290+
291+ When setting the STARTING quirk for Application Launcher icons, only do it for the monitor specified in the passed in args.
292+
293+2014-04-23 Andrea Azzarone <azzaronea@gmail.com>
294+
295+ Close dash/hud/etc. on signal locked too. Fixes: 1308850
296+
297+2014-04-17 Andrea Azzarone <azzaronea@gmail.com>
298+
299+ Use prompt_lock_requested signal.
300+
301+2014-04-17 Andrea Azzarone <azzaronea@gmail.com>
302+
303+ Close dash/hud/etc. on signal locked too.
304+
305+2014-04-17 Andrea Azzarone <azzaronea@gmail.com>
306+
307+ Close dash/hud/etc. on signal locked too.
308+
309+2014-04-16 CI bot <ps-jenkins@lists.canonical.com>
310+
311+ Releasing 7.2.0+14.04.20140416-0ubuntu1
312+
313+2014-04-16 Andrea Azzarone <azzaronea@gmail.com>
314+
315+ Do not allow to activate twice the same entry! Fixes: 1308572
316+
317+2014-04-16 Andrea Azzarone <azzaronea@gmail.com>
318+
319+ Minor change.
320+
321+2014-04-16 Andrea Azzarone <azzaronea@gmail.com>
322+
323+ Fix ident.
324+
325+2014-04-16 Andrea Azzarone <azzaronea@gmail.com>
326+
327+ Do not allow to activate two times the same entry!
328+
329+2014-04-16 Marco Trevisan (Treviño) <mail@3v1n0.net>
330+
331+ UnityScreen: save a locked.stamp file when locking/unlocking, to relock on startup
332+
333+ This makes unity to relocks if it was locked before crashing... Fixes: 1308572
334+
335+2014-04-17 Marco Trevisan (Treviño) <mail@3v1n0.net>
336+
337+ UnityScreen: Save lock file stamp in $XDG_RUNTIME_DIR, cleanup it on destroy
338+
339+2014-04-17 Marco Trevisan (Treviño) <mail@3v1n0.net>
340+
341+ DesktopUtilities: add GetUserRuntimeDirectory to fetch $XDG_RUNTIME_DIR
342+
343+2014-04-16 Marco Trevisan (Treviño) <mail@3v1n0.net>
344+
345+ UnityScreen: save a locked.stamp file when locking/unlocking, to relock on startup
346+
347+2014-04-16 Marco Trevisan (Treviño) <mail@3v1n0.net>
348+
349+ DesktopUtilities: add GetCacheDirectory, to fetch and create an unity cache dir
350+
351+2014-04-14 CI bot <ps-jenkins@lists.canonical.com>
352+
353+ Releasing 7.2.0+14.04.20140414.1-0ubuntu1
354+
355+2014-04-14 Marco Trevisan (Treviño) <mail@3v1n0.net>
356+
357+
358+ CompizUtils: only shadow-decorate alpha windows that have full decorations as well
359+
360+ Since alpha windows might have custom shapes, it's safer not to shadow-decorate them
361+ unless they don't provide, for sure, a full decoration.
362+
363+ This fixes, between the others, the unity force-quit dialog. Fixes: 1281825, 1307524
364+
365+2014-04-14 Marco Trevisan (Treviño) <mail@3v1n0.net>
366+
367+ CompizUtils: only shadow-decorate alpha windows that have full decorations as well
368+
369+ Since alpha windows might have custom shapes, it's safer not to shadow-decorate them
370+ unless they don't provide, for sure, a full decoration.
371+
372+ This fixes, between the others, the unity force-quit dialog.
373+
374+2014-04-14 Sami Jaktholm <sjakthol@outlook.com>
375+
376+ Scale: Correctly detect the activation of a scale and set scale_just_activated_
377+ to true properly. Fixes: 1288789
378+
379+2014-04-11 Sami Jaktholm <sjakthol@outlook.com>
380+
381+ Scale: Correctly detect the activation of a scale and set scale_just_activated_
382+ to true properly.
383+
384+2014-04-14 Alfred Neumayer <dev.beidl@gmail.com>
385+
386+ Security issue: Gestures on the lock screen allow to peek inside running applications.
387+ As with keyboard input, gestures should be blocked while the screen is locked. Fixes: 1303041, 1306973
388+
389+2014-04-14 Alfred Neumayer <dev.beidl@gmail.com>
390+
391+ Stop hiding the launchers parent window for now as it breaks urgent icon wiggling and hint shadow.
392+
393+2014-04-13 Alfred Neumayer <dev.beidl@gmail.com>
394+
395+ Don't queue up drawing if the gestures are ignored.
396+
397+2014-04-12 Alfred Neumayer <dev.beidl@gmail.com>
398+
399+ Make the lockscreen_controller accessible to other classes and don't allow 4 finger gestures in the lock screen.
400+
401+2014-04-12 Alfred Neumayer <dev.beidl@gmail.com>
402+
403+ Should not even try to show the switcher if the screen is locked.
404+
405+2014-04-12 Alfred Neumayer <dev.beidl@gmail.com>
406+
407+ Forgot a variable
408+
409+2014-04-12 Alfred Neumayer <dev.beidl@gmail.com>
410+
411+ Also, don't hide the launcher window if expo or scale are active.
412+
413+2014-04-12 Alfred Neumayer <dev.beidl@gmail.com>
414+
415+ Really shouldn't hide the launcher window if the dash is open.
416+
417+2014-04-11 CI bot <ps-jenkins@lists.canonical.com>
418+
419+ Releasing 7.2.0+14.04.20140411-0ubuntu1
420+
421+2014-04-11 Sami Jaktholm <sjakthol@outlook.com>
422+
423+ Lockscreen: Give proper grabs to the shield before releasing blank_window_. Fixes: 1306417
424+
425+2014-04-11 Sami Jaktholm <sjakthol@outlook.com>
426+
427+ Lockscreen: Give proper grabs to the shield before releasing blank_window_.
428+
429+2014-04-10 CI bot <ps-jenkins@lists.canonical.com>
430+
431+ Releasing 7.2.0+14.04.20140410.1-0ubuntu1
432+
433+2014-04-10 William Hua <william.hua@canonical.com>
434+
435+ Enable sound buttons and input source switching under lock screen.
436+
437+2014-04-11 William Hua <william.hua@canonical.com>
438+
439+ Clean up.
440+
441+2014-04-11 William Hua <william.hua@canonical.com>
442+
443+ Fix merge errors.
444+
445+2014-04-11 William Hua <william.hua@canonical.com>
446+
447+ Minor changes.
448+
449+2014-04-11 William Hua <william.hua@canonical.com>
450+
451+ Merge trunk.
452+
453+2014-04-11 William Hua <william.hua@canonical.com>
454+
455+ Enable sound and input source shortcuts on lock screen.
456+
457+2014-04-10 CI bot <ps-jenkins@lists.canonical.com>
458+
459+ LockScreen: add ability to show without fading in on some system calls
460+
461+ Also, if locking is not enabled, calling Lock causes the screensaver to be initiated.
462+ Many cleanups and misc fixes. Fixes: 1292575, 1305194
463+
464+2014-04-10 Eleni Maria Stea <elenimaria.stea@canonical.com>
465+
466+ It fixes the quicklist menu appearance. Fixes: 1298859
467+
468+2014-04-09 Eleni Maria Stea <elenimaria.stea@canonical.com>
469+
470+ fixed quicklist scaling
471+
472+2014-04-10 Brandon Schaefer <brandontschaefer@gmail.com>
473+
474+ When we detect caps lock, or caps lock is pressed, render a warning icon to show its on. Fixes: 1291737
475+
476+2014-04-09 Brandon Schaefer <brandontschaefer@gmail.com>
477+
478+ * Make sure we update the caps lock detector when we change primary sheilds
479+
480+2014-04-01 Brandon Schaefer <brandontschaefer@gmail.com>
481+
482+ * Get rid of magic numbers, have to get the width of the cached
483+ spin icon width, so we can place the warning icon in the right spot
484+
485+2014-04-01 Brandon Schaefer <brandontschaefer@gmail.com>
486+
487+ * Check if caps is on each time we make a new Prompt, as it can change
488+ when authenticating, and we need to know.
489+
490+2014-04-01 Brandon Schaefer <brandontschaefer@gmail.com>
491+
492+ * Detect if caps lock is on, and check if caps lock is pressed.
493+ If so, then render a warning icon.
494+
495+2014-04-10 Alfred Neumayer <dev.beidl@gmail.com>
496+
497+ If the dash has not been opened before, a 4 finger tap will result in a dash with no selected scope.
498+ Instead, set up the window and view of the dash by sending DASH_ABOUT_TO_SHOW (same happens when hovering the mouse pointer over the BFB icon)
499+ and open the home scope. Fixes: 1303468
500+
501+2014-04-10 Alfred Neumayer <dev.beidl@gmail.com>
502+
503+ UnityGestureTarget.cpp: Remove spaces
504+
505+2014-04-10 Alfred Neumayer <dev.beidl@gmail.com>
506+
507+ 4 finger tap: Set up the dash window and its view, show the home scope afterwards.
508+
509+2014-04-10 Alfred Neumayer <dev.beidl@gmail.com>
510+
511+ Launcher: Show and hide the launcher window OnDragUpdate() to fix the gesture animations Fixes: 1303141
512+
513+2014-04-10 Alfred Neumayer <dev.beidl@gmail.com>
514+
515+ Only hide/unhide launcher window if autohide mode is on.
516+
517+2014-04-10 Alfred Neumayer <dev.beidl@gmail.com>
518+
519+ Actually, Hide/Un-Hide launcher window in OnDragUpdate.
520+
521+2014-04-10 Alfred Neumayer <dev.beidl@gmail.com>
522+
523+ Un-hide launcher window when dragging out using 4 finger gesture: https://bugs.launchpad.net/unity/+bug/1303141
524+
525+2014-04-10 Alfred Neumayer <dev.beidl@gmail.com>
526+
527+ Alt-Tab has always respected the alt-tab-bias-viewport setting, but the 3-finger gesture to switch between windows has not, even though it does the same thing.
528+ They should behave the same way depending on the CCSM setting. Fixes: 1303060
529+
530+2014-04-07 Alfred Neumayer <dev.beidl@gmail.com>
531+
532+ Make 3 finger window switch gesture respect the alt-tab-bias-viewport setting by moving the check to SetUpAndShowSwitcher.
533+
534+2014-04-10 Sami Jaktholm <sjakthol@outlook.com>
535+
536+ Shortcuts: Listen and react to view close requests. Fixes: 1297842
537+
538+2014-04-05 Sami Jaktholm <sjakthol@outlook.com>
539+
540+ Shortcuts: Listen and react to view close requests.
541+
542+2014-04-10 Marco Trevisan (Treviño) <mail@3v1n0.net>
543+
544+ DecorationsGrabEdge, PanelMenuView: perform proper WM action on clicks, based on user settings Fixes: 1283849
545+
546+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
547+
548+ PanelMenuView: use generic actions based on WM settings for double,middle and right clicks
549+
550+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
551+
552+ WindowManager: add methods to {Horizontally,Vertically}Maximize a window
553+
554+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
555+
556+ WindowManager: add window shading methods
557+
558+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
559+
560+ DecorationsGrabEdge: perform proper WM action on clicks, based on user settings
561+
562+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
563+
564+ DecorationStyle: add WindowManagerAction to get WM click options
565+
566+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
567+
568+ Merging with lp:~3v1n0/unity/right-left-click-maximize-fix
569+
570+2014-04-10 CI bot <ps-jenkins@lists.canonical.com>
571+
572+ Releasing 7.2.0+14.04.20140410-0ubuntu1
573+
574+2014-04-10 CI bot <ps-jenkins@lists.canonical.com>
575+
576+ Session: Don't lock the screen if screen locking is disabled by
577+ org.gnome.desktop.lockdown disable-lock-screen. Fixes: 1292154
578+
579+2014-04-10 CI bot <ps-jenkins@lists.canonical.com>
580+
581+ ScreenSaverDBusManager: start/stop gnome-screensaver if we don't/do handle the locking
582+
583+ This allows to just use the fallback gnome-screensaver lockscreen if we need to use it. Fixes: 1303712
584+
585+2014-04-10 CI bot <ps-jenkins@lists.canonical.com>
586+
587+ GnomeSessionManager: impelement gnome session dbus interface and a fader to blank the screen Fixes: 1291088, 1292041, 1292078, 1292446, 1292451
588+
589+2014-04-10 Marco Trevisan (Treviño) <mail@3v1n0.net>
590+
591+ LockScreen: add ability to show without fading in on some system calls
592+
593+ Also, if locking is not enabled, calling Lock causes the screensaver to be initiated.
594+ Many cleanups and misc fixes. Fixes: 1292575, 1305194
595+
596+2014-04-10 Marco Trevisan (Treviño) <mail@3v1n0.net>
597+
598+ LockScreenController: fire screensaver_post_lock_timeout_ when the view is fully visible
599+
600+2014-04-10 Marco Trevisan (Treviño) <mail@3v1n0.net>
601+
602+ GnomeSessionManager: if it's impossible to lock a session, start the screensaver on lock
603+
604+ This is what most of apps expect, and thus we do that. Although it's not really that coherent.
605+
606+2014-04-10 Marco Trevisan (Treviño) <mail@3v1n0.net>
607+
608+ SessionManager: add ScreenSaver{Activate,Deactivate} and relevant signals and export them
609+
610+ Update LockScreenController and dbus apis to match this
611+
612+2014-04-10 Marco Trevisan (Treviño) <mail@3v1n0.net>
613+
614+ LockScreenController: remove some racy code, avoid to emit multiple signals
615+
616+ And fix pre-lock blank window
617+
618+2014-04-10 Marco Trevisan (Treviño) <mail@3v1n0.net>
619+
620+ LockScreenController: increase the lockscreen timeout wait to be bigger to a frame duration
621+
622+2014-04-10 Marco Trevisan (Treviño) <mail@3v1n0.net>
623+
624+ SessionDBusManager: export PromptLock method on the dbus
625+
626+2014-04-10 Marco Trevisan (Treviño) <mail@3v1n0.net>
627+
628+ BackgroundSettings: don't create new panel style instances, use the actual instance
629+
630+2014-04-10 Marco Trevisan (Treviño) <mail@3v1n0.net>
631+
632+ ScreenSaverDBusManager: get rid of the old active_ bool variable, that caused undefined behavior
633+
634+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
635+
636+ LockScreenController: even more cleanup, move blank window grabbing to own function
637+
638+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
639+
640+ UnityWindow: we need to paint also the decorations of the windows, when in lock-mode
641+
642+ Othewise their texture won't be rebuilt and this will lead to wrong textures.
643+ Also, we don't need to damage the screen when lock opacity changes as it's done by nux.
644+
645+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
646+
647+ LockScreenController: also hide BlankWindow on mouse and keyboard down events
648+
649+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
650+
651+ LockScreenController: show a blank window unless we don't have the lockscreen ready on prompt requests
652+
653+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
654+
655+ SessionDBusManager: add support for "PromptLock"
656+
657+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
658+
659+ GnomeSessionManager: use prompt lockscreen on logind lock requests
660+
661+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
662+
663+ LockScreenController: add support to PromptLockScreen
664+
665+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
666+
667+ SessionManager: add PromptLockScreen method and signal, to require a fast lock (with no fading)
668+
669+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
670+
671+ Merging with lp:~sjakthol/unity/fix-1292154
672+
673+2014-04-06 Sami Jaktholm <sjakthol@outlook.com>
674+
675+ Don't cache the value and watch for changes. Check the setting every time instead.
676+
677+2014-04-06 Sami Jaktholm <sjakthol@outlook.com>
678+
679+ Session: Don't lock the screen if screen locking is disabled by
680+ org.gnome.desktop.lockdown disable-lock-screen.
681+
682+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
683+
684+ Merging with parent
685+
686+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
687+
688+ LockScreenController: make sure whe hide the blank window on unlock
689+
690+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
691+
692+ Merging with lp:~laney/unity/g-s-replace
693+
694+ Remves the ugly killall
695+
696+2014-04-09 Iain Lane <iain@orangesquash.org.uk>
697+
698+ Take over as the owner of the gnome-screensaver interface, if necessary.
699+
700+2014-04-09 Iain Lane <iain@orangesquash.org.uk>
701+
702+ Allow skipping of the tests with DEB_BUILD_OPTIONS=nocheck
703+
704+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
705+
706+ Merging with parent branch
707+
708+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
709+
710+ LockScreenController: add ShowBlankWindow method
711+
712+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
713+
714+ UnityShell: ops, remove wrong change
715+
716+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
717+
718+ Merging with parent branch
719+
720+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
721+
722+ LockScreenController: start the screensaver after few seconds that the user has locked his session, if there's no more interaction
723+
724+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
725+
726+ LockScreenShield: emit a signal when we receive a keyboard input
727+
728+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
729+
730+ LockScreenController: immediately start the screensaver on SetActive dbus call
731+
732+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
733+
734+ ScreenSaverDBusManager: add request_activate signal that is emitted on remote activation request
735+
736+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
737+
738+ LockScreenController: some cleanup, and HideBlankWindow on simulate user activity
739+
740+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
741+
742+ LockScreenController: keep track of dbus_manager and reset screensaver on simulate-user activity
743+
744+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
745+
746+ ScreenSaverDBusManager: implement SimulateUserActivity
747+
748+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
749+
750+ ScreenSaverDBusManager: use a nux property for active state
751+
752+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
753+
754+ LockScreenController: don't animate when locking the screen on suspend or screensaver
755+
756+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
757+
758+ LockScreenController: we can lock the screen if the GS setting is disabled
759+
760+ Also rename the setting to be more understandable
761+
762+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
763+
764+ Merging with parent branch
765+
766+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
767+
768+ LockScreenController: always call LockScreen of SessionManager as it has some checks
769+
770+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
771+
772+ UnityScreen: damage the screen when the lockscreen opacity changes
773+
774+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
775+
776+ LockScreenController: use a ROProperty for opacity
777+
778+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
779+
780+ LockScreenController: only try to lock if locking is enabled
781+
782+2014-04-08 Marco Trevisan (Treviño) <mail@3v1n0.net>
783+
784+ LockScreenController: use timeout seconds for lock delay
785+
786+2014-04-08 Marco Trevisan (Treviño) <mail@3v1n0.net>
787+
788+ LockScreenController: only use one window to blank the screen, it's not needed to have one per monitor
789+
790+2014-04-08 Marco Trevisan (Treviño) <mail@3v1n0.net>
791+
792+ LockScreenController: move OnPresenceStatusChanged into a function
793+
794+2014-04-08 Marco Trevisan (Treviño) <mail@3v1n0.net>
795+
796+ LockScreenController: lock the screen on suspend if ubuntu is configured to do so
797+
798+2014-04-08 Marco Trevisan (Treviño) <mail@3v1n0.net>
799+
800+ Uscreen: emit suspending signal on PrepareForSleep
801+
802+2014-04-08 Marco Trevisan (Treviño) <mail@3v1n0.net>
803+
804+ LockScreenController: use direction to set the animation value
805+
806+2014-04-09 Marco Trevisan (Treviño) <mail@3v1n0.net>
807+
808+ ExternalGschema: add missing external settings
809+
810+2014-04-08 Marco Trevisan (Treviño) <mail@3v1n0.net>
811+
812+ LockScreenSettings: also use legacy lockscreen if screen reader is enabled
813+
814+2014-04-08 Marco Trevisan (Treviño) <mail@3v1n0.net>
815+
816+ ScreenSaverDBusManager: add some comments
817+
818+2014-04-08 Marco Trevisan (Treviño) <mail@3v1n0.net>
819+
820+ ScreenSaverDBusManager: use async calls
821+
822+2014-04-08 Marco Trevisan (Treviño) <mail@3v1n0.net>
823+
824+ LockScreenController: call gnome-screensaver to lock the screen if we use a legacy lockscreen
825+
826+2014-04-08 Marco Trevisan (Treviño) <mail@3v1n0.net>
827+
828+ ScreenSaverDBusManager: start/stop gnome-screensaver if we don't/do handle the locking
829+
830+2014-04-08 Marco Trevisan (Treviño) <mail@3v1n0.net>
831+
832+ LockScreenSettings: add use_fallback option, that is on if OSK is active
833+
834+ This is to workaround on screen keyboard issues
835+
836+2014-04-07 Marco Trevisan (Treviño) <mail@3v1n0.net>
837+
838+ Add GS schemas to external list
839+
840+2014-04-07 Marco Trevisan (Treviño) <mail@3v1n0.net>
841+
842+ GnomeSessionManager: use enum class PresenceStatus instead of magic numbers
843+
844+2014-04-07 Andrea Azzarone <azzaronea@gmail.com>
845+
846+ Merge trunk.
847+
848+2014-04-07 Andrea Azzarone <azzaronea@gmail.com>
849+
850+ Remove magic numbers.
851+
852+2014-04-07 Andrea Azzarone <azzaronea@gmail.com>
853+
854+ Do not implement SimulateUserActivity.
855+
856+2014-04-07 Andrea Azzarone <azzaronea@gmail.com>
857+
858+ Update tests.
859+
860+2014-04-07 Andrea Azzarone <azzaronea@gmail.com>
861+
862+ Start cleaning lockscreen code.
863+
864+2014-04-06 Andrea Azzarone <azzaronea@gmail.com>
865+
866+ Fix. Code style is still WIP.
867+
868+2014-04-04 Andrea Azzarone <azzaronea@gmail.com>
869+
870+ Lock the screen after a delay.
871+
872+2014-04-02 Andrea Azzarone <azzaronea@gmail.com>
873+
874+ Add the first settings.
875+
876+2014-04-02 Andrea Azzarone <azzaronea@gmail.com>
877+
878+ Initial commit to implement g-s dbus interface in unity.
879+
880+2014-04-04 CI bot <ps-jenkins@lists.canonical.com>
881+
882+ Releasing 7.2.0+14.04.20140404-0ubuntu1
883+
884+2014-04-04 Marco Trevisan (Treviño) <mail@3v1n0.net>
885+
886+ ForceQuitDialog: add a new "sheet style" dialog that is shown when a window hangs
887+
888+ Listen to compiz toolkit events and prompt a dialog that allows to force-quit an
889+ hanging application. Fixes: 698031, 1299061, 1299080
890+
891+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
892+
893+ ForceQuitDialog: make sure that the dialog is not deletable by WM
894+
895+ For this to be safe we need also to ignore the delete events
896+
897+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
898+
899+ POTFILES: include DecorationsForceQuitDialog.cpp
900+
901+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
902+
903+ DecoratedWindow: let's do one line things!
904+
905+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
906+
907+ ForceQuitDialog: make sure we hide the dialog before we killed the parent window
908+
909+ It must be hidden before than the parent, in case the window is not really killed,
910+ it will be shown anyway later.
911+
912+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
913+
914+ ForceQuitDialog: avoid warnings on close, due to finalized close button
915+
916+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
917+
918+ DecorationsForceQuitDialog: emit close_request signal on close and "Wait" button
919+
920+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
921+
922+ DecorationsForceQuitDialog: add close_request signal and destroy window when it gets called
923+
924+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
925+
926+ DecoratedWindow: add missing call to UpdateForceQuitDialogPosition
927+
928+ Maybe it was removed due to a shelved change...
929+
930+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
931+
932+ DecorationsForceQuitDialog: implement actual window killing by using both XKillClient and kill -9
933+
934+ Yeah, now
935+
936+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
937+
938+ DecorationsForceQuitDialog: use proper class names (mostly for theming)
939+
940+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
941+
942+ DecorationsForceQuitDialog: use themed button textures
943+
944+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
945+
946+ DecorationsForceQuitDialog: set the dialog pid/hostname to match the ones of the parent window
947+
948+ In this way we don't confuse BAMF about the ownership of the dialog.
949+
950+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
951+
952+ ForceQuitDialog: use the same window class of the real parent window
953+
954+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
955+
956+ ForceQuitDialog: keep the dialog centered on parent window when its geometry changes
957+
958+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
959+
960+ DecorationsManager.cpp: show a forcequit dialog when we get a toolkitActionForceQuitDialog ClientMessage
961+
962+ These events are triggered directly by compiz, so we only have to catch them!
963+
964+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
965+
966+ DecoratedWindow: add ShowForceQuitDialog method to show a forcequit dialog on given window
967+
968+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
969+
970+ DecorationsForceQuitDialog: set dialog X time to match the one of the close event
971+
972+ In this way we correctly handle the focus-stealing prevention
973+
974+2014-04-01 Marco Trevisan (Treviño) <mail@3v1n0.net>
975+
976+ ForceQuitDialog: set shape area to ignore input events outside the actual dialog
977+
978+2014-04-01 Marco Trevisan (Treviño) <mail@3v1n0.net>
979+
980+ DecorationsForceQuitDialog: set parent window as its actual parent X-side, and center on it
981+
982+2014-04-01 Marco Trevisan (Treviño) <mail@3v1n0.net>
983+
984+ ForceQuitDialog: fix label strings
985+
986+2014-03-28 Marco Trevisan (Treviño) <mail@3v1n0.net>
987+
988+ Merge with trunk
989+
990+2014-03-27 Marco Trevisan (Treviño) <mail@3v1n0.net>
991+
992+ DecorationsForceQuitDialog: obey to style for shadows
993+
994+2014-03-27 Marco Trevisan (Treviño) <mail@3v1n0.net>
995+
996+ DecorationsForceQuitDialog: add first basic gtk implementation of the force-quit dialog
997+
998+2014-04-04 Chris Townsend <christopher.townsend@canonical.com>
999+
1000+ Fix issue where windows that are in Show Desktop mode are selected for spread have a blank preview. This fix will Fade Out the window for Spread and Fade In the window again when Spread exits if that window is not chosen. Fixes: 1104236
1001+
1002+2014-04-04 Chris Townsend <christopher.townsend@canonical.com>
1003+
1004+ Fix issue where windows that are in Show Desktop mode are selected for spread have a blank preview. This fix will Fade Out the window for Spread and Fade In the window again when Spread exits if that window is not chosen.
1005+
1006+2014-04-03 CI bot <ps-jenkins@lists.canonical.com>
1007+
1008+ Releasing 7.2.0+14.04.20140403-0ubuntu1
1009+
1010+2014-04-03 Marco Trevisan (Treviño) <mail@3v1n0.net>
1011+
1012+ DecorationsGrabEdge: Only perform tookit actions on right-click Fixes: 1301459
1013+
1014+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
1015+
1016+ DecorationsGrabEdge: Only perform tookit actions on right-click
1017+
1018+2014-04-03 Marco Trevisan (Treviño) <mail@3v1n0.net>
1019+
1020+ UnityScreen: reset decoration::DataPool on destruction, otherwise we won't have a valid screen ptr Fixes: 1291243
1021+
1022+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
1023+
1024+ UnityScreen: reset decoration::DataPool on destruction, otherwise we won't have screen ptr valid
1025+
1026+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
1027+
1028+ DecorationsDataPool: add static Reset method that allows to reset our textures
1029+
1030+2014-04-03 Marco Trevisan (Treviño) <mail@3v1n0.net>
1031+
1032+ ApplicationLauncherIcon: recompute pips when the screen geometry changes Fixes: 1024101
1033+
1034+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
1035+
1036+ ApplicationLauncherIcon: recompute pips when the screen geometry changes
1037+
1038+2014-04-03 Marco Trevisan (Treviño) <mail@3v1n0.net>
1039+
1040+ Launcher: hide the launcher window when in auto-hide mode if it's not presented Fixes: 1301394
1041+
1042+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
1043+
1044+ Launcher: hide the launcher window when in auto-hide mode if it's not presented
1045+
1046+2014-04-03 Stephen M. Webb <stephen.webb@canonical.com>
1047+
1048+ remove libsyncindicator from services/panel-service.c
1049+
1050+2014-04-02 Stephen M. Webb <stephen.webb@canonical.com>
1051+
1052+ remove libsyncindicator.so (lp: #1300916)
1053+
1054+2014-04-03 Dimitri John Ledkov <dimitri.ledkov@canonical.com>
1055+
1056+ Drop U1 default shortcuts & indicator-sync recommendation. (LP: #1300916) Fixes: 1300916
1057+
1058+2014-04-02 Dimitri John Ledkov <dimitri.ledkov@canonical.com>
1059+
1060+ Drop U1 default shortcuts & indicator-sync recommendation. (LP: #1300916)
1061+
1062+2014-04-02 CI bot <ps-jenkins@lists.canonical.com>
1063+
1064+ Releasing 7.2.0+14.04.20140402-0ubuntu1
1065+
1066+2014-04-02 Stephen M. Webb <stephen.webb@canonical.com>
1067+
1068+ bump to release 7.2.0
1069+
1070+2014-04-01 Stephen M. Webb <stephen.webb@canonical.com>
1071+
1072+ debian/control: fix some style warnings in package description
1073+
1074+2014-04-01 Stephen M. Webb <stephen.webb@canonical.com>
1075+
1076+ debian/changelog: fix syntax to silence a lintian warning
1077+
1078+2014-04-01 Stephen M. Webb <stephen.webb@canonical.com>
1079+
1080+ debian/control(Standards-Version): bump to 3.9.5 (no changes)
1081+
1082+2014-03-31 Stephen M. Webb <stephen.webb@canonical.com>
1083+
1084+ release 7.2.0
1085+
1086+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
1087+
1088+ SpreadFilter: use launcher width, scale on HiDPI, match also application names
1089+
1090+ Launcher Width is now considered in setting the offset of the scale filter (fixes
1091+ padding when launcher is in autohide mode).
1092+ The search bar is correctly scaled when in HiDPI mode.
1093+ We use ApplicationManager and thus BAMF to match windows by their name or app name. Fixes: 1281297, 1282001, 1300763, 1300842
1094+
1095+2014-04-01 Marco Trevisan (Treviño) <mail@3v1n0.net>
1096+
1097+ SpreadFilter: use casefold instead that tolower as it's meant for equalty checks as we do here
1098+
1099+2014-04-01 Marco Trevisan (Treviño) <mail@3v1n0.net>
1100+
1101+ SpreadFilter: implement our own to_lower_copy that works with utf8
1102+
1103+2014-04-01 Marco Trevisan (Treviño) <mail@3v1n0.net>
1104+
1105+ UnityScreen: match the scaled windows based on the SpreadFilter matches
1106+
1107+2014-04-01 Marco Trevisan (Treviño) <mail@3v1n0.net>
1108+
1109+ SpreadFilter: compute a list of filtered windows using both window and application name
1110+
1111+2014-04-01 Marco Trevisan (Treviño) <mail@3v1n0.net>
1112+
1113+ SpreadFilter: take in consideration the launcher width when setting the spread offset
1114+
1115+2014-04-01 Marco Trevisan (Treviño) <mail@3v1n0.net>
1116+
1117+ SpreadFilter :Scale the internal searchbar to match DPI settings
1118+
1119+2014-04-01 Marco Trevisan (Treviño) <mail@3v1n0.net>
1120+
1121+ SearchBar: fix crash when trying to update the show filter scale in a filterless-search bar
1122+
1123+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
1124+
1125+ PanelMenuView: use panel style context for painting the panel title Fixes: 1296866
1126+
1127+2014-03-31 Marco Trevisan (Treviño) <mail@3v1n0.net>
1128+
1129+ PanelMenuView: add "panel-title" class to the panel style context when drawing title
1130+
1131+2014-03-31 Marco Trevisan (Treviño) <mail@3v1n0.net>
1132+
1133+ PanelStyle: return a Style context with different widget path in GetStyleContext based on type
1134+
1135+2014-03-31 Marco Trevisan (Treviño) <mail@3v1n0.net>
1136+
1137+ PanelMenuView: use panel style context for painting the panel title
1138+
1139+2014-03-31 Marco Trevisan (Treviño) <mail@3v1n0.net>
1140+
1141+ DecorationStyle: allow to use a different style context in DrawTitle
1142+
1143+ Panel will need to use a different one
1144+
1145+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
1146+
1147+ Panel, Decorations: draw the background under the text glyphs before the text itself Fixes: 723167
1148+
1149+2014-03-31 Marco Trevisan (Treviño) <mail@3v1n0.net>
1150+
1151+ UnitySettings: never allow values minor or equal to 0 as UI scale
1152+
1153+2014-03-31 Marco Trevisan (Treviño) <mail@3v1n0.net>
1154+
1155+ DecorationsMenuEntry: draw background under text glyphs
1156+
1157+2014-03-31 Marco Trevisan (Treviño) <mail@3v1n0.net>
1158+
1159+ DecorationsTitle: draw background under text glyphs
1160+
1161+2014-03-31 Marco Trevisan (Treviño) <mail@3v1n0.net>
1162+
1163+ DecorationStyle: draw text glyphs background on menu items
1164+
1165+2014-03-31 Marco Trevisan (Treviño) <mail@3v1n0.net>
1166+
1167+ PanelMenuView: draw the background under the text glyphs
1168+
1169+2014-03-31 Marco Trevisan (Treviño) <mail@3v1n0.net>
1170+
1171+ DecorationStyle: add support for drawing the text background under the glyphs
1172+
1173+2014-03-31 Marco Trevisan (Treviño) <mail@3v1n0.net>
1174+
1175+ PanelIndicatorEntryView: draw the background under the text glyphs
1176+
1177+2014-04-02 Marco Trevisan (Treviño) <mail@3v1n0.net>
1178+
1179+ CompizUtils: only shadow-decorate alpha windows that have full decorations as well
1180+
1181+ Since alpha windows might have custom shapes, it's safer not to shadow-decorate them
1182+ unless they don't provide, for sure, a full decoration. Fixes: 1281825
1183+
1184+2014-03-29 Marco Trevisan (Treviño) <mail@3v1n0.net>
1185+
1186+ CompizUtils: only shadow-decorate alpha windows that have full decorations as well
1187+
1188+ Since alpha windows might have custom shapes, it's safer not to shadow-decorate them
1189+ unless they don't provide, for sure, a full decoration.
1190+
1191+>>>>>>> MERGE-SOURCE
1192 2014-03-28 CI bot <ps-jenkins@lists.canonical.com>
1193
1194 Releasing 7.1.2+14.04.20140328.1-0ubuntu1
1195
1196=== modified file 'debian/changelog'
1197--- debian/changelog 2014-06-19 18:41:56 +0000
1198+++ debian/changelog 2014-07-01 15:43:33 +0000
1199@@ -1,3 +1,4 @@
1200+<<<<<<< TREE
1201 unity (7.3.0+14.10.20140619-0ubuntu1) utopic; urgency=low
1202
1203 [ Stephen M. Webb ]
1204@@ -93,11 +94,76 @@
1205 std:vector definition
1206 * disabled precompiled headers on arm64 Ubuntu package builds (LP:
1207 #1317276)
1208+=======
1209+unity (7.2.1+14.04.20140513-0ubuntu3) trusty; urgency=medium
1210+
1211+ [ Alfred Neumayer ]
1212+ * Restore the launcher position by reversing the animation and
1213+ unsetting the DND_PUSHED_OFF quirk. (LP: #1304882)
1214+
1215+ [ Brandon Schaefer ]
1216+ * TextInput: move the warning icon inside the input field, render it
1217+ white (LP: #1307738)
1218+ * ShutdownView: Scale up the Buttons and Text plus Borders of the
1219+ UnityWindowView. (LP: #1308323)
1220+ * Lockscreen warning icon needs a tooltip to say what the warning is
1221+ about! (LP: #1308288)
1222+
1223+ [ Marco Trevisan (Treviño) ]
1224+ * UnityScreen: always paint the lockscreen above, just add menu and
1225+ onboard as exceptions Some code cleanup, factorizing similar code.
1226+ (LP: #1313280)
1227+ * ApplicationLauncherIcon: Focus and, in case, Spread the windows on
1228+ DnD After 1 second that an user is over an icon, that icon should
1229+ focus the relative application and Spread its windows if it has more
1230+ than one opened. Correctly handle the DnD scale in launcher, and
1231+ apply glow to the icon under pointer. (LP: #607796)
1232+ * ShutdownView: Scale up the Buttons and Text plus Borders of the
1233+ UnityWindowView. (LP: #1308323)
1234+ * SwitcherView: use RawPixel's for the size values and convert them to
1235+ match current scaling (LP: #1317348)
1236+ * PluginAdapter: try to grab the screen to make sure that the screen
1237+ is not grabbed FocusIn event with NotifyGrab mode is not always
1238+ triggered by X when a window takes the grab, then we need to ensure
1239+ that there's no grab by trying to get one. We only care about
1240+ keyboard here, since pointer grabs don't affect us in general.
1241+ (LP: #741869)
1242+ * ShortcutView: use RawPixel's for the size values and convert them to
1243+ match current scaling Plus dinamically allocate horizontal space,
1244+ not to cut the text. (LP: #924840)
1245+
1246+ [ Chris Townsend ]
1247+ * Fix issue where scaling the edge illumination up and down with the
1248+ size of the Launcher icons would cause the illumination border to be
1249+ offset and smaller than the icon. (LP: #1309739)
1250+ * Fix issue where the number of Launcher icon pips are not always
1251+ properly updated when a new window of an already running application
1252+ is opened. (LP: #1283775)
1253+ * Fix issue where the Panel shadow would get drawn over drop down
1254+ windows in full screen windows. (LP: #1316005)
1255+
1256+ [ Andrea Azzarone ]
1257+ * Clear the clipboard when locking the screen. (LP: #1308911)
1258+ * Disable switcher gestures if screen is locked. Fixed a regression.
1259+ (LP: #1321043)
1260+ * Pass the correct options to showLauncherKeyTerminate in
1261+ UnityScreen::OnLockScreen (LP: #1320438)
1262+ * Fix skype indicator blinking. (LP: #1310200)
1263+ * Add a warning in the session dialog if other sessions are still
1264+ open. (LP: #1281058)
1265+
1266+ -- Chris Townsend <christopher.townsend@canonical.com> Thu, 19 Jun 2014 10:36:15 -0400
1267+
1268+unity (7.2.1+14.04.20140513-0ubuntu2) trusty; urgency=medium
1269+>>>>>>> MERGE-SOURCE
1270
1271 [ Brandon Schaefer ]
1272 * Set the max width, so our static text wraps. So we don't end up
1273 rendering text out of the view area. (LP: #1312749)
1274
1275+ [ Jnkyu Yi ]
1276+ * fixed range of blacklisted Unicode characters (lp: #1251193)
1277+
1278 [ Marco Trevisan (Treviño) ]
1279 * UnityScreen: toggle activation of all the unity compiz actions when
1280 locking the screen Also, make sure that the lockscreen views are
1281@@ -109,38 +175,23 @@
1282 focus. This will make possible to see menus also when there's a key-
1283 grab (although they will be without keyboard support). Finally,
1284 reset the menu state, if that failed.
1285- * UnityScreen: always paint the lockscreen above, just add menu and
1286- onboard as exceptions Some code cleanup, factorizing similar code.
1287- (LP: #1313280)
1288- * UnityScreen: don't try to show Dash/Hud if the screen is grabbed
1289- Also move the dash opening out from LauncherController, and get rid
1290- of UBus as first initialization source, as it can only slow things
1291- down here. (LP: #741869)
1292 * PluginAdapter: make sure we don't try to call an invalid
1293 initiate/terminate callback function (LP: #1221673)
1294 * DebugDBusInterface: match properties if they are in the AP array
1295 form [<type>, <value>] (LP: #1307748)
1296
1297+ [ Stephen M. Webb ]
1298+ * lockscreen/LockScreenAccelerators.h: added required header for
1299+ std:vector definition (fixes FTBFS in Ubuntu)
1300+ * disabled precompiled headers on arm64 Ubuntu package builds
1301+ (lp: #1317276)
1302+ * bump upstream release to 7.2.1
1303+
1304 [ William Hua ]
1305- * Add proper support for modifier-only shortcuts on the lock screen.
1306- (LP: #1291461)
1307-
1308- [ Jinkyu Yi ]
1309- * Dash: Fix problem at checking blacklisted unicode range (LP:
1310- #1251193)
1311-
1312- [ Andrea Azzarone ]
1313- * Add a warning in the session dialog if other sessions are still
1314- open. (LP: #1281058)
1315-
1316- -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 12 May 2014 22:03:27 +0000
1317-
1318-unity (7.2.0+14.04.20140423-0ubuntu2) utopic; urgency=medium
1319-
1320- * debian/control: depends on autopilot-desktop-legacy rather than
1321- autopilot-desktop.
1322-
1323- -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Thu, 01 May 2014 00:32:05 -0400
1324+ * added proper support for modifier-only shortcuts on the lock screen
1325+ (lp: #1291461)
1326+
1327+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 13 May 2014 20:46:01 +0000
1328
1329 unity (7.2.0+14.04.20140423-0ubuntu1.2) trusty-security; urgency=medium
1330
1331
1332=== modified file 'debian/control'
1333--- debian/control 2014-05-07 19:55:43 +0000
1334+++ debian/control 2014-07-01 15:43:33 +0000
1335@@ -165,7 +165,7 @@
1336 Architecture: all
1337 Depends: ${misc:Depends},
1338 ${python:Depends},
1339- autopilot-desktop-legacy,
1340+ autopilot-desktop,
1341 python-windowmocker,
1342 gir1.2-appindicator3-0.1,
1343 gir1.2-dee-1.0,
1344
1345=== modified file 'lockscreen/LockScreenController.cpp'
1346=== modified file 'plugins/unityshell/src/unityshell.cpp'
1347=== modified file 'po/unity.pot'
1348--- po/unity.pot 2014-03-10 17:51:32 +0000
1349+++ po/unity.pot 2014-07-01 15:43:33 +0000
1350@@ -8,7 +8,7 @@
1351 msgstr ""
1352 "Project-Id-Version: PACKAGE VERSION\n"
1353 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
1354-"POT-Creation-Date: 2013-04-17 16:00+0100\n"
1355+"POT-Creation-Date: 2014-07-01 11:21-0400\n"
1356 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1357 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1358 "Language-Team: LANGUAGE <LL@li.org>\n"
1359@@ -38,6 +38,26 @@
1360 msgid "Last Updated"
1361 msgstr ""
1362
1363+#. The "%s" is used in the dash preview to display the "<hint>: <value>" infos
1364+#, c-format
1365+msgid "%s:"
1366+msgstr ""
1367+
1368+msgid "Comments"
1369+msgstr ""
1370+
1371+msgid "This window is not responding"
1372+msgstr ""
1373+
1374+msgid "Do you want to force the application to exit, or wait for it to respond?"
1375+msgstr ""
1376+
1377+msgid "_Wait"
1378+msgstr ""
1379+
1380+msgid "_Force Quit"
1381+msgstr ""
1382+
1383 msgid "Type your command"
1384 msgstr ""
1385
1386@@ -50,6 +70,12 @@
1387 msgid "Quit"
1388 msgstr ""
1389
1390+msgid "Exit"
1391+msgstr ""
1392+
1393+msgid "Close"
1394+msgstr ""
1395+
1396 msgid "Search your computer and online sources"
1397 msgstr ""
1398
1399@@ -69,13 +95,16 @@
1400 msgid "Waiting to install"
1401 msgstr ""
1402
1403+msgid "Installing…"
1404+msgstr ""
1405+
1406 msgid "Drop To Add Application"
1407 msgstr ""
1408
1409 msgid "Trash"
1410 msgstr ""
1411
1412-msgid "Empty Trash..."
1413+msgid "Empty Trash…"
1414 msgstr ""
1415
1416 msgid "Open"
1417@@ -96,6 +125,15 @@
1418 msgid "Unmount"
1419 msgstr ""
1420
1421+msgid "Password"
1422+msgstr ""
1423+
1424+msgid "Username"
1425+msgstr ""
1426+
1427+msgid "Invalid password, please try again"
1428+msgstr ""
1429+
1430 msgid "Ubuntu Desktop"
1431 msgstr ""
1432
1433@@ -105,6 +143,14 @@
1434 msgid "Launcher"
1435 msgstr ""
1436
1437+#, c-format
1438+msgid "%s: running: %zu windows open"
1439+msgstr ""
1440+
1441+#, c-format
1442+msgid "%s: running"
1443+msgstr ""
1444+
1445 msgid "Quicklist"
1446 msgstr ""
1447
1448@@ -165,6 +211,9 @@
1449 msgid "Opens the Dash Music Lens."
1450 msgstr ""
1451
1452+msgid "Opens the Dash Photo Lens."
1453+msgstr ""
1454+
1455 msgid "Opens the Dash Video Lens."
1456 msgstr ""
1457
1458@@ -210,6 +259,9 @@
1459 msgid "Switches between applications."
1460 msgstr ""
1461
1462+msgid "Switches between applications from all workspaces."
1463+msgstr ""
1464+
1465 msgid "Switches windows of current applications."
1466 msgstr ""
1467
1468@@ -234,6 +286,12 @@
1469 msgid "Spreads all windows in the current workspace."
1470 msgstr ""
1471
1472+msgid "Spreads all windows."
1473+msgstr ""
1474+
1475+msgid "Spreads all windows in all the workspaces."
1476+msgstr ""
1477+
1478 msgid "Minimises all windows."
1479 msgstr ""
1480
1481@@ -258,7 +316,7 @@
1482 msgid "Places the window in corresponding position."
1483 msgstr ""
1484
1485-msgid "Ctrl + Alt + Num"
1486+msgid "Ctrl + Alt + Num (keypad)"
1487 msgstr ""
1488
1489 msgid " Drag"
1490@@ -270,6 +328,11 @@
1491 msgid "Resizes the window."
1492 msgstr ""
1493
1494+msgid ""
1495+"Other users are logged in. Restarting or shutting down will close their open applications and may cause them to lose work.\n"
1496+"\n"
1497+msgstr ""
1498+
1499 msgid "Shut Down"
1500 msgstr ""
1501
1502@@ -327,3 +390,7 @@
1503
1504 msgid "Filter results"
1505 msgstr ""
1506+
1507+#. avoid wrap lines
1508+msgid "Caps lock is on"
1509+msgstr ""
1510
1511=== modified file 'shutdown/SessionView.cpp'
1512--- shutdown/SessionView.cpp 2014-06-18 15:08:33 +0000
1513+++ shutdown/SessionView.cpp 2014-07-01 15:43:33 +0000
1514@@ -96,10 +96,16 @@
1515 UpdateContents();
1516 }
1517
1518+<<<<<<< TREE
1519 void View::UpdateContents()
1520 {
1521 SetVisible(true);
1522 PopulateButtons();
1523+=======
1524+ scale.changed.connect(sigc::hide(sigc::mem_fun(this, &View::UpdateViewSize)));
1525+
1526+ UpdateViewSize();
1527+>>>>>>> MERGE-SOURCE
1528 UpdateText();
1529 UpdateViewSize();
1530 }
1531@@ -130,6 +136,26 @@
1532 }
1533 }
1534
1535+void View::UpdateViewSize()
1536+{
1537+ main_layout_->SetTopAndBottomPadding(style::TOP_PADDING.CP(scale()), style::BOTTOM_PADDING.CP(scale()));
1538+ main_layout_->SetLeftAndRightPadding(style::LEFT_RIGHT_PADDING.CP(scale()));
1539+ main_layout_->SetSpaceBetweenChildren(style::MAIN_SPACE.CP(scale()));
1540+
1541+ title_->SetScale(scale());
1542+ subtitle_->SetScale(scale());
1543+
1544+ ReloadCloseButtonTexture();
1545+
1546+ buttons_layout_->SetSpaceBetweenChildren(style::BUTTONS_SPACE.CP(scale()));
1547+
1548+ for (auto* area : buttons_layout_->GetChildren())
1549+ {
1550+ auto* button = static_cast<Button*>(area);
1551+ button->scale = scale();
1552+ }
1553+}
1554+
1555 void View::UpdateText()
1556 {
1557 std::string message;
1558@@ -217,6 +243,7 @@
1559
1560 if (mode() == Mode::LOGOUT)
1561 {
1562+<<<<<<< TREE
1563 if (manager_->is_locked())
1564 return;
1565
1566@@ -228,6 +255,14 @@
1567 }
1568
1569 auto* button = new Button(Button::Action::LOGOUT, NUX_TRACKER_LOCATION);
1570+=======
1571+ auto* button = new Button(Button::Action::LOCK, NUX_TRACKER_LOCATION);
1572+ button->scale = scale();
1573+ button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::LockScreen));
1574+ AddButton(button);
1575+
1576+ button = new Button(Button::Action::LOGOUT, NUX_TRACKER_LOCATION);
1577+>>>>>>> MERGE-SOURCE
1578 button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::Logout));
1579 key_focus_area_ = button;
1580 AddButton(button);
1581@@ -236,23 +271,40 @@
1582 {
1583 if (mode() == Mode::FULL)
1584 {
1585+<<<<<<< TREE
1586 if (manager_->CanLock())
1587 {
1588 auto* button = new Button(Button::Action::LOCK, NUX_TRACKER_LOCATION);
1589 button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::LockScreen));
1590 AddButton(button);
1591 }
1592+=======
1593+ auto* button = new Button(Button::Action::LOCK, NUX_TRACKER_LOCATION);
1594+ button->scale = scale();
1595+ button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::LockScreen));
1596+ AddButton(button);
1597+>>>>>>> MERGE-SOURCE
1598
1599 if (manager_->CanSuspend())
1600 {
1601+<<<<<<< TREE
1602 auto* button = new Button(Button::Action::SUSPEND, NUX_TRACKER_LOCATION);
1603+=======
1604+ button = new Button(Button::Action::SUSPEND, NUX_TRACKER_LOCATION);
1605+ button->scale = scale();
1606+>>>>>>> MERGE-SOURCE
1607 button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::Suspend));
1608 AddButton(button);
1609 }
1610
1611 if (manager_->CanHibernate())
1612 {
1613+<<<<<<< TREE
1614 auto* button = new Button(Button::Action::HIBERNATE, NUX_TRACKER_LOCATION);
1615+=======
1616+ button = new Button(Button::Action::HIBERNATE, NUX_TRACKER_LOCATION);
1617+ button->scale = scale();
1618+>>>>>>> MERGE-SOURCE
1619 button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::Hibernate));
1620 AddButton(button);
1621 }
1622@@ -261,10 +313,12 @@
1623 if (manager_->CanShutdown())
1624 {
1625 auto *button = new Button(Button::Action::REBOOT, NUX_TRACKER_LOCATION);
1626+ button->scale = scale();
1627 button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::Reboot));
1628 AddButton(button);
1629
1630 button = new Button(Button::Action::SHUTDOWN, NUX_TRACKER_LOCATION);
1631+ button->scale = scale();
1632 button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::Shutdown));
1633 key_focus_area_ = (mode() == Mode::SHUTDOWN) ? button : key_focus_area_;
1634 AddButton(button);
1635@@ -272,6 +326,7 @@
1636 else if (mode() == Mode::FULL && !manager_->is_locked())
1637 {
1638 auto* button = new Button(Button::Action::LOGOUT, NUX_TRACKER_LOCATION);
1639+ button->scale = scale();
1640 button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::Logout));
1641 AddButton(button);
1642 }
1643
1644=== modified file 'shutdown/SessionView.h'
1645--- shutdown/SessionView.h 2014-05-16 03:39:48 +0000
1646+++ shutdown/SessionView.h 2014-07-01 15:43:33 +0000
1647@@ -25,9 +25,14 @@
1648 #include <Nux/VLayout.h>
1649 #include <Nux/HLayout.h>
1650
1651+<<<<<<< TREE
1652 #include <UnityCore/GLibSource.h>
1653 #include <UnityCore/SessionManager.h>
1654 #include "unity-shared/EMConverter.h"
1655+=======
1656+#include "UnityCore/SessionManager.h"
1657+#include "unity-shared/EMConverter.h"
1658+>>>>>>> MERGE-SOURCE
1659 #include "unity-shared/UnityWindowView.h"
1660
1661 namespace unity
1662@@ -73,7 +78,12 @@
1663 private:
1664 friend class TestSessionView;
1665
1666+<<<<<<< TREE
1667 void PopulateButtons();
1668+=======
1669+ void UpdateViewSize();
1670+
1671+>>>>>>> MERGE-SOURCE
1672 void UpdateText();
1673 void UpdateContents();
1674 void UpdateViewSize();