Merge lp:~laney/ubuntu-system-settings/wifi-scrolling into lp:ubuntu-system-settings

[Iain Lane]

[wifi] Properly set the list of networks up for scrolling

[wifi] Properly set the list of networks up for scrolling

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:462
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/475/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/475

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-system-settings-ci/475/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

=== removed file 'plugins/background/ChangeImage.qml'
--- plugins/background/ChangeImage.qml	2013-10-10 14:55:40 +0000
+++ plugins/background/ChangeImage.qml	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2013 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:
- * Iain Lane <[e-mail]>
- *
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1
-import SystemSettings 1.0
-
-ItemPage {
-
-    id: rootPage
-
-    ListModel {
-        id: galleriesModel
-
-        ListElement {
-            name: "Ubuntu Art"
-        }
-
-        ListElement {
-            name: "Camera Photos"
-        }
-
-        ListElement {
-            name: "An Album"
-        }
-
-        ListElement {
-            name: "Another Album"
-        }
-
-    }
-
-    ListView {
-        anchors.fill: parent
-        model: galleriesModel
-
-        delegate: Standard {
-            text: name
-            icon: Qt.resolvedUrl("darkeningclockwork.jpg")
-            progression: true
-        }
-    }
-
-}

=== modified file 'plugins/background/MainPage.qml'
--- plugins/background/MainPage.qml	2013-10-10 21:50:44 +0000
+++ plugins/background/MainPage.qml	2013-10-15 15:19:17 +0000
@@ -33,7 +33,10 @@
     title: i18n.tr("Background")
 
     /* TODO: For now hardcoded paths, later we'll use GSettings */
-    property string defaultBackground: mainPage.width >= units.gu(60) ? "/usr/share/unity8/graphics/tablet_background.jpg" : "/usr/share/unity8/graphics/phone_background.jpg"
+    property string defaultBackground:
+        mainPage.width >= units.gu(60) ?
+            "/usr/share/unity8/graphics/tablet_background.jpg" :
+            "/usr/share/unity8/graphics/phone_background.jpg"
 
     UbuntuBackgroundPanel {
         id: backgroundPanel
@@ -59,8 +62,8 @@
         }
     }
 
-
-    /* TODO: We hide the welcome screen parts for v1 - there's a lot of elements to hide */
+    /* TODO: We hide the welcome screen parts for v1 -
+       there's a lot of elements to hide */
 
     Label {
         id: welcomeLabel

=== modified file 'plugins/background/background.pro'
--- plugins/background/background.pro	2013-10-08 10:47:44 +0000
+++ plugins/background/background.pro	2013-10-15 15:19:17 +0000
@@ -5,11 +5,9 @@
 TARGET = background
 
 QML_SOURCES = \
-    ChangeImage.qml \
     MainPage.qml \
-    SwappableImage.qml \
-    UbuntuSwappableImage.qml \
-    OverlayImage.qml
+    OverlayImage.qml \
+    SwappableImage.qml
 
 OTHER_FILES += \
     $${QML_SOURCES}

=== modified file 'plugins/wifi/PageComponent.qml'
--- plugins/wifi/PageComponent.qml	2013-09-19 09:02:18 +0000
+++ plugins/wifi/PageComponent.qml	2013-10-15 15:19:17 +0000
@@ -73,7 +73,10 @@
         cacheBuffer: 10000
 
         // Only allow flicking if the content doesn't fit on the page
-        interactive: contentHeight > height
+        contentHeight: contentItem.childrenRect.height
+        boundsBehavior: (contentHeight > wifibase.height) ?
+                            Flickable.DragAndOvershootBounds :
+                            Flickable.StopAtBounds
 
         currentIndex: -1
         delegate: Item {