@@ -15,10 +15,10 @@
1515 */
1616
1717import QtQuick 2.4
18+import QtQuick.Layouts 1.1
1819import QMenuModel 0.1 as QMenuModel
1920import Ubuntu.Components 1.3
2021import Ubuntu.Components.ListItems 1.3
21−import Ubuntu.Settings.Menus 0.1 as Menus
2222import Wizard 0.1
2323import ".." as LocalComponents
2424
@@ -89,7 +89,7 @@ LocalComponents.Page {
8989 readonly property bool secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
9090 readonly property bool adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
9191 readonly property bool isConnected: menuData && menuData.actionState
92− property int signalStrength: strengthAction.valid ? strengthAction.state : 0
92+ readonly property int signalStrength: strengthAction.valid ? strengthAction.state : 0
9393 property int menuIndex: -1
9494
9595 function loadAttributes() {
@@ -150,7 +150,7 @@ LocalComponents.Page {
150150 }
151151 }
152152
153− Column {
153+ ColumnLayout {
154154 id: column
155155 spacing: units.gu(2)
156156 anchors {
@@ -176,9 +176,9 @@ LocalComponents.Page {
176176 id: listview
177177 anchors.left: parent.left
178178 anchors.right: parent.right
179− height: column.height - label.height - column.spacing - topMargin
180179 clip: true
181180 model: menuModel
181+ Layout.fillHeight: true
182182
183183 delegate: Loader {
184184 id: loader