sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Change gateway settings in NetworkManager

Browse Source
This commit is contained in:
sunwen
2024-06-24 17:20:16 +08:00
parent 78cb0de2d3
commit 9d89a06c67
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/device/networkmanager.cpp
View File

@@ -63,6 +63,7 @@ void NetworkManager::initNetworkInfo()
mIsDHCP = !entry.isPermanent(); mIsDHCP = !entry.isPermanent();
mIpAddress = entry.ip().toString(); mIpAddress = entry.ip().toString();
mSubNetMask = entry.netmask().toString(); mSubNetMask = entry.netmask().toString();
mGateway = JsonObject::Instance()->getDefaultIpAddr().gateway;
return; return;
} }
} }

2
src/dialogs/IpSettingsDialog.cpp
View File

@@ -20,7 +20,7 @@ IpSettingsDialog::IpSettingsDialog(QWidget* aParent, Qt::WindowFlags aFlag)
, mGateway(new ULineEdit(this)) , mGateway(new ULineEdit(this))
, mThread(nullptr) , mThread(nullptr)
{ {
IpAddr addr = JsonObject::Instance()->getDefaultIpAddr(); IpAddr addr = NetworkManager::getInstance()->getDefaultIpAddr();
mDhcpButton->setChecked(addr.dhcp); mDhcpButton->setChecked(addr.dhcp);
mIpAddress->setText(addr.ip); mIpAddress->setText(addr.ip);
mSubnetMask->setText(addr.mask); mSubnetMask->setText(addr.mask);

2
src/json/jsonobject.cpp
View File

@@ -507,7 +507,7 @@ void JsonObject::setDefaultIpAddr(const IpAddr& addr)
{ {
setJsonString("address", "ip", addr.ip.toStdString().c_str()); setJsonString("address", "ip", addr.ip.toStdString().c_str());
setJsonString("address", "mask", addr.mask.toStdString().c_str()); setJsonString("address", "mask", addr.mask.toStdString().c_str());
setJsonString("address", "gateway", addr.ip.toStdString().c_str()); setJsonString("address", "gateway", addr.gateway.toStdString().c_str());
setBool("address","dhcp", addr.dhcp, true); setBool("address","dhcp", addr.dhcp, true);
mDefaultIpAddress = addr; mDefaultIpAddress = addr;
} }