diff --git a/net-view/operation/nettype.h b/net-view/operation/nettype.h index 440cd423..45ff32aa 100644 --- a/net-view/operation/nettype.h +++ b/net-view/operation/nettype.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2019 - 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2019 - 2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later #ifndef NETTYPE_H @@ -103,12 +103,12 @@ class NetType Net_AirplaneTips = 0x01000000, Net_VPNTips = 0x02000000, Net_VPNChildren = 0x04000000, - + Net_SysProxyAlwaysShow = 0x08000000, // Net_DockFlags = Net_Device | Net_VPN | Net_SysProxy | Net_Airplane | Net_AirplaneTips | Net_VPNTips | Net_tipsLinkEnabled | Net_UseSecretAgent | Net_CheckPortal | Net_8021xToControlCenterUnderConnect | Net_autoUpdateHiddenConfig, Net_LockFlags = Net_Device | Net_VPN | Net_SysProxy | Net_Airplane | Net_AirplaneTips | Net_VPNTips | Net_UseSecretAgent | Net_CheckPortal | Net_8021xSendNotifyUnderConnect, Net_GreeterFlags = Net_Device | Net_Airplane | Net_AirplaneTips | Net_ServiceNM | Net_AutoAddConnection | Net_UseSecretAgent | Net_CheckPortal | Net_8021xSendNotifyUnderConnect, - Net_DccFlags = Net_Device | Net_VPN | Net_VPNChildren | Net_SysProxy | Net_Hotspot | Net_Airplane | Net_DSL | Net_Details, + Net_DccFlags = Net_Device | Net_VPN | Net_VPNChildren | Net_SysProxy | Net_Hotspot | Net_Airplane | Net_DSL | Net_Details | Net_SysProxyAlwaysShow, // Net_8021xMask = 0x00000F00, }; diff --git a/net-view/operation/private/netmanagerthreadprivate.cpp b/net-view/operation/private/netmanagerthreadprivate.cpp index f9aa83cb..4b5ff5fe 100644 --- a/net-view/operation/private/netmanagerthreadprivate.cpp +++ b/net-view/operation/private/netmanagerthreadprivate.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2019 - 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2019 - 2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: LGPL-3.0-or-later #include "netmanagerthreadprivate.h" @@ -462,11 +462,12 @@ void NetManagerThreadPrivate::doInit() item->updatemethod(NetType::ProxyMethod(method)); item->item()->moveToThread(m_parentThread); Q_EMIT itemAdded("Root", item); - onSystemProxyExistChanged(networkController->proxyController()->systemProxyExist()); onSystemAutoProxyChanged(networkController->proxyController()->autoProxy()); onSystemManualProxyChanged(); - - connect(networkController->proxyController(), &ProxyController::systemProxyExistChanged, this, &NetManagerThreadPrivate::onSystemProxyExistChanged); + if (!m_flags.testFlags(NetType::NetManagerFlag::Net_SysProxyAlwaysShow)) { + onSystemProxyExistChanged(networkController->proxyController()->systemProxyExist()); + connect(networkController->proxyController(), &ProxyController::systemProxyExistChanged, this, &NetManagerThreadPrivate::onSystemProxyExistChanged); + } connect(networkController->proxyController(), &ProxyController::proxyMethodChanged, this, &NetManagerThreadPrivate::onSystemProxyMethodChanged); connect(networkController->proxyController(), &ProxyController::autoProxyChanged, this, &NetManagerThreadPrivate::onSystemAutoProxyChanged); connect(networkController->proxyController(), &ProxyController::proxyChanged, this, &NetManagerThreadPrivate::onSystemManualProxyChanged);