@@ -15,10 +15,10 @@
17import QtQuick 2.4
17import QtQuick 2.4
18+import QtQuick.Layouts 1.1
18import QMenuModel 0.1 as QMenuModel
19import QMenuModel 0.1 as QMenuModel
19import Ubuntu.Components 1.3
20import Ubuntu.Components 1.3
20import Ubuntu.Components.ListItems 1.3
21import Ubuntu.Components.ListItems 1.3
21−import Ubuntu.Settings.Menus 0.1 as Menus
22import Wizard 0.1
22import Wizard 0.1
23import ".." as LocalComponents
23import ".." as LocalComponents
@@ -89,7 +89,7 @@ LocalComponents.Page {
89 readonly property bool secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
89 readonly property bool secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
90 readonly property bool adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
90 readonly property bool adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
91 readonly property bool isConnected: menuData && menuData.actionState
91 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
93 property int menuIndex: -1
93 property int menuIndex: -1
95 function loadAttributes() {
95 function loadAttributes() {
@@ -150,7 +150,7 @@ LocalComponents.Page {
153− Column {
153+ ColumnLayout {
154 id: column
154 id: column
155 spacing: units.gu(2)
155 spacing: units.gu(2)
156 anchors {
156 anchors {
@@ -176,9 +176,9 @@ LocalComponents.Page {
176 id: listview
176 id: listview
177 anchors.left: parent.left
177 anchors.left: parent.left
178 anchors.right: parent.right
178 anchors.right: parent.right
179− height: column.height - label.height - column.spacing - topMargin
180 clip: true
179 clip: true
181 model: menuModel
180 model: menuModel
181+ Layout.fillHeight: true
183 delegate: Loader {
183 delegate: Loader {
184 id: loader
184 id: loader