Merge lp:~vanvugt/ubuntu-system-settings/brightness-slider-title into lp:ubuntu-system-settings

[Daniel van Vugt]

Use the proper text attribute for the "Display brightness" slider.

Less code, and a more consistent layout (since most other sliders do
it this way already).

Unmerged revisions

1761. By Daniel van Vugt on 2017-02-20

Use the proper text attribute for the "Display brightness" slider.

Less code, and a more consistent layout (since most other sliders do
it this way already).

=== modified file 'plugins/brightness/PageComponent.qml'
--- plugins/brightness/PageComponent.qml	2016-12-06 15:38:02 +0000
+++ plugins/brightness/PageComponent.qml	2017-02-20 04:00:37 +0000
@@ -80,11 +80,6 @@
             anchors.left: parent.left
             anchors.right: parent.right
 
-            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.
             */
@@ -93,6 +88,7 @@
                 objectName: "sliderMenu"
                 enabled: indicatorPower.brightness.state != null
                 live: true
+                text: i18n.tr("Display brightness")
                 minimumValue: 0.0
                 maximumValue: 100.0
                 minIcon: "image://theme/display-brightness-min"