Add set ip with new IpSettingsDialog.
This commit is contained in:
@@ -58,7 +58,6 @@ void JsonObject::init()
|
||||
mLockScreenTime = QString(getJsonString("general", "lockscreen")).toInt();
|
||||
mStorageAlarmSize = getJsonString("storagepolicy", "mininum");
|
||||
mInterfaceName = QString(getJsonString("address", "device"));
|
||||
mDhcp = QVariant(QString(getJsonString("address", "dhcp"))).toBool();
|
||||
mGateway = QString(getJsonString("routing", "defaultgateway"));
|
||||
mScanConfirm = getBool("general","ScanConfirm");
|
||||
mCompleteNotify = getBool("general","CompleteNotify");
|
||||
@@ -476,14 +475,13 @@ void JsonObject::setInterfaceName(const QString& name)
|
||||
|
||||
bool JsonObject::isDHCP()
|
||||
{
|
||||
return mDhcp;
|
||||
return mDefaultIpAddress.dhcp;
|
||||
}
|
||||
|
||||
void JsonObject::autoDHCP(bool ena)
|
||||
{
|
||||
QString str = QVariant(ena).toString();
|
||||
setJsonString("address", "dhcp", str.toStdString().c_str());
|
||||
mDhcp = ena;
|
||||
setBool("address","Dhcp", ena, true);
|
||||
mDefaultIpAddress.dhcp = ena;
|
||||
}
|
||||
|
||||
IpAddr JsonObject::getDefaultIpAddr()
|
||||
|
||||
@@ -173,7 +173,6 @@ private:
|
||||
host mMppsHost;
|
||||
IpAddr mDefaultIpAddress;
|
||||
|
||||
bool mDhcp;
|
||||
bool mDmsSimulator;
|
||||
bool mScanConfirm;
|
||||
bool mCompleteNotify;
|
||||
|
||||
Reference in New Issue
Block a user