lp://qastaging/~dyams/unity-2d/mm-updates-pips

Branch merges

Propose for merging

No branches dependent on this one.

Superseded for merging into lp://qastaging/unity-2d

Albert Astals Cid: Pending requested 2012-02-16

Diff: 1218 lines (+638/-222)

15 files modified

libunity-2d-private/src/launcherapplication.cpp (+88/-0)
libunity-2d-private/src/launcherapplication.h (+5/-0)
libunity-2d-private/src/launcheritem.cpp (+6/-0)
libunity-2d-private/src/launcheritem.h (+2/-0)
libunity-2d-private/src/screeninfo.cpp (+15/-0)
libunity-2d-private/src/screeninfo.h (+2/-0)
shell/Shell.qml (+5/-1)
shell/app/CMakeLists.txt (+2/-0)
shell/app/shell.cpp (+3/-51)
shell/app/shelldeclarativeview.cpp (+52/-147)
shell/app/shelldeclarativeview.h (+16/-20)
shell/app/shellmanager.cpp (+380/-0)
shell/app/shellmanager.h (+58/-0)
shell/launcher/LauncherList.qml (+3/-2)
shell/launcher/LauncherLoader.qml (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

922. By Lohith D Shivamurthy on 2012-02-20

fix comments

921. By Lohith D Shivamurthy on 2012-02-16

[shell] update pips to show whether application belongs to current screen or not

920. By Lohith D Shivamurthy on 2012-02-15

merge lp:~dyams/unity-2d/centralized-superkey

919. By Lohith D Shivamurthy on 2012-02-14

merge bzr merge lp:~dyams/unity-2d/centralized-hotkeys

918. By Lohith D Shivamurthy on 2012-02-14

merge lp:unity-2d

917. By Lohith D Shivamurthy on 2012-02-14

Add missing files shellmanager.h/cpp

916. By Lohith D Shivamurthy on 2012-02-14

[Shell][MuliMonintor] To support shell in multi monitor. Initial commit

915. By Florian Boucault on 2012-02-14

Revert HUD backend introduction from bzr revision 912.

Merging the backend without the frontend is not useful and risky because there is no practical way to test it (in the absence of automated tests).

Aside of that, a few things were wrong with the code itself:
- the hudActive property in the shell declarative view should only exist in QML, if possible (the dashActive property is supposed to go away ASAP)
- the handling of the alt key should not be done in the panel
- the dbus service for the hud is not necessary

UNBLOCK. Fixes: . Approved by .

914. By Gerry Boland on 2012-02-13

change default to never hide launcher as per design request (LP: #928153). Fixes: https://bugs.launchpad.net/bugs/928153. Approved by .

913. By Tiago Salem Herrmann on 2012-02-13

depend on libqtdee >= 0.2.4-0ubuntu1. Fixes: . Approved by Albert Astals Cid.