fanhuadesenlinnn/EZ4Connect
1
0
Fork 0
mirror of https://github.com/chenx-dust/EZ4Connect.git synced 2026-09-20 10:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: 调整设置命名

Browse Source
This commit is contained in:
Chenx Dust
2026-02-02 13:37:01 +08:00
parent bb2597bb0e
commit 305bd41968
4 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
settingwindow/settingwindow.cpp
View File

@@ -199,8 +199,8 @@ void SettingWindow::loadSettings()
ui->dnsAutoCheckBox->setChecked(settings->value("ZJUConnect/DNSAuto").toBool());
ui->secondaryDnsLineEdit->setText(settings->value("ZJUConnect/SecondaryDNS").toString());
ui->dnsTTLSpinBox->setValue(settings->value("ZJUConnect/DNSTTL").toInt());
ui->socks5PortSpinBox->setValue(settings->value("ZJUConnect/Socks5Port").toInt());
ui->httpPortSpinBox->setValue(settings->value("ZJUConnect/HttpPort").toInt());
ui->socks5PortSpinBox->setValue(settings->value("ZJUConnect/SOCKS5Port").toInt());
ui->httpPortSpinBox->setValue(settings->value("ZJUConnect/HTTPPort").toInt());
ui->shadowsocksUrlLineEdit->setText(settings->value("ZJUConnect/ShadowsocksURL").toString());
ui->dialDirectProxyLineEdit->setText(settings->value("ZJUConnect/DialDirectProxy").toString());
ui->updateBestNodesIntervalSpinBox->setValue(
@@ -234,13 +234,13 @@ void SettingWindow::loadSettings()
ui->disableDNSCheckBox->setChecked(settings->value("ZJUConnect/DisableZJUDNS").toBool());
ui->debugCheckBox->setChecked(settings->value("ZJUConnect/Debug").toBool());
ui->tunCheckBox->setChecked(settings->value("ZJUConnect/TunMode").toBool());
ui->tunCheckBox->setChecked(settings->value("ZJUConnect/TUNMode").toBool());
ui->routeCheckBox->setChecked(settings->value("ZJUConnect/AddRoute").toBool());
ui->dnsHijackCheckBox->setChecked(settings->value("ZJUConnect/DNSHijack").toBool());
ui->tcpTunnelModeCheckBox->setChecked(settings->value("ZJUConnect/TcpTunnelMode").toBool());
ui->tcpTunnelModeCheckBox->setChecked(settings->value("ZJUConnect/TCPTunnelMode").toBool());
tcpPortForwarding = settings->value("ZJUConnect/TcpPortForwarding").toString();
udpPortForwarding = settings->value("ZJUConnect/UdpPortForwarding").toString();
tcpPortForwarding = settings->value("ZJUConnect/TCPPortForwarding").toString();
udpPortForwarding = settings->value("ZJUConnect/UDPPortForwarding").toString();
customDNS = settings->value("ZJUConnect/CustomDNS").toString();
customProxyDomain = settings->value("ZJUConnect/CustomProxyDomain").toString();
extraArguments = settings->value("ZJUConnect/ExtraArguments").toString();
@@ -277,8 +277,8 @@ void SettingWindow::applySettings()
settings->setValue("ZJUConnect/DNSAuto", ui->dnsAutoCheckBox->isChecked());
settings->setValue("ZJUConnect/SecondaryDNS", ui->secondaryDnsLineEdit->text());
settings->setValue("ZJUConnect/DNSTTL", ui->dnsTTLSpinBox->value());
settings->setValue("ZJUConnect/Socks5Port", ui->socks5PortSpinBox->value());
settings->setValue("ZJUConnect/HttpPort", ui->httpPortSpinBox->value());
settings->setValue("ZJUConnect/SOCKS5Port", ui->socks5PortSpinBox->value());
settings->setValue("ZJUConnect/HTTPPort", ui->httpPortSpinBox->value());
settings->setValue("ZJUConnect/ShadowsocksURL", ui->shadowsocksUrlLineEdit->text());
settings->setValue("ZJUConnect/DialDirectProxy", ui->dialDirectProxyLineEdit->text());
settings->setValue("ZJUConnect/UpdateBestNodesInterval", ui->updateBestNodesIntervalSpinBox->value());
@@ -302,14 +302,14 @@ void SettingWindow::applySettings()
settings->setValue("ZJUConnect/ZJUDefault", ui->zjuDefaultCheckBox->isChecked());
settings->setValue("ZJUConnect/Debug", ui->debugCheckBox->isChecked());
settings->setValue("ZJUConnect/TunMode", ui->tunCheckBox->isChecked());
settings->setValue("ZJUConnect/TUNMode", ui->tunCheckBox->isChecked());
settings->setValue("ZJUConnect/AddRoute", ui->routeCheckBox->isChecked());
settings->setValue("ZJUConnect/DNSHijack", ui->dnsHijackCheckBox->isChecked());
settings->setValue("ZJUConnect/TcpTunnelMode", ui->tcpTunnelModeCheckBox->isChecked());
settings->setValue("ZJUConnect/TCPTunnelMode", ui->tcpTunnelModeCheckBox->isChecked());
settings->setValue("ZJUConnect/TcpPortForwarding", tcpPortForwarding);
settings->setValue("ZJUConnect/UdpPortForwarding", udpPortForwarding);
settings->setValue("ZJUConnect/TCPPortForwarding", tcpPortForwarding);
settings->setValue("ZJUConnect/UDPPortForwarding", udpPortForwarding);
settings->setValue("ZJUConnect/CustomDNS", customDNS);
settings->setValue("ZJUConnect/CustomProxyDomain", customProxyDomain);
settings->setValue("ZJUConnect/ExtraArguments", extraArguments);

12
utils/utils.cpp
View File

@@ -493,8 +493,8 @@ void Utils::resetDefaultSettings(QSettings& settings)
settings.setValue("ZJUConnect/DNSAuto", true);
settings.setValue("ZJUConnect/SecondaryDNS", "");
settings.setValue("ZJUConnect/DNSTTL", 3600);
settings.setValue("ZJUConnect/Socks5Port", 11080);
settings.setValue("ZJUConnect/HttpPort", 11081);
settings.setValue("ZJUConnect/SOCKS5Port", 11080);
settings.setValue("ZJUConnect/HTTPPort", 11081);
settings.setValue("ZJUConnect/ShadowsocksURL", "");
settings.setValue("ZJUConnect/DialDirectProxy", "");
settings.setValue("ZJUConnect/UpdateBestNodesInterval", 300);
@@ -518,14 +518,14 @@ void Utils::resetDefaultSettings(QSettings& settings)
settings.setValue("ZJUConnect/ZJUDefault", false);
settings.setValue("ZJUConnect/Debug", false);
settings.setValue("ZJUConnect/TunMode", false);
settings.setValue("ZJUConnect/TUNMode", false);
settings.setValue("ZJUConnect/AddRoute", false);
settings.setValue("ZJUConnect/DNSHijack", false);
settings.setValue("ZJUConnect/TcpTunnelMode", false);
settings.setValue("ZJUConnect/TCPTunnelMode", false);
settings.setValue("ZJUConnect/TcpPortForwarding", "");
settings.setValue("ZJUConnect/UdpPortForwarding", "");
settings.setValue("ZJUConnect/TCPPortForwarding", "");
settings.setValue("ZJUConnect/UDPPortForwarding", "");
settings.setValue("ZJUConnect/CustomDNS", "");
settings.setValue("ZJUConnect/CustomProxyDomain", "");
settings.setValue("ZJUConnect/ExtraArguments", "");

2
utils/utils.h
View File

@@ -14,7 +14,7 @@ namespace Utils
const inline QString APP_NAME("EZ4Connect");
constexpr inline int CONFIG_VERSION = 5;
constexpr inline int CONFIG_VERSION = 6;
QString consoleOutputToQString(const QByteArray &byteArray);

18
zjuconnectmode.cpp
View File

@@ -165,7 +165,7 @@ void MainWindow::initZjuConnect()
#if !defined(Q_OS_UNIX)
// Linux will elevate only the core process via sudo in the controller.
if (settings->value("ZJUConnect/TunMode").toBool() && !Utils::isRunningAsAdmin())
if (settings->value("ZJUConnect/TUNMode").toBool() && !Utils::isRunningAsAdmin())
{
if (Utils::relaunchAsAdmin())
@@ -208,8 +208,8 @@ void MainWindow::initZjuConnect()
settings->value("ZJUConnect/DNSAuto").toBool(),
settings->value("ZJUConnect/SecondaryDNS").toString(),
settings->value("ZJUConnect/DNSTTL").toInt(),
bind_prefix + QString::number(settings->value("ZJUConnect/Socks5Port").toInt()),
bind_prefix + QString::number(settings->value("ZJUConnect/HttpPort").toInt()),
bind_prefix + QString::number(settings->value("ZJUConnect/SOCKS5Port").toInt()),
bind_prefix + QString::number(settings->value("ZJUConnect/HTTPPort").toInt()),
settings->value("ZJUConnect/ShadowsocksURL").toString(),
settings->value("ZJUConnect/DialDirectProxy").toString(),
settings->value("ZJUConnect/UpdateBestNodesInterval", 300).toInt(),
@@ -221,12 +221,12 @@ void MainWindow::initZjuConnect()
settings->value("ZJUConnect/DisableZJUDNS").toBool(),
!settings->value("ZJUConnect/ZJUDefault").toBool(),
settings->value("ZJUConnect/Debug").toBool(),
settings->value("ZJUConnect/TunMode").toBool(),
settings->value("ZJUConnect/TUNMode").toBool(),
settings->value("ZJUConnect/AddRoute").toBool(),
settings->value("ZJUConnect/DNSHijack").toBool(),
settings->value("ZJUConnect/TcpTunnelMode").toBool(),
settings->value("ZJUConnect/TcpPortForwarding").toString(),
settings->value("ZJUConnect/UdpPortForwarding").toString(),
settings->value("ZJUConnect/TCPTunnelMode").toBool(),
settings->value("ZJUConnect/TCPPortForwarding").toString(),
settings->value("ZJUConnect/UDPPortForwarding").toString(),
settings->value("ZJUConnect/CustomDNS", "").toString(),
settings->value("ZJUConnect/CustomProxyDomain", "").toString(),
settings->value("Credential/CertFile", "").toString(),
@@ -284,8 +284,8 @@ void MainWindow::initZjuConnect()
}
}
Utils::setSystemProxy(settings->value("ZJUConnect/HttpPort").toInt(),
settings->value("ZJUConnect/Socks5Port").toInt(),
Utils::setSystemProxy(settings->value("ZJUConnect/HTTPPort").toInt(),
settings->value("ZJUConnect/SOCKS5Port").toInt(),
settings->value("Common/SystemProxyBypass").toString());
ui->pushButton2->setText("清除系统代理");
isSystemProxySet = true;