diff options
| author | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-06-06 15:04:03 +0300 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-06-06 12:33:30 +0000 |
| commit | 75db95f0e6a7b55a770372a1e5d92c034bd934b3 (patch) | |
| tree | 4a55a5f10a8092d5a0a3be9b459685d4f0c24a60 /src/settingsui/network/WifiSettings.qml | |
| parent | 6cc1f9e3f1702dee79ec4a5d85869c3234f078ed (diff) | |
Fixed WPA supplicant and made it default backend for wifi settings.
Change-Id: Ic539098e2edc5d736da0331e06f5bfc6c51947e1
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'src/settingsui/network/WifiSettings.qml')
| -rw-r--r-- | src/settingsui/network/WifiSettings.qml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/settingsui/network/WifiSettings.qml b/src/settingsui/network/WifiSettings.qml index 0944ef6..5514ece 100644 --- a/src/settingsui/network/WifiSettings.qml +++ b/src/settingsui/network/WifiSettings.qml @@ -54,7 +54,7 @@ Item { Layout.preferredWidth: root.width * 0.382 Layout.alignment: Qt.AlignVCenter horizontalAlignment: Text.AlignRight - text: selectedInterface.powered ? qsTr("Wi-Fi OFF") : qsTr("Wi-Fi ON") + text: selectedInterface.powered ? qsTr("Wi-Fi ON") : qsTr("Wi-Fi OFF") } Switch { checked: selectedInterface.powered @@ -70,6 +70,7 @@ Item { text: qsTr("Current network") horizontalAlignment: Text.AlignRight Layout.alignment: Qt.AlignVCenter + } ComboBoxEntry { id: networkSelection @@ -79,7 +80,8 @@ Item { onCurrentIndexChanged: if (currentIndex >= 0) model.itemFromRow(currentIndex).connectService(); delegate: WifiSelectorDelegate { - onConnectChanged: if (connect) networkSelection.currentIndex = networkSelection.find(modelData.name) + width: networkSelection.width + onConnectChanged: if (connect) networkSelection.currentIndex = index } } } @@ -152,7 +154,7 @@ Item { text: qsTr("Connect") onClicked: { connectView.visible = false - NetworkSettingsUserAgent.setUserCredentials("", password.text) + NetworkSettingsManager.userAgent.setUserCredentials("", password.text) } } Button { @@ -175,7 +177,7 @@ Item { } } Connections { - target: NetworkSettingsUserAgent + target: NetworkSettingsManager.userAgent onShowUserCredentialsInput : { connectView.visible = true } |