unity-2d

Merge lp://qastaging/~aacid/unity-2d/unity-2d_hud_configuration_key into lp://qastaging/unity-2d

unity-2d_hud_configuration_key
Merge into trunk

Proposed by Albert Astals Cid on 2012-04-02

Status:

Merged

Approved by:

Michał Sawicz on 2012-04-02

Approved revision:

1035

Merged at revision:

1030

Proposed branch:

lp://qastaging/~aacid/unity-2d/unity-2d_hud_configuration_key

Merge into:

lp://qastaging/unity-2d

Diff against target:

605 lines (+302/-31)

15 files modified

libunity-2d-private/src/CMakeLists.txt (+1/-0)
libunity-2d-private/src/gkeysequenceparser.cpp (+73/-0)
libunity-2d-private/src/gkeysequenceparser.h (+28/-0)
libunity-2d-private/src/hotkey.cpp (+37/-15)
libunity-2d-private/src/hotkey.h (+7/-4)
libunity-2d-private/src/hotkeymonitor.cpp (+15/-0)
libunity-2d-private/src/hotkeymonitor.h (+1/-0)
libunity-2d-private/src/hotmodifier.cpp (+9/-5)
libunity-2d-private/src/hotmodifier.h (+1/-0)
libunity-2d-private/tests/CMakeLists.txt (+1/-0)
libunity-2d-private/tests/gkeysequenceparser.cpp (+66/-0)
libunity-2d-private/tests/hotkeytest.cpp (+1/-1)
shell/app/shellmanager.cpp (+50/-6)
shell/app/shellmanager.h (+2/-0)
tests/manual-tests/hud.txt (+10/-0)

To merge this branch:

bzr merge lp://qastaging/~aacid/unity-2d/unity-2d_hud_configuration_key

Undecided

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Paweł Stołowski (community)	2012-04-02	Approve on 2012-04-02
Michał Sawicz	2012-04-02	Pending
Review via email: mp+100418@code.qastaging.launchpad.net

Commit message

[HUD] Read the unity setting for hud toggling

For that we need to introduce a parser of the gsettings unity conf key and modify the hotmodifier so it supports multiple modifiers (like shift + alt)

Description of the change

[HUD] Read the unity setting for hud toggling

For that we need to introduce a parser of the gsettings unity conf key and modify the hotmodifier so it supports multiple modifiers (like shift + alt)

Revision history for this message