Merge lp://qastaging/~jonas-drange/ubuntu-system-settings/displayConfiguration into lp://qastaging/ubuntu-system-settings
Proposed by
Jonas G. Drange
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~jonas-drange/ubuntu-system-settings/displayConfiguration |
| Merge into: | lp://qastaging/ubuntu-system-settings |
| Diff against target: |
1591 lines (+1288/-71) 20 files modified
debian/control (+2/-0) plugins/brightness/CMakeLists.txt (+25/-2) plugins/brightness/ExternalDisplay.qml (+195/-0) plugins/brightness/PageComponent.qml (+101/-64) plugins/brightness/PageResolution.qml (+65/-0) plugins/brightness/PageRotation.qml (+96/-0) plugins/brightness/brightness.cpp (+13/-1) plugins/brightness/brightness.h (+7/-0) plugins/brightness/brightness.settings (+1/-0) plugins/brightness/display.cpp (+162/-0) plugins/brightness/display.h (+119/-0) plugins/brightness/displaymodel.cpp (+133/-0) plugins/brightness/displaymodel.h (+69/-0) plugins/brightness/displays.cpp (+75/-0) plugins/brightness/displays.h (+51/-0) plugins/brightness/mirdisplays.cpp (+85/-0) plugins/brightness/mirdisplays.h (+50/-0) plugins/brightness/plugin.cpp (+4/-1) plugins/brightness/plugin/CMakeLists.txt (+2/-2) plugins/brightness/plugin/brightness-plugin.cpp (+33/-1) |
| To merge this branch: | bzr merge lp://qastaging/~jonas-drange/ubuntu-system-settings/displayConfiguration |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Touch System Settings | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 1581. By Jonas G. Drange
-
add orientation and fix local/actual code
- 1580. By Jonas G. Drange
-
some doccing as well as cleanup of imports
- 1579. By Jonas G. Drange
-
cleanup in mirdisplays and 1.0->1.3
- 1578. By Jonas G. Drange
-
mirdisplays
- 1577. By Jonas G. Drange
-
add display config
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
