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

fixed:control center show detail page info wrong && add key-ring

This commit is contained in:
jzxc95 2021-09-29 16:40:09 +08:00
parent f483d7c5b2
commit d3c0ac06a6
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,6 +64,9 @@ NetDetail::NetDetail(QString interface, QString name, QString uuid, bool isActiv
setFixedSize(WINDOW_WIDTH,WINDOW_HEIGHT);
centerToScreen();
if (isCreateNet && !uuid.isEmpty()) {
isCreateNet = false;
}
m_netDeviceResource = new KyNetworkDeviceResourse(this);
m_wirelessConnOpration = new KyWirelessConnectOperation(this);
m_resource = new KyWirelessNetResource(this);

4
src/frontend/new-mainwindow.cpp
View File

@ -8,6 +8,7 @@
#include <QProcess>
#include "kylinnetworkdeviceresource.h"
#include "../backend/dbus-interface/kylinagentinterface.h"
#define MAINWINDOW_WIDTH 420
#define MAINWINDOW_HEIGHT 456
@ -77,6 +78,9 @@ void MainWindow::firstlyStart()
secondaryStart();//满足条件后执行比较耗时的二级启动
});
m_secondaryStartTimer->start(5 * 1000);
//加载key ring
agent_init();
}
/**

8
src/frontend/tab-pages/wlanpage.cpp
View File

@ -317,7 +317,7 @@ void WlanPage::getAllWlan()
void WlanPage::onWlanAdded(QString interface, KyWirelessNetItem &item)
{
qDebug() << "A Wlan Added! interface = " << interface << "; ssid = " << item.m_NetSsid << Q_FUNC_INFO <<__LINE__;
qDebug() << "A Wlan Added! interface = " << interface << "; ssid = " << item.m_NetSsid << "interface" << interface << Q_FUNC_INFO <<__LINE__;
if (interface != m_defaultDevice) {
qDebug() << "wlan add interface not equal defaultdevice,ignore";
}
@ -904,8 +904,10 @@ void WlanPage::showDetailPage(QString devName, QString ssid)
return;
}
bool isActive = actMap[devName].contains(ssid);
NetDetail *netDetail = new NetDetail(devName, ssid, data.m_connectUuid, isActive, true, false, this);
QString actSsid;
m_resource->getSsidByUuid(actMap[devName].at(0), actSsid, devName);
bool isActive = (actSsid == ssid);
NetDetail *netDetail = new NetDetail(devName, ssid, data.m_connectUuid, isActive, true, true, this);
netDetail->show();
}