Merge lp://staging/~nick-dedekind/qtmir/miral-DisplayConfigurationStorage into lp://staging/~unity-team/qtmir/miral-qt-integration

Proposed by Nick Dedekind
Status: Superseded
Proposed branch: lp://staging/~nick-dedekind/qtmir/miral-DisplayConfigurationStorage
Merge into: lp://staging/~unity-team/qtmir/miral-qt-integration
Prerequisite: lp://staging/~nick-dedekind/qtmir/edid
Diff against target: 329 lines (+169/-19)
7 files modified
CMakeLists.txt (+2/-2)
debian/control (+3/-3)
src/platforms/mirserver/miral/CMakeLists.txt (+1/-0)
src/platforms/mirserver/miral/display_configuration_storage.h (+52/-0)
src/platforms/mirserver/miral/persist_display_config.cpp (+91/-11)
src/platforms/mirserver/miral/persist_display_config.h (+7/-2)
src/platforms/mirserver/qmirserver_p.cpp (+13/-1)
To merge this branch: bzr merge lp://staging/~nick-dedekind/qtmir/miral-DisplayConfigurationStorage
Reviewer Review Type Date Requested Status
Alan Griffiths Needs Resubmitting
Review via email: mp+312693@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2017-01-25.

Commit message

Added interface for saving/loading display configuration output options.

Description of the change

Pass responsibility for display configuration storage to an overridable interface.

To post a comment you must log in.
595. By Nick Dedekind

better storage options

596. By Nick Dedekind

cleanup

597. By Nick Dedekind

clone_of->clone_of_output_index

598. By Nick Dedekind

clone_of_output_index->clone_output_index

599. By Nick Dedekind

merged edid

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

+ conf.for_each_output([this, &conf](mg::UserDisplayConfigurationOutput& output) {
...
default_policy.apply_to(conf);

First apply any saved configuration and then overwrite that with the default policy. Is this the right behaviour?

review: Needs Information
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

- miral::Application applicationFor(qtmir::PromptSession const &promptSession) const;
+ ::miral::Application applicationFor(qtmir::PromptSession const &promptSession) const;

This (and similar changes elsewhere) shouldn't be needed now.

600. By Nick Dedekind

merged parent

601. By Nick Dedekind

moved default apply before load

602. By Nick Dedekind

removed ::miral

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

The target branch has landed, the pre-requisite has been rebased.

review: Needs Resubmitting
603. By Nick Dedekind

merged pre-req

604. By Nick Dedekind

merged with pre-req

605. By Nick Dedekind

merged with prereq

606. By Nick Dedekind

merged with prereq

607. By Nick Dedekind

review comments

608. By Nick Dedekind

removed mir 0.26 version check

609. By Nick Dedekind

merged parent

610. By Nick Dedekind

added check for ouput.connected to load/save config

611. By Nick Dedekind

print error on failed EDID parse

612. By Nick Dedekind

more info for identifying a display

613. By Nick Dedekind

merged with trunk

614. By Nick Dedekind

merged trunk

615. By Nick Dedekind

miral 1.3.1 compat

616. By Nick Dedekind

merged trunk

617. By Nick Dedekind

merged trunk

618. By Nick Dedekind

merged with trunk

Unmerged revisions

618. By Nick Dedekind

merged with trunk

617. By Nick Dedekind

merged trunk

616. By Nick Dedekind

merged trunk

615. By Nick Dedekind

miral 1.3.1 compat

614. By Nick Dedekind

merged trunk

613. By Nick Dedekind

merged with trunk

612. By Nick Dedekind

more info for identifying a display

611. By Nick Dedekind

print error on failed EDID parse

610. By Nick Dedekind

added check for ouput.connected to load/save config

609. By Nick Dedekind

merged parent

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches