Merge lp://staging/~jonas-drange/ubuntu-system-settings/displays-stub into lp://staging/ubuntu-system-settings
Proposed by
Jonas G. Drange
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~jonas-drange/ubuntu-system-settings/displays-stub |
| Merge into: | lp://staging/ubuntu-system-settings |
| Diff against target: |
2417 lines (+2005/-30) 36 files modified
debian/control (+1/-0) plugins/brightness/CMakeLists.txt (+5/-1) plugins/brightness/PageComponent.qml (+148/-9) plugins/brightness/WifiDisplays.qml (+22/-19) plugins/brightness/brightness.cpp (+19/-1) plugins/brightness/brightness.h (+13/-0) plugins/brightness/displays/display.cpp (+141/-0) plugins/brightness/displays/display.h (+112/-0) plugins/brightness/displays/displaymodel.cpp (+190/-0) plugins/brightness/displays/displaymodel.h (+82/-0) plugins/brightness/plugin.cpp (+6/-0) tests/mocks/CMakeLists.txt (+1/-0) tests/mocks/GSettings1.0/CMakeLists.txt (+19/-0) tests/mocks/GSettings1.0/fake_gsettings.cpp (+127/-0) tests/mocks/GSettings1.0/fake_gsettings.h (+101/-0) tests/mocks/GSettings1.0/plugin.cpp (+35/-0) tests/mocks/GSettings1.0/plugin.h (+33/-0) tests/mocks/GSettings1.0/qmldir (+2/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/CMakeLists.txt (+28/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/MockAethercastDevice.h (+63/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/MockAethercastDeviceModel.cpp (+95/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/MockAethercastDeviceModel.h (+63/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/MockAethercastDisplays.cpp (+89/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/MockAethercastDisplays.h (+96/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/MockBrightness.cpp (+87/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/MockBrightness.h (+73/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/MockDisplay.h (+52/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/MockDisplayModel.h (+26/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/plugin.cpp (+39/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/plugin.h (+33/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/qmldir (+2/-0) tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt (+1/-0) tests/plugins/CMakeLists.txt (+10/-0) tests/plugins/brightness/Source/qmldir (+3/-0) tests/plugins/brightness/tst_BrightnessPageComponent.qml (+109/-0) tests/plugins/brightness/tst_BrightnessWifiDisplays.qml (+79/-0) |
| To merge this branch: | bzr merge lp://staging/~jonas-drange/ubuntu-system-settings/displays-stub |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Touch System Settings | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2016-10-26.
To post a comment you must log in.
Unmerged revisions
- 1736. By Jonas G. Drange
-
drop unecessary whitespace changes
- 1735. By Jonas G. Drange
-
make one test for when all new things are hidden, and one where a display config is shown
- 1734. By Jonas G. Drange
-
remove the rest of the kbd jazz
- 1733. By Jonas G. Drange
-
add setData to display model
- 1732. By Jonas G. Drange
-
undo the kbd rectangle, move api forward
- 1731. By Jonas G. Drange
-
move api forward
- 1730. By Jonas G. Drange
-
merge prereq
- 1729. By Jonas G. Drange
-
add initial stub of displays code
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
