QT/Serial-Studio
1
0
Fork 0
mirror of https://github.com/Serial-Studio/Serial-Studio.git synced 2025-01-31 17:42:55 +08:00
Code Issues Projects Releases Wiki Activity

Remove spaces from DNS queries

Browse Source
This commit is contained in:
Alex Spataru 2021-02-16 00:28:13 -05:00
parent 4deb803c67
commit 9f851608e0
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
assets/qml/SetupPanes/Network.qml
View File

@ -134,6 +134,9 @@ Control {
// //
Label { Label {
text: qsTr("DNS lookup") + ": " text: qsTr("DNS lookup") + ": "
opacity: enabled ? 1 : 0.5
enabled: !Cpp_IO_Manager.connected
Behavior on opacity {NumberAnimation{}}
} RowLayout { } RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: app.spacing / 2 spacing: app.spacing / 2
@ -141,9 +144,13 @@ Control {
TextField { TextField {
id: _addrLookup id: _addrLookup
Layout.fillWidth: true Layout.fillWidth: true
opacity: enabled ? 1 : 0.5
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
enabled: !Cpp_IO_Manager.connected
onAccepted: Cpp_IO_Network.findIp(text) onAccepted: Cpp_IO_Network.findIp(text)
placeholderText: qsTr("Enter address (e.g. google.com)") placeholderText: qsTr("Enter address (e.g. google.com)")
Behavior on opacity {NumberAnimation{}}
} }
Button { Button {
@ -152,8 +159,10 @@ Control {
Layout.maximumWidth: height Layout.maximumWidth: height
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
icon.source: "qrc:/icons/search.svg" icon.source: "qrc:/icons/search.svg"
enabled: _addrLookup.text.length > 0
onClicked: Cpp_IO_Network.findIp(_addrLookup.text) onClicked: Cpp_IO_Network.findIp(_addrLookup.text)
enabled: _addrLookup.text.length > 0 && !Cpp_IO_Manager.connected
Behavior on opacity {NumberAnimation{}}
} }
} }

3
assets/qml/Windows/Setup.qml
View File

@ -214,9 +214,10 @@ Control {
clip: true clip: true
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
Layout.minimumHeight: 218
Layout.maximumHeight: 218
currentIndex: tab.currentIndex currentIndex: tab.currentIndex
Layout.topMargin: -parent.spacing - 1 Layout.topMargin: -parent.spacing - 1
Layout.minimumHeight: serial.implicitHeight + 14
SetupPanes.Serial { SetupPanes.Serial {
id: serial id: serial

4
src/IO/DataSources/Network.cpp
View File

@ -101,7 +101,7 @@ int Network::socketTypeIndex() const
bool Network::configurationOk() const bool Network::configurationOk() const
{ {
return true; return true;
// return port() > 0 && !QHostAddress(host()).isNull(); return port() > 0 && !QHostAddress(host()).isNull();
} }
/** /**
@ -210,7 +210,7 @@ void Network::setHost(const QString &host)
*/ */
void Network::findIp(const QString &host) void Network::findIp(const QString &host)
{ {
QHostInfo::lookupHost(host, this, &Network::lookupFinished); QHostInfo::lookupHost(host.simplified(), this, &Network::lookupFinished);
} }
/** /**