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

[Jonas G. Drange]

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

1579. By Jonas G. Drange on 2015-12-23

cleanup in mirdisplays and 1.0->1.3

1580. By Jonas G. Drange on 2015-12-24

some doccing as well as cleanup of imports

1581. By Jonas G. Drange on 2016-01-03

add orientation and fix local/actual code

Unmerged revisions

1581. By Jonas G. Drange on 2016-01-03

add orientation and fix local/actual code

1580. By Jonas G. Drange on 2015-12-24

some doccing as well as cleanup of imports

1579. By Jonas G. Drange on 2015-12-23

cleanup in mirdisplays and 1.0->1.3

1578. By Jonas G. Drange on 2015-12-23

mirdisplays

1577. By Jonas G. Drange on 2015-12-22

add display config

=== modified file 'debian/control'
--- debian/control	2015-11-10 15:24:27 +0000
+++ debian/control	2016-01-03 21:35:16 +0000
@@ -15,6 +15,7 @@
                libclick-0.4-dev,
                libglib2.0-dev (>= 2.37.92),
                libicu-dev,
+               libmirclient-dev,
                libnm-glib-dev,
                libpolkit-agent-1-dev,
                libqmenumodel-dev,
@@ -26,6 +27,7 @@
                qml-module-ubuntu-connectivity (>= 0.5.5),
                qt5-default,
                qtbase5-dev,
+               qtbase5-private-dev,
                qtdeclarative5-dev,
                libapt-pkg-dev,
 # test-deps

=== modified file 'plugins/brightness/CMakeLists.txt'
--- plugins/brightness/CMakeLists.txt	2014-10-25 00:30:46 +0000
+++ plugins/brightness/CMakeLists.txt	2016-01-03 21:35:16 +0000
@@ -1,18 +1,41 @@
 add_subdirectory(plugin)
 
+pkg_search_module(MIR REQUIRED mirclient)
+find_package(Qt5Gui)
+include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS} ${MIR_INCLUDE_DIRS})
+
 set(QML_SOURCES
     PageComponent.qml
+    PageResolution.qml
+    PageRotation.qml
+    ExternalDisplay.qml
 )
 
+add_library(uss-displays SHARED
+                display.h
+                display.cpp
+                displaymodel.h
+                displaymodel.cpp
+                mirdisplays.h
+                mirdisplays.cpp
+                displays.h
+                displays.cpp)
+qt5_use_modules(uss-displays Quick DBus)
+set_target_properties(uss-displays PROPERTIES VERSION 0.0 SOVERSION 0.0)
+target_link_libraries(uss-displays ${Qt5Gui_PRIVATE_LDFLAGS} ${MIR_LDFLAGS})
+
 add_library(UbuntuBrightnessPanel MODULE
+                brightness.h
+                brightness.cpp
                 plugin.h
-                brightness.h
                 plugin.cpp
-                brightness.cpp
                 ${QML_SOURCES})
 qt5_use_modules(UbuntuBrightnessPanel Quick Qml DBus)
 
+target_link_libraries(UbuntuBrightnessPanel uss-displays)
+
 set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/Brightness)
+install(TARGETS uss-displays DESTINATION ${PLUGIN_MODULE_DIR})
 install(TARGETS UbuntuBrightnessPanel DESTINATION ${PLUG_DIR})
 install(FILES qmldir DESTINATION ${PLUG_DIR})
 install(FILES brightness.settings DESTINATION ${PLUGIN_MANIFEST_DIR})

=== added file 'plugins/brightness/ExternalDisplay.qml'
--- plugins/brightness/ExternalDisplay.qml	1970-01-01 00:00:00 +0000
+++ plugins/brightness/ExternalDisplay.qml	2016-01-03 21:35:16 +0000
@@ -0,0 +1,195 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Jonas G. Drange <[e-mail]>
+ */
+
+import QtQuick 2.4
+import SystemSettings 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItems
+import Ubuntu.Settings.Menus 0.1 as Menus
+import Ubuntu.Settings.Components 0.1 as USC
+import Ubuntu.SystemSettings.Brightness 1.0
+
+Column {
+
+    property var localOrientation
+    property string localMode
+    property var localEnabled
+
+    signal apply();
+
+    ListItems.Standard {
+        text: i18n.tr("External display")
+        enabled: model.connected
+        onClicked: enabledCheck.trigger()
+        control: CheckBox {
+            id: enabledCheck
+            property bool serverChecked: model.enabled
+            onServerCheckedChanged: checked = serverChecked
+            Component.onCompleted: checked = serverChecked
+            onTriggered: {
+                console.warn('disabling display');
+                localEnabled = checked;
+            }
+        }
+    }
+
+    ListItems.SingleValue {
+        text: i18n.tr("Rotation")
+        value: {
+            console.warn('display orientation', model.orientation);
+            switch (model.orientation) {
+                case Display.Normal:
+                    return i18n.tr("None");
+                    break;
+                case Display.PortraitMode:
+                    return i18n.tr("90° clockwise");
+                    break;
+                case Display.LandscapeInvertedMode:
+                    return i18n.tr("180° clockwise");
+                    break;
+                case Display.PortraitInvertedMode:
+                    return i18n.tr("270° clockwise");
+                    break;
+                default:
+                    throw "Unable to determine orientation type.";
+            }
+        }
+        visible: model.enabled
+        progression: true
+        onClicked: {
+            var rotationPage = pageStack.push(
+                Qt.resolvedUrl("PageRotation.qml"), {
+                    orientation: model.orientation
+                }
+            );
+            rotationPage.orientationChanged.connect(
+                function () {
+                    console.warn('locally setting orientation', rotationPage.orientation);
+                    localOrientation = rotationPage.orientation;
+                }
+            );
+        }
+    }
+
+    ListItems.SingleValue {
+        text: i18n.tr("Resolution")
+        value: model.mode
+        visible: model.enabled
+        progression: true
+        onClicked: {
+            var resPage = pageStack.push(
+                Qt.resolvedUrl("PageResolution.qml"), {
+                    modes: availableModes,
+                    mode: mode
+                }
+            );
+            resPage.modeChanged.connect(
+                function (mode) {
+                    localMode = mode;
+                }
+            );
+        }
+    }
+
+    SettingsItemTitle {
+        text: i18n.tr("Scale UI elements")
+        visible: model.enabled && showAllUI
+        showDivider: false
+    }
+
+    Menus.SliderMenu {
+        id: scaleSlider
+        objectName: "scaleSlider"
+        visible: model.enabled && showAllUI
+        live: true
+        minimumValue: 0.0
+        maximumValue: 100.0
+        value: localScale >= 0 ? localScale : model.scale
+        onUpdated: localScale = value
+    }
+
+    Column {
+        anchors {
+            left: parent.left;
+            right: parent.right
+            leftMargin: spacing
+            rightMargin: spacing
+        }
+        visible: model.enabled
+        spacing: units.gu(1)
+
+        Button {
+            anchors { left: parent.left; right: parent.right }
+            text: i18n.tr("Apply changes")
+            enabled: localOrientation ||
+                     localMode ||
+                     (typeof localEnabled !== "undefined")
+            onClicked: {
+                if (localOrientation) {
+                    model.orientation = localOrientation;
+                    localOrientation = null;
+                }
+
+                if (localMode) {
+                    model.mode = localMode;
+                    localMode = "";
+                }
+
+                if (typeof localEnabled !== "undefined") {
+                    model.enabled = localEnabled;
+                    localEnabled = null;
+                }
+
+                apply();
+            }
+        }
+
+        ListItems.ThinDivider { opacity: 0 }
+
+        Button {
+            anchors { left: parent.left; right: parent.right }
+            text: i18n.tr("Sound settings…")
+            onClicked: {
+                var sPlugin = pluginManager.getByName("sound")
+                if (sPlugin) {
+                    var soundPage = sPlugin.pageComponent;
+                    if (soundPage)
+                        pageStack.push(soundPage);
+                    else
+                        console.warn(
+                            "Failed to get sound page " +
+                            "pageComponent"
+                        );
+                } else {
+                    console.warn(
+                        "Failed to get sound plugin " +
+                        "instance"
+                    )
+                }
+            }
+        }
+
+        Button {
+            anchors { left: parent.left; right: parent.right }
+            text: i18n.tr("External keyboard…")
+        }
+    }
+}

=== modified file 'plugins/brightness/PageComponent.qml'
--- plugins/brightness/PageComponent.qml	2015-08-10 13:31:45 +0000
+++ plugins/brightness/PageComponent.qml	2016-01-03 21:35:16 +0000
@@ -38,70 +38,107 @@
         id: brightnessPanel
     }
 
-    Column {
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        QDBusActionGroup {
-            id: indicatorPower
-            busType: 1
-            busName: "com.canonical.indicator.power"
-            objectPath: "/com/canonical/indicator/power"
-
-            property variant brightness: action("brightness")
-
-            Component.onCompleted: start()
-        }
-
-        ListItem.Standard {
-            text: i18n.tr("Display brightness")
-            showDivider: false
-        }
-
-        /* Use the SliderMenu component instead of the Slider to avoid binding
-           issues on valueChanged until LP: #1388094 is fixed.
-        */
-        Menus.SliderMenu {
-            id: brightnessSlider
-            objectName: "sliderMenu"
-            enabled: indicatorPower.brightness.state != null
-            live: true
-            minimumValue: 0.0
-            maximumValue: 100.0
-            minIcon: "image://theme/display-brightness-min"
-            maxIcon: "image://theme/display-brightness-max"
-
-            property real serverValue: enabled ? indicatorPower.brightness.state * 100 : 0.0
-
-            USC.ServerPropertySynchroniser {
-                userTarget: brightnessSlider
-                userProperty: "value"
-                serverTarget: brightnessSlider
-                serverProperty: "serverValue"
-                maximumWaitBufferInterval: 16
-
-                onSyncTriggered: indicatorPower.brightness.updateState(value / 100.0)
-            }
-        }
-
-        ListItem.Standard {
-            id: adjust
-            text: i18n.tr("Adjust automatically")
-            visible: brightnessPanel.powerdRunning &&
-                     brightnessPanel.autoBrightnessAvailable
-            control: CheckBox {
-                id: autoAdjustCheck
-                property bool serverChecked: gsettings.autoBrightness
-                onServerCheckedChanged: checked = serverChecked
-                Component.onCompleted: checked = serverChecked
-                onTriggered: gsettings.autoBrightness = checked
-            }
-            showDivider: false
-        }
-        ListItem.Caption {
-            text: i18n.tr(
-                    "Brightens and dims the display to suit the surroundings.")
-            visible: adjust.visible
+    Flickable {
+        anchors.fill: parent
+        contentHeight: contentItem.childrenRect.height
+        boundsBehavior: (contentHeight > root.height) ?
+                            Flickable.DragAndOvershootBounds :
+                            Flickable.StopAtBounds
+        /* Set the direction to workaround
+           https://bugreports.qt-project.org/browse/QTBUG-31905 otherwise the UI
+           might end up in a situation where scrolling doesn't work */
+        flickableDirection: Flickable.VerticalFlick
+
+        Column {
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            QDBusActionGroup {
+                id: indicatorPower
+                busType: 1
+                busName: "com.canonical.indicator.power"
+                objectPath: "/com/canonical/indicator/power"
+
+                property variant brightness: action("brightness")
+
+                Component.onCompleted: start()
+            }
+
+            SettingsItemTitle {
+                text: i18n.tr("Display brightness")
+                showDivider: false
+            }
+
+            /* Use the SliderMenu component instead of the Slider to avoid binding
+               issues on valueChanged until LP: #1388094 is fixed.
+            */
+            Menus.SliderMenu {
+                id: brightnessSlider
+                objectName: "sliderMenu"
+                enabled: indicatorPower.brightness.state != null
+                live: true
+                minimumValue: 0.0
+                maximumValue: 100.0
+                minIcon: "image://theme/display-brightness-min"
+                maxIcon: "image://theme/display-brightness-max"
+                showDivider: adjust.visible
+                property real serverValue: enabled ? indicatorPower.brightness.state * 100 : 0.0
+
+                USC.ServerPropertySynchroniser {
+                    userTarget: brightnessSlider
+                    userProperty: "value"
+                    serverTarget: brightnessSlider
+                    serverProperty: "serverValue"
+                    maximumWaitBufferInterval: 16
+
+                    onSyncTriggered: indicatorPower.brightness.updateState(value / 100.0)
+                }
+            }
+
+            ListItem.Standard {
+                id: adjust
+                text: i18n.tr("Adjust automatically")
+                visible: brightnessPanel.powerdRunning &&
+                         brightnessPanel.autoBrightnessAvailable
+                control: CheckBox {
+                    id: autoAdjustCheck
+                    property bool serverChecked: gsettings.autoBrightness
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: gsettings.autoBrightness = checked
+                }
+                showDivider: false
+            }
+
+            ListItem.Caption {
+                text: i18n.tr(
+                        "Brightens and dims the display to suit the surroundings.")
+                visible: adjust.visible
+            }
+
+            ListItem.Divider {
+                visible: brightnessPanel.displays.count > 0
+            }
+
+            Repeater {
+                id: rep
+                model: brightnessPanel.displays
+
+                delegate: ExternalDisplay {
+                    Component.onCompleted: console.warn('model.mode', mode);
+                    onApply: {
+                        console.warn('apply event obseverd by pagecompo');
+                        brightnessPanel.configureDisplay();
+                    }
+                    anchors { left: parent.left; right: parent.right }
+                }
+            }
+
+            ListItem.Divider {
+                anchors { left: parent.left; right: parent.right; }
+                height: units.gu(10)
+                opacity: 0
+            }
         }
     }
 

=== added file 'plugins/brightness/PageResolution.qml'
--- plugins/brightness/PageResolution.qml	1970-01-01 00:00:00 +0000
+++ plugins/brightness/PageResolution.qml	2016-01-03 21:35:16 +0000
@@ -0,0 +1,65 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Jonas G. Drange <[e-mail]>
+ */
+
+import QtQuick 2.0
+import SystemSettings 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.SystemSettings.Brightness 1.0
+
+ItemPage {
+    id: root
+    title: i18n.tr("Resolution")
+    objectName: "modePage"
+
+    property var modes
+    property string mode
+
+    Flickable {
+        id: scrollWidget
+        anchors.fill: parent
+        contentHeight: contentItem.childrenRect.height
+        boundsBehavior: (contentHeight > root.height) ?
+                        Flickable.DragAndOvershootBounds :
+                        Flickable.StopAtBounds
+
+        Column {
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            ListItem.ItemSelector {
+                id: modeSelector
+                objectName: "modeSelector"
+                delegate: OptionSelectorDelegate {
+                    text: modelData
+                }
+                model: modes
+                expanded: true
+                highlightWhenPressed: false
+                onDelegateClicked: mode = model[index]
+                Component.onCompleted: {
+                    selectedIndex = modes.indexOf(mode)
+                    console.warn("slected", modes, mode, modes.indexOf(mode))
+                }
+            }
+        }
+    }
+}

=== added file 'plugins/brightness/PageRotation.qml'
--- plugins/brightness/PageRotation.qml	1970-01-01 00:00:00 +0000
+++ plugins/brightness/PageRotation.qml	2016-01-03 21:35:16 +0000
@@ -0,0 +1,96 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Jonas G. Drange <[e-mail]>
+ */
+
+import QtQuick 2.0
+import SystemSettings 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.SystemSettings.Brightness 1.0
+
+ItemPage {
+    id: root
+    title: i18n.tr("Resolution")
+    objectName: "resolutionPage"
+
+    property var orientation
+
+    Flickable {
+        id: scrollWidget
+        anchors.fill: parent
+        contentHeight: contentItem.childrenRect.height
+        boundsBehavior: (contentHeight > root.height) ?
+                        Flickable.DragAndOvershootBounds :
+                        Flickable.StopAtBounds
+
+        Column {
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            ListItem.ItemSelector {
+                id: orientationSelector
+                objectName: "orientationSelector"
+                model: [
+                    i18n.tr("None"),
+                    i18n.tr("90° clockwise"),
+                    i18n.tr("180° clockwise"),
+                    i18n.tr("270° clockwise")
+                ]
+                expanded: true
+                highlightWhenPressed: false
+                onDelegateClicked: {
+                    switch (index) {
+                        case 0:
+                            orientation = Display.Normal;
+                            break;
+                        case 1:
+                            orientation = Display.PortraitMode;
+                            break;
+                        case 2:
+                            orientation = Display.LandscapeInvertedMode;
+                            break;
+                        case 3:
+                            orientation = Display.PortraitInvertedMode;
+                            break;
+                    }
+                }
+                Component.onCompleted: {
+                    console.warn('orientation', orientation)
+                    switch (orientation) {
+                        case Display.Normal:
+                            selectedIndex = 0;
+                            break;
+                        case Display.PortraitMode:
+                            selectedIndex = 1;
+                            break;
+                        case Display.LandscapeInvertedMode:
+                            selectedIndex = 2;
+                            break;
+                        case Display.PortraitInvertedMode:
+                            selectedIndex = 3;
+                            break;
+                        default:
+                            throw "Unable to determine orientation type.";
+                    }
+                }
+            }
+        }
+    }
+}

=== modified file 'plugins/brightness/brightness.cpp'
--- plugins/brightness/brightness.cpp	2014-12-08 21:41:24 +0000
+++ plugins/brightness/brightness.cpp	2016-01-03 21:35:16 +0000
@@ -20,10 +20,13 @@
 
 #include "brightness.h"
 
+//#include <qpa/qplatformnativeinterface.h>
+
 #include <QDBusArgument>
 #include <QDBusReply>
 #include <QDBusMetaType>
 #include <QDebug>
+#include <QGuiApplication>
 
 // Returned data from getBrightnessParams
 struct BrightnessParams {
@@ -61,7 +64,8 @@
                    "com.canonical.powerd",
                    m_systemBusConnection),
     m_powerdRunning(false),
-    m_autoBrightnessAvailable(false)
+    m_autoBrightnessAvailable(false),
+    m_displays(this)
 {
     qRegisterMetaType<BrightnessParams>();
     m_powerdRunning = m_powerdIface.isValid();
@@ -90,3 +94,11 @@
 bool Brightness::getPowerdRunning() const {
     return m_powerdRunning;
 }
+
+QAbstractItemModel * Brightness::displays() {
+    return m_displays.displays();
+}
+
+void Brightness::configureDisplay() {
+    m_displays.applyDisplayConfiguration();
+}

=== modified file 'plugins/brightness/brightness.h'
--- plugins/brightness/brightness.h	2014-01-27 13:01:26 +0000
+++ plugins/brightness/brightness.h	2016-01-03 21:35:16 +0000
@@ -23,6 +23,7 @@
 
 #include <QDBusInterface>
 #include <QObject>
+#include "displays.h"
 
 class Brightness : public QObject
 {
@@ -33,11 +34,16 @@
     Q_PROPERTY (bool autoBrightnessAvailable
                 READ getAutoBrightnessAvailable
                 CONSTANT)
+    Q_PROPERTY (QAbstractItemModel * displays
+                READ displays
+                CONSTANT)
 
 public:
     explicit Brightness(QObject *parent = 0);
     bool getPowerdRunning() const;
     bool getAutoBrightnessAvailable() const;
+    QAbstractItemModel * displays();
+    Q_INVOKABLE void configureDisplay();
 
 private:
     QDBusConnection m_systemBusConnection;
@@ -45,6 +51,7 @@
     QDBusInterface m_powerdIface;
     bool m_powerdRunning;
     bool m_autoBrightnessAvailable;
+    Displays m_displays;
 };
 
 #endif // BRIGHTNESS_H

=== modified file 'plugins/brightness/brightness.settings'
--- plugins/brightness/brightness.settings	2014-09-24 17:10:03 +0000
+++ plugins/brightness/brightness.settings	2016-01-03 21:35:16 +0000
@@ -14,5 +14,6 @@
     ],
     "has-dynamic-keywords": false,
     "has-dynamic-visibility": true,
+    "has-dynamic-name": true,
     "page-component": "PageComponent.qml"
 }

=== added file 'plugins/brightness/display.cpp'
--- plugins/brightness/display.cpp	1970-01-01 00:00:00 +0000
+++ plugins/brightness/display.cpp	2016-01-03 21:35:16 +0000
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Jonas G. Drange <[e-mail]>
+ *
+ */
+
+#include <QDebug>
+
+#include "display.h"
+
+Display::Display(MirDisplayOutput *output) {
+    setDisplayOutput(output);
+}
+
+void Display::updateModes() {
+    qWarning() << "updateModes";
+    for (unsigned int i = 0; i < m_mirOutput->num_modes; ++i) {
+        MirDisplayMode mode = m_mirOutput->modes[i];
+        m_availableModes <<  QString("%1x%2x%3").arg(
+                QString::number(mode.vertical_resolution),
+                QString::number(mode.horizontal_resolution),
+                QString::number(mode.refresh_rate));
+        qWarning() << "mode" << i << m_availableModes;
+        if (i == m_mirOutput->current_mode) {
+            m_currentMode = i;
+            m_refreshRate = mode.refresh_rate;
+        }
+    }
+}
+
+void Display::updateSizes() {
+    qWarning() << "updateSizes";
+    m_physicalSize = QSizeF(
+        QSize(m_mirOutput->physical_width_mm,
+              m_mirOutput->physical_height_mm)
+    );
+}
+
+void Display::updateOrientation() {
+    qWarning() << "updateOrientation";
+    m_orientation = m_mirOutput->orientation;
+}
+
+int Display::id() const {
+    return m_id;
+}
+bool Display::enabled() const {
+    return m_enabled && m_powerMode == mir_power_mode_on;
+}
+
+bool Display::connected() const {
+    return m_connected;
+}
+
+QString Display::mode() const {
+    return m_availableModes.value(m_currentMode, QString());
+}
+
+QStringList Display::availableModes() const {
+    return m_availableModes;
+}
+
+Display::Orientation Display::orientation() const {
+    qWarning() << __PRETTY_FUNCTION__ << m_orientation;
+    switch (m_orientation) {
+        case mir_orientation_normal:
+            return Display::Orientation::Normal;
+        case mir_orientation_left:
+            return Display::Orientation::PortraitMode;
+        case mir_orientation_inverted:
+            return Display::Orientation::LandscapeInvertedMode;
+        case mir_orientation_right:
+            return Display::Orientation::PortraitInvertedMode;
+        default:
+            return Display::Orientation::Normal;
+    }
+}
+
+MirDisplayOutput * Display::getDisplayOutput() const {
+    return m_mirOutput;
+}
+
+void Display::setEnabled(const bool &enabled) {
+    m_mirOutput->used = enabled;
+    if (enabled) {
+        int index = m_availableModes.indexOf(mode());
+        uint32_t i = (uint32_t)index;
+        m_mirOutput->current_mode = i;
+        m_mirOutput->power_mode = mir_power_mode_on;
+    } else {
+        m_mirOutput->current_mode = 0;
+        m_mirOutput->power_mode = mir_power_mode_standby;
+    }
+    m_powerMode = m_mirOutput->power_mode;
+}
+
+void Display::setMode(const QString &mode) {
+    int index = m_availableModes.indexOf(mode);
+    if (index >= 0) {
+        uint32_t i = (uint32_t)index;
+        m_mirOutput->current_mode = i;
+    } else {
+        qWarning() << __PRETTY_FUNCTION__ << "failed to set mode to" << mode;
+    }
+}
+
+void Display::setOrientation(const Orientation &orientation) {
+    qWarning() << __PRETTY_FUNCTION__ << orientation;
+    MirOrientation newOrientation;
+    switch (orientation) {
+        case Display::Orientation::Normal:
+            newOrientation = mir_orientation_normal;
+            break;
+        case Display::Orientation::PortraitMode:
+            newOrientation = mir_orientation_left;
+            break;
+        case Display::Orientation::LandscapeInvertedMode:
+            newOrientation = mir_orientation_inverted;
+            break;
+        case Display::Orientation::PortraitInvertedMode:
+            newOrientation = mir_orientation_right;
+            break;
+        default:
+            newOrientation = mir_orientation_normal;
+    }
+    m_orientation = newOrientation;
+}
+
+void Display::setDisplayOutput(MirDisplayOutput * output) {
+    qWarning() << __PRETTY_FUNCTION__ << output;
+    m_mirOutput = output;
+    if (output) {
+        m_connected = output->connected;
+        m_enabled = output->used && output->power_mode == mir_power_mode_on;
+        m_id = output->output_id;
+        m_powerMode = static_cast<MirPowerMode>(output->power_mode);
+        m_orientation = static_cast<MirOrientation>(output->orientation);
+        qWarning() << "Sat display output, type:"
+            << output->type
+            << "connected:" << output->connected
+            << "used:" << output->used
+            << "orientation:" << output->orientation;
+
+        updateModes();
+        updateOrientation();
+        updateSizes();
+    }
+}

=== added file 'plugins/brightness/display.h'
--- plugins/brightness/display.h	1970-01-01 00:00:00 +0000
+++ plugins/brightness/display.h	2016-01-03 21:35:16 +0000
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Jonas G. Drange <[e-mail]>
+ *
+ * A abstraction of a display, currently only suitable for use with Mir.
+ * Note: It is assumed that this class will eventually be replaced
+ * by QScreen objects produced by platform abstraction APIs.
+ */
+
+#ifndef DISPLAY_H
+#define DISPLAY_H
+
+#include <QDBusInterface>
+#include <QObject>
+#include <QScreen>
+#include <mir_toolkit/client_types.h>
+
+struct Display : QObject
+{
+    Q_OBJECT
+
+public:
+
+    Display() {}
+    ~Display() {}
+    Display(MirDisplayOutput * output);
+    Q_PROPERTY( int id
+                READ id
+                CONSTANT )
+    Q_PROPERTY( bool enabled
+                READ enabled
+                WRITE setEnabled
+                NOTIFY enabledChanged )
+    Q_PROPERTY( bool connected
+                READ connected
+                NOTIFY connectedChanged )
+    Q_PROPERTY( QStringList availableModes
+                READ availableModes
+                NOTIFY availableModesChanged )
+    Q_PROPERTY( QString mode
+                READ mode
+                WRITE setMode
+                NOTIFY modeChanged )
+    Q_PROPERTY( Orientation orientation
+                READ orientation
+                WRITE setOrientation
+                NOTIFY orientationChanged )
+
+    enum Orientation {
+        Normal, PortraitMode, LandscapeInvertedMode,
+        PortraitInvertedMode
+    };
+
+    Q_ENUMS(Orientation)
+
+    int id() const;
+
+    bool enabled() const;
+    void setEnabled(const bool &enabled);
+
+    bool connected() const;
+
+    QStringList availableModes() const;
+
+    QString mode() const;
+    void setMode(const QString &mode);
+
+    Orientation orientation() const;
+    void setOrientation(const Orientation &orientation);
+
+    // TODO: Move to some private object as to not expose too much
+    // MIR specific stuff in this model.
+    MirDisplayOutput * getDisplayOutput() const;
+    void setDisplayOutput(MirDisplayOutput * output);
+
+Q_SIGNALS:
+    void enabledChanged();
+    void connectedChanged();
+    void availableModesChanged();
+    void modeChanged();
+    void orientationChanged();
+
+private:
+    void updateModes();
+    void updateOrientation();
+    void updateSizes();
+
+    // TODO: hide this in some private object in this model
+    MirDisplayOutput * m_mirOutput;
+
+    QSize m_size;
+    QSizeF m_physicalSize;
+    qreal m_refreshRate;
+    MirOrientation m_orientation;
+    QStringList m_availableModes;
+    int m_currentMode;
+    bool m_enabled;
+    bool m_connected;
+    MirPowerMode m_powerMode;
+    int m_id;
+};
+
+Q_DECLARE_METATYPE(Display*)
+
+#endif // DISPLAY_H

=== added file 'plugins/brightness/displaymodel.cpp'
--- plugins/brightness/displaymodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/brightness/displaymodel.cpp	2016-01-03 21:35:16 +0000
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Jonas G. Drange <[e-mail]>
+ *
+ */
+
+#include <QDebug>
+#include "displaymodel.h"
+
+DisplayListModel::DisplayListModel(QObject *parent)
+    : QAbstractListModel(parent) {
+}
+
+void DisplayListModel::addDisplay(QSharedPointer<Display> &display) {
+    int at = rowCount();
+    for (int i = 0; i < m_displays.size(); ++i) {
+        if (display->id() < m_displays.at(i)->id()) {
+            at = i;
+            break;
+        }
+    }
+    beginInsertRows(QModelIndex(), at, at);
+    m_displays.insert(at, display);
+    endInsertRows();
+}
+
+int DisplayListModel::rowCount(const QModelIndex & parent) const {
+    Q_UNUSED(parent);
+    return m_displays.count();
+}
+
+QVariant DisplayListModel::data(const QModelIndex & index, int role) const {
+    QVariant ret;
+    if (index.row() < 0 || index.row() >= m_displays.count())
+        return ret;
+
+    auto display = m_displays[index.row()];
+    switch (role) {
+    case Qt::DisplayRole:
+        ret = QString("Display %1").arg(QString::number(display->id()));
+        break;
+    case EnabledRole:
+        ret = display->enabled();
+        break;
+    case ConnectedRole:
+        ret = display->connected();
+        break;
+    case ModeRole:
+        ret = display->mode();
+        break;
+    case AvailableModesRole:
+        ret = display->availableModes();
+        break;
+    case OrientationRole:
+        ret = display->orientation();
+        break;
+    }
+    return ret;
+}
+
+bool DisplayListModel::setData(const QModelIndex &index,
+                               const QVariant &value,
+                               int role)
+{
+    if (index.row() < 0 || index.row() >= m_displays.count())
+        return false;
+    auto display = m_displays[index.row()];
+    switch (role) {
+    case EnabledRole:
+        switch (static_cast<QMetaType::Type>(value.type())) {
+        case QMetaType::Bool:
+        case QMetaType::QChar:
+        case QMetaType::Int:
+        case QMetaType::UInt:
+        case QMetaType::LongLong:
+        case QMetaType::ULongLong:
+            display->setEnabled(value.toBool());
+            return true;
+
+        default:
+            break;
+        }
+
+        break;
+    }
+
+    return false;
+}
+
+QHash<int, QByteArray> DisplayListModel::roleNames() const {
+    QHash<int, QByteArray> roles;
+    roles[EnabledRole] = "enabled";
+    roles[ConnectedRole] = "connected";
+    roles[ModeRole] = "mode";
+    roles[AvailableModesRole] = "availableModes";
+    roles[OrientationRole] = "orientation";
+    // roles[ScaleRole] = "scale";
+    return roles;
+}
+
+QSharedPointer<Display> DisplayListModel::getDisplay(const int outputId) const {
+    QSharedPointer<Display> display;
+
+    for (int i=0, n=m_displays.size(); i<n; i++)
+        if (m_displays[i]->id() == outputId)
+            return m_displays[i];
+
+    return display;
+}
+
+QModelIndex DisplayListModel::index(int row, int column,
+        const QModelIndex & parent) const {
+    Q_UNUSED(parent);
+    Q_UNUSED(column);
+    return createIndex(row, column);
+}
+
+DisplayListModel::~DisplayListModel() {
+}

=== added file 'plugins/brightness/displaymodel.h'
--- plugins/brightness/displaymodel.h	1970-01-01 00:00:00 +0000
+++ plugins/brightness/displaymodel.h	2016-01-03 21:35:16 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Jonas G. Drange <[e-mail]>
+ *
+ * A model for storing and accessing displays.
+ */
+
+#ifndef DISPLAY_MODEL_H
+#define DISPLAY_MODEL_H
+
+#include <QObject>
+#include <QAbstractListModel>
+#include <QSharedPointer>
+
+#include "display.h"
+
+class DisplayListModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    explicit DisplayListModel(QObject *parent = 0);
+    ~DisplayListModel();
+
+    enum Roles
+    {
+      // Qt::DisplayRole holds display name
+      EnabledRole = Qt::UserRole,
+      ConnectedRole,
+      ModeRole,
+      AvailableModesRole,
+      OrientationRole
+    };
+
+    void addDisplay(QSharedPointer<Display> &display);
+
+    QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const;
+    bool setData(const QModelIndex &index, const QVariant &value,
+                 int role = Qt::EditRole);
+    int rowCount(const QModelIndex & parent = QModelIndex()) const;
+    QModelIndex index(int row, int column,
+                      const QModelIndex & parent = QModelIndex()) const;
+
+    QSharedPointer<Display> getDisplay(const int outputId) const;
+
+    Q_INVOKABLE bool apply(const bool &enabled);
+
+protected:
+    QHash<int, QByteArray> roleNames() const;
+
+private:
+    QList<QSharedPointer<Display> > m_displays;
+};
+
+#endif // DISPLAY_MODEL_H

=== added file 'plugins/brightness/displays.cpp'
--- plugins/brightness/displays.cpp	1970-01-01 00:00:00 +0000
+++ plugins/brightness/displays.cpp	2016-01-03 21:35:16 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Jonas G. Drange <[e-mail]>
+ *
+ */
+
+#include <QDebug>
+#include <QQmlEngine>
+
+#include "displays.h"
+
+Displays::Displays(QObject *parent) :
+    QObject(parent),
+    m_displaysModel(this),
+    m_mirDisplays(this) {
+
+    if (m_mirDisplays.isConnected()) {
+        updateAvailableMirDisplays();
+
+        connect(&m_mirDisplays, SIGNAL(configurationChanged()),
+                    this, SLOT(updateAvailableMirDisplays()));
+    }
+}
+
+Displays::~Displays() {}
+
+QAbstractItemModel * Displays::displays() {
+    auto ret = &m_displaysModel;
+    QQmlEngine::setObjectOwnership(ret, QQmlEngine::CppOwnership);
+    return ret;
+}
+
+void Displays::applyDisplayConfiguration() {
+    qWarning() << "apply config";
+    MirDisplayConfiguration * conf = m_mirDisplays.getConfiguration();
+    for (unsigned  int i = 0; i < conf->num_outputs; ++i) {
+        MirDisplayOutput output = conf->outputs[i];
+        QSharedPointer<Display> display = m_displaysModel.getDisplay(output.output_id);
+        conf->outputs[i] = *display->getDisplayOutput();
+    }
+    qWarning() << "Changed outputs.";
+
+    m_mirDisplays.applyConfiguration(conf);
+}
+
+void Displays::updateAvailableMirDisplays() {
+    MirDisplayConfiguration * conf = m_mirDisplays.getConfiguration();
+    for (unsigned int i = 0; i < conf->num_outputs; ++i) {
+        MirDisplayOutput output = conf->outputs[i];
+        QSharedPointer<Display> display = m_displaysModel.getDisplay(output.output_id);
+
+        if (display) {
+            qWarning() << __PRETTY_FUNCTION__ << "Updating existing display" << i;
+            display->setDisplayOutput(&output);
+        } else {
+            qWarning() << __PRETTY_FUNCTION__ << "Adding new display" << i;
+            QSharedPointer<Display> display = QSharedPointer<Display>::create(&output);
+            m_displaysModel.addDisplay(display);
+        }
+    }
+}

=== added file 'plugins/brightness/displays.h'
--- plugins/brightness/displays.h	1970-01-01 00:00:00 +0000
+++ plugins/brightness/displays.h	2016-01-03 21:35:16 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Jonas G. Drange <[e-mail]>
+ *
+ * A Displays manager class. Currently only suitable for Mir.
+ * Note: It is assumed that the model will hold QScreen objects
+ * some time in the future, and thus lose it's tight coupling
+ * to Mir.
+ */
+
+#ifndef DISPLAYS_H
+#define DISPLAYS_H
+
+#include <QObject>
+#include <QDebug>
+
+#include "mirdisplays.h"
+#include "displaymodel.h"
+
+class Displays : public QObject
+{
+    Q_OBJECT
+public:
+    explicit Displays(QObject * parent = 0);
+    ~Displays();
+    QAbstractItemModel * displays();
+    void applyDisplayConfiguration();
+
+public Q_SLOTS:
+    void updateAvailableMirDisplays();
+
+private:
+    DisplayListModel m_displaysModel;
+    MirDisplays m_mirDisplays;
+};
+
+#endif // DISPLAYS_H

=== added file 'plugins/brightness/mirdisplays.cpp'
--- plugins/brightness/mirdisplays.cpp	1970-01-01 00:00:00 +0000
+++ plugins/brightness/mirdisplays.cpp	2016-01-03 21:35:16 +0000
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Jonas G. Drange <[e-mail]>
+ */
+
+#include <QDebug>
+#include <QQmlEngine>
+#include <QGuiApplication>
+#include <qpa/qplatformnativeinterface.h>
+#include "mirdisplays.h"
+
+
+static void mir_display_change_callback(MirConnection *connection, void *context) {
+    qWarning() << "mir_display_change_callback" << context;
+    MirDisplayConfiguration *conf = mir_connection_create_display_config(
+            connection);
+    static_cast<MirDisplays*>(context)->setConfiguration(conf);
+
+}
+
+MirDisplays::MirDisplays(QObject *parent) :
+        QObject(parent),
+        m_mir_connection(nullptr),
+        m_configuration(nullptr) {
+    connect();
+    if (isConnected()) {
+        setConfiguration(
+                mir_connection_create_display_config(m_mir_connection));
+    }
+}
+
+MirDisplays::~MirDisplays() {}
+
+MirDisplayConfiguration * MirDisplays::getConfiguration() const {
+    return m_configuration;
+}
+
+bool MirDisplays::isConnected() {
+    return mir_connection_is_valid(m_mir_connection);
+}
+
+void MirDisplays::setConfiguration(MirDisplayConfiguration * conf) {
+    m_configuration = conf;
+}
+
+void MirDisplays::applyConfiguration(MirDisplayConfiguration * conf) {
+    mir_wait_for(mir_connection_apply_display_config(m_mir_connection, conf));
+    qWarning() << "mirdisplays applyConfiguration" << conf;
+
+    const char *error = "No error";
+    error = mir_connection_get_error_message(m_mir_connection);
+    qWarning() << "Mir apply configuration error:" << error;
+}
+
+void MirDisplays::connect() {
+    qWarning() << "Connecting...";
+    m_mir_connection = static_cast<MirConnection*>(
+            QGuiApplication::platformNativeInterface()
+                ->nativeResourceForIntegration("mirConnection")
+    );
+    if (m_mir_connection == nullptr || !isConnected()) {
+        const char *error = "Unknown error";
+        if (m_mir_connection != nullptr)
+            error = mir_connection_get_error_message(m_mir_connection);
+        qWarning() << error;
+    } else {
+        qWarning() << "Using mir as display server.";
+        mir_connection_set_display_config_change_callback(
+                m_mir_connection, mir_display_change_callback, this);
+    }
+}

=== added file 'plugins/brightness/mirdisplays.h'
--- plugins/brightness/mirdisplays.h	1970-01-01 00:00:00 +0000
+++ plugins/brightness/mirdisplays.h	2016-01-03 21:35:16 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Jonas G. Drange <[e-mail]>
+ *
+ * This is a concrete DAO for obtaining the means to view and configure
+ * displays (outputs) in Mir.
+ */
+
+#ifndef MIRDISPLAYS_H
+#define MIRDISPLAYS_H
+
+#include <QObject>
+#include <QDebug>
+#include <mir_toolkit/mir_client_library.h>
+
+class MirDisplays : public QObject
+{
+    Q_OBJECT
+public:
+    explicit MirDisplays(QObject *parent = 0);
+    ~MirDisplays();
+    MirDisplayConfiguration * getConfiguration() const;
+    void setConfiguration(MirDisplayConfiguration * conf);
+    void applyConfiguration(MirDisplayConfiguration * conf);
+    bool isConnected();
+
+Q_SIGNALS:
+    void configurationChanged() const;
+
+private:
+    void connect();
+    MirConnection * m_mir_connection;
+    MirDisplayConfiguration * m_configuration;
+};
+
+#endif // MIRDISPLAYS_H

=== modified file 'plugins/brightness/plugin.cpp'
--- plugins/brightness/plugin.cpp	2014-07-23 13:44:31 +0000
+++ plugins/brightness/plugin.cpp	2016-01-03 21:35:16 +0000
@@ -22,14 +22,17 @@
 
 #include <QtQml>
 #include <QtQml/QQmlContext>
+#include "display.h"
 #include "brightness.h"
 
-
 void BackendPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.Brightness"));
 
+    // qRegisterMetaType<Display::OrientationMode>();
     qmlRegisterType<Brightness>(uri, 1, 0, "UbuntuBrightnessPanel");
+    qmlRegisterType<Display>(uri, 1, 0, "Display");
+    qRegisterMetaType<Display*>("Display*");
 }
 
 void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'plugins/brightness/plugin/CMakeLists.txt'
--- plugins/brightness/plugin/CMakeLists.txt	2014-01-27 13:01:26 +0000
+++ plugins/brightness/plugin/CMakeLists.txt	2016-01-03 21:35:16 +0000
@@ -1,8 +1,8 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${Qt5Gui_PRIVATE_INCLUDE_DIRS} ${MIR_INCLUDE_DIRS})
 
 add_definitions(-DQT_NO_KEYWORDS)
 
 add_library(brightness-plugin SHARED brightness-plugin.h brightness-plugin.cpp)
 qt5_use_modules(brightness-plugin Core Qml DBus)
-target_link_libraries(brightness-plugin SystemSettings)
+target_link_libraries(brightness-plugin SystemSettings uss-displays ${Qt5Gui_PRIVATE_LDFLAGS} ${MIR_LDFLAGS})
 install(TARGETS brightness-plugin DESTINATION ${PLUGIN_MODULE_DIR})

=== modified file 'plugins/brightness/plugin/brightness-plugin.cpp'
--- plugins/brightness/plugin/brightness-plugin.cpp	2014-07-23 13:44:31 +0000
+++ plugins/brightness/plugin/brightness-plugin.cpp	2016-01-03 21:35:16 +0000
@@ -19,12 +19,18 @@
  */
 
 #include "brightness-plugin.h"
+#include "../mirdisplays.h"
 
 #include <QDebug>
 #include <QDBusInterface>
 #include <QStringList>
 #include <SystemSettings/ItemBase>
 
+#include <libintl.h>
+QString _(const char *text){
+    return QString::fromUtf8(dgettext(0, text));
+}
+
 using namespace SystemSettings;
 
 class BrightnessItem: public ItemBase
@@ -33,8 +39,11 @@
 
 public:
     explicit BrightnessItem(const QVariantMap &staticData, QObject *parent = 0);
+    void setDisplayName(const QString &name);
     void setVisibility(bool visible);
 
+private:
+    int getNumberOfDisplays();
 };
 
 
@@ -47,7 +56,30 @@
                                   QDBusConnection::systemBus());
 
     // Hide the plugin if powerd isn't running; it's redundant currentlys
-    setVisibility(m_powerdIface.isValid());
+    //setVisibility(m_powerdIface.isValid());
+    setVisibility(true);
+
+    if (getNumberOfDisplays() == 0) {
+        setDisplayName(_("Brightness"));
+    } else {
+        setDisplayName(_("Brightness & Display"));
+    }
+}
+
+int BrightnessItem::getNumberOfDisplays() {
+    MirDisplays mirDisplays;
+    int outputs = 0;
+
+    if (mirDisplays.isConnected()) {
+        MirDisplayConfiguration *conf = mirDisplays.getConfiguration();
+        outputs = conf->num_outputs;
+    }
+    return outputs;
+}
+
+void BrightnessItem::setDisplayName(const QString &name)
+{
+    setName(name);
 }
 
 void BrightnessItem::setVisibility(bool visible)