Merge lp:~jonas-drange/ubuntu-system-settings/displays-stub into lp:ubuntu-system-settings

[Jonas G. Drange]

* adds display configuration UI
* adds display and displaymodel to serve as backend for new config UI (stubbed out for now)
* tests new UI (minimally)

This branch introduces most of the display configuration UI and some parts of the display and displaymodel API.

The idea is that the displaymodel will contain all configurable displays. The user the modifies a display element and then the displaymodel (or possibly a new class) asks Mir to configure the displays.

[lp:~jonas-drange/ubuntu-system-settings/displays-stub]

1734. By Jonas G. Drange on 2016-10-26

remove the rest of the kbd jazz

1735. By Jonas G. Drange on 2016-10-26

make one test for when all new things are hidden, and one where a display config is shown

1736. By Jonas G. Drange on 2016-10-26

drop unecessary whitespace changes

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1734
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/218/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1908/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1909
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1748
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1748/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1748
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1748/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1748/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1748
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1748/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1748
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1748/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1748
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1748/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1748/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1748
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1748/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1748/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/218/rebuild

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1736
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/219/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1909/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1910
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1749/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1749
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1749/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1749
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1749/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1749
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1749/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1749
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1749/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1749
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1749/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1749
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1749/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1749
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1749/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1749
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1749/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/219/rebuild

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

The test failures should be addressed by silo 2066.

Unmerged revisions

1736. By Jonas G. Drange on 2016-10-26

drop unecessary whitespace changes

1735. By Jonas G. Drange on 2016-10-26

make one test for when all new things are hidden, and one where a display config is shown

1734. By Jonas G. Drange on 2016-10-26

remove the rest of the kbd jazz

1733. By Jonas G. Drange on 2016-10-26

add setData to display model

1732. By Jonas G. Drange on 2016-10-26

undo the kbd rectangle, move api forward

1731. By Jonas G. Drange on 2016-10-25

move api forward

1730. By Jonas G. Drange on 2016-10-20

merge prereq

1729. By Jonas G. Drange on 2016-10-20

add initial stub of displays code

=== modified file 'plugins/brightness/CMakeLists.txt'
--- plugins/brightness/CMakeLists.txt	2016-10-26 14:45:41 +0000
+++ plugins/brightness/CMakeLists.txt	2016-10-26 14:45:42 +0000
@@ -16,6 +16,8 @@
                 aethercast/displays.h
                 aethercast/freedesktop_properties.h
                 aethercast/freedesktop_objectmanager.h
+                displays/display.h
+                displays/displaymodel.h
                 plugin.h
                 brightness.h
                 aethercast/aethercast_device.cpp
@@ -25,6 +27,8 @@
                 aethercast/displays.cpp
 	        aethercast/freedesktop_properties.cpp
 	        aethercast/freedesktop_objectmanager.cpp
+                displays/display.cpp
+                displays/displaymodel.cpp
                 plugin.cpp
                 brightness.cpp
                 ${QML_SOURCES})

=== modified file 'plugins/brightness/PageComponent.qml'
--- plugins/brightness/PageComponent.qml	2016-10-26 14:45:41 +0000
+++ plugins/brightness/PageComponent.qml	2016-10-26 14:45:42 +0000
@@ -21,6 +21,7 @@
 import GSettings 1.0
 import QtQuick 2.4
 import SystemSettings 1.0
+import SystemSettings.ListItems 1.0 as SettingsListItems
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.SystemSettings.Brightness 1.0
@@ -35,6 +36,14 @@
     title: brightnessPanel.widiSupported ? i18n.tr("Brightness & Display") : i18n.tr("Brightness")
     flickable: scrollWidget
 
+    function formatMode(mode) {
+        mode = mode.split("x");
+        /* TRANSLATORS: %1 refer to the amount of horizontal pixels in a
+        display resolution, and %2 to the vertical pixels. E.g. 1200x720.
+        %3 is the refresh rate in hz. */
+        return i18n.tr("%1×%2 @ %3hz").arg(mode[0]).arg(mode[1]).arg(mode[2]);
+    }
+
     GSettings {
         id: gsettings
         schema.id: "com.ubuntu.touch.system"
@@ -68,7 +77,12 @@
 
     Flickable {
         id: scrollWidget
-        anchors.fill: parent
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+            bottom: applyButtonBackground.top
+        }
         contentHeight: contentItem.childrenRect.height
         boundsBehavior: (contentHeight > root.height) ?
                             Flickable.DragAndOvershootBounds :
@@ -82,7 +96,7 @@
             anchors.left: parent.left
             anchors.right: parent.right
 
-            ListItem.Standard {
+            SettingsListItems.Standard {
                 text: i18n.tr("Display brightness")
                 showDivider: false
             }
@@ -113,12 +127,13 @@
                 }
             }
 
-            ListItem.Standard {
+            SettingsListItems.Standard {
                 id: adjust
                 text: i18n.tr("Adjust automatically")
                 visible: brightnessPanel.powerdRunning &&
                          brightnessPanel.autoBrightnessAvailable
-                control: CheckBox {
+
+                CheckBox {
                     id: autoAdjustCheck
                     property bool serverChecked: gsettings.autoBrightness
                     onServerCheckedChanged: checked = serverChecked
@@ -138,12 +153,13 @@
                 visible: brightnessPanel.widiSupported
             }
 
-            ListItem.Standard {
+            SettingsListItems.Standard {
                 objectName: "externalDisplayControl"
                 text: i18n.tr("External display")
                 enabled: brightnessPanel.widiSupported
                 onClicked: enabledCheck.trigger()
-                control: Switch {
+
+                Switch {
                     id: enabledCheck
                     property bool serverChecked: aethercastDisplays.enabled
                     onServerCheckedChanged: checked = serverChecked
@@ -154,15 +170,129 @@
                 }
             }
 
-            ListItem.SingleValue {
+            SettingsListItems.SingleValueProgression {
                 objectName: "displayCasting"
                 visible: brightnessPanel.widiSupported
                 enabled: aethercastDisplays.enabled
                 text: i18n.tr("Wireless display")
                 value: aethercastDisplays.state === "connected" ? i18n.tr("Connected") : i18n.tr("Not connected")
-                progression: true
                 onClicked: pageStack.push(Qt.resolvedUrl("WifiDisplays.qml"))
             }
+
+            Repeater {
+                objectName: "displayConfigurationRepeater"
+                model: brightnessPanel.allDisplays
+
+                Column {
+                    objectName: "displayConfiguration_" + displayName
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                    }
+
+                    Label {
+                        visible: brightnessPanel.allDisplays.count > 1
+                        anchors {
+                            left: parent.left
+                            right: parent.right
+                            margins: units.gu(2)
+                        }
+
+                        text: displayName
+                    }
+
+                    SettingsItemTitle {
+                        text: i18n.tr("Rotation:")
+                    }
+
+                    OptionSelector {
+                        id: rotationSelector
+                        objectName: "rotationSelector"
+                        property bool _expanded: false
+                        anchors {
+                            left: parent.left
+                            right: parent.right
+                            margins: units.gu(2)
+                        }
+                        containerHeight: itemHeight * 4
+                        model: [
+                            i18n.tr("None"),
+                            i18n.tr("90° clockwise"),
+                            i18n.tr("180°"),
+                            i18n.tr("270°")
+                        ]
+                        onDelegateClicked: {
+                            expanded = !currentlyExpanded;
+                        }
+                    }
+
+                    SettingsItemTitle {
+                        text: availableModes.length > 1 ?
+                            i18n.tr("Resolution:") :
+                            /* TRANSLATORS: %1 is a display mode, e.g.
+                            1200x720x24. */
+                            i18n.tr("Resolution: %1").arg(formatMode(mode))
+                    }
+
+                    OptionSelector {
+                        id: resolutionSelector
+                        objectName: "resolutionSelector"
+                        property bool _expanded: false
+                        anchors {
+                            left: parent.left
+                            right: parent.right
+                            margins: units.gu(2)
+                        }
+                        visible: availableModes.length > 1
+                        containerHeight: itemHeight * availableModes.length
+                        model: availableModes
+                        onDelegateClicked: expanded = !currentlyExpanded
+                        delegate: OptionSelectorDelegate {
+                            text: formatMode(modelData)
+                        }
+                    }
+
+                    SettingsItemTitle {
+                        text: i18n.tr("Scale screen elements:")
+                    }
+
+                    Menus.SliderMenu {
+                        id: scaleSlider
+                        objectName: "scaleSlider"
+                        minimumValue: 1.0
+                        maximumValue: 100.0
+                        value: scale
+                        minIcon: "image://theme/grip-large"
+                        maxIcon: "image://theme/view-grid-symbolic"
+                    }
+                }
+            }
+        }
+    }
+
+    Rectangle {
+        id: applyButtonBackground
+        objectName: "applyButtonBackground"
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        color: Theme.palette.selected.background
+
+        visible: brightnessPanel.allDisplays.count > 0
+        height: units.gu(6)
+        Button {
+            id: applyButton
+            objectName: "applyButton"
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(1)
+                verticalCenter: parent.verticalCenter
+            }
+            enabled: brightnessPanel.changedDisplays.count > 0
+            text: i18n.tr("Apply Changes…")
+            onClicked: brightnessPanel.applyDisplayConfiguration()
         }
     }
 }

=== modified file 'plugins/brightness/brightness.cpp'
--- plugins/brightness/brightness.cpp	2016-04-13 19:21:59 +0000
+++ plugins/brightness/brightness.cpp	2016-10-26 14:45:42 +0000
@@ -25,6 +25,7 @@
 #include <QDBusReply>
 #include <QDBusMetaType>
 #include <QDebug>
+#include <QQmlEngine>
 
 // Returned data from getBrightnessParams
 struct BrightnessParams {
@@ -81,6 +82,8 @@
     QDBusArgument result(reply.arguments()[0].value<QDBusArgument>());
     BrightnessParams params = qdbus_cast<BrightnessParams>(result);
     m_autoBrightnessAvailable = params.automatic;
+    m_changedDisplays.filterOnUncommittedChanges(true);
+    m_changedDisplays.setSourceModel(&m_displays);
 }
 
 bool Brightness::getAutoBrightnessAvailable() const
@@ -98,3 +101,17 @@
     property_get("ubuntu.widi.supported", widi, "0");
     return (strcmp(widi, "0") > 0);
 }
+
+QAbstractItemModel* Brightness::allDisplays()
+{
+    auto ret = &m_displays;
+    QQmlEngine::setObjectOwnership(ret, QQmlEngine::CppOwnership);
+    return ret;
+}
+
+QAbstractItemModel* Brightness::changedDisplays()
+{
+    auto ret = &m_changedDisplays;
+    QQmlEngine::setObjectOwnership(ret, QQmlEngine::CppOwnership);
+    return ret;
+}

=== modified file 'plugins/brightness/brightness.h'
--- plugins/brightness/brightness.h	2016-04-13 17:12:35 +0000
+++ plugins/brightness/brightness.h	2016-10-26 14:45:42 +0000
@@ -21,6 +21,9 @@
 #ifndef BRIGHTNESS_H
 #define BRIGHTNESS_H
 
+#include "displays/displaymodel.h"
+
+#include <QAbstractItemModel>
 #include <QDBusInterface>
 #include <QObject>
 
@@ -36,12 +39,20 @@
     Q_PROPERTY (bool widiSupported
                 READ getWidiSupported
                 CONSTANT)
+    Q_PROPERTY (QAbstractItemModel* allDisplays
+                READ allDisplays
+                CONSTANT)
+    Q_PROPERTY (QAbstractItemModel* changedDisplays
+                READ changedDisplays
+                CONSTANT)
 
 public:
     explicit Brightness(QObject *parent = 0);
     bool getPowerdRunning() const;
     bool getAutoBrightnessAvailable() const;
     bool getWidiSupported() const;
+    QAbstractItemModel* allDisplays();
+    QAbstractItemModel* changedDisplays();
 
 private:
     QDBusConnection m_systemBusConnection;
@@ -49,6 +60,8 @@
     QDBusInterface m_powerdIface;
     bool m_powerdRunning;
     bool m_autoBrightnessAvailable;
+    DisplayModel m_displays;
+    DisplaysFilter m_changedDisplays;
 };
 
 #endif // BRIGHTNESS_H

=== added directory 'plugins/brightness/displays'
=== added file 'plugins/brightness/displays/display.cpp'
--- plugins/brightness/displays/display.cpp	1970-01-01 00:00:00 +0000
+++ plugins/brightness/displays/display.cpp	2016-10-26 14:45:42 +0000
@@ -0,0 +1,141 @@
+#include "display.h"
+
+Display::Display(QObject *parent)
+    : QObject(parent)
+{
+    QObject::connect(this, SIGNAL(nameChanged()),
+                     this, SLOT(changedSlot()));
+    QObject::connect(this, SIGNAL(typeChanged()),
+                     this, SLOT(changedSlot()));
+    QObject::connect(this, SIGNAL(mirroredChanged()),
+                     this, SLOT(changedSlot()));
+    QObject::connect(this, SIGNAL(connectedChanged()),
+                     this, SLOT(changedSlot()));
+    QObject::connect(this, SIGNAL(enabledChanged()),
+                     this, SLOT(changedSlot()));
+    QObject::connect(this, SIGNAL(modeChanged()),
+                     this, SLOT(changedSlot()));
+    QObject::connect(this, SIGNAL(availableModesChanged()),
+                     this, SLOT(changedSlot()));
+    QObject::connect(this, SIGNAL(orientationChanged()),
+                     this, SLOT(changedSlot()));
+    QObject::connect(this, SIGNAL(scaleChanged()),
+                     this, SLOT(changedSlot()));
+    QObject::connect(this, SIGNAL(uncommittedChangesChanged()),
+                     this, SLOT(changedSlot()));
+}
+
+QString Display::name() const
+{
+    return m_name;
+}
+
+QString Display::type() const
+{
+    return m_type;
+}
+
+bool Display::mirrored() const
+{
+    return m_mirrored;
+}
+
+bool Display::connected() const
+{
+    return m_connected;
+}
+
+bool Display::enabled() const
+{
+    return m_enabled;
+}
+
+QString Display::mode() const
+{
+    return m_mode;
+}
+
+QStringList Display::availableModes() const
+{
+    return m_availableModes;
+}
+
+Display::Orientation Display::orientation() const
+{
+    return m_orientation;
+}
+
+double Display::scale() const
+{
+    return m_scale;
+}
+
+bool Display::uncommittedChanges() const
+{
+    return m_uncommittedChanges;
+}
+
+void Display::setName(const QString &name)
+{
+    m_name = name;
+    Q_EMIT nameChanged();
+}
+
+void Display::setType(const QString &type)
+{
+    m_type = type;
+    Q_EMIT typeChanged();
+}
+
+void Display::setMirrored(const bool &mirrored)
+{
+    m_mirrored = mirrored;
+    Q_EMIT mirroredChanged();
+}
+
+void Display::setConnected(const bool &connected)
+{
+    m_connected = connected;
+    Q_EMIT connectedChanged();
+}
+
+void Display::setEnabled(const bool &enabled)
+{
+    m_enabled = enabled;
+    Q_EMIT enabledChanged();
+}
+
+void Display::setMode(const QString &mode)
+{
+    m_mode = mode;
+    Q_EMIT modeChanged();
+}
+
+void Display::setAvailableModes(const QStringList &availableModes)
+{
+    m_availableModes = availableModes;
+    Q_EMIT availableModesChanged();
+}
+
+void Display::setOrientation(const Display::Orientation &orientation)
+{
+    m_orientation = orientation;
+    Q_EMIT orientationChanged();
+}
+
+void Display::setScale(const double &scale)
+{
+    m_scale = scale;
+    Q_EMIT scaleChanged();
+}
+
+void Display::setUncommitedChanges(const bool uncommittedChanges)
+{
+    m_uncommittedChanges = uncommittedChanges;
+    Q_EMIT uncommittedChangesChanged();
+}
+
+void Display::changedSlot()
+{
+    Q_EMIT displayChanged(this);
+}

=== added file 'plugins/brightness/displays/display.h'
--- plugins/brightness/displays/display.h	1970-01-01 00:00:00 +0000
+++ plugins/brightness/displays/display.h	2016-10-26 14:45:42 +0000
@@ -0,0 +1,112 @@
+#ifndef DISPLAY_H
+#define DISPLAY_H
+
+#include <QObject>
+#include <QString>
+#include <QStringList>
+
+class Display : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name
+               READ name
+               NOTIFY nameChanged)
+    Q_PROPERTY(QString type
+               READ type
+               NOTIFY typeChanged)
+    Q_PROPERTY(bool mirrored
+               READ mirrored
+               WRITE setMirrored
+               NOTIFY mirroredChanged)
+    Q_PROPERTY(bool connected
+               READ connected
+               NOTIFY connectedChanged)
+    Q_PROPERTY(bool enabled
+               READ enabled
+               WRITE setEnabled
+               NOTIFY enabledChanged)
+    Q_PROPERTY(QString mode
+               READ mode
+               WRITE setMode
+               NOTIFY modeChanged)
+    Q_PROPERTY(QStringList availableModes
+               READ availableModes
+               NOTIFY availableModesChanged)
+    Q_PROPERTY(Orientation orientation
+               READ orientation
+               WRITE setOrientation
+               NOTIFY orientationChanged)
+    Q_PROPERTY(double scale
+               READ scale
+               WRITE setScale
+               NOTIFY scaleChanged)
+    Q_PROPERTY(bool uncommittedChanges
+               READ uncommittedChanges
+               NOTIFY uncommittedChangesChanged)
+
+Q_SIGNALS:
+    void nameChanged();
+    void typeChanged();
+    void mirroredChanged();
+    void connectedChanged();
+    void enabledChanged();
+    void modeChanged();
+    void availableModesChanged();
+    void orientationChanged();
+    void scaleChanged();
+    void uncommittedChangesChanged();
+    void displayChanged(const Display *display);
+
+public:
+    explicit Display(QObject *parent = nullptr);
+    ~Display() {};
+    enum class Orientation : uint {
+        Normal, PortraitMode, LandscapeInvertedMode,
+        PortraitInvertedMode
+    };
+    enum class DisplayType : uint {
+        PhysicalType, AethercastType
+    };
+    Q_ENUMS(Orientation DisplayType)
+
+    QString name() const;
+    QString type() const;
+    bool mirrored() const;
+    bool connected() const;
+    bool enabled() const;
+    QString mode() const;
+    QStringList availableModes() const;
+    Orientation orientation() const;
+    double scale() const;
+    bool uncommittedChanges() const;
+
+    void setMirrored(const bool &mirrored);
+    void setEnabled(const bool &enabled);
+    void setMode(const QString &mode);
+    void setOrientation(const Orientation &orientation);
+    void setScale(const double &scale);
+
+protected:
+    void setName(const QString &name);
+    void setAvailableModes(const QStringList &availableModes);
+    void setConnected(const bool &connected);
+    void setType(const QString &type);
+    void setUncommitedChanges(const bool uncommittedChanges);
+    QString m_name = QString::null;
+    QString m_type = QString::null;
+    bool m_mirrored = false;
+    bool m_connected = false;
+    bool m_enabled = false;
+    QString m_mode = QString::null;
+    QStringList m_availableModes = QStringList();
+    Orientation m_orientation = Orientation::Normal;
+    double m_scale = 1;
+    bool m_uncommittedChanges = false;
+
+private slots:
+    void changedSlot();
+};
+
+Q_DECLARE_METATYPE(Display*)
+
+#endif // DISPLAY_H

=== added file 'plugins/brightness/displays/displaymodel.cpp'
--- plugins/brightness/displays/displaymodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/brightness/displays/displaymodel.cpp	2016-10-26 14:45:42 +0000
@@ -0,0 +1,190 @@
+#include "displaymodel.h"
+
+#include <QDebug>
+
+DisplayModel::DisplayModel(QObject *parent)
+{
+}
+
+DisplayModel::~DisplayModel()
+{
+}
+
+int DisplayModel::rowCount(const QModelIndex &parent) const
+{
+    return m_displays.count();
+}
+
+QVariant DisplayModel::data(const QModelIndex &index, int role) const
+{
+    QVariant ret;
+
+    if ((0 <= index.row()) && (index.row() < m_displays.size())) {
+
+        auto display = m_displays[index.row()];
+
+        switch (role) {
+        case Qt::DisplayRole:
+            ret = display->name();
+            break;
+        case TypeRole:
+            ret = display->type();
+            break;
+        case MirroredRole:
+            ret = display->mirrored();
+            break;
+        case ConnectedRole:
+            ret = display->connected();
+            break;
+        case EnabledRole:
+            ret = display->enabled();
+            break;
+        case ModeRole:
+            ret = display->mode();
+            break;
+        case AvailableModesRole:
+            ret = display->availableModes();
+            break;
+        case OrientationRole:
+            ret = (uint) display->orientation();
+            break;
+        case ScaleRole:
+            ret = display->scale();
+            break;
+        case UncommittedChangesRole:
+            ret = display->uncommittedChanges();
+            break;
+        }
+    }
+
+    return ret;
+}
+
+bool DisplayModel::setData(const QModelIndex &index, const QVariant &value,
+                           int role)
+{
+    if ((0 <= index.row()) && (index.row() < m_displays.size())) {
+
+        auto display = m_displays[index.row()];
+
+        switch (role) {
+
+        case MirroredRole:
+            display->setMirrored(value.toBool());
+            break;
+        case EnabledRole:
+            display->setEnabled(value.toBool());
+            break;
+        case ModeRole:
+            display->setMode(value.toString());
+            break;
+        case OrientationRole:
+            display->setOrientation((Display::Orientation) value.toUInt());
+            break;
+        case ScaleRole:
+            display->setScale(value.toInt());
+            break;
+        case Qt::DisplayRole:
+        case TypeRole:
+        case ConnectedRole:
+        case AvailableModesRole:
+        case UncommittedChangesRole:
+        default:
+            return false;
+        }
+        return true;
+    } else {
+        return false;
+    }
+}
+
+
+QHash<int,QByteArray> DisplayModel::roleNames() const
+{
+    static QHash<int,QByteArray> names;
+    if (Q_UNLIKELY(names.empty())) {
+        names[Qt::DisplayRole] = "displayName";
+        names[MirroredRole] = "mirrored";
+        names[ConnectedRole] = "connected";
+        names[EnabledRole] = "enabled";
+        names[ModeRole] = "mode";
+        names[AvailableModesRole] = "availableModes";
+        names[OrientationRole] = "orientation";
+        names[ScaleRole] = "scale";
+        names[UncommittedChangesRole] = "uncommittedChanges";
+    }
+    return names;
+}
+
+void DisplayModel::addDisplay(const QSharedPointer<Display> &display)
+{
+    // TODO: find display
+    int row = -1;
+
+    if (row >= 0) { // update existing display
+        m_displays[row] = display;
+        emitRowChanged(row);
+    } else { // add new display
+        row = m_displays.size();
+        beginInsertRows(QModelIndex(), row, row);
+        m_displays.append(display);
+        endInsertRows();
+    }
+
+   if (display) {
+        QObject::connect(display.data(), SIGNAL(displayChanged(const Display*)),
+                         this, SLOT(displayChangedSlot(const Display*)));
+    }
+
+    Q_EMIT countChanged();
+}
+
+void DisplayModel::emitRowChanged(const int &row)
+{
+    if (0 <= row && row < m_displays.size()) {
+        QModelIndex qmi = index(row, 0);
+        Q_EMIT(dataChanged(qmi, qmi));
+    }
+}
+
+void DisplayModel::displayChangedSlot(const Display *display)
+{
+    // find the row that goes with this display
+    int row = -1;
+    if (display != nullptr)
+        for (int i = 0, n = m_displays.size(); row == -1 && i < n; i++)
+            if (m_displays[i].data() == display)
+                row = i;
+
+    if (row != -1)
+        emitRowChanged(row);
+}
+
+bool DisplaysFilter::lessThan(const QModelIndex &left,
+                              const QModelIndex &right) const
+{
+    const QString a = sourceModel()->data(left, Qt::DisplayRole).value<QString>();
+    const QString b = sourceModel()->data(right, Qt::DisplayRole).value<QString>();
+    return a < b;
+}
+
+void DisplaysFilter::filterOnUncommittedChanges(const bool apply)
+{
+    m_uncommittedChanges = apply;
+    m_uncommittedChangesEnabled = true;
+    invalidateFilter();
+}
+
+bool DisplaysFilter::filterAcceptsRow(int sourceRow,
+                                      const QModelIndex &sourceParent) const
+{
+    bool accepts = true;
+    QModelIndex childIndex = sourceModel()->index(sourceRow, 0, sourceParent);
+
+    if (accepts && m_uncommittedChangesEnabled) {
+        const bool uncommittedChanges = childIndex.model()->data(childIndex, DisplayModel::UncommittedChangesRole).value<bool>();
+        accepts = (m_uncommittedChanges == uncommittedChanges);
+    }
+
+    return accepts;
+}

=== added file 'plugins/brightness/displays/displaymodel.h'
--- plugins/brightness/displays/displaymodel.h	1970-01-01 00:00:00 +0000
+++ plugins/brightness/displays/displaymodel.h	2016-10-26 14:45:42 +0000
@@ -0,0 +1,82 @@
+#ifndef DISPLAY_MODEL_H
+#define DISPLAY_MODEL_H
+
+#include "display.h"
+
+#include <QAbstractListModel>
+#include <QByteArray>
+#include <QHash>
+#include <QList>
+#include <QModelIndex>
+#include <QSharedPointer>
+#include <QSortFilterProxyModel>
+#include <QVariant>
+
+class DisplayModel : public QAbstractListModel
+{
+    Q_OBJECT
+    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
+public:
+    explicit DisplayModel(QObject *parent = 0);
+    ~DisplayModel();
+
+    enum Roles
+    {
+      // Qt::DisplayRole holds device name
+      TypeRole = Qt::UserRole,
+      MirroredRole,
+      ConnectedRole,
+      EnabledRole,
+      ModeRole,
+      AvailableModesRole,
+      OrientationRole,
+      ScaleRole,
+      UncommittedChangesRole,
+      LastRole = UncommittedChangesRole
+    };
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    bool setData(const QModelIndex &index, const QVariant &value,
+                 int role = Qt::EditRole);
+    QHash<int,QByteArray> roleNames() const;
+
+Q_SIGNALS:
+    void countChanged();
+
+protected:
+    void emitRowChanged(const int &row);
+    void addDisplay(const QSharedPointer<Display> &display);
+
+private:
+    QList<QSharedPointer<Display> > m_displays;
+
+private slots:
+    void displayChangedSlot(const Display *display);
+};
+
+class DisplaysFilter : public QSortFilterProxyModel
+{
+    Q_OBJECT
+    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
+
+public:
+    DisplaysFilter() {}
+    virtual ~DisplaysFilter() {}
+
+    void filterOnUncommittedChanges(const bool apply);
+
+Q_SIGNALS:
+    void countChanged(int count);
+
+protected:
+    virtual bool filterAcceptsRow(int, const QModelIndex&) const;
+    virtual bool lessThan(const QModelIndex&, const QModelIndex&) const;
+
+private:
+    bool m_uncommittedChanges = false;
+    bool m_uncommittedChangesEnabled = false;
+
+};
+
+#endif // DISPLAY_MODEL_H

=== modified file 'plugins/brightness/plugin.cpp'
--- plugins/brightness/plugin.cpp	2016-04-13 18:49:49 +0000
+++ plugins/brightness/plugin.cpp	2016-10-26 14:45:42 +0000
@@ -27,6 +27,9 @@
 #include "aethercast/displays.h"
 #include "aethercast/device.h"
 
+#include "displays/display.h"
+#include "displays/displaymodel.h"
+
 
 void BackendPlugin::registerTypes(const char *uri)
 {
@@ -39,6 +42,9 @@
     qmlRegisterType<Brightness>(uri, 1, 0, "UbuntuBrightnessPanel");
     qmlRegisterType<Device>(uri, 1, 0, "AethercastDevice");
     qmlRegisterType<Displays>(uri, 1, 0, "AethercastDisplays");
+
+    qmlRegisterType<DisplayModel>(uri, 1, 0, "DisplayModel");
+    qmlRegisterType<Display>(uri, 1, 0, "Display");
 }
 
 void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'tests/mocks/Ubuntu/SystemSettings/Brightness/CMakeLists.txt'
--- tests/mocks/Ubuntu/SystemSettings/Brightness/CMakeLists.txt	2016-10-26 14:45:41 +0000
+++ tests/mocks/Ubuntu/SystemSettings/Brightness/CMakeLists.txt	2016-10-26 14:45:42 +0000
@@ -1,6 +1,7 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/plugins/brightness/
+    ${CMAKE_SOURCE_DIR}/plugins/brightness/displays
 )
 
 set(MOCK_BRIGHTNESS_SRCS
@@ -8,6 +9,13 @@
     MockAethercastDeviceModel.cpp
     MockAethercastDisplays.cpp
     MockBrightness.cpp
+
+    ${CMAKE_SOURCE_DIR}/plugins/brightness/displays/display.h
+    ${CMAKE_SOURCE_DIR}/plugins/brightness/displays/displaymodel.h
+    MockDisplay.h
+    MockDisplayModel.h
+    ${CMAKE_SOURCE_DIR}/plugins/brightness/displays/display.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/brightness/displays/displaymodel.cpp
     plugin.cpp
 )
 

=== modified file 'tests/mocks/Ubuntu/SystemSettings/Brightness/MockAethercastDisplays.cpp'
--- tests/mocks/Ubuntu/SystemSettings/Brightness/MockAethercastDisplays.cpp	2016-10-26 14:45:41 +0000
+++ tests/mocks/Ubuntu/SystemSettings/Brightness/MockAethercastDisplays.cpp	2016-10-26 14:45:42 +0000
@@ -19,71 +19,71 @@
 
 #include <QQmlEngine>
 
-void MockDisplays::connectDevice(const QString &address)
-{
-    Q_UNUSED(address)
-}
-
-void MockDisplays::disconnectDevice(const QString &address)
-{
-    Q_UNUSED(address)
-}
-
-void MockDisplays::scan()
+void MockAethercastDisplays::connectDevice(const QString &address)
+{
+    Q_UNUSED(address)
+}
+
+void MockAethercastDisplays::disconnectDevice(const QString &address)
+{
+    Q_UNUSED(address)
+}
+
+void MockAethercastDisplays::scan()
 {
     m_scanning = true;
     Q_EMIT scanningChanged(m_scanning);
 }
 
-void MockDisplays::stopScan()
+void MockAethercastDisplays::stopScan()
 {
     m_scanning = false;
     Q_EMIT scanningChanged(m_scanning);
 }
 
-void MockDisplays::setProperties(const QMap<QString, QVariant> &properties)
+void MockAethercastDisplays::setProperties(const QMap<QString, QVariant> &properties)
 {
     Q_UNUSED(properties)
 }
 
-QAbstractItemModel* MockDisplays::devices()
+QAbstractItemModel* MockAethercastDisplays::devices()
 {
     auto ret = &m_devices;
     QQmlEngine::setObjectOwnership(ret, QQmlEngine::CppOwnership);
     return ret;
 }
 
-QAbstractItemModel* MockDisplays::connectedDevices()
+QAbstractItemModel* MockAethercastDisplays::connectedDevices()
 {
     auto ret = &m_connectedDevices;
     QQmlEngine::setObjectOwnership(ret, QQmlEngine::CppOwnership);
     return ret;
 }
 
-QAbstractItemModel* MockDisplays::disconnectedDevices()
+QAbstractItemModel* MockAethercastDisplays::disconnectedDevices()
 {
     auto ret = &m_disconnectedDevices;
     QQmlEngine::setObjectOwnership(ret, QQmlEngine::CppOwnership);
     return ret;
 }
 
-bool MockDisplays::scanning() const
+bool MockAethercastDisplays::scanning() const
 {
     return m_scanning;
 }
 
-bool MockDisplays::enabled() const
+bool MockAethercastDisplays::enabled() const
 {
     return m_enabled;
 }
 
-void MockDisplays::setEnabled(const bool enabled)
+void MockAethercastDisplays::setEnabled(const bool enabled)
 {
     m_enabled = enabled;
     Q_EMIT enabledChanged(enabled);
 }
 
-QString MockDisplays::state() const
+QString MockAethercastDisplays::state() const
 {
     return m_state;
 }

=== modified file 'tests/mocks/Ubuntu/SystemSettings/Brightness/MockAethercastDisplays.h'
--- tests/mocks/Ubuntu/SystemSettings/Brightness/MockAethercastDisplays.h	2016-10-26 14:45:41 +0000
+++ tests/mocks/Ubuntu/SystemSettings/Brightness/MockAethercastDisplays.h	2016-10-26 14:45:42 +0000
@@ -23,7 +23,7 @@
 
 #include <QObject>
 
-class MockDisplays : public QObject
+class MockAethercastDisplays : public QObject
 {
     Q_OBJECT
     Q_PROPERTY (QAbstractItemModel* devices
@@ -46,10 +46,10 @@
                 READ state
                 NOTIFY stateChanged)
 public:
-    explicit MockDisplays(QObject *parent = nullptr) {
+    explicit MockAethercastDisplays(QObject *parent = nullptr) {
         Q_UNUSED(parent)
     };
-    ~MockDisplays() {}
+    ~MockAethercastDisplays() {}
 
     enum Error {
         None,

=== modified file 'tests/mocks/Ubuntu/SystemSettings/Brightness/MockBrightness.cpp'
--- tests/mocks/Ubuntu/SystemSettings/Brightness/MockBrightness.cpp	2016-10-26 14:45:41 +0000
+++ tests/mocks/Ubuntu/SystemSettings/Brightness/MockBrightness.cpp	2016-10-26 14:45:42 +0000
@@ -15,8 +15,20 @@
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include "MockDisplayModel.h"
 #include "MockBrightness.h"
 
+#include <QQmlEngine>
+
+MockBrightness::MockBrightness(QObject *parent)
+    : QObject(parent)
+    , m_displays()
+    , m_changedDisplays()
+{
+    m_changedDisplays.filterOnUncommittedChanges(true);
+    m_changedDisplays.setSourceModel(&m_displays);
+}
+
 bool MockBrightness::getPowerdRunning() const
 {
     return m_powerdRunning;
@@ -49,3 +61,27 @@
     m_widiSupported = supported;
     Q_EMIT widiSupportedChanged();
 }
+
+QAbstractItemModel* MockBrightness::allDisplays()
+{
+    auto ret = &m_displays;
+    QQmlEngine::setObjectOwnership(ret, QQmlEngine::CppOwnership);
+    return ret;
+}
+
+QAbstractItemModel* MockBrightness::changedDisplays()
+{
+    auto ret = &m_changedDisplays;
+    QQmlEngine::setObjectOwnership(ret, QQmlEngine::CppOwnership);
+    return ret;
+}
+
+void MockBrightness::applyDisplayConfiguration()
+{
+
+}
+
+MockDisplayModel* MockBrightness::displayModel()
+{
+    return (MockDisplayModel*) allDisplays();
+}

=== modified file 'tests/mocks/Ubuntu/SystemSettings/Brightness/MockBrightness.h'
--- tests/mocks/Ubuntu/SystemSettings/Brightness/MockBrightness.h	2016-10-26 14:45:41 +0000
+++ tests/mocks/Ubuntu/SystemSettings/Brightness/MockBrightness.h	2016-10-26 14:45:42 +0000
@@ -19,7 +19,11 @@
 #ifndef MOCK_BRIGHTNESS_H
 #define MOCK_BRIGHTNESS_H
 
+#include "MockDisplayModel.h"
+
+#include <QAbstractItemModel>
 #include <QObject>
+#include <QSortFilterProxyModel>
 
 class MockBrightness : public QObject
 {
@@ -33,16 +37,25 @@
     Q_PROPERTY (bool widiSupported
                 READ getWidiSupported
                 NOTIFY widiSupportedChanged)
+    Q_PROPERTY (QAbstractItemModel* allDisplays
+                READ allDisplays
+                CONSTANT)
+    Q_PROPERTY (QAbstractItemModel* changedDisplays
+                READ changedDisplays
+                CONSTANT)
+
 public:
-    explicit MockBrightness(QObject *parent = 0) {
-        Q_UNUSED(parent)
-    };
+    explicit MockBrightness(QObject *parent = 0);
     bool getPowerdRunning() const;
     bool getAutoBrightnessAvailable() const;
     bool getWidiSupported() const;
-    Q_INVOKABLE void setPowerdRunning(const bool running); // mock only
-    Q_INVOKABLE void setAutoBrightnessAvailable(const bool available); // mock only
-    Q_INVOKABLE void setWidiSupported(const bool supported); // mock only
+    Q_INVOKABLE void setPowerdRunning(const bool running);
+    Q_INVOKABLE void setAutoBrightnessAvailable(const bool available);
+    Q_INVOKABLE void setWidiSupported(const bool supported);
+    QAbstractItemModel* allDisplays();
+    QAbstractItemModel* changedDisplays();
+    Q_INVOKABLE void applyDisplayConfiguration();
+    Q_INVOKABLE MockDisplayModel* displayModel(); // mock only
 
 Q_SIGNALS:
     void powerdRunningChanged(); // mock only
@@ -53,6 +66,8 @@
     bool m_powerdRunning = false;
     bool m_autoBrightnessAvailable = false;
     bool m_widiSupported = false;
+    MockDisplayModel m_displays;
+    DisplaysFilter m_changedDisplays;
 };
 
 #endif // MOCK_BRIGHTNESS_H

=== added file 'tests/mocks/Ubuntu/SystemSettings/Brightness/MockDisplay.h'
--- tests/mocks/Ubuntu/SystemSettings/Brightness/MockDisplay.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemSettings/Brightness/MockDisplay.h	2016-10-26 14:45:42 +0000
@@ -0,0 +1,52 @@
+#ifndef MOCK_DISPLAY_H
+#define MOCK_DISPLAY_H
+
+#include "display.h"
+
+#include <QObject>
+#include <QDebug>
+
+struct MockDisplay : public Display
+{
+    Q_OBJECT
+public:
+    Q_INVOKABLE void setName(const QString &name) // mock only
+    {
+        m_name = name;
+        Q_EMIT nameChanged();
+    }
+
+    Q_INVOKABLE void setType(const QString &type) // mock only
+    {
+        m_type = type;
+        Q_EMIT typeChanged();
+    }
+
+    Q_INVOKABLE void setConnected(const bool &connected) // mock only
+    {
+        m_connected = connected;
+        Q_EMIT connectedChanged();
+    }
+
+    Q_INVOKABLE void setAvailableModes(const QStringList &availableModes) // mock only
+    {
+        m_availableModes = availableModes;
+        Q_EMIT availableModesChanged();
+    }
+
+    Q_INVOKABLE void setUncommitedChanges(const bool uncommittedChanges) // mock only
+    {
+        m_uncommittedChanges = uncommittedChanges;
+        Q_EMIT uncommittedChangesChanged();
+    }
+
+    Q_INVOKABLE void addMode(const QString &mode) // mock only
+    {
+        m_availableModes.append(mode);
+        Q_EMIT availableModesChanged();
+    }
+};
+
+Q_DECLARE_METATYPE(MockDisplay*)
+
+#endif // MOCK_DISPLAY_H

=== added file 'tests/mocks/Ubuntu/SystemSettings/Brightness/MockDisplayModel.h'
--- tests/mocks/Ubuntu/SystemSettings/Brightness/MockDisplayModel.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemSettings/Brightness/MockDisplayModel.h	2016-10-26 14:45:42 +0000
@@ -0,0 +1,26 @@
+#ifndef MOCK_DISPLAY_MODEL_H
+#define MOCK_DISPLAY_MODEL_H
+
+#include "displaymodel.h"
+#include "MockDisplay.h"
+
+#include <QObject>
+#include <QQmlEngine>
+
+class MockDisplayModel : public DisplayModel
+{
+    Q_OBJECT
+public:
+    MockDisplayModel(QObject *parent = 0) : DisplayModel(parent) {
+    };
+    ~MockDisplayModel() {};
+    Q_INVOKABLE MockDisplay* mockAddDisplay() // mock only
+    {
+        QSharedPointer<MockDisplay> d = QSharedPointer<MockDisplay>(new MockDisplay);
+        addDisplay(d);
+        QQmlEngine::setObjectOwnership(d.data(), QQmlEngine::CppOwnership);
+        return d.data();
+    }
+};
+
+#endif // MOCK_DISPLAY_MODEL_H

=== modified file 'tests/mocks/Ubuntu/SystemSettings/Brightness/plugin.cpp'
--- tests/mocks/Ubuntu/SystemSettings/Brightness/plugin.cpp	2016-10-26 14:45:41 +0000
+++ tests/mocks/Ubuntu/SystemSettings/Brightness/plugin.cpp	2016-10-26 14:45:42 +0000
@@ -22,6 +22,9 @@
 #include "MockAethercastDeviceModel.h"
 #include "MockAethercastDisplays.h"
 
+#include "MockDisplay.h"
+#include "MockDisplayModel.h"
+
 #include <QtQml>
 
 void BackendPlugin::registerTypes(const char *uri)
@@ -29,5 +32,8 @@
     Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.Brightness"));
     qmlRegisterType<MockBrightness>(uri, 1, 0, "UbuntuBrightnessPanel");
     qmlRegisterType<MockAethercastDevice>(uri, 1, 0, "AethercastDevice");
-    qmlRegisterType<MockDisplays>(uri, 1, 0, "AethercastDisplays");
+    qmlRegisterType<MockAethercastDisplays>(uri, 1, 0, "AethercastDisplays");
+
+    qmlRegisterUncreatableType<MockDisplay>(uri, 1, 0, "Display", "Not to be instantiated directly.");
+    qmlRegisterType<MockDisplayModel>(uri, 1, 0, "DisplayModel");
 }

=== modified file 'tests/plugins/brightness/tst_BrightnessPageComponent.qml'
--- tests/plugins/brightness/tst_BrightnessPageComponent.qml	2016-10-26 14:45:41 +0000
+++ tests/plugins/brightness/tst_BrightnessPageComponent.qml	2016-10-26 14:45:42 +0000
@@ -86,5 +86,26 @@
             verify(entry.enabled);
             compare(entry.value, i18n.tr("Not connected"));
         }
+
+        // Test that everything is hidden if only aethercast devices (or none)
+        function test_no_displays() {
+            var repeater = findChild(instance, "displayConfigurationRepeater");
+            compare(repeater.count, 0);
+        }
+
+        // Test that there's a UI when we have some display available.
+        function test_one_display() {
+            var displayModel = get_panel_plugin().displayModel();
+            var display = displayModel.mockAddDisplay();
+            display.setName("Foo")
+            display.addMode("1600x1200x60")
+            display.addMode("1280x1024x60")
+            display.mode = "1600x1200x60"
+
+            var repeater = findChild(instance, "displayConfigurationRepeater");
+            var panel = findChild(instance, "displayConfiguration_" + display.name);
+            verify(panel.visible);
+            compare(repeater.count, 1);
+        }
     }
 }