openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge:解决冲突

This commit is contained in:
jzxc95 2023-09-26 09:46:37 +08:00
parent 940569f7e1
commit 3a9a41c08f
6 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/mobilehotspot/mobilehotspotwidget.h
View File

@ -143,12 +143,8 @@ private:
void deleteSettingPathInterface(); void deleteSettingPathInterface();
void initConnectDevPage(); void initConnectDevPage();
void initBlackListPage(); void initBlackListPage();
<<<<<<< HEAD
=======
bool m_isUserSelect = true; //是否用户操作 bool m_isUserSelect = true; //是否用户操作
>>>>>>> a7566033f9be861633342d27c57493da3250193c
signals: signals:
private slots: private slots:

BIN
plugins/vpn/translations/zh_CN.qm
View File

Binary file not shown.

9
plugins/vpn/translations/zh_CN.ts
View File

@ -36,17 +36,8 @@
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<<<<<<< HEAD
<location filename="../vpn.cpp" line="68"/>
<source>VPN</source>
<translation></translation>
</message>
<message>
<location filename="../vpn.cpp" line="151"/>
=======
<location filename="../vpn.cpp" line="157"/> <location filename="../vpn.cpp" line="157"/>
<location filename="../vpn.cpp" line="284"/> <location filename="../vpn.cpp" line="284"/>
>>>>>>> a7566033f9be861633342d27c57493da3250193c
<source>Show on Taskbar</source> <source>Show on Taskbar</source>
<translation>在任务栏显示图标</translation> <translation>在任务栏显示图标</translation>
<extra-contents_path>/Vpn/Show on Taskbar</extra-contents_path> <extra-contents_path>/Vpn/Show on Taskbar</extra-contents_path>

21
src/frontend/netdetails/ipv4page.cpp
View File

@ -192,27 +192,8 @@ bool Ipv4Page::checkIsChanged(const ConInfo info, KyConnectSetting &setting)
type = CONFIG_IP_MANUAL; type = CONFIG_IP_MANUAL;
if (info.ipv4ConfigType != CONFIG_IP_MANUAL) { if (info.ipv4ConfigType != CONFIG_IP_MANUAL) {
qDebug() << "ipv4ConfigType change to Manual"; qDebug() << "ipv4ConfigType change to Manual";
<<<<<<< HEAD
setting.setIpConfigType(IPADDRESS_V4, CONFIG_IP_MANUAL);
isChanged = true;
}
qDebug() << "ipv4 netmask " << getNetMaskText(netMaskEdit->text());
if(info.strIPV4Address != ipv4addressEdit->text()
|| info.strIPV4NetMask != /*netMaskEdit->text()*/getNetMaskText(netMaskEdit->text())
|| info.strIPV4GateWay != gateWayEdit->text()) {
qDebug() << "ipv4 info changed";
QString ipv4address =ipv4addressEdit->text();
QString netMask = getNetMaskText(netMaskEdit->text());
QString gateWay = gateWayEdit->text();
qDebug() << ipv4address << netMask << gateWay;
setting.ipv4AddressConstruct(ipv4address, netMask, gateWay);
setting.dumpInfo();
isChanged = true; isChanged = true;
} else { } else {
if(info.strIPV4Address != ipv4addressEdit->text() if(info.strIPV4Address != ipv4addressEdit->text()
|| info.strIPV4NetMask != getNetMaskText(netMaskEdit->text()) || info.strIPV4NetMask != getNetMaskText(netMaskEdit->text())
|| info.strIPV4GateWay != gateWayEdit->text()) { || info.strIPV4GateWay != gateWayEdit->text()) {
@ -224,7 +205,7 @@ bool Ipv4Page::checkIsChanged(const ConInfo info, KyConnectSetting &setting)
QList<QHostAddress> ipv4dnsList; QList<QHostAddress> ipv4dnsList;
ipv4dnsList.clear(); ipv4dnsList.clear();
ipv4dnsList = m_dnsWidget->getDns(); ipv4dnsList = m_dnsWidget->getDns();
if(info.ipv4DnsList != ipv4dnsList) { if(info.ipv4DnsList != ipv4dnsList) {
isChanged = true; isChanged = true;
} }

8
src/frontend/netdetails/netdetail.cpp
View File

@ -788,11 +788,7 @@ void NetDetail::initSecuData()
initTlsInfo(m_info); initTlsInfo(m_info);
} else if (m_info.enterpriseType == PEAP) { } else if (m_info.enterpriseType == PEAP) {
initPeapInfo(m_info); initPeapInfo(m_info);
<<<<<<< HEAD
} else if (m_info.enterpriseType == TTLS){
=======
} else if (m_info.enterpriseType == TTLS) { } else if (m_info.enterpriseType == TTLS) {
>>>>>>> a7566033f9be861633342d27c57493da3250193c
initTtlsInfo(m_info); initTtlsInfo(m_info);
} else if (m_info.enterpriseType == LEAP) { } else if (m_info.enterpriseType == LEAP) {
initLeapInfo(m_info); initLeapInfo(m_info);
@ -964,11 +960,7 @@ void NetDetail::updateWirelessEnterPriseConnect(KyEapMethodType enterpriseType)
securityPage->updateFastChange(m_info.fastInfo); securityPage->updateFastChange(m_info.fastInfo);
m_wirelessConnOpration->updateWirelessEnterPriseFastConnect(m_uuid, m_info.fastInfo); m_wirelessConnOpration->updateWirelessEnterPriseFastConnect(m_uuid, m_info.fastInfo);
} else { } else {
<<<<<<< HEAD
qWarning() << "[NetDetail] unknow enterprise connection type";
=======
qWarning() << "[NetDetail] unknown enterprise connection type" << enterpriseType; qWarning() << "[NetDetail] unknown enterprise connection type" << enterpriseType;
>>>>>>> a7566033f9be861633342d27c57493da3250193c
} }
} }

3
src/src.pro
View File

@ -21,14 +21,11 @@ INCLUDEPATH += /usr/include/KF5/NetworkManagerQt
LIBS += -L/usr/lib/ -lgsettings-qt -lX11 -lKF5NetworkManagerQt -lukui-log4qt LIBS += -L/usr/lib/ -lgsettings-qt -lX11 -lKF5NetworkManagerQt -lukui-log4qt
#LIBS += -lkysec #LIBS += -lkysec
<<<<<<< HEAD
=======
CONFIG(release, debug|release) { CONFIG(release, debug|release) {
!system($$PWD/translate_generation.sh): error("Failed to generate translation") !system($$PWD/translate_generation.sh): error("Failed to generate translation")
} }
>>>>>>> a7566033f9be861633342d27c57493da3250193c
target.path = /usr/bin target.path = /usr/bin
target.source += $$TARGET target.source += $$TARGET
desktop.path = /etc/xdg/autostart/ desktop.path = /etc/xdg/autostart/