Merge lp:~ken-vandine/ubuntu-system-settings/brightness_slider_rtm into lp:ubuntu-system-settings/rtm-14.09

[Ken VanDine]

Use the SliderMenu component instead of the Slider component to fixed value binding issues

Use the SliderMenu component instead of the Slider component to fixed value binding issues

[Jonas G. Drange (jonas-drange)]

LGTM

review: Approve

=== removed file 'plugins/brightness/BrightnessSlider.qml'
--- plugins/brightness/BrightnessSlider.qml	2014-08-11 16:13:17 +0000
+++ plugins/brightness/BrightnessSlider.qml	1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-/*
- * This file is part of system-settings
- *
- * Copyright (C) 2013-14 Canonical Ltd.
- *
- * Contact: Iain Lane <[e-mail]>
- *
- * 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/>.
- */
-
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
-import QtQuick 2.0
-import QMenuModel 0.1
-
-Column {
-    signal pressed
-    readonly property bool pressed: sliderId.pressed
-
-    anchors {
-        left: parent.left
-        right: parent.right
-    }
-
-    QDBusActionGroup {
-        id: indicatorPower
-        busType: 1
-        busName: "com.canonical.indicator.power"
-        objectPath: "/com/canonical/indicator/power"
-
-        property variant brightness: action("brightness").state
-        onBrightnessChanged: { 
-            sliderId.enabled = brightness != null
-            sliderId.value = sliderId.enabled ? brightness * 100 : 0.0
-        }
-    }
-
-    Component.onCompleted: indicatorPower.start()
-
-    ListItem.Standard {
-        text: i18n.tr("Display brightness")
-        showDivider: false
-    }
-
-    ListItem.Base {
-
-        Icon {
-            id: iconLeft
-            anchors.verticalCenter: parent.verticalCenter
-            height: sliderId.height - units.gu(1)
-            name: "torch-off"
-            width: height
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: sliderId.value = 0.0
-            }
-        }
-        Slider {
-            id: sliderId
-            function formatValue(v) {
-                return "%1%".arg(v.toFixed(0))
-            }
-
-            anchors {
-                left: iconLeft.right
-                right: iconRight.left
-                leftMargin: units.gu(1)
-                rightMargin: units.gu(1)
-                verticalCenter: parent.verticalCenter
-            }
-            height: parent.height - units.gu(2)
-            minimumValue: 0.0
-            maximumValue: 100.0
-            live: true
-
-            onValueChanged: indicatorPower.action('brightness').updateState(value / 100.0)
-        }
-        Icon {
-            id: iconRight
-            anchors.right: parent.right
-            anchors.verticalCenter: parent.verticalCenter
-            height: sliderId.height - units.gu(1)
-            name: "torch-on"
-            width: height
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: sliderId.value = 100.0
-            }
-        }
-    }
-}

=== modified file 'plugins/brightness/CMakeLists.txt'
--- plugins/brightness/CMakeLists.txt	2014-08-11 16:13:17 +0000
+++ plugins/brightness/CMakeLists.txt	2014-11-17 15:39:24 +0000
@@ -1,7 +1,6 @@
 add_subdirectory(plugin)
 
 set(QML_SOURCES
-    BrightnessSlider.qml
     PageComponent.qml
 )
 

=== modified file 'plugins/brightness/PageComponent.qml'
--- plugins/brightness/PageComponent.qml	2014-08-12 13:32:30 +0000
+++ plugins/brightness/PageComponent.qml	2014-11-17 15:39:24 +0000
@@ -24,6 +24,8 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.SystemSettings.Brightness 1.0
+import Ubuntu.Settings.Menus 0.1 as Menus
+import QMenuModel 0.1
 
 ItemPage {
     id: root
@@ -39,7 +41,42 @@
         anchors.left: parent.left
         anchors.right: parent.right
 
-        BrightnessSlider {}
+        QDBusActionGroup {
+            id: indicatorPower
+            busType: 1
+            busName: "com.canonical.indicator.power"
+            objectPath: "/com/canonical/indicator/power"
+
+            property variant brightness: action("brightness")
+
+            Component.onCompleted: start()
+        }
+
+        Binding {
+            target: sliderMenu
+            property: "value"
+            value: sliderMenu.enabled ? indicatorPower.action("brightness").state * 100 : 0.0
+        }
+
+        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: sliderMenu
+            objectName: "sliderMenu"
+            enabled: indicatorPower.action("brightness").state != null
+            live: true
+            minimumValue: 0.0
+            maximumValue: 100.0
+            minIcon: "image://theme/display-brightness-min"
+            maxIcon: "image://theme/display-brightness-max"
+            onUpdated: indicatorPower.action("brightness").updateState(value / 100.0)
+        }
 
         Binding {
             target: autoAdjustCheck