Merge lp:~seb128/ubuntu-system-settings/location-list-scrolling into lp:ubuntu-system-settings

[Sebastien Bacher]

[location] use a flickable so the list can be scrolled

[location] use a flickable so the list can be scrolled

[Sebastien Bacher (seb128)]

the diff looks non trivial but it's basically moving the column in a flickable, which is changing the indendation of the block but not the content

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1078
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1559/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5186
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3784
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/751
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4937
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6438
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6438/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13764
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4095
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4095/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1559/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

I get some errors in the log:

2014-09-26 10:54:00,812 - WARNING - Exception org.freedesktop.DBus.Error.ServiceUnknown: The name com.ubuntu.trust.store.UbuntuLocationService was not provided by any .service files
2014-09-26 10:54:00,833 - WARNING - file:///usr/share/ubuntu/settings/system/qml-plugins/security-privacy/Location.qml:38: ReferenceError: root is not defined

I'm sure the first one has nothing to do with this branch, but the reference error does.

review: Needs Fixing

[lp:~seb128/ubuntu-system-settings/location-list-scrolling]

1079. By Sebastien Bacher on 2014-09-26

use correct variable name

[Sebastien Bacher (seb128)]

> I'm sure the first one has nothing to do with this branch, but the reference error does.

good catch, I copied that from another panel and didn't update to the itempage's id, done that now

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1079
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1569/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5234
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3812
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/761
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4962
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6486
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6486/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13818
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3198
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4123
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4123/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1569/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Thanks!

review: Approve

=== modified file 'plugins/security-privacy/Location.qml'
--- plugins/security-privacy/Location.qml	2014-09-05 08:50:28 +0000
+++ plugins/security-privacy/Location.qml	2014-09-26 15:00:09 +0000
@@ -29,84 +29,95 @@
 ItemPage {
     id: dashPage
     title: i18n.tr("Location")
-
-    Column {
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        QDBusActionGroup {
-            id: locationActionGroup
-            busType: DBus.SessionBus
-            busName: "com.canonical.indicator.location"
-            objectPath: "/com/canonical/indicator/location"
-
-            property variant enabled: action("location-detection-enabled")
-
-            Component.onCompleted: start()
-        }
-
-        ListItem.Standard {
-            text: i18n.tr("Location detection")
-            control: Switch {
-                id: locationOn
-                onClicked: locationActionGroup.enabled.activate()
-            }
-            visible: locationActionGroup.enabled.state !== undefined
-            Component.onCompleted:
-                clicked.connect(locationOn.clicked)
-        }
-
-        Binding {
-            target: locationOn
-            property: "checked"
-            value: locationActionGroup.enabled.state
-        }
-
-        ListItem.Caption {
-            /* TODO: replace by real info from the location service */
-            property int locationInfo: 0
-
-            text: {
-                if (locationInfo === 0) /* GPS only */
-                    return i18n.tr("Uses GPS to detect your rough location. When off, GPS turns off to save battery.")
-                else if (locationInfo === 1) /* GPS, wi-fi on */
-                    return i18n.tr("Uses wi-fi and GPS to detect your rough location. Turning off location detection saves battery.")
-                else if (locationInfo === 2) /* GPS, wi-fi off */
-                    return i18n.tr("Uses wi-fi (currently off) and GPS to detect your rough location. Turning off location detection saves battery.")
-                else if (locationInfo === 3) /* GPS, wi-fi and cellular on */
-                    return i18n.tr("Uses wi-fi, cell tower locations, and GPS to detect your rough location. Turning off location detection saves battery.")
-                else if (locationInfo === 4) /* GPS, wi-fi on, cellular off */
-                    return i18n.tr("Uses wi-fi, cell tower locations (no current cellular connection), and GPS to detect your rough location. Turning off location detection saves battery.")
-                else if (locationInfo === 5) /* GPS, wi-fi off, cellular on */
-                    return i18n.tr("Uses wi-fi (currently off), cell tower locations, and GPS to detect your rough location. Turning off location detection saves battery.")
-                else if (locationInfo === 6) /* GPS, wi-fi and cellular off */
-                    return i18n.tr("Uses wi-fi (currently off), cell tower locations (no current cellular connection), and GPS to detect your rough location. Turning off location detection saves battery.")
-            }
-
-            visible: showAllUI /* hide until the information is real */
-        }
-
-        ListItem.Standard {
-            text: i18n.tr("Allow access to location:")
-            visible: locationOn.checked
-        }
-
-        TrustStoreModel {
-            id: trustStoreModel
-            serviceName: "UbuntuLocationService"
-        }
-
-        Repeater {
-            model: trustStoreModel
+    flickable: scrollWidget
+
+    Flickable {
+        id: scrollWidget
+        anchors.fill: parent
+        contentHeight: contentItem.childrenRect.height
+        boundsBehavior: (contentHeight > dashPage.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: locationActionGroup
+                busType: DBus.SessionBus
+                busName: "com.canonical.indicator.location"
+                objectPath: "/com/canonical/indicator/location"
+
+                property variant enabled: action("location-detection-enabled")
+
+                Component.onCompleted: start()
+            }
+
             ListItem.Standard {
-                text: model.applicationName
-                iconSource: model.iconName
+                text: i18n.tr("Location detection")
                 control: Switch {
-                    checked: model.granted
-                    onClicked: trustStoreModel.setEnabled(index, !model.granted)
-                }
+                    id: locationOn
+                    onClicked: locationActionGroup.enabled.activate()
+                }
+                visible: locationActionGroup.enabled.state !== undefined
+                Component.onCompleted:
+                    clicked.connect(locationOn.clicked)
+            }
+
+            Binding {
+                target: locationOn
+                property: "checked"
+                value: locationActionGroup.enabled.state
+            }
+
+            ListItem.Caption {
+                /* TODO: replace by real info from the location service */
+                property int locationInfo: 0
+
+                text: {
+                    if (locationInfo === 0) /* GPS only */
+                        return i18n.tr("Uses GPS to detect your rough location. When off, GPS turns off to save battery.")
+                    else if (locationInfo === 1) /* GPS, wi-fi on */
+                        return i18n.tr("Uses wi-fi and GPS to detect your rough location. Turning off location detection saves battery.")
+                    else if (locationInfo === 2) /* GPS, wi-fi off */
+                        return i18n.tr("Uses wi-fi (currently off) and GPS to detect your rough location. Turning off location detection saves battery.")
+                    else if (locationInfo === 3) /* GPS, wi-fi and cellular on */
+                        return i18n.tr("Uses wi-fi, cell tower locations, and GPS to detect your rough location. Turning off location detection saves battery.")
+                    else if (locationInfo === 4) /* GPS, wi-fi on, cellular off */
+                        return i18n.tr("Uses wi-fi, cell tower locations (no current cellular connection), and GPS to detect your rough location. Turning off location detection saves battery.")
+                    else if (locationInfo === 5) /* GPS, wi-fi off, cellular on */
+                        return i18n.tr("Uses wi-fi (currently off), cell tower locations, and GPS to detect your rough location. Turning off location detection saves battery.")
+                    else if (locationInfo === 6) /* GPS, wi-fi and cellular off */
+                        return i18n.tr("Uses wi-fi (currently off), cell tower locations (no current cellular connection), and GPS to detect your rough location. Turning off location detection saves battery.")
+                }
+
+                visible: showAllUI /* hide until the information is real */
+            }
+
+            ListItem.Standard {
+                text: i18n.tr("Allow access to location:")
                 visible: locationOn.checked
             }
+
+            TrustStoreModel {
+                id: trustStoreModel
+                serviceName: "UbuntuLocationService"
+            }
+
+            Repeater {
+                model: trustStoreModel
+                ListItem.Standard {
+                    text: model.applicationName
+                    iconSource: model.iconName
+                    control: Switch {
+                        checked: model.granted
+                        onClicked: trustStoreModel.setEnabled(index, !model.granted)
+                    }
+                    visible: locationOn.checked
+                }
+            }
         }
 
     }