git.iko.soy/unity8
on xenial help sign in
filtering enterprise APs out, try 2
0236371Lukáš Tinkl
qml/Wizard/Pages/30-wifi.qml+3−6
compare with xenial
unifiedsplit
@@ -62,8 +62,7 @@ LocalComponents.Page {
62
62
63 function getAccessPointName() {
63 function getAccessPointName() {
64 // 0 is the interface
64 // 0 is the interface
65− if (currentNetworkMode === NetworkInfo.WlanMode &&
66− networkStatus(NetworkInfo.WlanMode, 0) === NetworkInfo.HomeNetwork)
65+ if (currentNetworkMode === NetworkInfo.WlanMode && networkStatus(NetworkInfo.WlanMode, 0) === NetworkInfo.HomeNetwork)
67 accessPointName = networkName(NetworkInfo.WlanMode, 0);
66 accessPointName = networkName(NetworkInfo.WlanMode, 0);
68 else
67 else
69 accessPointName = "";
68 accessPointName = "";
@@ -87,7 +86,6 @@ LocalComponents.Page {
87 readonly property bool secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
86 readonly property bool secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
88 readonly property bool adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
87 readonly property bool adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
89 readonly property bool enterprise: getExtendedProperty(extendedData, "xCanonicalWifiApIsEnterprise", false)
88 readonly property bool enterprise: getExtendedProperty(extendedData, "xCanonicalWifiApIsEnterprise", false)
90− readonly property bool isAccessPoint: menuData.type === "unity.widgets.systemsettings.tablet.accesspoint"
91 property int signalStrength: strengthAction.valid ? strengthAction.state : 0
89 property int signalStrength: strengthAction.valid ? strengthAction.state : 0
92 property int menuIndex: -1
90 property int menuIndex: -1
93
91
@@ -102,9 +100,7 @@ LocalComponents.Page {
102 signal activate()
100 signal activate()
103
101
104 text: menuData && menuData.label || ""
102 text: menuData && menuData.label || ""
105− enabled: menuData && menuData.sensitive || false
103+ enabled: menuData && menuData.sensitive && !enterprise || false
106− height: isAccessPoint && !enterprise ? units.gu(6) : 0
107− visible: !enterprise
108 __foregroundColor: "#525252"
104 __foregroundColor: "#525252"
109 showDivider: true
105 showDivider: true
110 iconName: {
106 iconName: {
@@ -170,6 +166,7 @@ LocalComponents.Page {
170
166
171 readonly property bool isAccessPoint: model.type === "unity.widgets.systemsettings.tablet.accesspoint"
167 readonly property bool isAccessPoint: model.type === "unity.widgets.systemsettings.tablet.accesspoint"
172
168
169+ height: isAccessPoint ? units.gu(6) : 0
173 anchors.left: parent.left
170 anchors.left: parent.left
174 anchors.right: parent.right
171 anchors.right: parent.right
175 asynchronous: true
172 asynchronous: true