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

Fix:wlanpage refresh and close wifiswitchbutton

This commit is contained in:
jinxujie 2021-09-30 17:23:37 +08:00
parent d6b43dfddd
commit e497f99c1b
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,6 +138,19 @@ void WlanPage::initConnections()
connect(m_switchGsettings, &QGSettings::changed, this, [ = ](const QString &key) { connect(m_switchGsettings, &QGSettings::changed, this, [ = ](const QString &key) {
if (key == WIRELESS_SWITCH) { if (key == WIRELESS_SWITCH) {
bool status = m_switchGsettings->get(WIRELESS_SWITCH).toBool(); bool status = m_switchGsettings->get(WIRELESS_SWITCH).toBool();
if (!status) {
// m_deviceFrame->hide();
m_activatedNetFrame->hide();
m_inactivatedNetFrame->hide();
m_activatedNetDivider->hide();
m_inactivatedNetDivider->hide();
} else {
// m_deviceFrame->show();
m_activatedNetFrame->show();
m_inactivatedNetFrame->show();
m_activatedNetDivider->show();
m_inactivatedNetDivider->show();
}
m_wirelessConnectOpreation->setWirelessEnabled(status); m_wirelessConnectOpreation->setWirelessEnabled(status);
m_netSwitch->setSwitchStatus(m_switchGsettings->get(WIRELESS_SWITCH).toBool()); m_netSwitch->setSwitchStatus(m_switchGsettings->get(WIRELESS_SWITCH).toBool());
onWlanSwitchStatusChanged(m_switchGsettings->get(WIRELESS_SWITCH).toBool()); onWlanSwitchStatusChanged(m_switchGsettings->get(WIRELESS_SWITCH).toBool());
@ -684,6 +697,10 @@ void WlanPage::onWifiEnabledChanged(bool isWifiOn)
void WlanPage::updateByStrength() void WlanPage::updateByStrength()
{ {
if (m_expandedItem) {
qDebug() << "Has expanded item and forbid refresh wifi strength" << Q_FUNC_INFO << __LINE__;
return;
}
qDebug() << "Will update Wlan list by strength." << Q_FUNC_INFO << __LINE__; qDebug() << "Will update Wlan list by strength." << Q_FUNC_INFO << __LINE__;
QList<KyWirelessNetItem> wlanList; QList<KyWirelessNetItem> wlanList;
if (!m_resource->getDeviceWifiNetwork(m_defaultDevice, wlanList)) { if (!m_resource->getDeviceWifiNetwork(m_defaultDevice, wlanList)) {
@ -718,6 +735,8 @@ void WlanPage::updateByStrength()
} else {//找到了该位置的wifi而且与现在的排序不符，需要调整 } else {//找到了该位置的wifi而且与现在的排序不符，需要调整
KyWirelessNetItem *data = new KyWirelessNetItem(wlanList.at(i)); KyWirelessNetItem *data = new KyWirelessNetItem(wlanList.at(i));
WlanListItem * currentWlan = new WlanListItem(m_resource, data, m_defaultDevice); WlanListItem * currentWlan = new WlanListItem(m_resource, data, m_defaultDevice);
connect(currentWlan, &WlanListItem::itemHeightChanged, this, &WlanPage::onItemHeightChanged);
connect(currentWlan, &WlanListItem::connectButtonClicked, this, &WlanPage::onConnectButtonClicked);
QPair<QListWidgetItem*, WlanListItem*> newPair; QPair<QListWidgetItem*, WlanListItem*> newPair;
newPair.first = m_itemsMap.value(lastWlan->getSsid()).first; newPair.first = m_itemsMap.value(lastWlan->getSsid()).first;
newPair.second = currentWlan; newPair.second = currentWlan;