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

优化代码

This commit is contained in:
jzxc95 2022-03-15 14:35:44 +08:00
parent 98e0ef5000
commit 76cec152c9
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontend/mainwindow.cpp
View File

@ -401,7 +401,7 @@ void MainWindow::resetWindowTheme()
void MainWindow::showControlCenter() void MainWindow::showControlCenter()
{ {
QProcess process; QProcess process;
if (!m_lanWidget->lanIsConnected() && m_wlanWidget->wlanIsConnected()){ if (!m_lanWidget->lanIsConnected() && m_wlanWidget->checkWlanStatus(NetworkManager::ActiveConnection::State::Activated)){
process.startDetached("ukui-control-center -m wlanconnect"); process.startDetached("ukui-control-center -m wlanconnect");
} else { } else {
process.startDetached("ukui-control-center -m netconnect"); process.startDetached("ukui-control-center -m netconnect");
@ -451,7 +451,7 @@ void MainWindow::onRefreshTrayIcon()
if (m_lanWidget->lanIsConnected()) { if (m_lanWidget->lanIsConnected()) {
m_trayIcon->setIcon(QIcon::fromTheme("network-wired-connected-symbolic")); m_trayIcon->setIcon(QIcon::fromTheme("network-wired-connected-symbolic"));
iconStatus = IconActiveType::LAN_CONNECTED; iconStatus = IconActiveType::LAN_CONNECTED;
} else if (m_wlanWidget->wlanIsConnected()){ } else if (m_wlanWidget->checkWlanStatus(NetworkManager::ActiveConnection::State::Activated)){
m_trayIcon->setIcon(QIcon::fromTheme("network-wireless-connected-symbolic")); m_trayIcon->setIcon(QIcon::fromTheme("network-wireless-connected-symbolic"));
iconStatus = IconActiveType::WLAN_CONNECTED; iconStatus = IconActiveType::WLAN_CONNECTED;
} else { } else {
@ -504,7 +504,7 @@ void MainWindow::onWlanConnectStatusToChangeTrayIcon(int state)
m_wlanIsLoading = true; m_wlanIsLoading = true;
iconTimer->start(LOADING_TRAYICON_TIMER_MS); iconTimer->start(LOADING_TRAYICON_TIMER_MS);
} else { } else {
if (m_wlanWidget->wlanIsConnecting()) { if (m_wlanWidget->checkWlanStatus(NetworkManager::ActiveConnection::State::Activating)) {
return; return;
} }
m_wlanIsLoading = false; m_wlanIsLoading = false;

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

@ -1378,18 +1378,9 @@ void WlanPage::showDetailPage(QString devName, QString ssid)
return; return;
} }
bool WlanPage::wlanIsConnected() bool WlanPage::checkWlanStatus(NetworkManager::ActiveConnection::State state)
{ {
if (m_activatedConnectResource->checkWirelessStatus(NetworkManager::ActiveConnection::State::Activated)) { if (m_activatedConnectResource->checkWirelessStatus(state)) {
return true;
} else {
return false;
}
}
bool WlanPage::wlanIsConnecting()
{
if (m_activatedConnectResource->checkWirelessStatus(NetworkManager::ActiveConnection::State::Activating)) {
return true; return true;
} else { } else {
return false; return false;

3
src/frontend/tab-pages/wlanpage.h
View File

@ -42,8 +42,7 @@ public:
void showDetailPage(QString devName, QString uuid); void showDetailPage(QString devName, QString uuid);
bool wlanIsConnected(); bool checkWlanStatus(NetworkManager::ActiveConnection::State state);
bool wlanIsConnecting();
void getApInfoBySsid(QString devName, QString ssid, QStringList &list); void getApInfoBySsid(QString devName, QString ssid, QStringList &list);
//无线总开关 //无线总开关