Index: sources/gui/qml/pages/settings/SettingsWiFi.qml =================================================================== diff -u -re7adb742d7dd362b2deb795259694b223eea3bc0 -r94c7a571dc12f24aa072ac2b14199432ce9f3821 --- sources/gui/qml/pages/settings/SettingsWiFi.qml (.../SettingsWiFi.qml) (revision e7adb742d7dd362b2deb795259694b223eea3bc0) +++ sources/gui/qml/pages/settings/SettingsWiFi.qml (.../SettingsWiFi.qml) (revision 94c7a571dc12f24aa072ac2b14199432ce9f3821) @@ -42,6 +42,7 @@ readonly property int leftMargin : 50 readonly property int rightMargin : 50 readonly property int topMargin : 160 + readonly property bool isConnected : vDevice.ssid !== "" readonly property bool isValid : @@ -68,46 +69,51 @@ textInput.width : entryWidth label.width : labelWidth hasCursor : false // set false for now to disable the static IP entry for phase 1 + textInput.color : Colors.textMain } TextEntry { id : _ipAddress nextInput : _gateway // helps user to tap on enter to go to the next entry, keyboard visibility is handled by TextEntry. - textInput.text : vDevice.ssid !== "" ? vDevice.ipAddress : "" + textInput.text : vDevice.ipAddress + textInput.visible: _root.isConnected label.text : qsTr("IP Address") textInput.width : entryWidth label.width : labelWidth hasCursor : false // set false for now to disable the static IP entry for phase 1 - validator : ipValidator + textInput.color : Colors.textMain } TextEntry { id : _gateway nextInput : _subnetmask // helps user to tap on enter to go to the next entry, keyboard visibility is handled by TextEntry. textInput.text : vDevice.gateway + textInput.visible: _root.isConnected textInput.width : entryWidth label.width : labelWidth label.text : qsTr("Gateway") hasCursor : false // set false for now to disable the static IP entry for phase 1 - validator : ipValidator + textInput.color : Colors.textMain } TextEntry { id : _subnetmask nextInput : _dns // helps user to tap on enter to go to the next entry, keyboard visibility is handled by TextEntry. textInput.text : vDevice.subnetMask + textInput.visible: _root.isConnected textInput.width : entryWidth label.width : labelWidth label.text : qsTr("Subnet Mask") hasCursor : false // set false for now to disable the static IP entry for phase 1 - validator : ipValidator + textInput.color : Colors.textMain } TextEntry { id : _dns textInput.text : vDevice.dns + textInput.visible: _root.isConnected textInput.width : entryWidth textInput.wrapMode : Text.WordWrap label.width : labelWidth label.text : qsTr("DNS") hasCursor : false // set false for now to disable the static IP entry for phase 1 -// validator : ipValidator // Will fail the validor if there are more than 1 ip + textInput.color : Colors.textMain } }