Merge lp:~azzar1/unity/proper-reboot into lp:unity

Proposed by Andrea Azzarone
Status: Work in progress
Proposed branch: lp:~azzar1/unity/proper-reboot
Merge into: lp:unity
Diff against target: 93 lines (+16/-5)
6 files modified
UnityCore/GnomeSessionManager.cpp (+3/-0)
UnityCore/GnomeSessionManagerImpl.h (+1/-0)
UnityCore/SessionManager.h (+1/-0)
shutdown/SessionController.cpp (+8/-4)
shutdown/SessionView.cpp (+1/-0)
shutdown/SessionView.h (+2/-1)
To merge this branch: bzr merge lp:~azzar1/unity/proper-reboot
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+275053@code.launchpad.net

Commit message

Properly handle in unity the reboot dialog.

Description of the change

Properly handle in unity the reboot dialog.

To post a comment you must log in.
lp:~azzar1/unity/proper-reboot updated
4028. By Marco Trevisan (Treviño)

Upstream release 7.3.3
Approved by: Andrea Azzarone

4029. By Marco Trevisan (Treviño)

Bump version to 7.4.0 Fixes: #1511542
Approved by: Andrea Azzarone

4030. By Stephen M. Webb

changed the wording of the help message and warning message for the --reset option Fixes: #1486498
Approved by: Brandon Schaefer

4031. By Didier Roche-Tolomelli

Remove unity2d transitional packages. We are post trusty LTS, they are not needed anymore
Approved by: Marco Trevisan (Treviño)

4032. By Marco Trevisan (Treviño)

Unity: use compiz cursorCache to get properly updated cursors

We avoid duplicating instances and they're automatically recreated
when the system cursor setting change. Fixes: #1359211
Approved by: Andrea Azzarone

4033. By Marco Trevisan (Treviño)

PanelService: unset the idle ID before removal on callback Fixes: #1501289
Approved by: Andrea Azzarone

4034. By Marco Trevisan (Treviño)

UnityScreen: add SpreadAppWindows option and trigger it on Super+Ctrl+[Shift]+W
Approved by: Andrea Azzarone

4035. By Marco Trevisan (Treviño)

ApplicationLauncherIcon: if an app is not running and has no desktop file, add QL item to add to dash

This allows to generate a desktop file without sticking the icon
Approved by: Andrea Azzarone

4036. By CI Train Bot Account

Releasing 7.4.0+16.04.20151102-0ubuntu1

4037. By Marco Trevisan (Treviño)

PanelMenuView: ignore leave events when triggered by feeding nux manually

WindowManager::Default().UnGrabMousePointer uses ProcessForeignEvent to send
a ButtonRelease event, and this breaks the panel. So we need to ignore this. Fixes: #1513496
Approved by: Andrea Azzarone

4038. By Marco Trevisan (Treviño)

SwitcherModel: allow to add/remove icons dynamically and update them when they require it

We keep hidden applications in a separated vector; when an application becomes
invisible in switcher we need to move it to the hidden_applications_ vector,
if it becomes visible again we put it back on the main model vector. Fixes: #1512349
Approved by: Andrea Azzarone

4039. By Marco Trevisan (Treviño)

Switcher{View,Controller}: close active selection on Alt+q

'Q' should be instead the first key in the row, near to tab. Fixes: #1468820
Approved by: Andrea Azzarone

4040. By Marco Trevisan (Treviño)

XKeyboardUtil: add ability to get keycodes from any relative position
Approved by: PS Jenkins bot, Andrea Azzarone

4041. By Marco Trevisan (Treviño)

SwitcherView: Add support to Alt+Key-right-to-tab to close the selected app/window
Approved by: Andrea Azzarone

4042. By Marco Trevisan (Treviño)

debian/rules: enable unit tests on arm64 again Fixes: #1514538
Approved by: Andrea Azzarone

4043. By Marco Trevisan (Treviño)

PanelIndicatorEntryView: Activate menus on click, by drawing them as active Fixes: #1513523
Approved by: Andrea Azzarone

4044. By Marco Trevisan (Treviño)

TextInput: show warning also when num lock is enabled
Approved by: Andrea Azzarone

4045. By Marco Trevisan (Treviño)

Places(Overlay)VScrollBar: impelement gtk-like overlay scrollbars Fixes: #1481706
Approved by: PS Jenkins bot, Andrea Azzarone

4046. By Marco Trevisan (Treviño)

ApplicationLauncherIcon: if a new window opens while spreading, spread again with proper match Fixes: #1517455
Approved by: PS Jenkins bot, Andrea Azzarone

4047. By Marco Trevisan (Treviño)

ExpoLauncherIcon: add Quicklist to switch workspace and see the selected one Fixes: #750497
Approved by: PS Jenkins bot, Andrea Azzarone

4048. By Eleni Maria Stea

Replaced deprecated calls in tests to get rid of compiler warnings
Approved by: PS Jenkins bot, Marco Trevisan (Treviño)

4049. By Marco Trevisan (Treviño)

unity: ensure we use python3 for the launch script and python2.7 for autopilot Fixes: #1512909
Approved by: PS Jenkins bot

4050. By Bryan Quigley

debian/control: Remove telepathy from recommends
Approved by: Marco Trevisan (Treviño)

4051. By Andrea Azzarone

Properly hide shortcut overlay window to avoid unnecessary redraws.
Approved by: PS Jenkins bot, Marco Trevisan (Treviño)

4052. By Sebastien Bacher

Updated apport hook to include:
- the compiz and xorg details, not only after asking users if the issue
is a graphical one (which is weird question)
- the upstart logs for unity/ups/lockscreen
- some gsettings configurations Fixes: #1508974
Approved by: PS Jenkins bot, Marco Trevisan (Treviño)

4053. By CI Train Bot Account

Releasing 7.4.0+16.04.20151211-0ubuntu1

4054. By Didier Roche-Tolomelli

releasing package unity version 7.4.0+16.04.20151211-0ubuntu2

4055. By Aneesh Madhavan

resources: optimize png images Fixes: #1023745
Approved by: Didier Roche, Marco Trevisan (Treviño)

4056. By Michael Vogt

Display "image-missing" icon in the panel if for some reason a icon can not be loaded. Fixes: #1525186
Approved by: PS Jenkins bot, Marco Trevisan (Treviño)

4057. By Evan McIntire

ShortcutHint: Add key shortcut hints for Screenshot and Window Screenshot

Key bindings are dynamically taken from gnome settings. Fixes: #1050195
Approved by: Marco Trevisan (Treviño)

4058. By Marco Trevisan (Treviño)

Unity: compile a byte regex in order to get proper matching with byte cmdline Fixes: #1526455
Approved by: PS Jenkins bot, Barry Warsaw, Sebastien Bacher

4059. By Marco Trevisan (Treviño)

GnomeKeyGrabber: refcount the actions and remove them only when nobody needs

There might be multiple customers for an action (i.e. a menu entry and a dbus customer)
so we can't remove them in this case without ref-counting. Fixes: #1525308
Approved by: PS Jenkins bot, Andrea Azzarone

4060. By Marco Trevisan (Treviño)

a11y: don't spam the log with warnings when a quicklist is opened

React silently when trying to get accessible elements from null views.
Approved by: PS Jenkins bot, Andrea Azzarone

4061. By Marco Trevisan (Treviño)

a11y: move accessibility stuff to its own directory, adding a private lib for building
Approved by: Andrea Azzarone

4062. By Marco Trevisan (Treviño)

LayoutSystem: add ComputeDecorationHeight method to LayoutWindow

Use this only for SwitcherView, while we don't need this trick when using
these windows for generating the spread grid. Fixes: #1526386
Approved by: PS Jenkins bot, Andrea Azzarone

4063. By Marco Trevisan (Treviño)

SwitcherModel: don't reiterate over windows all the time, keep a list and update it

Windows are computed just once, unless the window count for the selected icon
changes. DetailXids is now returning something only if detail is enabled.

When the active app windows changed, we can update the detail xids. Fixes: #1526434
Approved by: Andrea Azzarone

4064. By Marco Trevisan (Treviño)

TextInput: reduce opacity to warning if only num_lock is enabled
Approved by: PS Jenkins bot, Andrea Azzarone

4065. By Marco Trevisan (Treviño)

CompizShortcutModeller: show menus keybinding can be read from settings
Approved by: PS Jenkins bot, Andrea Azzarone

4066. By Marco Trevisan (Treviño)

PanelMenuView: ensure that the maximized window is computed when setting the monitor Fixes: #1526835
Approved by: PS Jenkins bot, Andrea Azzarone

4067. By CI Train Bot Account

Releasing 7.4.0+16.04.20151218-0ubuntu1

4068. By Andrea Azzarone

Merge with trunk.

Unmerged revisions

4068. By Andrea Azzarone

Merge with trunk.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'UnityCore/GnomeSessionManager.cpp'
2--- UnityCore/GnomeSessionManager.cpp 2015-09-10 15:37:07 +0000
3+++ UnityCore/GnomeSessionManager.cpp 2016-01-25 16:19:47 +0000
4@@ -285,6 +285,9 @@
5 case shell::Action::REBOOT:
6 manager_->reboot_requested.emit(has_inibitors);
7 break;
8+ case shell::Action::FULL:
9+ manager_->full_dialog_requested.emit(has_inibitors);
10+ break;
11 default:
12 break;
13 }
14
15=== modified file 'UnityCore/GnomeSessionManagerImpl.h'
16--- UnityCore/GnomeSessionManagerImpl.h 2015-01-24 00:56:37 +0000
17+++ UnityCore/GnomeSessionManagerImpl.h 2016-01-25 16:19:47 +0000
18@@ -37,6 +37,7 @@
19 LOGOUT = 0,
20 SHUTDOWN,
21 REBOOT,
22+ FULL = 69,
23 NONE
24 };
25 }
26
27=== modified file 'UnityCore/SessionManager.h'
28--- UnityCore/SessionManager.h 2014-05-16 04:24:05 +0000
29+++ UnityCore/SessionManager.h 2016-01-25 16:19:47 +0000
30@@ -72,6 +72,7 @@
31 sigc::signal<void> prompt_lock_requested;
32 sigc::signal<void> locked;
33 sigc::signal<void> unlocked;
34+ sigc::signal<void, bool /* inhibitors */> full_dialog_requested;
35 sigc::signal<void, bool /* inhibitors */> logout_requested;
36 sigc::signal<void, bool /* inhibitors */> reboot_requested;
37 sigc::signal<void, bool /* inhibitors */> shutdown_requested;
38
39=== modified file 'shutdown/SessionController.cpp'
40--- shutdown/SessionController.cpp 2014-12-10 14:24:06 +0000
41+++ shutdown/SessionController.cpp 2016-01-25 16:19:47 +0000
42@@ -41,17 +41,21 @@
43 , fade_animator_(FADE_DURATION)
44 {
45 manager_->reboot_requested.connect([this] (bool inhibitors) {
46+ Show(View::Mode::REBOOT, inhibitors);
47+ });
48+
49+ manager_->shutdown_requested.connect([this] (bool inhibitors) {
50 Show(View::Mode::SHUTDOWN, inhibitors);
51 });
52
53- manager_->shutdown_requested.connect([this] (bool inhibitors) {
54- Show(View::Mode::FULL, inhibitors);
55- });
56-
57 manager_->logout_requested.connect([this] (bool inhibitors) {
58 Show(View::Mode::LOGOUT, inhibitors);
59 });
60
61+ manager_->full_dialog_requested.connect([this] (bool inhibitors) {
62+ Show(View::Mode::FULL, inhibitors);
63+ });
64+
65 manager_->cancel_requested.connect(sigc::mem_fun(this, &Controller::Hide));
66
67 WindowManager::Default().average_color.changed.connect(sigc::mem_fun(this, &Controller::OnBackgroundUpdate));
68
69=== modified file 'shutdown/SessionView.cpp'
70--- shutdown/SessionView.cpp 2015-07-01 01:38:02 +0000
71+++ shutdown/SessionView.cpp 2016-01-25 16:19:47 +0000
72@@ -262,6 +262,7 @@
73 {
74 auto *button = new Button(Button::Action::REBOOT, NUX_TRACKER_LOCATION);
75 button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::Reboot));
76+ key_focus_area_ = (mode() == Mode::REBOOT) ? button : key_focus_area_;
77 AddButton(button);
78
79 button = new Button(Button::Action::SHUTDOWN, NUX_TRACKER_LOCATION);
80
81=== modified file 'shutdown/SessionView.h'
82--- shutdown/SessionView.h 2014-05-16 03:39:48 +0000
83+++ shutdown/SessionView.h 2016-01-25 16:19:47 +0000
84@@ -47,7 +47,8 @@
85 {
86 FULL,
87 SHUTDOWN,
88- LOGOUT
89+ LOGOUT,
90+ REBOOT
91 };
92
93 View(Manager::Ptr const& manager);