Merge lp:~vanvugt/ubuntu-system-settings/fix-1569227 into lp:ubuntu-system-settings

[Daniel van Vugt]

Fix unlabelled sliders in Mouse & Touchpad (LP: #1569227)

The problem was that the labels existed but had been clipped to zero
height in ItemTitle.qml, so never appeared. However once you make them
appear they conflict visually with the things around them (also fixed
here).

Also:
  * improved the title texts
  * increased the visibility of the main Mouse and Touchpad titles
  * removed the clumsy misplaced "Slow" and "Fast" labels
  * added comments describing what needs fixing next (in SliderMenu
    which is a different project) to replace the old Slow and Fast labels

System Settings needs A LOT of visual fixes so I had to restrain myself
and tried to keep this change mostly about just fixing LP: #1569227.

[lp:~vanvugt/ubuntu-system-settings/fix-1569227]

1742. By Daniel van Vugt on 2016-11-16

Shrink the diff

[Jonas G. Drange (jonas-drange)]

LGTM, thank you.

review: Approve

=== modified file 'plugins/mouse/Connected.qml'
--- plugins/mouse/Connected.qml	2016-08-04 09:56:29 +0000
+++ plugins/mouse/Connected.qml	2016-11-16 10:14:27 +0000
@@ -55,12 +55,11 @@
             }
             spacing: 0
             height: childrenRect.height
-            ItemTitle {
-                text: i18n.tr("Move:")
-                showDivider: false
-            }
 
             Menus.SliderMenu {
+                /* FIXME: No appropriate icons exist yet, also SliderMenu lacks
+                          support for text labels on the ends. */
+                text: i18n.tr("Cursor speed:")
                 anchors { 
                     left: parent.left
                     right: parent.right
@@ -94,12 +93,10 @@
             spacing: 0
             height: childrenRect.height
 
-            ItemTitle {
-                text: i18n.tr("Scroll:")
-                showDivider: false
-            }
-
             Menus.SliderMenu {
+                /* FIXME: No appropriate icons exist yet, also SliderMenu lacks
+                          support for text labels on the ends. */
+                text: i18n.tr("Wheel scrolling speed:")
                 anchors { 
                     left: parent.left
                     right: parent.right
@@ -132,12 +129,11 @@
             spacing: 0
             height: childrenRect.height
             visible: showAllUI
-            ItemTitle {
-                text: i18n.tr("Double-click:")
-                showDivider: false
-            }
 
             Menus.SliderMenu {
+                /* FIXME: No appropriate icons exist yet, also SliderMenu lacks
+                          support for text labels on the ends. */
+                text: i18n.tr("Double-click speed:")
                 anchors { 
                     left: parent.left
                     right: parent.right
@@ -228,12 +224,11 @@
             }
             spacing: 0
             height: childrenRect.height
-            ItemTitle {
-                text: i18n.tr("Move:")
-                showDivider: false
-            }
 
             Menus.SliderMenu {
+                /* FIXME: No appropriate icons exist yet, also SliderMenu lacks
+                          support for text labels on the ends. */
+                text: i18n.tr("Cursor speed:")
                 anchors { 
                     left: parent.left
                     right: parent.right
@@ -266,12 +261,11 @@
             }
             spacing: 0
             height: childrenRect.height
-            ItemTitle {
-                text: i18n.tr("Scroll:")
-                showDivider: false
-            }
 
             Menus.SliderMenu {
+                /* FIXME: No appropriate icons exist yet, also SliderMenu lacks
+                          support for text labels on the ends. */
+                text: i18n.tr("Finger scrolling speed:")
                 anchors { 
                     left: parent.left
                     right: parent.right
@@ -305,12 +299,11 @@
             spacing: 0
             height: childrenRect.height
             visible: showAllUI
-            ItemTitle {
-                text: i18n.tr("Double-click:")
-                showDivider: false
-            }
 
             Menus.SliderMenu {
+                /* FIXME: No appropriate icons exist yet, also SliderMenu lacks
+                          support for text labels on the ends. */
+                text: i18n.tr("Double-click speed:")
                 anchors { 
                     left: parent.left
                     right: parent.right

=== modified file 'plugins/mouse/ItemTitle.qml'
--- plugins/mouse/ItemTitle.qml	2015-12-04 19:17:51 +0000
+++ plugins/mouse/ItemTitle.qml	2016-11-16 10:14:27 +0000
@@ -23,7 +23,7 @@
 ListItem.Standard {
     id: itemEmpty
     property string text
-    height: label.height - units.gu(2)
+    height: label.height
     Label {
         id: label
         anchors {

=== modified file 'plugins/mouse/SectionHeader.qml'
--- plugins/mouse/SectionHeader.qml	2016-03-16 17:03:35 +0000
+++ plugins/mouse/SectionHeader.qml	2016-11-16 10:14:27 +0000
@@ -43,7 +43,8 @@
                 top: parent.top
             }
             text: root.text
-            fontSize: "medium"
+            /* We are "large" to avoid looking like normal "medium" text */
+            fontSize: "large"
             elide: Text.ElideRight
             color: Theme.palette.normal.baseText
             font.weight: Text.Normal
@@ -51,27 +52,4 @@
         highlightWhenPressed: false
         showDivider: false
     }
-    Item {
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-        height: childrenRect.height + units.gu(1)
-        Label {
-            anchors {
-                left: parent.left
-                top: parent.top
-            }
-            text: i18n.tr("Slow")
-            fontSize: "small"
-        }
-        Label {
-            anchors {
-                right: parent.right
-                top: parent.top
-            }
-            text: i18n.tr("Fast")
-            fontSize: "small"
-        }
-    }
 }