Merge lp://staging/~3v1n0/unity/lockscreen-panel into lp://staging/unity

Proposed by Marco Trevisan (Treviño)
Status: Merged
Merged at revision: 3705
Proposed branch: lp://staging/~3v1n0/unity/lockscreen-panel
Merge into: lp://staging/unity
Prerequisite: lp://staging/~3v1n0/unity/lockscreen-review
Diff against target: 1623 lines (+781/-146)
35 files modified
UnityCore/SessionManager.h (+2/-0)
lockscreen/BackgroundSettings.cpp (+24/-41)
lockscreen/CMakeLists.txt (+1/-0)
lockscreen/LockScreenAbstractShield.h (+6/-1)
lockscreen/LockScreenController.cpp (+22/-6)
lockscreen/LockScreenController.h (+3/-1)
lockscreen/LockScreenPanel.cpp (+225/-0)
lockscreen/LockScreenPanel.h (+75/-0)
lockscreen/LockScreenSettings.cpp (+38/-0)
lockscreen/LockScreenSettings.h (+11/-0)
lockscreen/LockScreenShield.cpp (+56/-52)
lockscreen/LockScreenShield.h (+10/-11)
lockscreen/LockScreenShieldFactory.cpp (+2/-2)
lockscreen/LockScreenShieldFactory.h (+2/-2)
lockscreen/UserAuthenticatorPam.cpp (+1/-1)
lockscreen/UserPromptView.cpp (+1/-2)
lockscreen/pch/lockscreen_pch.hh (+2/-1)
panel/PanelIndicatorEntryView.cpp (+1/-1)
panel/PanelIndicatorsView.cpp (+8/-0)
panel/PanelIndicatorsView.h (+1/-0)
panel/PanelMenuView.cpp (+0/-1)
panel/PanelMenuView.h (+0/-1)
panel/PanelView.cpp (+6/-14)
panel/PanelView.h (+1/-2)
plugins/unityshell/src/unityshell.cpp (+28/-4)
plugins/unityshell/src/unityshell.h (+3/-0)
services/panel-service.c (+1/-1)
shutdown/CMakeLists.txt (+1/-0)
shutdown/SessionDBusManager.cpp (+180/-0)
shutdown/SessionDBusManager.h (+50/-0)
shutdown/StandaloneSession.cpp (+1/-0)
tests/data/external.gschema.xml (+6/-0)
tests/test_lockscreen_controller.cpp (+11/-2)
tests/test_mock_session_manager.h (+1/-0)
unity-shared/WindowManager.h (+1/-0)
To merge this branch: bzr merge lp://staging/~3v1n0/unity/lockscreen-panel
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Andrea Azzarone (community) Approve
Brandon Schaefer (community) Approve
Review via email: mp+209797@code.staging.launchpad.net

Commit message

LockScreenPanel: added a light version of PanelView for Lockscreen only, using PanelIndicatorsView

 - Indicators scrubbing using mouse works again
 - Indicators key navigation is supported (Alt+F10 included)
 - Indicators will be correctly visible in light themes as well
 - Show hostname (optionally) on the top left side of the panel
 - LockScreenSettings now bind settings from unity-greeter dconf path

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Azzarone (azzar1) wrote :

Look good to me now.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.