git.iko.soy/unity8
on xenial help sign in
Fix continue button in wifi wizard page, adds qml-module-qtsysteminfo as unity8 dep Fixes: #1363400
881cb81Andrea Cimitan
debian/control+2
compare with xenial
unifiedsplit
@@ -39,6 +39,7 @@ Build-Depends: cmake,
39 qml-module-qtquick-layouts,
39 qml-module-qtquick-layouts,
40 qml-module-qtquick-xmllistmodel,
40 qml-module-qtquick-xmllistmodel,
41 qml-module-qtquick2,
41 qml-module-qtquick2,
42+ qml-module-qtsysteminfo,
42 qml-module-qttest,
43 qml-module-qttest,
43 qt5-default,
44 qt5-default,
44 qtbase5-dev (>= 5.2.1),
45 qtbase5-dev (>= 5.2.1),
@@ -90,6 +91,7 @@ Depends: gsettings-desktop-schemas,
90 qmenumodel-qml (>= 0.2.9),
91 qmenumodel-qml (>= 0.2.9),
91 qml-module-qt-labs-folderlistmodel,
92 qml-module-qt-labs-folderlistmodel,
92 qml-module-qtquick-xmllistmodel,
93 qml-module-qtquick-xmllistmodel,
94+ qml-module-qtsysteminfo,
93 qtdeclarative5-gsettings1.0,
95 qtdeclarative5-gsettings1.0,
94 qtdeclarative5-qtmir-plugin (>= 0.4.4),
96 qtdeclarative5-qtmir-plugin (>= 0.4.4),
95 qtdeclarative5-ubuntu-telephony0.1,
97 qtdeclarative5-ubuntu-telephony0.1,
qml/Wizard/Pages/40-wifi.qml+27−9
@@ -16,6 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import QMenuModel 0.1 as QMenuModel
18import QMenuModel 0.1 as QMenuModel
19+import QtSystemInfo 5.0
19import Ubuntu.Components 0.1
20import Ubuntu.Components 0.1
20import Ubuntu.Components.ListItems 0.1 as ListItem
21import Ubuntu.Components.ListItems 0.1 as ListItem
21import Ubuntu.Settings.Menus 0.1 as Menus
22import Ubuntu.Settings.Menus 0.1 as Menus
@@ -28,7 +29,7 @@ LocalComponents.Page {
28 title: i18n.tr("Connect to Wi‑Fi")
29 title: i18n.tr("Connect to Wi‑Fi")
29 forwardButtonSourceComponent: forwardButton
30 forwardButtonSourceComponent: forwardButton
30
31
31− readonly property bool connected: mainMenu.connectedAPs === 1
32+ readonly property bool connected: networkInfo.accessPointName
32
33
33 function getExtendedProperty(object, propertyName, defaultValue) {
34 function getExtendedProperty(object, propertyName, defaultValue) {
34 if (object && object.hasOwnProperty(propertyName)) {
35 if (object && object.hasOwnProperty(propertyName)) {
@@ -44,6 +45,31 @@ LocalComponents.Page {
44 menuObjectPath: "/com/canonical/indicator/network/phone_wifi_settings"
45 menuObjectPath: "/com/canonical/indicator/network/phone_wifi_settings"
45 }
46 }
46
47
48+ NetworkInfo {
49+ id: networkInfo
50+
51+ property string accessPointName
52+
53+ monitorCurrentNetworkMode: true
54+ monitorNetworkName: true
55+ monitorNetworkStatus: true
56+
57+ onCurrentNetworkModeChanged: getAccessPointName()
58+ onNetworkNameChanged: getAccessPointName()
59+ onNetworkStatusChanged: if (status !== NetworkInfo.HomeNetwork) accessPointName = ""
60+
61+ Component.onCompleted: getAccessPointName()
62+
63+ function getAccessPointName() {
64+ // 0 is the interface
65+ if (currentNetworkMode === NetworkInfo.WlanMode &&
66+ networkStatus(NetworkInfo.WlanMode, 0) === NetworkInfo.HomeNetwork)
67+ accessPointName = networkName(NetworkInfo.WlanMode, 0);
68+ else
69+ accessPointName = "";
70+ }
71+ }
72+
47 Component {
73 Component {
48 id: accessPointComponent
74 id: accessPointComponent
49 ListItem.Standard {
75 ListItem.Standard {
@@ -119,11 +145,6 @@ LocalComponents.Page {
119 onCheckedChanged: {
145 onCheckedChanged: {
120 // Can't rely on binding. Checked is assigned on click.
146 // Can't rely on binding. Checked is assigned on click.
121 checkBoxActive.checked = checked;
147 checkBoxActive.checked = checked;
122− if (checked) {
123− mainMenu.connectedAPs++
124− } else {
125− mainMenu.connectedAPs--
126− }
127 }
148 }
128 onActivate: unityMenuModel.activate(menuIndex);
149 onActivate: unityMenuModel.activate(menuIndex);
129 }
150 }
@@ -165,9 +186,6 @@ LocalComponents.Page {
165 Repeater {
186 Repeater {
166 id: mainMenu
187 id: mainMenu
167
188
168− // FIXME Check connection better https://bugs.launchpad.net/indicator-network/+bug/1349371
169− property int connectedAPs: 0
170−
171 model: menuModel
189 model: menuModel
172
190
173 delegate: Loader {
191 delegate: Loader {