Merge lp://qastaging/~gordallott/unity/standalone-unity into lp://qastaging/unity
Proposed by
Gord Allott
| Status: | Merged |
|---|---|
| Approved by: | Gord Allott |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 2365 |
| Proposed branch: | lp://qastaging/~gordallott/unity/standalone-unity |
| Merge into: | lp://qastaging/unity |
| Diff against target: |
1365 lines (+816/-76) 23 files modified
CMakeLists.txt (+1/-0) com.canonical.Unity.gschema.xml (+1/-0) dash/CMakeLists.txt (+0/-1) dash/DashController.cpp (+3/-4) dash/DashView.cpp (+6/-4) dash/StandaloneDash.cpp (+2/-2) hud/StandaloneHud.cpp (+2/-2) panel/PanelMenuView.cpp (+1/-1) panel/StandalonePanel.cpp (+2/-2) panel/WindowButtons.cpp (+8/-8) plugins/unityshell/CMakeLists.txt (+2/-2) plugins/unityshell/src/unityshell.h (+2/-2) tests/CMakeLists.txt (+27/-26) unity-shared/CMakeLists.txt (+20/-2) unity-shared/DashStyle.cpp (+12/-1) unity-shared/DashStyle.h (+2/-0) unity-shared/OverlayRenderer.cpp (+4/-4) unity-shared/PanelStyle.cpp (+10/-0) unity-shared/PluginAdapterStandalone.cpp (+453/-0) unity-shared/UnitySettings.cpp (+7/-8) unity-shared/UnitySettings.h (+7/-7) unity-standalone/CMakeLists.txt (+46/-0) unity-standalone/StandaloneUnity.cpp (+198/-0) |
| To merge this branch: | bzr merge lp://qastaging/~gordallott/unity/standalone-unity |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jason Smith (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Adds a standalone mode to unity
Description of the change
Adds a standalone mode to unity, basically just pulls in select components in a single window.
Required a few changes, mostly insignificant but pads out the diff. DashSettings got renamed to UnitySettings in the chaos, no need for it to be DashSpecific. Added a new FormFactor
build with make unity-standalone
its worth noting that its not perfect right now, but this diff is large enough
No tests, covered by existing tests, mostly just organisational renaming, no new logic.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good to me, seems to work too.