Index: sources/device/DeviceView.cpp =================================================================== diff -u -re7c552d59935eb2a63f3dcee0a5161d19f5c7ac5 -r5c4bcd852bc3026166a409e3fae4a08dbbe98bd0 --- sources/device/DeviceView.cpp (.../DeviceView.cpp) (revision e7c552d59935eb2a63f3dcee0a5161d19f5c7ac5) +++ sources/device/DeviceView.cpp (.../DeviceView.cpp) (revision 5c4bcd852bc3026166a409e3fae4a08dbbe98bd0) @@ -371,7 +371,7 @@ QStringList fields = lines[row].split(','); // qDebug() << fields.join("-"); -// LOG_DEBUG(fields.join("-")); + LOG_DEBUG(fields.join("-")); // this will never fail since even an empty string in split at least has index 0=eSSID; mSSID = fields[eSSID].trimmed(); if ( mSSID.isEmpty() ) continue; //hidden networks, or an incorrect entry @@ -548,7 +548,7 @@ subnetMask(fields[eSUBNETMASK].trimmed()); gateway(fields[eGATEWAY].trimmed()); dns(fields[eDNS2].isEmpty() ? fields[eDNS1].trimmed() : - QStringLiteral("%1,%2").arg(fields[eDNS1].trimmed()) + QStringLiteral("%1,\n%2").arg(fields[eDNS1].trimmed()) .arg(fields[eDNS2].trimmed())); } @@ -573,21 +573,18 @@ } void VDevice::onAttributeResponse(const DeviceConnectWifiResponseData &vData) { - LOG_DEBUG(QStringLiteral("*********** onAttributeResponse : %1 %2").arg(vData.mCompleted ) - .arg(vData.mCompleted )); - - // this has to be called to let Gui to set to old value that device controller provided. - status(vData.mMessage); - accepted(vData.mAccepted); - reason (vData.mReason ); - if ( vData.mCompleted ) { if ( vData.mAccepted ) { // rescan once connect/disconnect has completed wifiListRequest({}); } } + // this has to be called to let Gui to set to old value that device controller provided. + status(vData.mMessage); + accepted(vData.mAccepted); + reason (vData.mReason ); + // has to be the last one response(true); } Index: sources/gui/qml/pages/settings/SettingsWiFi.qml =================================================================== diff -u -re7c552d59935eb2a63f3dcee0a5161d19f5c7ac5 -r5c4bcd852bc3026166a409e3fae4a08dbbe98bd0 --- sources/gui/qml/pages/settings/SettingsWiFi.qml (.../SettingsWiFi.qml) (revision e7c552d59935eb2a63f3dcee0a5161d19f5c7ac5) +++ sources/gui/qml/pages/settings/SettingsWiFi.qml (.../SettingsWiFi.qml) (revision 5c4bcd852bc3026166a409e3fae4a08dbbe98bd0) @@ -94,6 +94,7 @@ TextEntry { id : _dns textInput.text : vDevice.dns 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 @@ -154,10 +155,7 @@ readonly property string postSecurityTypeLabel : wifiSupported ? "" : " - " + qsTr("Not Supported") readonly property bool isConnected : wifiConnected onIsConnectedChanged: { - if ( isConnected ) { - _ssidText.text = wifiSsid - - } + _ssidText.text = isConnected ? wifiSsid : "" } clip : true