diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2017-04-07 16:23:35 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2017-04-10 11:48:32 +0000 |
| commit | 314de829065a3fa411b8fed90ff1289b000e229b (patch) | |
| tree | 1f075b1f5b17ee545c5a1cf4dab0b21176b0919f /src/settingsui/network/WifiSettings.qml | |
| parent | c396ac229303aeafa06e741948f68b94c1671e1e (diff) | |
Don't give connman user name as a network name
Don't give the network name as all, since it is not required for visible
networks. Also adjust the API to remove the user name parameter that was
never used (correctly).
Task-number: QTBUG-57249
Change-Id: I0eb75db6eebcaa05661a9404b728ab8af831cf1d
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/settingsui/network/WifiSettings.qml')
| -rw-r--r-- | src/settingsui/network/WifiSettings.qml | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/src/settingsui/network/WifiSettings.qml b/src/settingsui/network/WifiSettings.qml index f7cf823..b265746 100644 --- a/src/settingsui/network/WifiSettings.qml +++ b/src/settingsui/network/WifiSettings.qml @@ -147,7 +147,7 @@ Item { GroupBox { id: connectView - title: qsTr("Enter a password") + title: qsTr("Enter a passphrase") visible: false Layout.fillWidth: true ColumnLayout { @@ -172,34 +172,16 @@ Item { } RowLayout { spacing: 10 - visible: false width: parent.width Label { - text: qsTr("User name:") + text: qsTr("Passphrase:") horizontalAlignment: Text.AlignRight Layout.preferredWidth: root.width * 0.382 Layout.alignment: Qt.AlignVCenter } TextField { - text: "" - inputMethodHints: Qt.ImhNoPredictiveText - Layout.alignment: Qt.AlignVCenter - Layout.fillWidth: true - } - } - RowLayout { - spacing: 10 - width: parent.width - - Label { - text: qsTr("Password:") - horizontalAlignment: Text.AlignRight - Layout.preferredWidth: root.width * 0.382 - Layout.alignment: Qt.AlignVCenter - } - TextField { - id: password + id: passphrase text: "" echoMode: TextInput.Password inputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase | Qt.ImhPreferLowercase | Qt.ImhSensitiveData @@ -214,7 +196,7 @@ Item { text: qsTr("Connect") onClicked: { connectView.visible = false - NetworkSettingsManager.userAgent.setUserCredentials("", password.text) + NetworkSettingsManager.userAgent.setPassphrase(passphrase.text) } } Button { |