From 205bd5b3c5a9e18eb8e07ee099dfe76a4b632eb9 Mon Sep 17 00:00:00 2001 From: jzxc95 <907297917@qq.com> Date: Mon, 11 Oct 2021 15:24:42 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E8=B0=83=E7=94=A8=E5=B1=9E=E6=80=A7=E9=A1=B5?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E5=92=8C=E7=9B=B4=E6=8E=A5=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E9=85=8D=E7=BD=AE=E6=8E=A7=E5=88=B6=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E4=B8=8D=E6=96=AD=E8=BF=9E=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dbus-interface/kylinconnectresource.cpp | 4 +-- src/backend/dbusadaptor.cpp | 2 ++ src/backend/dbusadaptor.h | 2 +- src/frontend/mainwindow.h | 2 +- src/frontend/netdetails/detailpage.cpp | 7 ++++- src/frontend/netdetails/netdetail.cpp | 24 +++++++++-------- src/frontend/netdetails/netdetail.h | 2 +- src/frontend/tab-pages/wlanpage.cpp | 26 ++++++++++++------- src/frontend/tab-pages/wlanpage.h | 2 +- 9 files changed, 43 insertions(+), 28 deletions(-) diff --git a/src/backend/dbus-interface/kylinconnectresource.cpp b/src/backend/dbus-interface/kylinconnectresource.cpp index a3b380ed..3b0b95ae 100644 --- a/src/backend/dbus-interface/kylinconnectresource.cpp +++ b/src/backend/dbus-interface/kylinconnectresource.cpp @@ -583,7 +583,7 @@ bool KyConnectResourse::isWiredConnection(QString uuid) NetworkManager::Connection::Ptr connectPtr = m_networkResourceInstance->getConnect(uuid); - if (connectPtr->isValid()) { + if (!connectPtr.isNull()) { NetworkManager::ConnectionSettings::Ptr connectSettingPtr = connectPtr->settings(); if (connectSettingPtr.isNull()) { @@ -605,7 +605,7 @@ bool KyConnectResourse::isWirelessConnection(QString uuid) NetworkManager::Connection::Ptr connectPtr = m_networkResourceInstance->getConnect(uuid); - if (connectPtr->isValid()) { + if (connectPtr.isNull()) { NetworkManager::ConnectionSettings::Ptr connectSettingPtr = connectPtr->settings(); if (connectSettingPtr.isNull()) { diff --git a/src/backend/dbusadaptor.cpp b/src/backend/dbusadaptor.cpp index 66e306e5..140cb55d 100644 --- a/src/backend/dbusadaptor.cpp +++ b/src/backend/dbusadaptor.cpp @@ -178,12 +178,14 @@ QMap DbusAdaptor::getDeviceListAndEnabled(int devType) //唤起属性页 根据网卡类型 参数2 为ssid/uuid void DbusAdaptor::showPropertyWidget(QString devName, QString ssid) { + qDebug() << "showPropertyWidget"; parent()->showPropertyWidget(devName,ssid); } //唤起新建有线连接界面 void DbusAdaptor::showCreateWiredConnectWidget(QString devName) { + qDebug() << "showCreateWiredConnectWidget"; parent()->showCreateWiredConnectWidget(devName); } diff --git a/src/backend/dbusadaptor.h b/src/backend/dbusadaptor.h index bfbb471a..28c821d2 100644 --- a/src/backend/dbusadaptor.h +++ b/src/backend/dbusadaptor.h @@ -86,7 +86,7 @@ Q_SIGNALS: // SIGNALS void lanUpdate(QString devName, QStringList info); void wlanAdd(QString devName, QStringList info); void wlanRemove(QString devName,QString ssid); - void wlanactiveConnectionStateChanged(QString devName, QString ssid, int status); + void wlanactiveConnectionStateChanged(QString devName, QString ssid, QString uuid, int status); void lanActiveConnectionStateChanged(QString devName, QString uuid, int status); //仅失败，若成功直接发listUpdate void activateFailed(QString errorMessage); diff --git a/src/frontend/mainwindow.h b/src/frontend/mainwindow.h index 065a7db0..98412b68 100644 --- a/src/frontend/mainwindow.h +++ b/src/frontend/mainwindow.h @@ -60,7 +60,7 @@ signals: void lanUpdate(QString devName, QStringList info); void wlanAdd(QString devName, QStringList info); void wlanRemove(QString devName,QString ssid); - void wlanactiveConnectionStateChanged(QString devName, QString ssid, int status); + void wlanactiveConnectionStateChanged(QString devName, QString ssid, QString uuid, int status); void lanActiveConnectionStateChanged(QString devName, QString uuid, int status); void activateFailed(QString errorMessage); void deactivateFailed(QString errorMessage); diff --git a/src/frontend/netdetails/detailpage.cpp b/src/frontend/netdetails/detailpage.cpp index 70aa28f7..ba5adbf8 100644 --- a/src/frontend/netdetails/detailpage.cpp +++ b/src/frontend/netdetails/detailpage.cpp @@ -1,4 +1,5 @@ #include "detailpage.h" +#include extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed); @@ -80,12 +81,16 @@ void DetailPage::initUI() { mSSID = new QLineEdit(this); mSSID->setAlignment(Qt::AlignRight); + qDebug() << "DetailPage" << isCreate; if (!isCreate) { mSSID->setStyleSheet("background:transparent;border-width:0;border-style:outset"); mSSID->setFocusPolicy(Qt::NoFocus); } else { mSSID->setStyleSheet("border-width:0;border-style:outset"); } + QHBoxLayout *mSsidLayout = new QHBoxLayout(this); + mSsidLayout->addStretch(); + mSsidLayout->addWidget(mSSID); mProtocol = new QLabel(this); QHBoxLayout *mProtocolLayout = new QHBoxLayout(this); @@ -143,7 +148,7 @@ void DetailPage::initUI() { mAutoLayout->addWidget(autoConnect); mAutoLayout->addSpacerItem(horizontalSpacer); - mDetailLayout->addRow(tr("SSID:"), mSSID); + mDetailLayout->addRow(tr("SSID:"), mSsidLayout); mDetailLayout->addRow(tr("Protocol:"), mProtocolLayout); if (mIsWlan) { mDetailLayout->addRow(tr("Security Type:"), mSecTypeLayout); diff --git a/src/frontend/netdetails/netdetail.cpp b/src/frontend/netdetails/netdetail.cpp index bdc14829..3f7f8c5b 100644 --- a/src/frontend/netdetails/netdetail.cpp +++ b/src/frontend/netdetails/netdetail.cpp @@ -44,7 +44,7 @@ NetDetail::NetDetail(QString interface, QString name, QString uuid, bool isActiv m_uuid(uuid), isActive(isActive), isWlan(isWlan), - isCreateNet(isCreateNet), + m_isCreateNet(isCreateNet), QDialog(parent) { //设置窗口无边框，阴影 @@ -64,9 +64,11 @@ NetDetail::NetDetail(QString interface, QString name, QString uuid, bool isActiv setFixedSize(WINDOW_WIDTH,WINDOW_HEIGHT); centerToScreen(); - if (isCreateNet && !uuid.isEmpty()) { - isCreateNet = false; + qDebug() << m_isCreateNet << name; + if (m_isCreateNet && !name.isEmpty()) { + m_isCreateNet = false; } + qDebug() << m_isCreateNet; m_netDeviceResource = new KyNetworkDeviceResourse(this); m_wirelessConnOpration = new KyWirelessConnectOperation(this); m_resource = new KyWirelessNetResource(this); @@ -79,13 +81,13 @@ NetDetail::NetDetail(QString interface, QString name, QString uuid, bool isActiv pagePadding(name,isWlan); - isCreateOk = !(isCreateNet && !isWlan); + isCreateOk = !(m_isCreateNet && !isWlan); isDetailOk = !(m_name.isEmpty()); isIpv4Ok = true; isIpv6Ok = true; isSecuOk = true; - qDebug() << interface << name << uuid << "isWlan" << isWlan << "isCreateNet" <setContentsMargins(9,9,14,24); - detailPage = new DetailPage(isWlan, isCreateNet, this); + detailPage = new DetailPage(isWlan, m_isCreateNet, this); ipv4Page = new Ipv4Page(this); ipv6Page = new Ipv6Page(this); securityPage = new SecurityPage(this); @@ -230,7 +232,7 @@ void NetDetail::initUI() void NetDetail::loadPage() { //判断是否创建网络页面 - if (isCreateNet && !isWlan) { + if (m_isCreateNet && !isWlan) { pageFrame->hide(); stackWidget->setCurrentIndex(CREATE_NET_PAGE_NUM); titleLabel->setText(tr("Add Lan Connect")); @@ -305,7 +307,7 @@ void NetDetail::initComponent() void NetDetail::pagePadding(QString netName, bool isWlan) { //网络详情页填充 - if(isCreateNet && !isWlan) { + if(m_isCreateNet && !isWlan) { return; } @@ -363,7 +365,7 @@ void NetDetail::pagePadding(QString netName, bool isWlan) //获取网路详情信息 void NetDetail::getConInfo(ConInfo &conInfo) { - if (isCreateNet && !isWlan) { + if (m_isCreateNet && !isWlan) { return; } getBaseInfo(conInfo); @@ -555,7 +557,7 @@ void NetDetail::initTtlsInfo(ConInfo &conInfo) //点击了保存更改网络设置的按钮 void NetDetail::on_btnConfirm_clicked() { - if (isCreateNet) { + if (m_isCreateNet) { if (!isWlan) { //新建有线连接 qDebug() << "Confirm create wired connect"; @@ -589,7 +591,7 @@ void NetDetail::on_btnForget_clicked() void NetDetail::setConfirmEnable() { - if (isCreateNet && !isWlan) { + if (m_isCreateNet && !isWlan) { isConfirmBtnEnable = isCreateOk; } else { if (isDetailOk && isIpv4Ok && isIpv6Ok) { diff --git a/src/frontend/netdetails/netdetail.h b/src/frontend/netdetails/netdetail.h index 35c469e4..d6c721a0 100644 --- a/src/frontend/netdetails/netdetail.h +++ b/src/frontend/netdetails/netdetail.h @@ -109,7 +109,7 @@ private: QString m_deviceName; bool isWlan; - bool isCreateNet; + bool m_isCreateNet; bool isActive; bool isHideWlan; diff --git a/src/frontend/tab-pages/wlanpage.cpp b/src/frontend/tab-pages/wlanpage.cpp index c624656f..4d37476c 100644 --- a/src/frontend/tab-pages/wlanpage.cpp +++ b/src/frontend/tab-pages/wlanpage.cpp @@ -538,7 +538,7 @@ void WlanPage::onActivatedWlanChanged(QString uuid, NetworkManager::ActiveConnec m_resource->getSsidByUuid(uuid, ssid, devName); qDebug() << "emit wlanActiveConnectionStateChanged" << devName << ssid << state; - emit wlanActiveConnectionStateChanged(devName, ssid, state); + emit wlanActiveConnectionStateChanged(devName, ssid,uuid, state); if (state == NetworkManager::ActiveConnection::State::Deactivated) { QList apConnectItemList; @@ -781,9 +781,14 @@ void WlanPage::getWirelessList(QMap > &map) QString activeSsid ; //先是已连接 if (actMap.contains(iter.key())) { + qDebug() << "find " <getWifiNetwork(iter.key(), actMap[iter.key()].at(0), data)) { - vector.append(QStringList()<getSsidByUuid(actMap[iter.key()].at(0), ssid, devName); + if (m_resource->getWifiNetwork(iter.key(), ssid, data)) { + qDebug() << data.m_NetSsid << data.m_signalStrength << data.m_secuType << data.m_connectUuid; + vector.append(QStringList()<getWifiNetwork(devName, ssid, data)) { qDebug()<<"[WlanPage] " << ssid << " is missing when showDetailPage"; return; @@ -931,15 +937,15 @@ void WlanPage::showDetailPage(QString devName, QString ssid) QMap actMap; m_resource->getWirelessActiveConnection(NetworkManager::ActiveConnection::State::Activated, actMap); - if (!actMap.contains(devName)) { - qDebug()<<"[WlanPage] " << devName << " is missing when showDetailPage"; - return; + if (actMap.empty() || !actMap.contains(devName)) { + qDebug()<<"[WlanPage] " << devName << " is missing in active device when showDetailPage"; + isActive = false; + } else { + QString actSsid; + m_resource->getSsidByUuid(actMap[devName].at(0), actSsid, devName); + isActive = !actSsid.compare(ssid); } - QString actSsid; - m_resource->getSsidByUuid(actMap[devName].at(0), actSsid, devName); - - bool isActive = !actSsid.compare(ssid); NetDetail *netDetail = new NetDetail(devName, ssid, data.m_connectUuid, isActive, true, true, this); netDetail->show(); } diff --git a/src/frontend/tab-pages/wlanpage.h b/src/frontend/tab-pages/wlanpage.h index dd3c748f..e7cf3573 100644 --- a/src/frontend/tab-pages/wlanpage.h +++ b/src/frontend/tab-pages/wlanpage.h @@ -44,7 +44,7 @@ signals: void oneItemExpanded(const QString &ssid); void wlanAdd(QString devName, QStringList info); void wlanRemove(QString devName,QString ssid); - void wlanActiveConnectionStateChanged(QString interface, QString ssid, int status); + void wlanActiveConnectionStateChanged(QString interface, QString ssid, QString uuid, int status); void hotspotDeactivated(QString devName, QString ssid); void hotspotActivated(QString devName, QString ssid); void signalStrengthChange(QString devName, QString ssid, int strength); From 0161531376579fd185316247474d6b8f7374d921 Mon Sep 17 00:00:00 2001 From: jxj Date: Tue, 12 Oct 2021 17:30:58 +0800 Subject: [PATCH 02/19] Fix:bug#84473 --- src/frontend/mainwindow.cpp | 6 +- translations/kylin-nm_bo.ts | 1742 +------------------------------- translations/kylin-nm_tr.qm | Bin 21647 -> 1757 bytes translations/kylin-nm_tr.ts | 1735 +++++++++---------------------- translations/kylin-nm_zh_CN.qm | Bin 11355 -> 6255 bytes translations/kylin-nm_zh_CN.ts | 1539 ++-------------------------- 6 files changed, 633 insertions(+), 4389 deletions(-) diff --git a/src/frontend/mainwindow.cpp b/src/frontend/mainwindow.cpp index 857e2daf..8c87b4eb 100644 --- a/src/frontend/mainwindow.cpp +++ b/src/frontend/mainwindow.cpp @@ -147,13 +147,13 @@ void MainWindow::initTrayIcon() m_trayIcon->setToolTip(QString(tr("kylin-nm"))); m_showSettingsAction->setIcon(QIcon::fromTheme("document-page-setup-symbolic", QIcon(":/res/x/setup.png")) ); - m_trayIconMenu->addAction(m_showMainwindowAction); +// m_trayIconMenu->addAction(m_showMainwindowAction); m_trayIconMenu->addAction(m_showSettingsAction); m_trayIcon->setContextMenu(m_trayIconMenu); m_trayIcon->setIcon(QIcon::fromTheme("network-wired-signal-excellent-symbolic")); connect(m_trayIcon, &QSystemTrayIcon::activated, this, &MainWindow::onTrayIconActivated); - connect(m_showMainwindowAction, &QAction::triggered, this, &MainWindow::onShowMainwindowActionTriggled); +// connect(m_showMainwindowAction, &QAction::triggered, this, &MainWindow::onShowMainwindowActionTriggled); connect(m_showSettingsAction, &QAction::triggered, this, &MainWindow::onShowSettingsActionTriggled); m_trayIcon->show(); } @@ -357,7 +357,7 @@ void MainWindow::onRefreshTrayIcon() } else if (m_wlanWidget->m_wlanIsConnected == true && m_lanWidget->m_isLanConnected == false){ m_trayIcon->setIcon(QIcon::fromTheme("network-wireless-signal-excellent-symbolic")); } else if (m_wlanWidget->m_wlanIsConnected == false && m_lanWidget->m_isLanConnected == false){ - m_trayIcon->setIcon(QIcon::fromTheme("network-wired-signal-excellent-symbolic")); + m_trayIcon->setIcon(QIcon::fromTheme("network-wired-disconnected-symbolic")); } } diff --git a/translations/kylin-nm_bo.ts b/translations/kylin-nm_bo.ts index 23a75a01..1279ad59 100644 --- a/translations/kylin-nm_bo.ts +++ b/translations/kylin-nm_bo.ts @@ -1,146 +1,6 @@ - - ConfForm - - - edit network - - - - - LAN name: - - - - - - - Method: - - - - - Address: - - - - - Netmask: - - - - - Gateway: - - - - - DNS 1: - - - - - DNS 2: - - - - - Ipv6 Address: - - - - - Edit Conn - - - - - Auto(DHCP) - - - - - Manual - - - - - Cancel - - - - - Save - - - - - Ok - - - - - Can not create new wired network for without wired card - - - - - New network already created - - - - - Wireless card not exist - - - - - Can not save wired network for without wired card - - - - - New network settings already finished - - - - - kylin-nm - - - - - kylin network applet desktop message - - - - - Will check the IP address conflict - - - - - IPV4 address conflict, Please change IP - - - - - IPV6 address conflict, Please change IP - - - - - Edit Network - - - - - Add Wired Network - - - CreatNetPage @@ -247,1058 +107,6 @@ - - DlgHideWifi - - - Connect to Hidden WLAN Network - - - - - Add Hidden WLAN - - - - - Connection - - - - - WLAN name - - - - - WLAN security - - - - - Cancel - - - - - Connect - - - - - C_reate… - - - - - None - - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - - - Conn WLAN Success - - - - - - Confirm your WLAN password or usable of wireless card - - - - - DlgHideWifiEapFast - - - Connect to Hidden WLAN Network - - - - - Add hidden WLAN - - - - - Connection - - - - - Network name - - - - - WLAN security - - - - - Authentication - - - - - Anonymous identity - - - - - Allow automatic PAC pro_visioning - - - - - PAC file - - - - - Inner authentication - - - - - Username - - - - - Password - - - - - Cancel - - - - - Connect - - - - - C_reate… - - - - - - None - - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - - WEP 40/128-bit Key (Hex or ASCII) - - - - - WEP 128-bit Passphrase - - - - - Dynamic WEP (802.1X) - - - - - Tunneled TLS - - - - - Protected EAP (PEAP) - - - - - Anonymous - - - - - Authenticated - - - - - Both - - - - - DlgHideWifiEapLeap - - - Connect to Hidden WLAN Network - - - - - Add hidden WLAN - - - - - Connection - - - - - Network name - - - - - WLAN security - - - - - Authentication - - - - - Username - - - - - Password - - - - - Cancel - - - - - Connect - - - - - C_reate… - - - - - None - - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - - WEP 40/128-bit Key (Hex or ASCII) - - - - - WEP 128-bit Passphrase - - - - - Dynamic WEP (802.1X) - - - - - Tunneled TLS - - - - - Protected EAP (PEAP) - - - - - DlgHideWifiEapPeap - - - Connect to Hidden WLAN Network - - - - - Add hidden WLAN - - - - - Connection - - - - - Network name - - - - - WLAN security - - - - - Authentication - - - - - Anonymous identity - - - - - Domain - - - - - CA certificate - - - - - CA certificate password - - - - - No CA certificate is required - - - - - PEAP version - - - - - Inner authentication - - - - - Username - - - - - Password - - - - - Cancel - - - - - Connect - - - - - - None - - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - - Protected EAP (PEAP) - - - - - Choose from file - - - - - Automatic - - - - - Version 0 - - - - - Version 1 - - - - - DlgHideWifiEapPwd - - - Connect to Hidden WLAN Network - - - - - Add hidden WLAN - - - - - Connection - - - - - Network name - - - - - WLAN security - - - - - Authentication - - - - - Username - - - - - Password - - - - - Cancel - - - - - Connect - - - - - C_reate… - - - - - None - - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - - WEP 40/128-bit Key (Hex or ASCII) - - - - - WEP 128-bit Passphrase - - - - - Dynamic WEP (802.1X) - - - - - Tunneled TLS - - - - - Protected EAP (PEAP) - - - - - DlgHideWifiEapTTLS - - - Add hidden WLAN - - - - - Connection - - - - - Network name - - - - - WLAN security - - - - - Authentication - - - - - Anonymous identity - - - - - Domain - - - - - CA certificate - - - - - CA certificate password - - - - - No CA certificate is required - - - - - Inner authentication - - - - - Username - - - - - Password - - - - - Cancel - - - - - Connect - - - - - C_reate… - - - - - - None - - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - - WEP 40/128-bit Key (Hex or ASCII) - - - - - WEP 128-bit Passphrase - - - - - Dynamic WEP (802.1X) - - - - - Tunneled TLS - - - - - Protected EAP (PEAP) - - - - - Choose from file - - - - - Connect to Hidden Wi-Fi Network - - - - - DlgHideWifiEapTls - - - Connect to Hidden WLAN Network - - - - - Add hidden WLAN - - - - - Connection - - - - - Network name - - - - - WLAN security - - - - - Authentication - - - - - Identity - - - - - Domain - - - - - CA certificate - - - - - CA certificate password - - - - - No CA certificate is required - - - - - User certificate - - - - - User certificate password - - - - - User private key - - - - - User key password - - - - - Cancel - - - - - Connect - - - - - C_reate… - - - - - - - - None - - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - - Tunneled TLS - - - - - Protected EAP (PEAP) - - - - - - - Choose from file - - - - - DlgHideWifiLeap - - - Connection - - - - - Network name - - - - - Username - - - - - Password - - - - - Cancel - - - - - Connect - - - - - C_reate… - - - - - None - - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - - WEP 40/128-bit Key (Hex or ASCII) - - - - - Add hidden Wi-Fi - - - - - Wi-Fi security - - - - - WEP 128-bit Passphrase - - - - - Dynamic WEP (802.1X) - - - - - Connect to Hidden Wi-Fi Network - - - - - DlgHideWifiWep - - - Connection - - - - - Network name - - - - - Key - - - - - WEP index - - - - - Authentication - - - - - Cancel - - - - - Connect - - - - - C_reate… - - - - - None - - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - - WEP 40/128-bit Key (Hex or ASCII) - - - - - Add hidden Wi-Fi - - - - - Wi-Fi security - - - - - WEP 128-bit Passphrase - - - - - Dynamic WEP (802.1X) - - - - - 1(default) - - - - - Open System - - - - - Shared Key - - - - - Connect to Hidden Wi-Fi Network - - - - - DlgHideWifiWpa - - - Connection - - - - - Add Hidden Wi-Fi - - - - - Wi-Fi name - - - - - Wi-Fi security - - - - - Password - - - - - Cancel - - - - - Connect - - - - - C_reate… - - - - - None - - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - - - Conn Wifi Success - - - - - - Confirm your Wi-Fi password or usable of wireless card - - - - - Connect to Hidden Wi-Fi Network - - - EnterpriseWlanDialog @@ -1408,43 +216,41 @@ + + LanListItem + + + Wired Device not carried + + + LanPage - + LAN - + Activated LAN - + Inactivated LAN - - - LAN Disconnected Successfully - - - - - LAN Connected Successfully - - ListItem - + Kylin NM - + kylin network applet desktop message @@ -1452,29 +258,28 @@ MainWindow - - - + + kylin-nm - + LAN - + WLAN - + Settings - + Show MainWindow @@ -1572,213 +377,6 @@ - - OldMainWindow - - - Ethernet Networks - - - - - New LAN - - - - - WLAN Networks - - - - - Hide WLAN - - - - - No usable network in the list - - - - - - - Ethernet - - - - - HotSpot - - - - - FlyMode - - - - - - Advanced - - - - - kylin-nm - - - - - Show MainWindow - - - - - - Wired net is disconnected - - - - - No wireless card detected - - - - - - - - - Not connected - - - - - - - - - - - - - Disconnected - - - - - - NetOn, - - - - - NetOn,IfName: - - - - - No Other Wired Network Scheme - - - - - No Other Wireless Network Scheme - - - - - - - - Wired connection - - - - - - - - Ethernet connection - - - - - WLAN is disconnected - - - - - - Conn Ethernet Success - - - - - Without Lan Cable - - - - - IP configuration could not be reserved - - - - - MAC Address Mismatch - - - - - Connection Be Killed - - - - - Connect Bluetooth Network Failed - - - - - Carrier/link changed - - - - - Connect Wired Network Failed - - - - - Connect VPN Network Failed - - - - - Conn WLAN Success - - - - - Confirm your WLAN password or usable of wireless card - - - - - Confirm your WLAN password - - - - - Selected WLAN has not been scanned. - - - - - Connect Hidden WLAN Success - - - OneConnForm @@ -1786,79 +384,6 @@ Form - - - - - - - - Connect - - - - - - - Disconnect - - - - - Cancel - - - - - Property - - - - - Password Incorrect - - - - - - Forget - - - - - Rate - - - - - None - - - - - WLAN Security： - - - - - Signal： - - - - - MAC： - - - - - Conn WLAN Success - - - - - Confirm your WLAN password or usable of wireless card - - OneLancForm @@ -1867,76 +392,6 @@ Form - - - - Connect - - - - - Disconnect - - - - - Cancel - - - - - Not connected - - - - - - Disconnected - - - - - - Ethernet - - - - - NetOn, - - - - - - - No Configuration - - - - - No IfName - - - - - IPv4： - - - - - IPv6： - - - - - MAC： - - - - - BandWidth： - - SecurityPage @@ -2134,20 +589,20 @@ - + Disconnect - + Connect - + Forget @@ -2180,163 +635,14 @@ - + WLAN Connected Successfully - + WLAN Disconnected Successfully - - WpaWifiDialog - - - Dialog - - - - - Connect WLAN - - - - - Security - - - - - EAP type - - - - - Name - - - - - Inner auth - - - - - Username - - - - - Password - - - - - Show password - - - - - Ask pwd each query - - - - - Cancel - - - - - Connect - - - - - - - - - - - None - - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - - - - Choose from file... - - - - - - - Choose a CA certificate - - - - - - CA Files (*.pem *.der *.p12 *.crt *.cer *.pfx) - - - - - CA Files (*.pem *.der *.p12 *.crt *.key *.cer *.pfx) - - - - - Identity - - - - - Anonymous Identity - - - - - Domain - - - - - CA certificate - - - - - no need for CA certificate - - - - - User Certificate - - - - - User Private Key - - - - - User Private Key password - - - diff --git a/translations/kylin-nm_tr.qm b/translations/kylin-nm_tr.qm index c5f225daedd3a8a20609afeec2a3a0204b566a97..3df96addd92796570dee9783200893bcae230a33 100644 GIT binary patch delta 267 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 Gv;POV@4~|X diff --git a/translations/kylin-nm_tr.ts b/translations/kylin-nm_tr.ts index 731a2500..9ad4c974 100644 --- a/translations/kylin-nm_tr.ts +++ b/translations/kylin-nm_tr.ts @@ -11,141 +11,80 @@ ConfForm - edit network - Ağı düzenle + Ağı düzenle - LAN name: - LAN adı: + LAN adı: - - - Method: - Yöntem: + Yöntem: - Address: - Adres: + Adres: - Netmask: - Netmask: + Netmask: - - Gateway: - - - - DNS 1: - DNS 1: + DNS 1: - DNS 2: - DNS 2: + DNS 2: - - Ipv6 Address: - - - - Edit Conn - Bağ. Düzenle + Bağ. Düzenle - Auto(DHCP) - Oto(DHCP) + Oto(DHCP) - Manual - Elle + Elle - Cancel - İptal + İptal - Save - Kaydet + Kaydet - Ok - Tamam + Tamam - Can not create new wired network for without wired card - Kablolu kart olmadan yeni kablolu ağ oluşturulamıyor + Kablolu kart olmadan yeni kablolu ağ oluşturulamıyor - New network already created - Yeni ağ zaten oluşturuldu + Yeni ağ zaten oluşturuldu - - Wireless card not exist - - - - - Can not save wired network for without wired card - - - - New network settings already finished - Yeni ağ ayarları zaten tamamlandı + Yeni ağ ayarları zaten tamamlandı - - kylin-nm - - - - kylin network applet desktop message - Kylin ağ uygulaması masaüstü mesajı + Kylin ağ uygulaması masaüstü mesajı - - Will check the IP address conflict - - - - - IPV4 address conflict, Please change IP - - - - - IPV6 address conflict, Please change IP - - - - Edit Network - Ağı Düzenle + Ağı Düzenle - Add Wired Network - Kablolu Ağ Ekle + Kablolu Ağ Ekle create wired network successfully @@ -269,66 +208,44 @@ DlgHideWifi - Add Hidden WLAN - Gizli WLAN Ekle + Gizli WLAN Ekle - Connection - Bağlantı + Bağlantı - WLAN name - WLAN adı + WLAN adı - WLAN security - WLAN güvenlik + WLAN güvenlik - Cancel - İptal + İptal - Connect - Bağlantı + Bağlantı - C_reate… - Oluştur... + Oluştur... - None - Yok + Yok - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - - Conn WLAN Success - WLAN Bağlantısı Başarılı + WLAN Bağlantısı Başarılı - - Confirm your WLAN password or usable of wireless card - Kablosuz şifrenizi veya kablosuz kart kullanılabilirliğini onaylayın + Kablosuz şifrenizi veya kablosuz kart kullanılabilirliğini onaylayın WPA & WPA2 Personal @@ -351,361 +268,166 @@ WPA & WPA2 Enterprise - Connect to Hidden WLAN Network - Gizli WLAN Ağına Bağlan + Gizli WLAN Ağına Bağlan DlgHideWifiEapFast - Connect to Hidden WLAN Network - Gizli WLAN Ağına Bağlan + Gizli WLAN Ağına Bağlan - Add hidden WLAN - Gizli WLAN Ekle + Gizli WLAN Ekle - Connection - Bağlantı: + Bağlantı: - Network name - Ağ adı + Ağ adı - WLAN security - WLAN güvenliği + WLAN güvenliği - Authentication - Kimlik Doğrulama + Kimlik Doğrulama - Anonymous identity - Anonim kimlik + Anonim kimlik - Allow automatic PAC pro_visioning - Otomatik PAC pro_visioning'e izin ver + Otomatik PAC pro_visioning'e izin ver - PAC file - PAC dosyası + PAC dosyası - Inner authentication - İç kimlik doğrulama: + İç kimlik doğrulama: - Username - Kullanıcı adı + Kullanıcı adı - Password - Parola + Parola - Cancel - İptal + İptal - Connect - Bağlan + Bağlan - C_reate… - Oluştur... + Oluştur... - - None - Yok - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - + Yok WPA & WPA2 Personal WPA & WPA2 Kişisel - WEP 40/128-bit Key (Hex or ASCII) - WEP 40/128-bit Key (Hex veya ASCII) + WEP 40/128-bit Key (Hex veya ASCII) - WEP 128-bit Passphrase - WEP 128-bit Passphrase + WEP 128-bit Passphrase - Dynamic WEP (802.1X) - Dinamik WEP (802.1x) + Dinamik WEP (802.1x) WPA & WPA2 Enterprise WPA & WPA2 Enterprise - Tunneled TLS - Tünelli TLS + Tünelli TLS - Protected EAP (PEAP) - Korumalı EAP (PEAP) + Korumalı EAP (PEAP) - Anonymous - Anonim + Anonim - Authenticated - Doğrulanmış + Doğrulanmış - Both - Her ikisi de + Her ikisi de DlgHideWifiEapLeap - Connect to Hidden WLAN Network - Gizli WLAN ağına bağlan + Gizli WLAN ağına bağlan - Add hidden WLAN - Gizli WLAN ekle + Gizli WLAN ekle - Connection - Bağlantı: + Bağlantı: - Network name - Ağ adı: + Ağ adı: - WLAN security - WLAN güvenliği: + WLAN güvenliği: - Authentication - Kimlik Doğrulama: + Kimlik Doğrulama: - Username - Kullanıcı adı: + Kullanıcı adı: - Password - Parola: + Parola: - Cancel - 取消 + 取消 - Connect - Bağlan + Bağlan - C_reate… - Oluştur... + Oluştur... - None - Yok - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - WPA & WPA2 Personal - WPA & WPA2 Kişisel - - - - WEP 40/128-bit Key (Hex or ASCII) - WEP 40/128-bit Key (Hex veya ASCII) - - - - WEP 128-bit Passphrase - WEP 128-bit Passphrase - - - - Dynamic WEP (802.1X) - Dinamik WEP (802.1x) - - - WPA & WPA2 Enterprise - WPA & WPA2 Enterprise - - - - Tunneled TLS - Tünelli TLS - - - - Protected EAP (PEAP) - Korumalı EAP (PEAP) - - - - DlgHideWifiEapPeap - - - Connect to Hidden WLAN Network - Gizli WLAN Ağına Bağlan - - - - Add hidden WLAN - Gizli WLAN ekle - - - - Connection - Bağlantı: - - - - Network name - Ağ adı: - - - - WLAN security - WLAN güvenliği: - - - - Authentication - Kimlik Doğrulama: - - - - Anonymous identity - Anonim kimlik: - - - - Domain - Domain: - - - - CA certificate - CA sertifikası: - - - - CA certificate password - CA sertifika şifresi: - - - - No CA certificate is required - CA sertifikası gerekmez - - - - PEAP version - PEAP sürümü: - - - - Inner authentication - İç kimlik doğrulama: - - - - Username - Kullanıcı adı: - - - - Password - Parola: - - - - Cancel - İptal - - - - Connect - Bağlan - - - - - None - Yok - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - + Yok WPA & WPA2 Personal @@ -732,392 +454,83 @@ Tünelli TLS - Protected EAP (PEAP) - Korumalı EAP (PEAP) - - - - Choose from file - Dosyadan seçin... - - - - Automatic - Otomatik - - - - Version 0 - Sürüm 0 - - - - Version 1 - Sürüm 1 + Korumalı EAP (PEAP) - DlgHideWifiEapPwd - - - Connect to Hidden WLAN Network - Gizli WLAN Ağına Bağlan - - - - Add hidden WLAN - Gizli WLAN ekle - - - - Connection - Bağlantı: - - - - Network name - Ağ adı: - - - - WLAN security - WLAN güvenliği: - - - - Authentication - Kimlik Doğrulama: - - - - Username - Kullanıcı adı: - - - - Password - Parola: - - - - Cancel - İptal - - - - Connect - Bağlan - - - - C_reate… - Oluştur... - - - - None - Yok - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - WPA & WPA2 Personal - WPA & WPA2 Kişisel - - - - WEP 40/128-bit Key (Hex or ASCII) - WEP 40/128-bit Key (Hex veya ASCII) - - - - WEP 128-bit Passphrase - WEP 128-bit Passphrase - - - - Dynamic WEP (802.1X) - Dinamik WEP (802.1x) - - - WPA & WPA2 Enterprise - WPA & WPA2 Enterprise - - - - Tunneled TLS - Tünelli TLS - - - - Protected EAP (PEAP) - Korumalı EAP (PEAP) - - - - DlgHideWifiEapTTLS + DlgHideWifiEapPeap Connect to Hidden WLAN Network Gizli WLAN Ağına Bağlan - Add hidden WLAN - Gizli WLAN ekle + Gizli WLAN ekle - Connection - Bağlantı: + Bağlantı: - Network name - Ağ adı: + Ağ adı: - WLAN security - WLAN Güvenliği: + WLAN güvenliği: - Authentication - Kimlik Doğrulama: + Kimlik Doğrulama: - Anonymous identity - Anonim kimlik: + Anonim kimlik: - Domain - Domain: + Domain: - CA certificate - CA Sertifikası: + CA sertifikası: - CA certificate password - CA sertifika şifresi: + CA sertifika şifresi: - No CA certificate is required - CA sertifikası gerekmez + CA sertifikası gerekmez + + + PEAP version + PEAP sürümü: - Inner authentication - İç kimlik doğrulama: + İç kimlik doğrulama: - Username - Kullanıcı adı: + Kullanıcı adı: - Password - Parola: + Parola: - Cancel - İptal + İptal - Connect - Bağlan + Bağlan - - C_reate… - Oluştur... - - - - None - Yok - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - WPA & WPA2 Personal - WPA & WPA2 Kişisel - - - - WEP 40/128-bit Key (Hex or ASCII) - WEP 40/128-bit Key (Hex veya ASCII) - - - - WEP 128-bit Passphrase - WEP 128-bit Passphrase - - - - Dynamic WEP (802.1X) - Dinamik WEP (802.1x) - - - WPA & WPA2 Enterprise - WPA & WPA2 Enterprise - - - - Tunneled TLS - Tünelli TLS - - - - Protected EAP (PEAP) - Korumalı EAP (PEAP) - - - - Choose from file - Dosyadan seçiniz... - - - - Connect to Hidden Wi-Fi Network - - - - - DlgHideWifiEapTls - - - Connect to Hidden WLAN Network - Gizli WLAN Ağına Bağlan - - - - Add hidden WLAN - Gizli WLAN ekle - - - - Connection - Bağlantı: - - - - Network name - Ağ adı: - - - - WLAN security - WLAN güvenliği: - - - - Authentication - Kimlik Doğrulama: - - - - Identity - Kimlik: - - - - Domain - Domain: - - - - CA certificate - CA sertifikası: - - - - CA certificate password - CA sertifika şifresi: - - - - No CA certificate is required - CA sertifikası gerekmez - - - - User certificate - Kullanıcı sertifikası: - - - - User certificate password - Kullanıcı sertifikası şifresi: - - - - User private key - Kullanıcı özel anahtarı: - - - - User key password - Kullanıcı anahtarı şifresi: - - - - Cancel - İptal - - - - Connect - Bağlan - - - - C_reate… - Oluştur... - - - - - - - None - Yok - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - + Yok WPA & WPA2 Personal @@ -1140,21 +553,325 @@ WPA & WPA2 Enterprise - Tunneled TLS - Tünelli TLS + Tünelli TLS - Protected EAP (PEAP) - Korumalı EAP (PEAP) + Korumalı EAP (PEAP) - - - Choose from file - Dosyadan seç... + Dosyadan seçin... + + + Automatic + Otomatik + + + Version 0 + Sürüm 0 + + + Version 1 + Sürüm 1 + + + + DlgHideWifiEapPwd + + Connect to Hidden WLAN Network + Gizli WLAN Ağına Bağlan + + + Add hidden WLAN + Gizli WLAN ekle + + + Connection + Bağlantı: + + + Network name + Ağ adı: + + + WLAN security + WLAN güvenliği: + + + Authentication + Kimlik Doğrulama: + + + Username + Kullanıcı adı: + + + Password + Parola: + + + Cancel + İptal + + + Connect + Bağlan + + + C_reate… + Oluştur... + + + None + Yok + + + WPA & WPA2 Personal + WPA & WPA2 Kişisel + + + WEP 40/128-bit Key (Hex or ASCII) + WEP 40/128-bit Key (Hex veya ASCII) + + + WEP 128-bit Passphrase + WEP 128-bit Passphrase + + + Dynamic WEP (802.1X) + Dinamik WEP (802.1x) + + + WPA & WPA2 Enterprise + WPA & WPA2 Enterprise + + + Tunneled TLS + Tünelli TLS + + + Protected EAP (PEAP) + Korumalı EAP (PEAP) + + + + DlgHideWifiEapTTLS + + Connect to Hidden WLAN Network + Gizli WLAN Ağına Bağlan + + + Add hidden WLAN + Gizli WLAN ekle + + + Connection + Bağlantı: + + + Network name + Ağ adı: + + + WLAN security + WLAN Güvenliği: + + + Authentication + Kimlik Doğrulama: + + + Anonymous identity + Anonim kimlik: + + + Domain + Domain: + + + CA certificate + CA Sertifikası: + + + CA certificate password + CA sertifika şifresi: + + + No CA certificate is required + CA sertifikası gerekmez + + + Inner authentication + İç kimlik doğrulama: + + + Username + Kullanıcı adı: + + + Password + Parola: + + + Cancel + İptal + + + Connect + Bağlan + + + C_reate… + Oluştur... + + + None + Yok + + + WPA & WPA2 Personal + WPA & WPA2 Kişisel + + + WEP 40/128-bit Key (Hex or ASCII) + WEP 40/128-bit Key (Hex veya ASCII) + + + WEP 128-bit Passphrase + WEP 128-bit Passphrase + + + Dynamic WEP (802.1X) + Dinamik WEP (802.1x) + + + WPA & WPA2 Enterprise + WPA & WPA2 Enterprise + + + Tunneled TLS + Tünelli TLS + + + Protected EAP (PEAP) + Korumalı EAP (PEAP) + + + Choose from file + Dosyadan seçiniz... + + + + DlgHideWifiEapTls + + Connect to Hidden WLAN Network + Gizli WLAN Ağına Bağlan + + + Add hidden WLAN + Gizli WLAN ekle + + + Connection + Bağlantı: + + + Network name + Ağ adı: + + + WLAN security + WLAN güvenliği: + + + Authentication + Kimlik Doğrulama: + + + Identity + Kimlik: + + + Domain + Domain: + + + CA certificate + CA sertifikası: + + + CA certificate password + CA sertifika şifresi: + + + No CA certificate is required + CA sertifikası gerekmez + + + User certificate + Kullanıcı sertifikası: + + + User certificate password + Kullanıcı sertifikası şifresi: + + + User private key + Kullanıcı özel anahtarı: + + + User key password + Kullanıcı anahtarı şifresi: + + + Cancel + İptal + + + Connect + Bağlan + + + C_reate… + Oluştur... + + + None + Yok + + + WPA & WPA2 Personal + WPA & WPA2 Kişisel + + + WEP 40/128-bit Key (Hex or ASCII) + WEP 40/128-bit Key (Hex veya ASCII) + + + WEP 128-bit Passphrase + WEP 128-bit Passphrase + + + Dynamic WEP (802.1X) + Dinamik WEP (802.1x) + + + WPA & WPA2 Enterprise + WPA & WPA2 Enterprise + + + Tunneled TLS + Tünelli TLS + + + Protected EAP (PEAP) + Korumalı EAP (PEAP) + + + Choose from file + Dosyadan seç... @@ -1168,97 +885,61 @@ Gizli WLAN Ekle - Connection - Bağlantı + Bağlantı - Network name - Ağ adı + Ağ adı WLAN security WLAN Güvenlik - - Add hidden Wi-Fi - - - - - Wi-Fi security - - - - Username - Kullanıcı adı + Kullanıcı adı - Password - Parola + Parola - Cancel - İptal + İptal - Connect - Bağlan + Bağlan - C_reate… - Oluştur... + Oluştur... - None - Yok - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - + Yok WPA & WPA2 Personal WPA & WPA2 Kişisel - WEP 40/128-bit Key (Hex or ASCII) - WEP 40/128-bit Key (Hex veya ASCII) + WEP 40/128-bit Key (Hex veya ASCII) - WEP 128-bit Passphrase - WEP 128-bit Passphrase + WEP 128-bit Passphrase - Dynamic WEP (802.1X) - Dinamik WEP (802.1X) + Dinamik WEP (802.1X) WPA & WPA2 Enterprise WPA & WPA2 Enterprise - - - Connect to Hidden Wi-Fi Network - - DlgHideWifiWep @@ -1271,116 +952,76 @@ Gizli WLAN Ekle - Connection - Bağlantı: + Bağlantı: - Network name - Ağ adı: + Ağ adı: WLAN security WLAN Güvenliği: - - Add hidden Wi-Fi - - - - - Wi-Fi security - - - - Key - Anahtar + Anahtar - WEP index - WEP index + WEP index - Authentication - Kimlik Doğrulama: + Kimlik Doğrulama: - Cancel - İptal + İptal - Connect - Bağlan + Bağlan - C_reate… - Oluştur... + Oluştur... - None - Yok - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - + Yok WPA & WPA2 Personal WPA & WPA2 Kişisel - WEP 40/128-bit Key (Hex or ASCII) - WEP 40/128-bit Key (Hex veya ASCII) + WEP 40/128-bit Key (Hex veya ASCII) - WEP 128-bit Passphrase - WEP 128-bit Passphrase + WEP 128-bit Passphrase - Dynamic WEP (802.1X) - Dinamik WEP (802.1x) + Dinamik WEP (802.1x) WPA & WPA2 Enterprise WPA & WPA2 Enterprise - 1(default) - 1(default) + 1(default) - Open System - Sistemi aç + Sistemi aç - Shared Key - Paylaşılan Anahtar - - - - Connect to Hidden Wi-Fi Network - + Paylaşılan Anahtar @@ -1394,9 +1035,8 @@ Gizli WLAN Ekle - Connection - Bağlantı: + Bağlantı: WLAN name @@ -1407,66 +1047,24 @@ WLAN güvenlik: - - Add Hidden Wi-Fi - - - - - Wi-Fi name - - - - - Wi-Fi security - - - - Password - Parola: + Parola: - Cancel - İptal + İptal - Connect - Bağlan + Bağlan - C_reate… - Oluştur... + Oluştur... - None - Yok - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - - - Conn Wifi Success - - - - - - Confirm your Wi-Fi password or usable of wireless card - + Yok Conn WLAN Success @@ -1492,11 +1090,6 @@ Dynamic WEP (802.1X) Dinamik WEP (802.1x) - - - Connect to Hidden Wi-Fi Network - - DlgHotspotCreate @@ -1649,43 +1242,41 @@ Kylin ağ uygulaması masaüstü mesajı + + LanListItem + + + Wired Device not carried + + + LanPage - + LAN - + Activated LAN - + Inactivated LAN - - - LAN Disconnected Successfully - - - - - LAN Connected Successfully - - ListItem - + Kylin NM - + kylin network applet desktop message Kylin ağ uygulaması masaüstü mesajı @@ -1693,9 +1284,8 @@ MainWindow - - - + + kylin-nm @@ -1716,17 +1306,17 @@ Gizli Ağı Bağlan - + LAN - + WLAN WLAN - + Settings @@ -1743,7 +1333,7 @@ HotSpot - + Show MainWindow Ana Pencereyi Göster @@ -1939,208 +1529,80 @@ OldMainWindow - Ethernet Networks - Ethernet Ağları + Ethernet Ağları - New LAN - Yeni LAN + Yeni LAN - WLAN Networks - WLAN Ağları + WLAN Ağları - Hide WLAN - Gizli WLAN + Gizli WLAN - No usable network in the list - Listede kullanılabilir ağ yok + Listede kullanılabilir ağ yok - - - Ethernet - Kablolu Ağ + Kablolu Ağ - HotSpot - HotSpot + HotSpot - - FlyMode - - - - - Advanced - Gelişmiş + Gelişmiş - - kylin-nm - - - - Show MainWindow - Ana Pencereyi Göster + Ana Pencereyi Göster - - Wired net is disconnected - Kablolu ağ bağlantısı kesildi + Kablolu ağ bağlantısı kesildi - - No wireless card detected - - - - - - - - Not connected - Bağlanamadı + Bağlanamadı - - - - - - - - - Disconnected - Bağlantı Kesildi + Bağlantı Kesildi - - - NetOn, - - - - - NetOn,IfName: - - - - No Other Wired Network Scheme - Başka Kablolu Ağ Düzeni Yok + Başka Kablolu Ağ Düzeni Yok - No Other Wireless Network Scheme - Başka Kablosuz Ağ Düzeni Yok + Başka Kablosuz Ağ Düzeni Yok - - - - - Wired connection - - - - - - - - Ethernet connection - - - - WLAN is disconnected - Kablosuz bağlantı kesildi + Kablosuz bağlantı kesildi - - Conn Ethernet Success - Ethernet Bağlantısı Başarılı + Ethernet Bağlantısı Başarılı - - Without Lan Cable - - - - - IP configuration could not be reserved - - - - - MAC Address Mismatch - - - - - Connection Be Killed - - - - - Connect Bluetooth Network Failed - - - - - Carrier/link changed - - - - - Connect Wired Network Failed - - - - - Connect VPN Network Failed - - - - Conn WLAN Success - WLAN Bağlantısı Başarılı + WLAN Bağlantısı Başarılı - Confirm your WLAN password or usable of wireless card - Kablosuz şifrenizi veya kablosuz kart kullanılabilirliğini onaylayın + Kablosuz şifrenizi veya kablosuz kart kullanılabilirliğini onaylayın - Confirm your WLAN password - WLAN parolasını doğrula - - - - Selected WLAN has not been scanned. - - - - - Connect Hidden WLAN Success - + WLAN parolasını doğrula @@ -2159,21 +1621,12 @@ Ayar - - - - - - Connect - Bağlan + Bağlan - - - Disconnect - Bağlantıyı Kes + Bağlantıyı Kes Input Password... @@ -2183,11 +1636,6 @@ Connect to Hidden WLAN Network Gizli WLAN Ağına Bağlan - - - Signal： - - Public Halka açık @@ -2197,59 +1645,32 @@ Güvenli - - Cancel - - - - - Property - - - - - Password Incorrect - - - - - - Forget - - - - Rate - Oran + Oran - None - Yok + Yok - WLAN Security： - WLAN güvenliği: + WLAN güvenliği: Sifnal： Sinyal gücü: - MAC： - Fiziksel adres: + Fiziksel adres: - Conn WLAN Success - WLAN Bağlantısı Başarılı + WLAN Bağlantısı Başarılı - Confirm your WLAN password or usable of wireless card - Kablosuz şifrenizi veya kablosuz kart kullanılabilirliğini onaylayın + Kablosuz şifrenizi veya kablosuz kart kullanılabilirliğini onaylayın Conn WLAN Failed @@ -2268,74 +1689,44 @@ Ayar - - Connect - Bağlan + Bağlan - Disconnect - Bağlantıyı Kes + Bağlantıyı Kes - - Cancel - - - - Not connected - Bağlanamadı + Bağlanamadı - - Disconnected - Bağlantı Kesildi + Bağlantı Kesildi - - Ethernet - Kablolu Ağ + Kablolu Ağ - - NetOn, - - - - - - No Configuration - Yapılandırma Yok + Yapılandırma Yok - - No IfName - - - - IPv4： - IPv4 adresi: + IPv4 adresi: - IPv6： - IPv6 adresi: + IPv6 adresi: - BandWidth： - Bant genişliği: + Bant genişliği: - MAC： - Fiziksel adres: + Fiziksel adres: Auto @@ -2545,20 +1936,20 @@ - + Disconnect Bağlantıyı Kes - + Connect - + Forget @@ -2591,12 +1982,12 @@ - + WLAN Connected Successfully - + WLAN Disconnected Successfully @@ -2604,150 +1995,16 @@ WpaWifiDialog - - Dialog - - - - - Connect WLAN - - - - - Security - - - - - EAP type - - - - - Name - - - - - Inner auth - - - - - Username - - - - - Password - - - - - Show password - - - - - Ask pwd each query - - - - - Cancel - - - - - Connect - - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - - - - Choose from file... - - - - - - - Choose a CA certificate - - - - - - CA Files (*.pem *.der *.p12 *.crt *.cer *.pfx) - - - - - CA Files (*.pem *.der *.p12 *.crt *.key *.cer *.pfx) - - - - Identity - Kimlik: + Kimlik: - - Anonymous Identity - - - - Domain - Domain: + Domain: - - CA certificate - - - - - no need for CA certificate - - - - - User Certificate - - - - - User Private Key - - - - - User Private Key password - - - - - - - - - - None - Yok + Yok diff --git a/translations/kylin-nm_zh_CN.qm b/translations/kylin-nm_zh_CN.qm index 656182620e487b1e3405e7bef3c1f2bc6dd708fc..b38250563e24c321ff955a16ddc31f97a5f6df35 100644 GIT binary patch delta 889 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 ConfForm - - edit network - - - - - LAN name: - - - - - - - Method: - - - - - Address: - - - - - Netmask: - - - - - Gateway: - - - - - DNS 1: - - - - - DNS 2: - - - - - Ipv6 Address: - - - - - Edit Conn - - - - - Auto(DHCP) - - - - Manual - 手动 + 手动 - Cancel - 取消 + 取消 - - Save - - - - - Ok - - - - - Can not create new wired network for without wired card - - - - - New network already created - - - - - Wireless card not exist - - - - - Can not save wired network for without wired card - - - - - New network settings already finished - - - - kylin-nm - 麒麟网络工具 + 麒麟网络工具 - kylin network applet desktop message - 网络提示消息 + 网络提示消息 - Will check the IP address conflict - 正在检测ip地址冲突 + 正在检测ip地址冲突 - IPV4 address conflict, Please change IP - ip地址冲突，请更改ip + ip地址冲突，请更改ip - IPV6 address conflict, Please change IP - ip地址冲突，请更改ip {6 ?} - - - - Edit Network - - - - - Add Wired Network - + ip地址冲突，请更改ip {6 ?} @@ -250,1053 +141,231 @@ DlgHideWifi - - Connect to Hidden WLAN Network - - - - - Add Hidden WLAN - - - - - Connection - - - - - WLAN name - - - - - WLAN security - - - - Cancel - 取消 + 取消 - Connect - 连接 + 连接 - - C_reate… - - - - None - 无 - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - - - Conn WLAN Success - - - - - - Confirm your WLAN password or usable of wireless card - + 无 DlgHideWifiEapFast - - Connect to Hidden WLAN Network - - - - - Add hidden WLAN - - - - - Connection - - - - - Network name - - - - - WLAN security - - - - - Authentication - - - - - Anonymous identity - - - - - Allow automatic PAC pro_visioning - - - - - PAC file - - - - - Inner authentication - - - - Username - 用户名 + 用户名 - Password - 密钥 + 密钥 - Cancel - 取消 + 取消 - Connect - 连接 + 连接 - - C_reate… - - - - - None - 无 - - - - WPA and WPA2 Personal - - - - - WEP 40/128-bit Key (Hex or ASCII) - - - - - WEP 128-bit Passphrase - - - - - Dynamic WEP (802.1X) - - - - - WPA and WPA2 Enterprise - - - - - Tunneled TLS - - - - - Protected EAP (PEAP) - - - - - Anonymous - - - - - Authenticated - - - - - Both - + 无 DlgHideWifiEapLeap - - Connect to Hidden WLAN Network - - - - - Add hidden WLAN - - - - - Connection - - - - - Network name - - - - - WLAN security - - - - - Authentication - - - - Username - 用户名 + 用户名 - Password - 密钥 + 密钥 - Cancel - 取消 + 取消 - Connect - 连接 + 连接 - - C_reate… - - - - None - 无 - - - - WPA and WPA2 Personal - - - - - WEP 40/128-bit Key (Hex or ASCII) - - - - - WEP 128-bit Passphrase - - - - - Dynamic WEP (802.1X) - - - - - WPA and WPA2 Enterprise - - - - - Tunneled TLS - - - - - Protected EAP (PEAP) - + 无 DlgHideWifiEapPeap - - Connect to Hidden WLAN Network - - - - - Add hidden WLAN - - - - - Connection - - - - - Network name - - - - - WLAN security - - - - - Authentication - - - - - Anonymous identity - - - - Domain - 域 + 域 - - CA certificate - - - - - CA certificate password - - - - - No CA certificate is required - - - - - PEAP version - - - - - Inner authentication - - - - Username - 用户名 + 用户名 - Password - 密钥 + 密钥 - Cancel - 取消 + 取消 - Connect - 连接 + 连接 - - None - 无 - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - - Protected EAP (PEAP) - - - - - Choose from file - - - - - Automatic - - - - - Version 0 - - - - - Version 1 - + 无 DlgHideWifiEapPwd - - Connect to Hidden WLAN Network - - - - - Add hidden WLAN - - - - - Connection - - - - - Network name - - - - - WLAN security - - - - - Authentication - - - - Username - 用户名 + 用户名 - Password - 密钥 + 密钥 - Cancel - 取消 + 取消 - Connect - 连接 + 连接 - - C_reate… - - - - None - 无 - - - - WPA and WPA2 Personal - - - - - WEP 40/128-bit Key (Hex or ASCII) - - - - - WEP 128-bit Passphrase - - - - - Dynamic WEP (802.1X) - - - - - WPA and WPA2 Enterprise - - - - - Tunneled TLS - - - - - Protected EAP (PEAP) - + 无 DlgHideWifiEapTTLS - - Connect to Hidden Wi-Fi Network - - - - - Add hidden WLAN - - - - - Connection - - - - - Network name - - - - - WLAN security - - - - - Authentication - - - - - Anonymous identity - - - - Domain - 域 + 域 - - CA certificate - - - - - CA certificate password - - - - - No CA certificate is required - - - - - Inner authentication - - - - Username - 用户名 + 用户名 - Password - 密钥 + 密钥 - Cancel - 取消 + 取消 - Connect - 连接 + 连接 - - C_reate… - - - - - None - 无 - - - - WPA and WPA2 Personal - - - - - WEP 40/128-bit Key (Hex or ASCII) - - - - - WEP 128-bit Passphrase - - - - - Dynamic WEP (802.1X) - - - - - WPA and WPA2 Enterprise - - - - - Tunneled TLS - - - - - Protected EAP (PEAP) - - - - - Choose from file - + 无 DlgHideWifiEapTls - - Connect to Hidden WLAN Network - - - - - Add hidden WLAN - - - - - Connection - - - - - Network name - - - - - WLAN security - - - - - Authentication - - - - Identity - 匿名身份 + 匿名身份 - Domain - 域 + 域 - - CA certificate - - - - - CA certificate password - - - - - No CA certificate is required - - - - User certificate - 用户证书 + 用户证书 - - User certificate password - - - - User private key - 用户私钥 + 用户私钥 - User key password - 用户密钥密码 + 用户密钥密码 - Cancel - 取消 + 取消 - Connect - 连接 + 连接 - - C_reate… - - - - - - - None - 无 - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - - Tunneled TLS - - - - - Protected EAP (PEAP) - - - - - - - Choose from file - + 无 DlgHideWifiLeap - - Connect to Hidden Wi-Fi Network - - - - - Add hidden Wi-Fi - - - - - Connection - - - - - Network name - - - - - Wi-Fi security - - - - Username - 用户名 + 用户名 - Password - 密钥 + 密钥 - Cancel - 取消 + 取消 - Connect - 连接 + 连接 - - C_reate… - - - - None - 无 - - - - WPA and WPA2 Personal - - - - - WEP 40/128-bit Key (Hex or ASCII) - - - - - WEP 128-bit Passphrase - - - - - Dynamic WEP (802.1X) - - - - - WPA and WPA2 Enterprise - + 无 DlgHideWifiWep - - Connect to Hidden Wi-Fi Network - - - - - Add hidden Wi-Fi - - - - - Connection - - - - - Network name - - - - - Wi-Fi security - - - - - Key - - - - - WEP index - - - - - Authentication - - - - Cancel - 取消 + 取消 - Connect - 连接 + 连接 - - C_reate… - - - - None - 无 - - - - WPA and WPA2 Personal - - - - - WEP 40/128-bit Key (Hex or ASCII) - - - - - WEP 128-bit Passphrase - - - - - Dynamic WEP (802.1X) - - - - - WPA and WPA2 Enterprise - - - - - 1(default) - - - - - Open System - - - - - Shared Key - + 无 DlgHideWifiWpa - - Connect to Hidden Wi-Fi Network - - - - - Add Hidden Wi-Fi - - - - - Connection - - - - - Wi-Fi name - - - - - Wi-Fi security - - - - Password - 密钥 + 密钥 - Cancel - 取消 + 取消 - Connect - 连接 + 连接 - - C_reate… - - - - None - 无 - - - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - - - Conn Wifi Success - - - - - - Confirm your Wi-Fi password or usable of wireless card - + 无 @@ -1408,43 +477,49 @@ 手动 + + LanListItem + + + Wired Device not carried + + + LanPage - + LAN 有线网络 - + Activated LAN 已激活 - + Inactivated LAN 未激活 - LAN Disconnected Successfully - 有线网络断开 + 有线网络断开 - LAN Connected Successfully - 连接有线网络成功 + 连接有线网络成功 ListItem - + Kylin NM 麒麟网络工具 - + kylin network applet desktop message 网络提示消息 @@ -1452,34 +527,33 @@ MainWindow - - - + + kylin-nm 麒麟网络工具 - + LAN 有线网络 有线网络 - + WLAN 无线局域网 无线局域网 - + Show MainWindow 打开网络工具 - + Settings - 网络设置 - 网络设置 + 设置网络项 + 设置网络项 @@ -1578,208 +652,16 @@ OldMainWindow - - Ethernet Networks - - - - - New LAN - - - - - WLAN Networks - - - - - Hide WLAN - - - - - No usable network in the list - - - - - - - Ethernet - - - - - HotSpot - - - - - FlyMode - - - - - - Advanced - - - - kylin-nm - 麒麟网络工具 + 麒麟网络工具 - Show MainWindow - 打开网络工具 + 打开网络工具 - - - Wired net is disconnected - - - - - No wireless card detected - - - - - - - - Not connected - 未连接 - - - - - - - - - - - - Disconnected - - - - - - NetOn, - - - - - NetOn,IfName: - - - - - No Other Wired Network Scheme - - - - - No Other Wireless Network Scheme - - - - - - - - Wired connection - - - - - - - - Ethernet connection - - - - - WLAN is disconnected - - - - - - Conn Ethernet Success - - - - - Without Lan Cable - - - - - IP configuration could not be reserved - - - - - MAC Address Mismatch - - - - - Connection Be Killed - - - - - Connect Bluetooth Network Failed - - - - - Carrier/link changed - - - - - Connect Wired Network Failed - - - - - Connect VPN Network Failed - - - - - Conn WLAN Success - - - - - Confirm your WLAN password or usable of wireless card - - - - - Confirm your WLAN password - - - - - Selected WLAN has not been scanned. - - - - - Connect Hidden WLAN Success - + 未连接 @@ -1790,77 +672,24 @@ - - - - - - Connect - 连接 + 连接 - - - Disconnect - 断开 + 断开 - Cancel - 取消 + 取消 - - Property - - - - - Password Incorrect - - - - - Forget - 忘记此网络 + 忘记此网络 - - Rate - - - - None - 无 - - - - WLAN Security： - - - - - Signal： - - - - - MAC： - - - - - Conn WLAN Success - - - - - Confirm your WLAN password or usable of wireless card - + 无 @@ -1871,74 +700,20 @@ - - Connect - 连接 + 连接 - Disconnect - 断开 + 断开 - Cancel - 取消 + 取消 - Not connected - 未连接 - - - - - Disconnected - - - - - - Ethernet - - - - - NetOn, - - - - - - - No Configuration - - - - - No IfName - - - - - IPv4： - - - - - IPv6： - - - - - BandWidth： - - - - - MAC： - + 未连接 @@ -2142,20 +917,20 @@ - + Disconnect 断开 - + Connect 连接 - + Forget 忘记此网络 @@ -2188,12 +963,12 @@ 更多... - + WLAN Connected Successfully 连接无线网络成功 - + WLAN Disconnected Successfully 断开无线网络 @@ -2201,150 +976,56 @@ WpaWifiDialog - - Dialog - - - - - Connect WLAN - - - - - Name - - - - - Security - - - - EAP type - EAP方法 + EAP方法 - - Inner auth - - - - Username - 用户名 + 用户名 - Password - 密钥 + 密钥 - - Show password - - - - Ask pwd each query - 每次询问密码 + 每次询问密码 - Cancel - 取消 + 取消 - Connect - 连接 + 连接 - - - - - - - None - 无 + 无 - - WPA and WPA2 Personal - - - - - WPA and WPA2 Enterprise - - - - - - Choose from file... - 从文件选择... + 从文件选择... - - - Choose a CA certificate - 选择一个CA证书 + 选择一个CA证书 - - CA Files (*.pem *.der *.p12 *.crt *.cer *.pfx) - CA 证书 (*.pem *.der *.p12 *.crt *.cer *.pfx) + CA 证书 (*.pem *.der *.p12 *.crt *.cer *.pfx) - - CA Files (*.pem *.der *.p12 *.crt *.key *.cer *.pfx) - - - - Identity - 匿名身份 + 匿名身份 - - Anonymous Identity - - - - Domain - 域 + 域 - - CA certificate - - - - no need for CA certificate - 不需要CA证书 - - - - User Certificate - - - - - User Private Key - - - - - User Private Key password - + 不需要CA证书 From ac5ed032942713f47ea6ed253000fec88302a3a1 Mon Sep 17 00:00:00 2001 From: jzxc95 <907297917@qq.com> Date: Tue, 12 Oct 2021 19:01:31 +0800 Subject: [PATCH 03/19] add scan dbus --- .../dbus-interface/kywirelessnetresource.cpp | 35 +++++++++++++++++++ .../dbus-interface/kywirelessnetresource.h | 6 ++++ src/backend/dbusadaptor.cpp | 7 ++++ src/backend/dbusadaptor.h | 2 ++ src/frontend/mainwindow.cpp | 5 +++ src/frontend/mainwindow.h | 2 ++ src/frontend/netdetails/detailpage.cpp | 1 - src/frontend/netdetails/netdetail.cpp | 4 +++ src/frontend/tab-pages/wlanpage.h | 3 +- 9 files changed, 63 insertions(+), 2 deletions(-) diff --git a/src/backend/dbus-interface/kywirelessnetresource.cpp b/src/backend/dbus-interface/kywirelessnetresource.cpp index 6dc0988b..0d7ee70c 100644 --- a/src/backend/dbus-interface/kywirelessnetresource.cpp +++ b/src/backend/dbus-interface/kywirelessnetresource.cpp @@ -33,6 +33,10 @@ KyWirelessNetResource::KyWirelessNetResource(QObject *parent) connect(m_connectResource, &KyConnectResourse::connectionRemove, this, &KyWirelessNetResource::onConnectionRemove); connect(m_connectResource, &KyConnectResourse::connectionUpdate, this, &KyWirelessNetResource::onConnectionUpdate); + connect(m_device, &KyNetworkDeviceResourse::deviceAdd, this, &KyWirelessNetResource::onDeviceAdd); + connect(m_device, &KyNetworkDeviceResourse::deviceRemove, this, &KyWirelessNetResource::onDeviceRemove); + connect(m_device, &KyNetworkDeviceResourse::deviceNameUpdate, this, &KyWirelessNetResource::onDeviceNameUpdate); + } KyWirelessNetResource::~KyWirelessNetResource() @@ -538,3 +542,34 @@ void KyWirelessNetResource::onConnectionUpdate(QString uuid) kyWirelessNetItemListInit(); emit wifiNetworkUpdate(); } + + +void KyWirelessNetResource::onDeviceAdd(QString deviceName, NetworkManager::Device::Type deviceType) +{ + if(deviceType == NetworkManager::Device::Type::Wifi) { + if (!m_WifiNetworkList.contains(deviceName)) { + m_WifiNetworkList.insert(deviceName,QList()); + } + } +} + +void KyWirelessNetResource::onDeviceRemove(QString deviceName) +{ + if (m_WifiNetworkList.contains(deviceName)) { + m_WifiNetworkList.remove(deviceName); + } +} + +void KyWirelessNetResource::onDeviceNameUpdate(QString oldName, QString newName) +{ + if (!m_WifiNetworkList.contains(oldName)) { + return; + } + + QMap > newWifiNetworkList(m_WifiNetworkList); + QList list = m_WifiNetworkList[oldName]; + newWifiNetworkList.remove(oldName); + newWifiNetworkList.insert(newName,list); + m_WifiNetworkList = newWifiNetworkList; + +} diff --git a/src/backend/dbus-interface/kywirelessnetresource.h b/src/backend/dbus-interface/kywirelessnetresource.h index c9ea8104..ae6b8180 100644 --- a/src/backend/dbus-interface/kywirelessnetresource.h +++ b/src/backend/dbus-interface/kywirelessnetresource.h @@ -7,6 +7,7 @@ #include "kyenterpricesettinginfo.h" #include "kylinconnectresource.h" #include "kywirelessconnectoperation.h" +#include "kylinnetworkdeviceresource.h" //class KyWirelessNetItem; @@ -47,6 +48,10 @@ public slots: void onConnectionUpdate(QString uuid); void onConnectionRemove(QString); + void onDeviceAdd(QString deviceName, NetworkManager::Device::Type deviceType); + void onDeviceRemove(QString deviceName); + void onDeviceNameUpdate(QString oldName, QString newName); + signals: void signalStrengthChange(QString, QString, int); void bssidChange(QString, QString, QString); @@ -61,6 +66,7 @@ private: KyNetworkResourceManager *m_networkResourceInstance = nullptr; KyConnectResourse *m_connectResource = nullptr; KyWirelessConnectOperation *m_operation = nullptr; + KyNetworkDeviceResourse *m_device = nullptr; QMap > m_WifiNetworkList; }; diff --git a/src/backend/dbusadaptor.cpp b/src/backend/dbusadaptor.cpp index 140cb55d..58639274 100644 --- a/src/backend/dbusadaptor.cpp +++ b/src/backend/dbusadaptor.cpp @@ -209,3 +209,10 @@ QStringList DbusAdaptor::getStoredApInfo() parent()->getStoredApInfo(list); return list; } + + +//扫描 +void DbusAdaptor::reScan() +{ + parent()->rescan(); +} diff --git a/src/backend/dbusadaptor.h b/src/backend/dbusadaptor.h index 28c821d2..b59e76d1 100644 --- a/src/backend/dbusadaptor.h +++ b/src/backend/dbusadaptor.h @@ -78,6 +78,8 @@ public Q_SLOTS: // METHODS void deactiveWirelessAp(const QString apName, const QString apPassword, const QString apDevice); //获取热点 QStringList getStoredApInfo(); + //wifi扫描 + void reScan(); Q_SIGNALS: // SIGNALS // void wirelessActivating(QString devName, QString ssid); // void wiredActivating(QString devName, QString ssid); diff --git a/src/frontend/mainwindow.cpp b/src/frontend/mainwindow.cpp index 857e2daf..9726a274 100644 --- a/src/frontend/mainwindow.cpp +++ b/src/frontend/mainwindow.cpp @@ -504,3 +504,8 @@ void MainWindow::deactivateWireless(const QString& devName, const QString& ssid) { m_wlanWidget->deactivateWireless(devName, ssid); } + +void MainWindow::rescan() +{ + m_wlanWidget->requestScan(); +} diff --git a/src/frontend/mainwindow.h b/src/frontend/mainwindow.h index 98412b68..65549f70 100644 --- a/src/frontend/mainwindow.h +++ b/src/frontend/mainwindow.h @@ -49,6 +49,8 @@ public: //唤起新建有线连接界面 void showCreateWiredConnectWidget(const QString devName); + void rescan(); + signals: //设备插拔 void deviceStatusChanged(); diff --git a/src/frontend/netdetails/detailpage.cpp b/src/frontend/netdetails/detailpage.cpp index ba5adbf8..572ea7e3 100644 --- a/src/frontend/netdetails/detailpage.cpp +++ b/src/frontend/netdetails/detailpage.cpp @@ -81,7 +81,6 @@ void DetailPage::initUI() { mSSID = new QLineEdit(this); mSSID->setAlignment(Qt::AlignRight); - qDebug() << "DetailPage" << isCreate; if (!isCreate) { mSSID->setStyleSheet("background:transparent;border-width:0;border-style:outset"); mSSID->setFocusPolicy(Qt::NoFocus); diff --git a/src/frontend/netdetails/netdetail.cpp b/src/frontend/netdetails/netdetail.cpp index 3f7f8c5b..0b1de9d3 100644 --- a/src/frontend/netdetails/netdetail.cpp +++ b/src/frontend/netdetails/netdetail.cpp @@ -815,6 +815,10 @@ bool NetDetail::updateConnect() } else { updateWirelessPersonalConnect(); } + if (isActive) { + //安全性变化 断开-重连 + m_wirelessConnOpration->activateConnection(m_uuid, m_deviceName); + } } return true; } diff --git a/src/frontend/tab-pages/wlanpage.h b/src/frontend/tab-pages/wlanpage.h index e7cf3573..51014334 100644 --- a/src/frontend/tab-pages/wlanpage.h +++ b/src/frontend/tab-pages/wlanpage.h @@ -40,6 +40,7 @@ public: void deactivateWireless(const QString& devName, const QString& ssid); void showDetailPage(QString devName, QString uuid); + signals: void oneItemExpanded(const QString &ssid); void wlanAdd(QString devName, QStringList info); @@ -54,6 +55,7 @@ signals: public slots: void onMainWindowVisibleChanged(const bool &visible); + void requestScan(); protected: bool eventFilter(QObject *watched, QEvent *event); @@ -119,7 +121,6 @@ private slots: void onWlanSwitchClicked(); void onWlanSwitchStatusChanged(const bool &checked); void onDeviceComboxIndexChanged(int currentIndex); - void requestScan(); void onHiddenWlanClicked(); void showControlCenter(); void onWifiEnabledChanged(bool isWifiOn); From 35cbd1986429f3f8f944ed0abeddc213544554c7 Mon Sep 17 00:00:00 2001 From: kangshuning Date: Wed, 13 Oct 2021 08:53:37 +0800 Subject: [PATCH 04/19] update translation --- src/frontend/list-items/lanlistitem.cpp | 2 +- translations/kylin-nm_zh_CN.ts | 303 ++++++++++++------------ 2 files changed, 155 insertions(+), 150 deletions(-) diff --git a/src/frontend/list-items/lanlistitem.cpp b/src/frontend/list-items/lanlistitem.cpp index b6642bcc..d9aaddd8 100644 --- a/src/frontend/list-items/lanlistitem.cpp +++ b/src/frontend/list-items/lanlistitem.cpp @@ -33,7 +33,7 @@ LanListItem::LanListItem(QWidget *parent) : ListItem(parent) { m_isActive = false; m_netButton->setButtonIcon(QIcon::fromTheme("network-wireless-signal-none-symbolic")); - const QString str="Not connected"; + const QString str=tr("Not connected"); m_nameLabel->setText(str); this->m_infoButton->hide(); } diff --git a/translations/kylin-nm_zh_CN.ts b/translations/kylin-nm_zh_CN.ts index 72681d3c..06f4bbf6 100644 --- a/translations/kylin-nm_zh_CN.ts +++ b/translations/kylin-nm_zh_CN.ts @@ -35,47 +35,47 @@ CreatNetPage - + Connection Name 网络名称 - + Ipv4Config Ipv4配置 - + Address 地址 - + Netmask 子网掩码 - + Default Gateway 默认网关 - + Prefs DNS 首选DNS - + Alternative DNS 备选DNS - + Auto(DHCP) 自动(DHCP) - + Manual 手动 @@ -83,57 +83,57 @@ DetailPage - + Auto Connection 自动连接 - + SSID: SSID： - + Protocol: 协议： - + Security Type: 安全类型： - + Hz: 网络频带： - + Chan: - 带宽： + 网络通道： - + BandWidth: 带宽： - + IPV6: - 本地链接Ipv6地址： + 本地链接IPV6地址： - + IPV4: - Ipv4地址： + IPV4地址： - + IPV4 Dns: - Ipv4 DNS服务器： + IPV4 DNS服务器： - + Mac: 物理地址： @@ -371,65 +371,65 @@ EnterpriseWlanDialog - + Connect Enterprise WLAN - + 连接企业网 - + Close - 关闭 + 关闭 - + Cancel - 取消 + 取消 - + Connect - 连接 + 连接 Ipv4Page - + Ipv4Config Ipv4配置 - + Address 地址 - + Netmask 子网掩码 - + Default Gateway 默认网关 - + Prefs DNS 首选DNS - + Alternative DNS 备选DNS - + Auto(DHCP) 自动 - + Manual 手动 @@ -437,42 +437,42 @@ Ipv6Page - + Ipv6Config Ipv6配置 - + Address 地址 - + Subnet prefix Length 子网前缀长度 - + Default Gateway 默认网关 - + Prefs DNS 首选DNS - + Alternative DNS 备选DNS - + Auto(DHCP) 自动 - + Manual 手动 @@ -480,25 +480,30 @@ LanListItem - + + Not connected + 未连接 + + + Wired Device not carried - + 未插入网线 LanPage - + LAN 有线网络 - + Activated LAN 已激活 - + Inactivated LAN 未激活 @@ -514,12 +519,12 @@ ListItem - + Kylin NM 麒麟网络工具 - + kylin network applet desktop message 网络提示消息 @@ -527,30 +532,30 @@ MainWindow - - + + kylin-nm 麒麟网络工具 - + LAN 有线网络 有线网络 - + WLAN 无线局域网 无线局域网 - + Show MainWindow 打开网络工具 - + Settings 设置网络项 设置网络项 @@ -559,94 +564,94 @@ NetDetail - + Kylin NM - 麒麟网络工具 + 麒麟网络工具 - + kylin network desktop message - + 网络提示消息 - + Detail 详情 - + Ipv4 Ipv4 - + Ipv6 Ipv6 - + Security 安全 - + Close 关闭 - + Confirm 确定 - + Cancel 取消 - + Forget this network 忘记此网络 - + Add Lan Connect 添加有线连接 - + connect hiddin wlan 连接到隐藏WLAN - - - + + + Auto 自动 - + start check ipv4 address conflict 开始检测ipv4地址冲突 - + start check ipv6 address conflict 开始检测ipv6地址冲突 - - - + + + ipv4 address conflict! ipv4地址冲突！ - - + + ipv6 address conflict! - ipv4地址冲突！ {6 ?} + ipv4地址冲突！ @@ -667,7 +672,7 @@ OneConnForm - + Form @@ -695,7 +700,7 @@ OneLancForm - + Form @@ -719,63 +724,63 @@ SecurityPage - + Security 安全性 - - + + Password 密钥 - + EAP type EAP方法 - + Identity 匿名身份 - + Domain 域 - + CA certficate CA 证书 - + no need for CA certificate 不需要CA证书 - + User certificate 用户证书 - + User private key 用户私钥 - + User key password 用户密钥密码 - + Ineer authentication 内部认证 - + Usename 用户名 @@ -785,54 +790,54 @@ 用户名 - + Ask pwd each query 每次询问密码 - - - - - - - + + + + + + + None 无 - + WPA&WPA2 Personal WPA&WPA2 个人 - + WPA&WPA2 Enterprise WPA&WPA2 企业 - + WPA3 Personal WPA3 个人 - - - + + + Choose from file... 从文件选择... - - - + + + Choose a CA certificate 选择一个CA证书 - - - + + + CA Files (*.pem *.der *.p12 *.crt *.cer *.pfx) CA 证书 (*.pem *.der *.p12 *.crt *.cer *.pfx) @@ -840,27 +845,27 @@ TabPage - + Current Device 当前网卡 - + Devices Closed! 设备关闭！ - + Settings 网络设置 - + Kylin NM 麒麟网络工具 - + kylin network applet desktop message 网络提示消息 @@ -868,42 +873,42 @@ WiFiConfigDialog - + Dialog - + WLAN Authentication - + Input WLAN Information Please - + WLAN ID： - + WLAN Name: - + Password： - + Cancl - + Ok @@ -911,31 +916,31 @@ WlanListItem - + Not connected 未连接 - - + + Disconnect 断开 - - - + + + Connect 连接 - - + + Forget 忘记此网络 - + Auto Connect 自动连接 @@ -943,32 +948,32 @@ WlanPage - + WLAN 无线局域网 - + Activated WLAN 已激活 - + Other WLAN 其他 - + More... 更多... - + WLAN Connected Successfully 连接无线网络成功 - + WLAN Disconnected Successfully 断开无线网络 From 26bf3bf21625d70f8269510a1d60d9895d950a83 Mon Sep 17 00:00:00 2001 From: kangshuning Date: Wed, 13 Oct 2021 13:54:57 +0800 Subject: [PATCH 05/19] bug#81259:delay --- .../kylinnetworkresourcemanager.cpp | 5 ++++- src/frontend/tab-pages/lanpage.cpp | 4 ++-- translations/kylin-nm_zh_CN.qm | Bin 6255 -> 6541 bytes 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/backend/dbus-interface/kylinnetworkresourcemanager.cpp b/src/backend/dbus-interface/kylinnetworkresourcemanager.cpp index b1156588..018bb7c5 100644 --- a/src/backend/dbus-interface/kylinnetworkresourcemanager.cpp +++ b/src/backend/dbus-interface/kylinnetworkresourcemanager.cpp @@ -17,6 +17,8 @@ */ #include "kylinnetworkresourcemanager.h" +#define SIGNAL_DELAY 80000 +#define EMIT_DELAY 10000 KyNetworkResourceManager* KyNetworkResourceManager::m_pInstance = nullptr; @@ -556,9 +558,10 @@ void KyNetworkResourceManager::onActiveConnectionChanged( if (activeConnect->isValid()) { qDebug()<<"!New state change activate connect"<uuid(); qDebug()<<"!New the active connect state"<state() != state) { qDebug()<<"connect real state"<state() <<"change state"<uuid(), state, NetworkManager::ActiveConnection::Reason::UknownReason); diff --git a/src/frontend/tab-pages/lanpage.cpp b/src/frontend/tab-pages/lanpage.cpp index 3a77c360..42abe2c7 100644 --- a/src/frontend/tab-pages/lanpage.cpp +++ b/src/frontend/tab-pages/lanpage.cpp @@ -684,9 +684,9 @@ void LanPage::initUI() QListWidgetItem *LanPage::addNewItem(KyConnectItem *itemData, QListWidget *listWidget) { - QListWidgetItem *p_listWidgetItem = new QListWidgetItem(listWidget); + QListWidgetItem *p_listWidgetItem = new QListWidgetItem(); p_listWidgetItem->setSizeHint(QSize(listWidget->width(),ITEM_HEIGHT)); - listWidget->addItem(p_listWidgetItem); + listWidget->insertItem(0, p_listWidgetItem); LanListItem *p_lanItem = nullptr; if (itemData != nullptr) { diff --git a/translations/kylin-nm_zh_CN.qm b/translations/kylin-nm_zh_CN.qm index b38250563e24c321ff955a16ddc31f97a5f6df35..7dc3e676f8314dd31f41d78f4e7f6dba687e0f23 100644 GIT binary patch delta 1093 zcmX|2HHZT#JW4K>)P3} zyUHWNt^}irtu~C5hdfeVN-2+Kp^1^Se1H#HAf!nVq+&>GA5p3sAy-+0etyVZ`UZf~3&j=>#=S);-==g{Lb19HASLC2?|wcOuoNmw zcLQ)Gl+plHt=o$CH<9}>p$KcYq0JtI9q)Gm%yh%uoB(nIjG3Ky-_P*fTL9oTB{3-Z zdrb9@7#BL2)^-&OwNg4yFjp(~K?>l5=>w4Elza~}*zyg4>u<}#OUD3&Axc+<_19kj zuyO33AxvZ&XCK#N=Z*$WNfcnGCESOfqpjv~Z71gf-u2|6`alW zl>LW(9bA8TKjvo=*#iKX;%>HH#>6{F`MaOty_b>mGnp6~6A=jw5&D<{^-FpQkeOd0>{R&DgQ_kp<2ek|qdX$o1KqDM=2@R*jqR%_{!kCt#<@>W;y>(4;T@b=rJZi`X8VH) zEZF(fac0?dO#GYU-03;!=Wsl-9m9aN5dimVX24pId5@iKu}Z0$?L%$(ZL7^MNiACq zb>^Sst!WnWWdv;~HD~e8jKRm4BI(<^!Q-o#s{B-qm>n07U+(glVd%l6w!%p2@#c6W zp=dYvdPqPAIbdqJg_#klfioxVn%U%-XFgHg1)k`Zk0XX==*dm7cvK7NiD)v` QtTpM0L}OUbq#dK;bAkUC9{>OV delta 926 zcmXAndq@;f6vn^Vy)!#IJG<+yyIF#d0!u+*D^n3G=^<-cDQFg!_OORp5J^R*t%jhG ziZnhlBnX9kVbo^yvNRM4Eh4ZtMf9{x`=g-T(2m}J<~R4u-0ytfxwm@xq^s892?sX6 z0(AR;v>d=N!6|ECRaXFGKSV^G-$Kp3s60sO~wQGKn%9)05*5>|csA6b;tlFQV>U`lqB9Vnx%W$9upYU^v@xnvTR}=&brciNVPl zIVD9_OUo%ps~l~~q{)4fFQs_)Q)3&w5XB6+OPIjMDTBhvsMN^7BDTCLODZq>= z$==#qokb0KO^z!p z{MPnZ#-_-*{g<_S&0}i(-1^KExmDQ9tZuhuDM>W|>Krk7UE zajg_POK*u(E_hSqKRWMC(;*fTjC@cT(OIsn#Pn-LWitXoaSAc?T#XVf)^E8c+x)!! Hek1aKQ9 Date: Wed, 13 Oct 2021 21:05:32 +0800 Subject: [PATCH 06/19] trayIcon and itemshow bug --- .../dbus-interface/kylinagentinterface.c | 53 +++++++++---------- src/frontend/mainwindow.cpp | 1 + src/frontend/tab-pages/lanpage.cpp | 7 +-- src/frontend/tab-pages/wlanpage.cpp | 7 ++- src/main.cpp | 2 +- 5 files changed, 38 insertions(+), 32 deletions(-) diff --git a/src/backend/dbus-interface/kylinagentinterface.c b/src/backend/dbus-interface/kylinagentinterface.c index 114a58f4..c00d26d1 100644 --- a/src/backend/dbus-interface/kylinagentinterface.c +++ b/src/backend/dbus-interface/kylinagentinterface.c @@ -81,6 +81,32 @@ free_wifi_info (SecretsRequest *req) } } + +void +applet_secrets_request_free (SecretsRequest *req) +{ + g_return_if_fail (req != NULL); + + if (req->free_func) + req->free_func (req); + + secrets_reqs = g_slist_remove (secrets_reqs, req); + + g_object_unref (req->connection); + g_free (req->setting_name); + g_strfreev (req->hints); + memset (req, 0, req->totsize); + g_free (req); +} + +void +applet_secrets_request_complete (SecretsRequest *req, + GVariant *settings, + GError *error) +{ + req->callback (req->agent, error ? NULL : settings, error, req->callback_data); +} + static void get_secrets_dialog_response_cb (GtkDialog *foo, gint response, @@ -230,24 +256,6 @@ l_out: //return 0; } - -void -applet_secrets_request_free (SecretsRequest *req) -{ - g_return_if_fail (req != NULL); - - if (req->free_func) - req->free_func (req); - - secrets_reqs = g_slist_remove (secrets_reqs, req); - - g_object_unref (req->connection); - g_free (req->setting_name); - g_strfreev (req->hints); - memset (req, 0, req->totsize); - g_free (req); -} - static SecretsRequest * applet_secrets_request_new (size_t totsize, NMConnection *connection, @@ -277,15 +285,6 @@ applet_secrets_request_new (size_t totsize, return req; } -void -applet_secrets_request_complete (SecretsRequest *req, - GVariant *settings, - GError *error) -{ - req->callback (req->agent, error ? NULL : settings, error, req->callback_data); -} - - static void get_existing_secrets_cb (NMSecretAgentOld *agent, NMConnection *connection, diff --git a/src/frontend/mainwindow.cpp b/src/frontend/mainwindow.cpp index 0a9af414..c30e8477 100644 --- a/src/frontend/mainwindow.cpp +++ b/src/frontend/mainwindow.cpp @@ -151,6 +151,7 @@ void MainWindow::initTrayIcon() m_trayIconMenu->addAction(m_showSettingsAction); m_trayIcon->setContextMenu(m_trayIconMenu); m_trayIcon->setIcon(QIcon::fromTheme("network-wired-signal-excellent-symbolic")); + onRefreshTrayIcon(); connect(m_trayIcon, &QSystemTrayIcon::activated, this, &MainWindow::onTrayIconActivated); // connect(m_showMainwindowAction, &QAction::triggered, this, &MainWindow::onShowMainwindowActionTriggled); diff --git a/src/frontend/tab-pages/lanpage.cpp b/src/frontend/tab-pages/lanpage.cpp index 3a77c360..657a5b49 100644 --- a/src/frontend/tab-pages/lanpage.cpp +++ b/src/frontend/tab-pages/lanpage.cpp @@ -766,8 +766,6 @@ void LanPage::updateConnectionArea(QString uuid) qDebug()<<"[LanPage] update connection item"<m_connectName; QListWidgetItem *p_listWidgetItem = addNewItem(p_newItem, m_inactivatedLanListWidget); m_deactiveMap.insert(p_newItem, p_listWidgetItem); - - emit this->lanConnectChanged(); } else { delete p_newItem; p_newItem = nullptr; @@ -790,8 +788,12 @@ void LanPage::onUpdateLanlist(QString uuid, if (state == NetworkManager::ActiveConnection::State::Activated) { updateActivatedConnectionArea(uuid); + m_isLanConnected = true; + emit this->lanConnectChanged(); } else if (state == NetworkManager::ActiveConnection::State::Deactivated) { updateConnectionArea(uuid); + m_isLanConnected = false; + emit this->lanConnectChanged(); } return; @@ -1040,7 +1042,6 @@ void LanPage::activateWired(const QString& devName, const QString& connUuid) { qDebug() << "[LanPage] activateWired" << devName << connUuid; m_wiredConnectOperation->activateConnection(connUuid, devName); - emit this->lanConnectChanged(); } void LanPage::deactivateWired(const QString& devName, const QString& connUuid) diff --git a/src/frontend/tab-pages/wlanpage.cpp b/src/frontend/tab-pages/wlanpage.cpp index 4d37476c..3af9d7f6 100644 --- a/src/frontend/tab-pages/wlanpage.cpp +++ b/src/frontend/tab-pages/wlanpage.cpp @@ -254,6 +254,8 @@ void WlanPage::getActiveWlan() m_activatedWlanSSid.clear(); m_activatedWlanUuid.clear(); WlanListItem *wlanItemWidget = new WlanListItem(); + connect(wlanItemWidget, &WlanListItem::itemHeightChanged, this, &WlanPage::onItemHeightChanged); + connect(wlanItemWidget, &WlanListItem::connectButtonClicked, this, &WlanPage::onConnectButtonClicked); qDebug() << "There is no activated wlan." << Q_FUNC_INFO << __LINE__ ; QListWidgetItem *wlanItem = new QListWidgetItem(); wlanItem->setSizeHint(QSize(m_activatedNetListWidget->width(), wlanItemWidget->height())); @@ -277,11 +279,12 @@ void WlanPage::appendActiveWlan(const QString &uuid, int &height) } KyWirelessNetItem *item_data = new KyWirelessNetItem(data); WlanListItem *wlanItemWidget = new WlanListItem(m_resource, item_data, m_defaultDevice); + connect(wlanItemWidget, &WlanListItem::itemHeightChanged, this, &WlanPage::onItemHeightChanged); + connect(wlanItemWidget, &WlanListItem::connectButtonClicked, this, &WlanPage::onConnectButtonClicked); qDebug() << "Activated wlan: ssid = " << item_data->m_NetSsid; QListWidgetItem *wlanItem = new QListWidgetItem(); wlanItem->setSizeHint(QSize(m_activatedNetListWidget->width(), wlanItemWidget->height())); m_activatedNetListWidget->addItem(wlanItem); - emit this->wlanConnectChanged(); qDebug() << "[wlanpage]emit wlanConnectChanged()" << Q_FUNC_INFO << __LINE__ ; m_activatedNetListWidget->setItemWidget(wlanItem, wlanItemWidget); wlanItemWidget->setActive(true); @@ -493,9 +496,11 @@ void WlanPage::onActivatedWlanChanged(QString uuid, NetworkManager::ActiveConnec if(NetworkManager::ActiveConnection::State::Activated == state){ m_wlanIsConnected = true; qDebug() << "[wlanpage] wlanIsConnected status : " << m_wlanIsConnected << Q_FUNC_INFO << __LINE__ ; + emit this->wlanConnectChanged(); } else { m_wlanIsConnected = false; qDebug() << "[wlanpage] wlanIsConnected status : " << m_wlanIsConnected << Q_FUNC_INFO << __LINE__ ; + emit this->wlanConnectChanged(); } //弹窗显示wifi连接状况 diff --git a/src/main.cpp b/src/main.cpp index cac828c9..f49bac11 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) // QApplication a(argc, argv); QString id = QString("kylin-nm"+ QLatin1String(getenv("DISPLAY"))); QtSingleApplication a(id, argc, argv); - qInstallMessageHandler(messageOutput); +// qInstallMessageHandler(messageOutput); if (a.isRunning()) { auto connection = QDBusConnection::sessionBus(); QDBusInterface iface("com.kylin.network", From 1b1ac4a0b14b9860089f4baa92f027835b96c959 Mon Sep 17 00:00:00 2001 From: fensite Date: Thu, 14 Oct 2021 09:03:05 +0800 Subject: [PATCH 07/19] =?UTF-8?q?simplify=20translation=20methods=EF=BC=9B?= =?UTF-8?q?=20Ignore=20dependent=20details=20to=20prevent=20compilation=20?= =?UTF-8?q?errors=20=E7=AE=80=E5=8C=96=E7=BF=BB=E8=AF=91=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=9B=E5=BF=BD=E7=95=A5=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E7=9A=84=E8=AF=A6=E6=83=85=E4=BB=A5=E9=98=B2=E6=AD=A2=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/control | 3 +-- debian/rules | 4 ++++ src/main.cpp | 16 +++++++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/debian/control b/debian/control index 0dec5721..c34468cd 100644 --- a/debian/control +++ b/debian/control @@ -16,14 +16,13 @@ Build-Depends: debhelper (>=9), libx11-dev, libqt5svg5-dev, libkf5networkmanagerqt-dev (>= 5.36.0), - libnm-dev, + libnm-dev, libcap-dev, Standards-Version: 4.5.0 Rules-Requires-Root: no Homepage: https://github.com/ukui/kylin-nm Vcs-Git: https://github.com/ukui/kylin-nm.git Vcs-Browser: https://github.com/ukui/kylin-nm - Package: kylin-nm Architecture: any Depends: network-manager (>=1.2.6), diff --git a/debian/rules b/debian/rules index 545fc119..9454d51a 100755 --- a/debian/rules +++ b/debian/rules @@ -28,3 +28,7 @@ override_dh_auto_clean: override_dh_auto_build: dh_auto_build -- $(MAKE_OPTS) + +override_dh_shlibdeps: + dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info + diff --git a/src/main.cpp b/src/main.cpp index cac828c9..6c34052a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -85,6 +85,7 @@ int main(int argc, char *argv[]) QtSingleApplication a(id, argc, argv); qInstallMessageHandler(messageOutput); if (a.isRunning()) { + qInfo() << "Kylin-Network-Manager Is Already Launched, just show"; auto connection = QDBusConnection::sessionBus(); QDBusInterface iface("com.kylin.network", "/com/kylin/network", @@ -94,22 +95,19 @@ int main(int argc, char *argv[]) return 0; } - qDebug()<<"Kylin Network Manager Is Already Launched"; - QApplication::setQuitOnLastWindowClosed(false); // Internationalization QString locale = QLocale::system().name(); QTranslator trans_global; - if (locale == "zh_CN") { - trans_global.load(":/translations/kylin-nm_zh_CN.qm"); + qDebug() << "QLocale " << QLocale(); + if (trans_global.load(QLocale(), "kylin-nm", "_", ":/translations/")) + { a.installTranslator(&trans_global); + qDebug()<<"Translations load success"; + } else { + qWarning() << "Translations load fail"; } - if (locale == "tr_TR") { - trans_global.load(":/translations/kylin-nm_tr.qm"); - a.installTranslator(&trans_global); - } - qDebug()<<"Translations Are Already Loaded"; MainWindow w; w.setProperty("useStyleWindowManager", false); //禁用拖动 From 7aa0c6852544a40ecf6ed74ce83204e8008b2f71 Mon Sep 17 00:00:00 2001 From: kangshuning Date: Thu, 14 Oct 2021 09:56:27 +0800 Subject: [PATCH 08/19] update icon --- src/frontend/list-items/lanlistitem.cpp | 2 +- src/frontend/netdetails/detailitem.cpp | 6 ++++++ src/frontend/netdetails/detailitem.h | 16 ++++++++++++++++ src/frontend/tab-pages/lanpage.cpp | 2 +- 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 src/frontend/netdetails/detailitem.cpp create mode 100644 src/frontend/netdetails/detailitem.h diff --git a/src/frontend/list-items/lanlistitem.cpp b/src/frontend/list-items/lanlistitem.cpp index d9aaddd8..a08850e7 100644 --- a/src/frontend/list-items/lanlistitem.cpp +++ b/src/frontend/list-items/lanlistitem.cpp @@ -32,7 +32,7 @@ LanListItem::LanListItem(KyConnectItem *data, QString deviceName, QWidget *paren LanListItem::LanListItem(QWidget *parent) : ListItem(parent) { m_isActive = false; - m_netButton->setButtonIcon(QIcon::fromTheme("network-wireless-signal-none-symbolic")); + m_netButton->setButtonIcon(QIcon::fromTheme("network-offline-symbolic")); const QString str=tr("Not connected"); m_nameLabel->setText(str); this->m_infoButton->hide(); diff --git a/src/frontend/netdetails/detailitem.cpp b/src/frontend/netdetails/detailitem.cpp new file mode 100644 index 00000000..be9001a4 --- /dev/null +++ b/src/frontend/netdetails/detailitem.cpp @@ -0,0 +1,6 @@ +#include "detailitem.h" + +DetailItem::DetailItem(QWidget *parent) : QWidget(parent) +{ + +} diff --git a/src/frontend/netdetails/detailitem.h b/src/frontend/netdetails/detailitem.h new file mode 100644 index 00000000..6e775c6f --- /dev/null +++ b/src/frontend/netdetails/detailitem.h @@ -0,0 +1,16 @@ +#ifndef DETAILITEM_H +#define DETAILITEM_H + +#include + +class DetailItem : public QWidget +{ + Q_OBJECT +public: + explicit DetailItem(QWidget *parent = nullptr); + +signals: + +}; + +#endif // DETAILITEM_H diff --git a/src/frontend/tab-pages/lanpage.cpp b/src/frontend/tab-pages/lanpage.cpp index 42abe2c7..4b3eb211 100644 --- a/src/frontend/tab-pages/lanpage.cpp +++ b/src/frontend/tab-pages/lanpage.cpp @@ -22,6 +22,7 @@ LanPage::LanPage(QWidget *parent) : TabPage(parent) m_activeResourse = new KyActiveConnectResourse(this); m_connectResourse = new KyConnectResourse(this); m_deviceResource = new KyNetworkDeviceResourse(this); + m_wiredConnectOperation = new KyWiredConnectOperation(this); initUI(); initNetSwitch(); @@ -679,7 +680,6 @@ void LanPage::initUI() inactiveLanListLayout->addWidget(m_inactivatedLanListWidget); m_settingsLabel->installEventFilter(this); -// emit this->lanConnectChanged(); } QListWidgetItem *LanPage::addNewItem(KyConnectItem *itemData, QListWidget *listWidget) From 92efbe52c318bf533033e1a8c88a908e5f4e38b4 Mon Sep 17 00:00:00 2001 From: jzxc95 <907297917@qq.com> Date: Thu, 14 Oct 2021 20:30:53 +0800 Subject: [PATCH 09/19] add device name when actvating or deactivating && lan list sort --- .../kylinactiveconnectresource.cpp | 20 +++++++++++++++++++ .../kylinactiveconnectresource.h | 2 ++ .../dbus-interface/kylinconnectoperation.cpp | 5 +++++ .../dbus-interface/kylinconnectresource.cpp | 19 ++++++++++++++++++ src/frontend/tab-pages/lanpage.cpp | 11 +++++++++- 5 files changed, 56 insertions(+), 1 deletion(-) diff --git a/src/backend/dbus-interface/kylinactiveconnectresource.cpp b/src/backend/dbus-interface/kylinactiveconnectresource.cpp index df31ff31..3c94b975 100644 --- a/src/backend/dbus-interface/kylinactiveconnectresource.cpp +++ b/src/backend/dbus-interface/kylinactiveconnectresource.cpp @@ -560,3 +560,23 @@ bool KyActiveConnectResourse::isActiveConnection(QString uuid, QStringList &devN } } } + +QString KyActiveConnectResourse::getDeviceOfActivateConnect(QString conUuid) +{ + QString deviceName = ""; + + NetworkManager::ActiveConnection::Ptr activeConnectPtr = + m_networkResourceInstance->getActiveConnect(conUuid); + + if (nullptr == activeConnectPtr) { + qWarning()<< "[KyActiveConnectResourse]" <<"it can not find connect "<< conUuid; + return deviceName; + } + + QStringList interfaces = activeConnectPtr->devices(); + QString ifaceUni = interfaces.at(0); + NetworkManager::Device:: Ptr devicePtr = + m_networkResourceInstance->findDeviceUni(ifaceUni); + deviceName = devicePtr->interfaceName(); + return deviceName; +} diff --git a/src/backend/dbus-interface/kylinactiveconnectresource.h b/src/backend/dbus-interface/kylinactiveconnectresource.h index 93225d1b..4a291167 100644 --- a/src/backend/dbus-interface/kylinactiveconnectresource.h +++ b/src/backend/dbus-interface/kylinactiveconnectresource.h @@ -37,6 +37,8 @@ public: bool isActiveConnection(QString uuid, QStringList &devName); + QString getDeviceOfActivateConnect(QString conUuid); + private: void getActiveConnectIp(NetworkManager::ActiveConnection::Ptr activeConnectPtr, QString &ipv4Address, diff --git a/src/backend/dbus-interface/kylinconnectoperation.cpp b/src/backend/dbus-interface/kylinconnectoperation.cpp index 4701df6b..bb05e3fd 100644 --- a/src/backend/dbus-interface/kylinconnectoperation.cpp +++ b/src/backend/dbus-interface/kylinconnectoperation.cpp @@ -208,9 +208,14 @@ void KyConnectOperation::activateConnection(const QString connectUuid, const QSt void KyConnectOperation::deactivateConnection(const QString activeConnectName, const QString &activeConnectUuid) { + NetworkManager::ActiveConnection::Ptr activateConnectPtr = nullptr; qDebug()<<"deactivetate connect name"<getActiveConnect(activeConnectUuid); if (nullptr == activateConnectPtr) { QString errorMessage = tr("it can not find the activate connect") diff --git a/src/backend/dbus-interface/kylinconnectresource.cpp b/src/backend/dbus-interface/kylinconnectresource.cpp index 3b0b95ae..ef266586 100644 --- a/src/backend/dbus-interface/kylinconnectresource.cpp +++ b/src/backend/dbus-interface/kylinconnectresource.cpp @@ -8,6 +8,22 @@ #include #include +static bool subLanListSort(const KyConnectItem* info1, const KyConnectItem* info2) +{ + QString name1 = info1->m_connectName; + QString name2 = info2->m_connectName; + bool result = true; + if (QString::compare(name1, name2, Qt::CaseInsensitive) > 0) { + result = false; + } + return result; +} + +static void lanListSort(QList &list) +{ + qSort(list.begin(), list.end(), subLanListSort); +} + KyConnectResourse::KyConnectResourse(QObject *parent) : QObject(parent) { m_networkResourceInstance = KyNetworkResourceManager::getInstance(); @@ -152,6 +168,9 @@ void KyConnectResourse::getConnectionList(QString deviceName, connectPtr = nullptr; } + if (connectItemList.size() > 1) { + lanListSort(connectItemList); + } return; } diff --git a/src/frontend/tab-pages/lanpage.cpp b/src/frontend/tab-pages/lanpage.cpp index 3a77c360..2537ba36 100644 --- a/src/frontend/tab-pages/lanpage.cpp +++ b/src/frontend/tab-pages/lanpage.cpp @@ -22,6 +22,7 @@ LanPage::LanPage(QWidget *parent) : TabPage(parent) m_activeResourse = new KyActiveConnectResourse(this); m_connectResourse = new KyConnectResourse(this); m_deviceResource = new KyNetworkDeviceResourse(this); + m_wiredConnectOperation = new KyWiredConnectOperation(this); initUI(); initNetSwitch(); @@ -792,11 +793,19 @@ void LanPage::onUpdateLanlist(QString uuid, updateActivatedConnectionArea(uuid); } else if (state == NetworkManager::ActiveConnection::State::Deactivated) { updateConnectionArea(uuid); + } else if (state == NetworkManager::ActiveConnection::State::Activating + || state == NetworkManager::ActiveConnection::State::Deactivating) { + QString devName = m_activeResourse->getDeviceOfActivateConnect(uuid); + if (devName.isEmpty()) { + NetworkManager::ConnectionSettings::ConnectionType type = NetworkManager::ConnectionSettings::Wired; + m_connectResourse->getInterfaceByUuid(devName, type, uuid); + } + emit lanActiveConnectionStateChanged(devName, uuid, state); } - return; } + void LanPage::getWiredList(QMap > &map) { QStringList devlist; From 808613285ca28c7839ce2de061d93ef86455cd1f Mon Sep 17 00:00:00 2001 From: jzxc95 <907297917@qq.com> Date: Thu, 14 Oct 2021 20:33:09 +0800 Subject: [PATCH 10/19] remove useless code --- src/backend/dbus-interface/kylinconnectoperation.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/backend/dbus-interface/kylinconnectoperation.cpp b/src/backend/dbus-interface/kylinconnectoperation.cpp index bb05e3fd..7c4b1eeb 100644 --- a/src/backend/dbus-interface/kylinconnectoperation.cpp +++ b/src/backend/dbus-interface/kylinconnectoperation.cpp @@ -208,14 +208,10 @@ void KyConnectOperation::activateConnection(const QString connectUuid, const QSt void KyConnectOperation::deactivateConnection(const QString activeConnectName, const QString &activeConnectUuid) { - NetworkManager::ActiveConnection::Ptr activateConnectPtr = nullptr; qDebug()<<"deactivetate connect name"<getActiveConnect(activeConnectUuid); if (nullptr == activateConnectPtr) { QString errorMessage = tr("it can not find the activate connect") From 1705488d60d83fe83f94aa8b76f9c6fdb8a1ff08 Mon Sep 17 00:00:00 2001 From: king Date: Thu, 14 Oct 2021 20:53:14 +0800 Subject: [PATCH 11/19] Fix:the wlanitem show bug 10-14 --- src/frontend/list-items/wlanlistitem.cpp | 10 ++++++++-- src/frontend/list-items/wlanlistitem.h | 1 + src/frontend/tab-pages/wlanpage.cpp | 14 ++++++++++++++ src/frontend/tab-pages/wlanpage.h | 1 + src/main.cpp | 2 +- 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/frontend/list-items/wlanlistitem.cpp b/src/frontend/list-items/wlanlistitem.cpp index 03925255..45f9162d 100644 --- a/src/frontend/list-items/wlanlistitem.cpp +++ b/src/frontend/list-items/wlanlistitem.cpp @@ -58,8 +58,8 @@ void WlanListItem::setExpanded(const bool &expanded) } this->setFixedHeight(expanded ? EXPANDED_HEIGHT : NORMAL_HEIGHT); - m_pwdFrame->setVisible(expanded); - m_autoConnectFrame->setVisible(expanded); +// m_pwdFrame->setVisible(false); +// m_autoConnectFrame->setVisible(false); emit this->itemHeightChanged(m_data->m_NetSsid); if (!expanded) { QPalette pal = qApp->palette(); @@ -68,6 +68,12 @@ void WlanListItem::setExpanded(const bool &expanded) } } +void WlanListItem::setWlanItemPwdVisible(const bool &expanded) +{ + m_pwdFrame->setVisible(expanded); + m_autoConnectFrame->setVisible(expanded); +} + QString WlanListItem::getSsid() { if (!m_data) { diff --git a/src/frontend/list-items/wlanlistitem.h b/src/frontend/list-items/wlanlistitem.h index 56b554d4..4a6d65f8 100644 --- a/src/frontend/list-items/wlanlistitem.h +++ b/src/frontend/list-items/wlanlistitem.h @@ -30,6 +30,7 @@ public: void setWlanSignal(const int &signal); void setWlanState(const int &state); void setExpanded(const bool &expanded); + void setWlanItemPwdVisible(const bool &expanded); QString getSsid(); KyWirelessNetItem *m_data = nullptr; protected: diff --git a/src/frontend/tab-pages/wlanpage.cpp b/src/frontend/tab-pages/wlanpage.cpp index 3af9d7f6..260dc82f 100644 --- a/src/frontend/tab-pages/wlanpage.cpp +++ b/src/frontend/tab-pages/wlanpage.cpp @@ -386,6 +386,10 @@ void WlanPage::onWlanRemoved(QString interface, QString ssid) int height = m_itemsMap.value(ssid).second->height(); m_inactivatedNetListWidget->setFixedHeight(m_inactivatedNetListWidget->height() - height - NET_LIST_SPACING); m_inactivatedWlanListAreaCentralWidget->setFixedHeight(m_inactivatedNetListWidget->height() + m_hiddenWlanLabel->height()); + QListWidgetItem * aItem = (m_itemsMap.value(ssid)).first; + delete aItem; + WlanListItem * awItem = (m_itemsMap.value(ssid)).second; + delete awItem; } m_itemsMap.remove(ssid); } @@ -605,22 +609,32 @@ void WlanPage::onActivatedWlanChanged(QString uuid, NetworkManager::ActiveConnec void WlanPage::onItemHeightChanged(const QString &ssid) { + qDebug() << "onItemHeightChanged" << __LINE__; if (!m_itemsMap.contains(ssid)) { return; } + //新的展开item QListWidgetItem *item = (m_itemsMap.value(ssid)).first; + WlanListItem * m_item = (m_itemsMap.value(ssid)).second; if (m_expandedItem && m_expandedItem != item) { + qDebug() << "onItemHeightChanged : the old fold and the new expanded" << m_expandedItem << item << __LINE__; QSize size(m_inactivatedNetListWidget->itemWidget(m_expandedItem)->size().width(), NORMAL_HEIGHT); //旧的收起 m_expandedItem->setSizeHint(size); m_inactivatedNetListWidget->itemWidget(m_expandedItem)->setFixedHeight(NORMAL_HEIGHT); + m_wlanExpandedItem->setWlanItemPwdVisible(false); //新的展开 m_expandedItem = item; + m_wlanExpandedItem = m_item; item->setSizeHint(m_inactivatedNetListWidget->itemWidget(item)->size()); + m_item->setWlanItemPwdVisible(true); } else if (!m_expandedItem) { + qDebug() << "onItemHeightChanged : only expanded the new one " << m_expandedItem << item << __LINE__; m_expandedItem = item; + m_wlanExpandedItem = m_item; m_inactivatedNetListWidget->setFixedHeight(m_inactivatedNetListWidget->height() + m_inactivatedNetListWidget->itemWidget(item)->height() - item->sizeHint().height()); m_inactivatedWlanListAreaCentralWidget->setFixedHeight(m_inactivatedNetListWidget->height() + m_hiddenWlanLabel->height()); item->setSizeHint(m_inactivatedNetListWidget->itemWidget(item)->size()); + m_item->setWlanItemPwdVisible(true); } } diff --git a/src/frontend/tab-pages/wlanpage.h b/src/frontend/tab-pages/wlanpage.h index 51014334..1aaacb17 100644 --- a/src/frontend/tab-pages/wlanpage.h +++ b/src/frontend/tab-pages/wlanpage.h @@ -84,6 +84,7 @@ private: QMap> m_itemsMap; QListWidgetItem *m_expandedItem = nullptr; + WlanListItem *m_wlanExpandedItem = nullptr; QFrame * m_inactivatedWlanListAreaCentralWidget = nullptr; QVBoxLayout * m_inactivatedWlanListAreaLayout = nullptr; QFrame * m_hiddenWlanWidget = nullptr; diff --git a/src/main.cpp b/src/main.cpp index f49bac11..cac828c9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) // QApplication a(argc, argv); QString id = QString("kylin-nm"+ QLatin1String(getenv("DISPLAY"))); QtSingleApplication a(id, argc, argv); -// qInstallMessageHandler(messageOutput); + qInstallMessageHandler(messageOutput); if (a.isRunning()) { auto connection = QDBusConnection::sessionBus(); QDBusInterface iface("com.kylin.network", From 6a0806dae0b6c3f25429372e9da796a8ef4930b1 Mon Sep 17 00:00:00 2001 From: jzxc95 <907297917@qq.com> Date: Fri, 15 Oct 2021 09:21:52 +0800 Subject: [PATCH 12/19] out arg --- src/frontend/tab-pages/lanpage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/tab-pages/lanpage.cpp b/src/frontend/tab-pages/lanpage.cpp index 2537ba36..0c11cb56 100644 --- a/src/frontend/tab-pages/lanpage.cpp +++ b/src/frontend/tab-pages/lanpage.cpp @@ -797,7 +797,7 @@ void LanPage::onUpdateLanlist(QString uuid, || state == NetworkManager::ActiveConnection::State::Deactivating) { QString devName = m_activeResourse->getDeviceOfActivateConnect(uuid); if (devName.isEmpty()) { - NetworkManager::ConnectionSettings::ConnectionType type = NetworkManager::ConnectionSettings::Wired; + NetworkManager::ConnectionSettings::ConnectionType type; m_connectResourse->getInterfaceByUuid(devName, type, uuid); } emit lanActiveConnectionStateChanged(devName, uuid, state); From 957cad765352cdc485918f1529f93de9fba4fd62 Mon Sep 17 00:00:00 2001 From: kangshuning Date: Fri, 15 Oct 2021 11:50:41 +0800 Subject: [PATCH 13/19] bug#83296 --- src/frontend/netdetails/detailitem.cpp | 6 -- src/frontend/netdetails/detailitem.h | 16 --- src/frontend/netdetails/detailpage.cpp | 124 +++++++++++++---------- src/frontend/netdetails/detailpage.h | 18 +++- src/frontend/netdetails/detailwidget.cpp | 32 ++++++ src/frontend/netdetails/detailwidget.h | 27 +++++ src/frontend/netdetails/netdetail.cpp | 23 ++++- src/frontend/netdetails/netdetail.h | 1 + src/frontend/netdetails/netdetails.pri | 2 + 9 files changed, 170 insertions(+), 79 deletions(-) delete mode 100644 src/frontend/netdetails/detailitem.cpp delete mode 100644 src/frontend/netdetails/detailitem.h create mode 100644 src/frontend/netdetails/detailwidget.cpp create mode 100644 src/frontend/netdetails/detailwidget.h diff --git a/src/frontend/netdetails/detailitem.cpp b/src/frontend/netdetails/detailitem.cpp deleted file mode 100644 index be9001a4..00000000 --- a/src/frontend/netdetails/detailitem.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "detailitem.h" - -DetailItem::DetailItem(QWidget *parent) : QWidget(parent) -{ - -} diff --git a/src/frontend/netdetails/detailitem.h b/src/frontend/netdetails/detailitem.h deleted file mode 100644 index 6e775c6f..00000000 --- a/src/frontend/netdetails/detailitem.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef DETAILITEM_H -#define DETAILITEM_H - -#include - -class DetailItem : public QWidget -{ - Q_OBJECT -public: - explicit DetailItem(QWidget *parent = nullptr); - -signals: - -}; - -#endif // DETAILITEM_H diff --git a/src/frontend/netdetails/detailpage.cpp b/src/frontend/netdetails/detailpage.cpp index 572ea7e3..7b8e45a8 100644 --- a/src/frontend/netdetails/detailpage.cpp +++ b/src/frontend/netdetails/detailpage.cpp @@ -1,5 +1,6 @@ #include "detailpage.h" #include +#include extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed); @@ -73,68 +74,78 @@ bool DetailPage::checkIsChanged(const ConInfo info) } } +void DetailPage::addDetailItem(QListWidget *listWidget, DetailWidget *detailWidget) +{ + QListWidgetItem *listWidgetItem = new QListWidgetItem(listWidget); + listWidgetItem->setSizeHint(QSize(listWidget->width(),36)); + listWidgetItem->setFlags(Qt::NoItemFlags); + listWidget->addItem(listWidgetItem); + listWidget->setItemWidget(listWidgetItem, detailWidget); +} + void DetailPage::initUI() { forgetNetBox = new QCheckBox(this); layout = new QVBoxLayout(this); + layout->setContentsMargins(0,0,0,0); - mDetailLayout = new QFormLayout(this); + QWidget *mDetailFrame = new QFrame(this); + mDetailLayout = new QVBoxLayout(mDetailFrame); + mDetailLayout->setContentsMargins(0,0,0,0); + + m_listWidget = new QListWidget(mDetailFrame); + m_listWidget->setFrameShape(QFrame::Shape::NoFrame); + m_listWidget->setBackgroundRole(QPalette::Base); + m_listWidget->setFocusPolicy(Qt::FocusPolicy::NoFocus); + mDetailLayout->addWidget(m_listWidget); mSSID = new QLineEdit(this); mSSID->setAlignment(Qt::AlignRight); if (!isCreate) { - mSSID->setStyleSheet("background:transparent;border-width:0;border-style:outset"); + mSSID->setStyleSheet("background:transparent;border-width:0px;border-style:none"); mSSID->setFocusPolicy(Qt::NoFocus); } else { - mSSID->setStyleSheet("border-width:0;border-style:outset"); +// mSSID->setStyleSheet("border-width:1px;;border-style:solid;border-color:black;border-radius:2px"); + mSSID->setStyleSheet("border-top:0px solid;border-bottom:1px solid;border-left:0px solid;border-right: 0px solid;"); + mSSID->setPlaceholderText(tr("Please input SSID:")); } - QHBoxLayout *mSsidLayout = new QHBoxLayout(this); - mSsidLayout->addStretch(); - mSsidLayout->addWidget(mSSID); + m_ssidWidget = new DetailWidget(qobject_cast(mSSID), m_listWidget); + m_ssidWidget->setKey(tr("SSID:")); - mProtocol = new QLabel(this); - QHBoxLayout *mProtocolLayout = new QHBoxLayout(this); - mProtocolLayout->addStretch(); - mProtocolLayout->addWidget(mProtocol); + mProtocol = new QLabel(this); + m_protocolWidget = new DetailWidget(qobject_cast(mProtocol), m_listWidget); + m_protocolWidget->setKey(tr("Protocol:")); - mSecType = new QLabel(this); - QHBoxLayout *mSecTypeLayout = new QHBoxLayout(this); - mSecTypeLayout->addStretch(); - mSecTypeLayout->addWidget(mSecType); + mSecType = new QLabel(this); + m_secTypeWidget = new DetailWidget(qobject_cast(mSecType)); + m_secTypeWidget->setKey(tr("Security Type:")); - mHz = new QLabel(this); - QHBoxLayout *mHzLayout = new QHBoxLayout(this); - mHzLayout->addStretch(); - mHzLayout->addWidget(mHz); + mHz = new QLabel(this); + m_hzWidget = new DetailWidget(qobject_cast(mHz)); + m_hzWidget->setKey(tr("Hz:")); - mChan = new QLabel(this); - QHBoxLayout *mChanLayout = new QHBoxLayout(this); - mChanLayout->addStretch(); - mChanLayout->addWidget(mChan); + mChan = new QLabel(this); + m_chanelWidget = new DetailWidget(qobject_cast(mChan)); + m_chanelWidget->setKey(tr("Chan:")); mBandWidth = new QLabel(this); - QHBoxLayout *mBandWidthLayout = new QHBoxLayout(this); - mBandWidthLayout->addStretch(); - mBandWidthLayout->addWidget(mBandWidth); + m_bandwidthWidget = new DetailWidget(qobject_cast(mBandWidth), m_listWidget); + m_bandwidthWidget->setKey(tr("BandWidth:")); - mIPV4 = new QLabel(this); - QHBoxLayout *mIPV4Layout = new QHBoxLayout(this); - mIPV4Layout->addStretch(); - mIPV4Layout->addWidget(mIPV4); + mIPV4 = new QLabel(this); + m_ipv4Widget = new DetailWidget(qobject_cast(mIPV4), m_listWidget); + m_ipv4Widget->setKey(tr("IPV4:")); - mIPV4Dns = new QLabel(this); - QHBoxLayout *mIPV4DnsLayout = new QHBoxLayout(this); - mIPV4DnsLayout->addStretch(); - mIPV4DnsLayout->addWidget(mIPV4Dns); + mIPV4Dns = new QLabel(this); + m_ipv4DnsWidget = new DetailWidget(qobject_cast(mIPV4Dns), m_listWidget); + m_ipv4DnsWidget->setKey(tr("IPV4 Dns:")); - mIPV6 = new QLabel(this); - QHBoxLayout *mIPV6Layout = new QHBoxLayout(this); - mIPV6Layout->addStretch(); - mIPV6Layout->addWidget(mIPV6); + mIPV6 = new QLabel(this); + m_ipv6Widget = new DetailWidget(qobject_cast(mIPV6), m_listWidget); + m_ipv6Widget->setKey(tr("IPV6:")); - mMac = new QLabel(this); - QHBoxLayout *mMacLayout = new QHBoxLayout(this); - mMacLayout->addStretch(); - mMacLayout->addWidget(mMac); + mMac = new QLabel(this); + m_macWidget = new DetailWidget(qobject_cast(mMac), m_listWidget); + m_macWidget->setKey(tr("Mac:")); autoConnect = new QLabel(this); @@ -147,23 +158,28 @@ void DetailPage::initUI() { mAutoLayout->addWidget(autoConnect); mAutoLayout->addSpacerItem(horizontalSpacer); - mDetailLayout->addRow(tr("SSID:"), mSsidLayout); - mDetailLayout->addRow(tr("Protocol:"), mProtocolLayout); + this->addDetailItem(m_listWidget, m_ssidWidget); + this->addDetailItem(m_listWidget, m_protocolWidget); if (mIsWlan) { - mDetailLayout->addRow(tr("Security Type:"), mSecTypeLayout); - mDetailLayout->addRow(tr("Hz:"), mHzLayout); - mDetailLayout->addRow(tr("Chan:"), mChanLayout); + this->addDetailItem(m_listWidget, m_secTypeWidget); + this->addDetailItem(m_listWidget, m_hzWidget); + this->addDetailItem(m_listWidget, m_chanelWidget); } - mDetailLayout->addRow(tr("BandWidth:"), mBandWidthLayout); - mDetailLayout->addRow(tr("IPV6:"), mIPV6Layout); - mDetailLayout->addRow(tr("IPV4:"), mIPV4Layout); - mDetailLayout->addRow(tr("IPV4 Dns:"), mIPV4DnsLayout); - mDetailLayout->addRow(tr("Mac:"), mMacLayout); + this->addDetailItem(m_listWidget, m_bandwidthWidget); + this->addDetailItem(m_listWidget, m_ipv6Widget); + this->addDetailItem(m_listWidget, m_ipv4Widget); + this->addDetailItem(m_listWidget, m_ipv4DnsWidget); + this->addDetailItem(m_listWidget, m_macWidget); - layout->addLayout(mDetailLayout); - layout->addStretch(); + QPalette mpal(m_listWidget->palette()); + mpal.setColor(QPalette::Base, qApp->palette().base().color()); + mpal.setColor(QPalette::AlternateBase, qApp->palette().alternateBase().color()); + m_listWidget->setAlternatingRowColors(true); +// m_listWidget->setAutoFillBackground(true); + m_listWidget->setPalette(mpal); + + layout->addWidget(mDetailFrame); layout->addLayout(mAutoLayout); - } void DetailPage::setEnableOfSaveBtn() { diff --git a/src/frontend/netdetails/detailpage.h b/src/frontend/netdetails/detailpage.h index 719e33ce..fa40c35a 100644 --- a/src/frontend/netdetails/detailpage.h +++ b/src/frontend/netdetails/detailpage.h @@ -7,7 +7,10 @@ #include #include #include +#include +#include +#include "detailwidget.h" #include "coninfo.h" class DetailPage : public QFrame @@ -34,8 +37,21 @@ public: private: void initUI(); + void addDetailItem(QListWidget *listWidget, DetailWidget *detailWidget); public: + QListWidget * m_listWidget = nullptr; + DetailWidget * m_ssidWidget = nullptr; + DetailWidget * m_protocolWidget = nullptr; + DetailWidget * m_secTypeWidget = nullptr; + DetailWidget * m_hzWidget = nullptr; + DetailWidget * m_chanelWidget = nullptr; + DetailWidget * m_bandwidthWidget = nullptr; + DetailWidget * m_ipv4Widget = nullptr; + DetailWidget * m_ipv4DnsWidget = nullptr; + DetailWidget * m_ipv6Widget = nullptr; + DetailWidget * m_macWidget = nullptr; + QLineEdit *mSSID; QLabel *mProtocol; QLabel *mSecType; @@ -51,7 +67,7 @@ public: // QWidget *autoFrame; private: QVBoxLayout *layout; - QFormLayout *mDetailLayout; + QVBoxLayout *mDetailLayout; QHBoxLayout *mAutoLayout; QCheckBox *forgetNetBox; bool mIsWlan; diff --git a/src/frontend/netdetails/detailwidget.cpp b/src/frontend/netdetails/detailwidget.cpp new file mode 100644 index 00000000..a045e0ce --- /dev/null +++ b/src/frontend/netdetails/detailwidget.cpp @@ -0,0 +1,32 @@ +#include "detailwidget.h" +#define ITEM_HEIGHT 36 +#define ITEM_MARGINS 18,0,16,0 + +DetailWidget::DetailWidget(QWidget *valueWidget, QWidget *parent) + : m_valueWidget(valueWidget) , QWidget(parent) +{ +// m_valueWidget = valueWidget; + initUI(); +} + +DetailWidget::~DetailWidget() +{ + +} + +void DetailWidget::initUI() +{ + this->setFixedHeight(ITEM_HEIGHT); + m_mainLayout = new QHBoxLayout(this); + m_mainLayout->setContentsMargins(ITEM_MARGINS); + + m_keyLabel = new QLabel(this); + m_mainLayout->addWidget(m_keyLabel); + m_mainLayout->addStretch(); + m_mainLayout->addWidget(m_valueWidget); +} + +void DetailWidget::setKey(const QString &keyLabel) +{ + m_keyLabel->setText(keyLabel); +} diff --git a/src/frontend/netdetails/detailwidget.h b/src/frontend/netdetails/detailwidget.h new file mode 100644 index 00000000..00333bb2 --- /dev/null +++ b/src/frontend/netdetails/detailwidget.h @@ -0,0 +1,27 @@ +#ifndef DetailWidget_H +#define DetailWidget_H + +#include +#include +#include + +class DetailWidget : public QWidget +{ + Q_OBJECT +public: + explicit DetailWidget(QWidget *valueWidget = nullptr, QWidget *parent = nullptr); + ~DetailWidget(); + + void setKey(const QString &keyLabel); + +private: + QHBoxLayout * m_mainLayout = nullptr; + QLabel * m_keyLabel = nullptr; + QWidget * m_valueWidget = nullptr; + + void initUI(); +signals: + +}; + +#endif // DetailWidget_H diff --git a/src/frontend/netdetails/netdetail.cpp b/src/frontend/netdetails/netdetail.cpp index 0b1de9d3..11f124d7 100644 --- a/src/frontend/netdetails/netdetail.cpp +++ b/src/frontend/netdetails/netdetail.cpp @@ -3,8 +3,8 @@ #include "backend/kylinipv6arping.h" #include "xatom/xatom-helper.h" -#define WINDOW_WIDTH 540 -#define WINDOW_HEIGHT 574 +#define WINDOW_WIDTH 520 +#define WINDOW_HEIGHT 590 #define BUTTON_SIZE 30 #define ICON_SIZE 22,22 #define TITLE_LAYOUT_MARGINS 9,9,0,0 @@ -80,6 +80,7 @@ NetDetail::NetDetail(QString interface, QString name, QString uuid, bool isActiv getConInfo(m_info); pagePadding(name,isWlan); + connect(qApp, &QApplication::paletteChanged, this, &NetDetail::onPaletteChanged); isCreateOk = !(m_isCreateNet && !isWlan); isDetailOk = !(m_name.isEmpty()); @@ -97,6 +98,20 @@ NetDetail::~NetDetail() } +void NetDetail::onPaletteChanged() +{ + QPalette pal = qApp->palette(); + pal.setColor(QPalette::Window, qApp->palette().base().color()); + this->setPalette(pal); + + QPalette listwidget_pal(detailPage->m_listWidget->palette()); + listwidget_pal.setColor(QPalette::Base, qApp->palette().base().color()); + listwidget_pal.setColor(QPalette::AlternateBase, qApp->palette().alternateBase().color()); + detailPage->m_listWidget->setAlternatingRowColors(true); + detailPage->m_listWidget->setPalette(listwidget_pal); + +} + void NetDetail::paintEvent(QPaintEvent *event) { return QDialog::paintEvent(event); @@ -227,6 +242,10 @@ void NetDetail::initUI() bottomLayout->addWidget(cancelBtn); bottomLayout->addWidget(confimBtn); + QPalette pal(this->palette()); + pal.setColor(QPalette::Background, qApp->palette().base().color()); + this->setAutoFillBackground(true); + this->setPalette(pal); } void NetDetail::loadPage() diff --git a/src/frontend/netdetails/netdetail.h b/src/frontend/netdetails/netdetail.h index d6c721a0..e40db6c0 100644 --- a/src/frontend/netdetails/netdetail.h +++ b/src/frontend/netdetails/netdetail.h @@ -127,5 +127,6 @@ private: private slots: void on_btnConfirm_clicked(); void on_btnForget_clicked(); + void onPaletteChanged(); }; #endif // NETDETAIL_H diff --git a/src/frontend/netdetails/netdetails.pri b/src/frontend/netdetails/netdetails.pri index 206899b9..720a66b8 100644 --- a/src/frontend/netdetails/netdetails.pri +++ b/src/frontend/netdetails/netdetails.pri @@ -5,6 +5,7 @@ HEADERS += \ $$PWD/creatnetpage.h \ $$PWD/customtabstyle.h \ $$PWD/detailpage.h \ + $$PWD/detailwidget.h \ $$PWD/ipv4page.h \ $$PWD/ipv6page.h \ $$PWD/netdetail.h \ @@ -14,6 +15,7 @@ SOURCES += \ $$PWD/creatnetpage.cpp \ $$PWD/customtabstyle.cpp \ $$PWD/detailpage.cpp \ + $$PWD/detailwidget.cpp \ $$PWD/ipv4page.cpp \ $$PWD/ipv6page.cpp \ $$PWD/netdetail.cpp \ From e2d0c9ea30ad4584bee254f27bc7ac5a81535b6b Mon Sep 17 00:00:00 2001 From: jzxc95 <907297917@qq.com> Date: Fri, 15 Oct 2021 14:41:18 +0800 Subject: [PATCH 14/19] src/backend/dbus-interface/kylinnetworkdeviceresource.cpp --- .../kylinnetworkdeviceresource.h | 1 + .../kywirelessconnectoperation.cpp | 36 ++++++++++++++++--- .../kywirelessconnectoperation.h | 20 ++++++++--- src/backend/dbusadaptor.cpp | 17 ++++++--- src/backend/dbusadaptor.h | 8 +++-- src/frontend/mainwindow.cpp | 13 ++++--- src/frontend/mainwindow.h | 8 +++-- src/frontend/tab-pages/wlanpage.cpp | 33 ++++++++--------- src/frontend/tab-pages/wlanpage.h | 8 +++-- 9 files changed, 99 insertions(+), 45 deletions(-) diff --git a/src/backend/dbus-interface/kylinnetworkdeviceresource.h b/src/backend/dbus-interface/kylinnetworkdeviceresource.h index d879b8c8..0aabc8a3 100644 --- a/src/backend/dbus-interface/kylinnetworkdeviceresource.h +++ b/src/backend/dbus-interface/kylinnetworkdeviceresource.h @@ -37,6 +37,7 @@ public: // void disconnectDevice(); //void setDeviceAutoConnect(); void getDeviceActiveAPInfo(const QString devName, QString &strMac, uint &iHz, uint &iChan, QString &secuType); + int getWirelessDeviceCapability(const QString deviceName); private: KyWiredConnectOperation wiredOperation; diff --git a/src/backend/dbus-interface/kywirelessconnectoperation.cpp b/src/backend/dbus-interface/kywirelessconnectoperation.cpp index 51569465..818f1eba 100644 --- a/src/backend/dbus-interface/kywirelessconnectoperation.cpp +++ b/src/backend/dbus-interface/kywirelessconnectoperation.cpp @@ -684,7 +684,10 @@ bool KyWirelessConnectOperation::getConnSecretFlags(QString &connUuid, NetworkMa } NetworkManager::ConnectionSettings::Ptr - KyWirelessConnectOperation::createWirelessApSetting(const QString apSsid, const QString apPassword, const QString apDevice) + KyWirelessConnectOperation::createWirelessApSetting(const QString apSsid, + const QString apPassword, + const QString apDevice, + const QString wirelessBand) { NetworkManager::ConnectionSettings::Ptr connectionSettings = NetworkManager::ConnectionSettings::Ptr(new NetworkManager::ConnectionSettings(NetworkManager::ConnectionSettings::Wireless)); @@ -710,6 +713,15 @@ NetworkManager::ConnectionSettings::Ptr wirelessSetting->setSsid(apSsid.toUtf8()); wirelessSetting->setMode(NetworkManager::WirelessSetting::NetworkMode::Ap); wirelessSetting->setSecurity("802-11-wireless-security"); + if (wirelessBand == WIFI_BAND_2_4GHZ) { + wirelessSetting->setBand(NetworkManager::WirelessSetting::FrequencyBand::Bg); + } else if (wirelessBand == WIFI_BAND_5GHZ) { + wirelessSetting->setBand(NetworkManager::WirelessSetting::FrequencyBand::A); + } else { + qWarning()<<"[KyWirelessConnectOperation] the band type undefined"<setBand(NetworkManager::WirelessSetting::FrequencyBand::Automatic); + } + NetworkManager::WirelessSecuritySetting::Ptr wirelessSecuritySetting = connectionSettings->setting(NetworkManager::Setting::WirelessSecurity).dynamicCast(); @@ -726,7 +738,9 @@ NetworkManager::ConnectionSettings::Ptr void KyWirelessConnectOperation::updateWirelessApSetting( NetworkManager::Connection::Ptr apConnectPtr, - const QString apName, const QString apPassword, const QString apDevice) + const QString apName, const QString apPassword, + const QString apDevice, const QString wirelessBand) + { NetworkManager::ConnectionSettings::Ptr apConnectSettingPtr = apConnectPtr->settings(); apConnectSettingPtr->setId(apName); @@ -737,6 +751,15 @@ void KyWirelessConnectOperation::updateWirelessApSetting( = apConnectSettingPtr->setting(NetworkManager::Setting::Wireless).dynamicCast(); wirelessSetting->setInitialized(true); wirelessSetting->setSsid(apName.toUtf8()); + if (wirelessBand == WIFI_BAND_2_4GHZ) { + wirelessSetting->setBand(NetworkManager::WirelessSetting::FrequencyBand::Bg); + } else if (wirelessBand == WIFI_BAND_5GHZ) { + wirelessSetting->setBand(NetworkManager::WirelessSetting::FrequencyBand::A); + } else { + qWarning()<<"[KyWirelessConnectOperation] the band type undefined"<setBand(NetworkManager::WirelessSetting::FrequencyBand::Automatic); + } + NetworkManager::WirelessSecuritySetting::Ptr wirelessSecuritySetting = apConnectSettingPtr->setting(NetworkManager::Setting::WirelessSecurity).dynamicCast(); @@ -752,8 +775,11 @@ void KyWirelessConnectOperation::updateWirelessApSetting( } void KyWirelessConnectOperation::activeWirelessAp(const QString apUuid, const QString apName, - const QString apPassword, const QString apDevice) + const QString apPassword, const QString apDevice, + const QString wirelessBand) + { + qDebug() << "activeWirelessAp]" << apUuid << apName << apPassword << apDevice << wirelessBand; //1、检查连接是否存在 NetworkManager::Connection::Ptr connectPtr = m_networkResourceInstance->getConnect(apUuid); if (nullptr == connectPtr) { @@ -768,7 +794,7 @@ void KyWirelessConnectOperation::activeWirelessAp(const QString apUuid, const QS QString deviceIdentifier = devicePtr->uni(); NetworkManager::ConnectionSettings::Ptr apConnectSettingPtr = - createWirelessApSetting(apName, apPassword, apDevice); + createWirelessApSetting(apName, apPassword, apDevice, wirelessBand); QString specificObject = ""; QDBusPendingCallWatcher * watcher; watcher = new QDBusPendingCallWatcher{NetworkManager::addAndActivateConnection(apConnectSettingPtr->toMap(), deviceIdentifier, specificObject), this}; @@ -781,7 +807,7 @@ void KyWirelessConnectOperation::activeWirelessAp(const QString apUuid, const QS watcher->deleteLater(); }); } else { - updateWirelessApSetting(connectPtr, apName, apPassword, apDevice); + updateWirelessApSetting(connectPtr, apName, apPassword, apDevice, wirelessBand); QTimer::singleShot(500, this, [=](){ activateApConnectionByUuid(apUuid, apDevice); }); diff --git a/src/backend/dbus-interface/kywirelessconnectoperation.h b/src/backend/dbus-interface/kywirelessconnectoperation.h index d160edb9..9a481b56 100644 --- a/src/backend/dbus-interface/kywirelessconnectoperation.h +++ b/src/backend/dbus-interface/kywirelessconnectoperation.h @@ -9,7 +9,10 @@ #include "kyenterpricesettinginfo.h" const QByteArray GSETTINGS_SCHEMA = "org.ukui.kylin-nm.switch"; -const QString WIRELESS_SWITCH = "wirelessswitch"; +const QString WIRELESS_SWITCH = "wirelessswitch"; + +const QString WIFI_BAND_2_4GHZ = "2.4Ghz"; +const QString WIFI_BAND_5GHZ = "5Ghz"; enum KySecuType { NONE = 0, @@ -105,13 +108,22 @@ public: //申请扫描 void requestWirelessScan(); - void activeWirelessAp(const QString apUuid, const QString apName, const QString apPassword, const QString apDevice); + void activeWirelessAp(const QString apUuid, const QString apName, + const QString apPassword, const QString apDevice, + const QString wirelessBand); void deactiveWirelessAp(const QString apName, const QString apUuid); private: - NetworkManager::ConnectionSettings::Ptr createWirelessApSetting(const QString apSsid, const QString apPassword, const QString apDevice); + NetworkManager::ConnectionSettings::Ptr createWirelessApSetting(const QString apSsid, + const QString apPassword, + const QString apDevice, + const QString wirelessBand); void updateWirelessApSetting(NetworkManager::Connection::Ptr apConnectPtr, - const QString apName, const QString apPassword, const QString apDevice); + const QString apName, + const QString apPassword, + const QString apDevice, + const QString wirelessBand); + diff --git a/src/backend/dbusadaptor.cpp b/src/backend/dbusadaptor.cpp index 58639274..ea26d293 100644 --- a/src/backend/dbusadaptor.cpp +++ b/src/backend/dbusadaptor.cpp @@ -30,6 +30,7 @@ DbusAdaptor::DbusAdaptor(MainWindow *parent) { // constructor qDBusRegisterMetaType >(); + qDBusRegisterMetaType >(); qDBusRegisterMetaType >(); qDBusRegisterMetaType >>(); //setAutoRelaySignals(true)后会自动转发mainwindow发出的同名信号，因此不必再额外写一个转发 @@ -175,6 +176,14 @@ QMap DbusAdaptor::getDeviceListAndEnabled(int devType) return map; } +//获取无线设备能力 +QMap DbusAdaptor::getWirelessDeviceCap() +{ + QMap map; + parent()->getWirelessDeviceCap(map); + return map; +} + //唤起属性页 根据网卡类型 参数2 为ssid/uuid void DbusAdaptor::showPropertyWidget(QString devName, QString ssid) { @@ -190,15 +199,15 @@ void DbusAdaptor::showCreateWiredConnectWidget(QString devName) } //开启热点 -void DbusAdaptor::activeWirelessAp(const QString apName, const QString apPassword, const QString apDevice) +void DbusAdaptor::activeWirelessAp(const QString apName, const QString apPassword, const QString band, const QString apDevice) { - parent()->activeWirelessAp(apName, apPassword, apDevice); + parent()->activeWirelessAp(apName, apPassword, band, apDevice); } //断开热点 -void DbusAdaptor::deactiveWirelessAp(const QString apName, const QString apPassword, const QString apDevice) +void DbusAdaptor::deactiveWirelessAp(const QString apName, const QString uuid) { - parent()->deactiveWirelessAp(apName, apPassword, apDevice); + parent()->deactiveWirelessAp(apName, uuid); } //获取热点 diff --git a/src/backend/dbusadaptor.h b/src/backend/dbusadaptor.h index b59e76d1..3a383c6d 100644 --- a/src/backend/dbusadaptor.h +++ b/src/backend/dbusadaptor.h @@ -68,14 +68,16 @@ public Q_SLOTS: // METHODS Q_NOREPLY void deActivateConnect(int type, QString devName, QString ssid); //获取设备列表和启用/禁用状态 QMap getDeviceListAndEnabled(int devType); + //获取无线设备能力 + QMap getWirelessDeviceCap(); //唤起属性页 根据网卡类型 参数2 为ssid/uuid Q_NOREPLY void showPropertyWidget(QString devName, QString ssid); //唤起新建有线连接界面 Q_NOREPLY void showCreateWiredConnectWidget(QString devName); //开启热点 - void activeWirelessAp(const QString apName, const QString apPassword, const QString apDevice); + void activeWirelessAp(const QString apName, const QString apPassword, const QString band, const QString apDevice); //断开热点 - void deactiveWirelessAp(const QString apName, const QString apPassword, const QString apDevice); + void deactiveWirelessAp(const QString apName, const QString uuid); //获取热点 QStringList getStoredApInfo(); //wifi扫描 @@ -99,7 +101,7 @@ Q_SIGNALS: // SIGNALS //热点断开 void hotspotDeactivated(QString devName, QString ssid); //热点连接 - void hotspotActivated(QString devName, QString ssid); + void hotspotActivated(QString devName, QString ssid, QString uuid); //信号强度变化 void signalStrengthChange(QString devName, QString ssid, int strength); diff --git a/src/frontend/mainwindow.cpp b/src/frontend/mainwindow.cpp index 0a9af414..f8d6db02 100644 --- a/src/frontend/mainwindow.cpp +++ b/src/frontend/mainwindow.cpp @@ -419,18 +419,18 @@ void MainWindow::getWiredList(QMap> &map) * @param apPassword * @param apDevice */ -void MainWindow::activeWirelessAp(const QString apName, const QString apPassword, const QString apDevice) +void MainWindow::activeWirelessAp(const QString apName, const QString apPassword, const QString band, const QString apDevice) { - m_wlanWidget->activeWirelessAp(apName, apPassword, apDevice); + m_wlanWidget->activeWirelessAp(apName, apPassword, band, apDevice); } /** * @brief MainWindow::activeWirelessAp 断开热点，供dbus调用 * @param apName */ -void MainWindow::deactiveWirelessAp(const QString apName, const QString apPassword, const QString apDevice) +void MainWindow::deactiveWirelessAp(const QString apName, const QString uuid) { - m_wlanWidget->deactiveWirelessAp(apName, apPassword, apDevice); + m_wlanWidget->deactiveWirelessAp(apName, uuid); } /** @@ -484,6 +484,11 @@ void MainWindow::showCreateWiredConnectWidget(const QString devName) netDetail->show(); } +void MainWindow::getWirelessDeviceCap(QMap &map) +{ + m_wlanWidget->getWirelessDeviceCap(map); +} + //有线连接断开 void MainWindow::activateWired(const QString& devName, const QString& connUuid) { diff --git a/src/frontend/mainwindow.h b/src/frontend/mainwindow.h index 65549f70..d028bc37 100644 --- a/src/frontend/mainwindow.h +++ b/src/frontend/mainwindow.h @@ -30,9 +30,9 @@ public: void getWirelessList(QMap > &map); void getWiredList(QMap> &map); //开启热点 - void activeWirelessAp(const QString apName, const QString apPassword, const QString apDevice); + void activeWirelessAp(const QString apName, const QString apPassword, const QString wirelessBand, const QString apDevice); //断开热点 - void deactiveWirelessAp(const QString apName, const QString apPassword, const QString apDevice); + void deactiveWirelessAp(const QString apName, const QString uuid); //获取热点 void getStoredApInfo(QStringList &list); //有线连接断开 @@ -49,6 +49,8 @@ public: //唤起新建有线连接界面 void showCreateWiredConnectWidget(const QString devName); + void getWirelessDeviceCap(QMap &map); + void rescan(); signals: @@ -68,7 +70,7 @@ signals: void deactivateFailed(QString errorMessage); //热点断开 void hotspotDeactivated(QString devName, QString ssid); - void hotspotActivated(QString devName, QString ssid); + void hotspotActivated(QString devName, QString ssid, QString uuid); //信号强度变化 void signalStrengthChange(QString devName, QString ssid, int strength); //安全性变化 diff --git a/src/frontend/tab-pages/wlanpage.cpp b/src/frontend/tab-pages/wlanpage.cpp index 4d37476c..75e8a1a4 100644 --- a/src/frontend/tab-pages/wlanpage.cpp +++ b/src/frontend/tab-pages/wlanpage.cpp @@ -561,7 +561,7 @@ void WlanPage::onActivatedWlanChanged(QString uuid, NetworkManager::ActiveConnec foreach (auto item, apConnectItemList) { if (item->m_connectUuid == uuid) { qDebug() << "[WlanPage] hotspot Deactivated"; - emit hotspotActivated(item->m_ifaceName, ssid); + emit hotspotActivated(item->m_ifaceName, ssid, uuid); break; } } @@ -686,6 +686,8 @@ void WlanPage::showControlCenter() } void WlanPage::onWifiEnabledChanged(bool isWifiOn) { + qDebug() << "[WlanPage]onWifiEnabledChanged====================================" << isWifiOn; + qDebug() << "realstatus" << m_wirelessConnectOpreation->getWirelessEnabled(); //监听外部命令导致wifi状态变化，更新界面 //应该先检测是否有无线网卡可用，才改变开关状态 m_netDeviceResource->getNetworkDeviceList(NetworkManager::Device::Type::Wifi, m_devList); @@ -811,7 +813,7 @@ void WlanPage::getWirelessList(QMap > &map) } //开启热点 -void WlanPage::activeWirelessAp(const QString apName, const QString apPassword, const QString apDevice) +void WlanPage::activeWirelessAp(const QString apName, const QString apPassword, const QString wirelessBand, const QString apDevice) { QString uuid(""); QList apConnectItemList; @@ -819,29 +821,14 @@ void WlanPage::activeWirelessAp(const QString apName, const QString apPassword, if (!apConnectItemList.isEmpty()) { uuid = apConnectItemList.at(0)->m_connectUuid; } - m_wirelessConnectOpreation->activeWirelessAp(uuid, apName, apPassword, apDevice); + m_wirelessConnectOpreation->activeWirelessAp(uuid, apName, apPassword, apDevice, wirelessBand); } //断开热点 -void WlanPage::deactiveWirelessAp(const QString apName, const QString apPassword, const QString apDevice) +void WlanPage::deactiveWirelessAp(const QString apName, const QString uuid) { - QString uuid(""); - QList apConnectItemList; - m_apConnectResource->getApConnections(apConnectItemList); - if (!apConnectItemList.isEmpty()) { - foreach (auto item, apConnectItemList) { - if (apName == item->m_connectName && apPassword == item->m_password && apDevice == item->m_ifaceName) { - uuid = item->m_connectUuid; - qDebug() << "[WlanPage] deactiveWirelessAp uuid = " << uuid; - break; - } - } - } if (!uuid.isEmpty()) { m_wirelessConnectOpreation->deactiveWirelessAp(apName, uuid); - } else { - qDebug() << "[WlanPage] deactiveWirelessAp can not find apName " << apName; - emit deactivateFailed("Deactivate hotspot failed.Don't exist " + apName); } } @@ -950,3 +937,11 @@ void WlanPage::showDetailPage(QString devName, QString ssid) netDetail->show(); } +void WlanPage::getWirelessDeviceCap(QMap &map) +{ + for (int i = 0; i < m_devList.size(); ++i) { + QString devName = m_devList.at(i); + map.insert(devName, m_netDeviceResource->getWirelessDeviceCapability(devName)); + } +} + diff --git a/src/frontend/tab-pages/wlanpage.h b/src/frontend/tab-pages/wlanpage.h index 51014334..75a79600 100644 --- a/src/frontend/tab-pages/wlanpage.h +++ b/src/frontend/tab-pages/wlanpage.h @@ -31,9 +31,9 @@ public: //for dbus void getWirelessList(QMap > &map); //开启热点 - void activeWirelessAp(const QString apName, const QString apPassword, const QString apDevice); + void activeWirelessAp(const QString apName, const QString apPassword, const QString wirelessBand, const QString apDevice); //断开热点 - void deactiveWirelessAp(const QString apName, const QString apPassword, const QString apDevice); + void deactiveWirelessAp(const QString apName, const QString uuid); //获取热点 void getStoredApInfo(QStringList &list); void activateWireless(const QString& devName, const QString& ssid); @@ -41,13 +41,15 @@ public: void showDetailPage(QString devName, QString uuid); + void getWirelessDeviceCap(QMap &map); + signals: void oneItemExpanded(const QString &ssid); void wlanAdd(QString devName, QStringList info); void wlanRemove(QString devName,QString ssid); void wlanActiveConnectionStateChanged(QString interface, QString ssid, QString uuid, int status); void hotspotDeactivated(QString devName, QString ssid); - void hotspotActivated(QString devName, QString ssid); + void hotspotActivated(QString devName, QString ssid, QString uuid); void signalStrengthChange(QString devName, QString ssid, int strength); void secuTypeChange(QString devName, QString ssid, QString secuType); void hiddenWlanClicked(); From d84c97cbc7d34185b05d6c3f047bbee7c8b54ed9 Mon Sep 17 00:00:00 2001 From: jzxc95 <907297917@qq.com> Date: Fri, 15 Oct 2021 14:42:20 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E6=BC=8F=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kylinnetworkdeviceresource.cpp | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/backend/dbus-interface/kylinnetworkdeviceresource.cpp b/src/backend/dbus-interface/kylinnetworkdeviceresource.cpp index c41dd93f..c95b7ec9 100644 --- a/src/backend/dbus-interface/kylinnetworkdeviceresource.cpp +++ b/src/backend/dbus-interface/kylinnetworkdeviceresource.cpp @@ -202,6 +202,33 @@ void KyNetworkDeviceResourse::getDeviceActiveAPInfo(const QString devName, QStri } } +int KyNetworkDeviceResourse::getWirelessDeviceCapability(const QString deviceName) +{ + NetworkManager::Device::Ptr connectDevice = + m_networkResourceInstance->findDeviceInterface(deviceName); + if (connectDevice->isValid() + && NetworkManager::Device::Type::Wifi == connectDevice->type()) { + NetworkManager::WirelessDevice *wirelessDevicePtr = + qobject_cast(connectDevice.data()); + + int cap = 0; + if (wirelessDevicePtr->wirelessCapabilities() & NetworkManager::WirelessDevice::ApCap) { + cap = cap | 0x01; + } + if (wirelessDevicePtr->wirelessCapabilities() & NetworkManager::WirelessDevice::Freq2Ghz) { + cap = cap | 0x02; + } + if (wirelessDevicePtr->wirelessCapabilities() & NetworkManager::WirelessDevice::Freq5Ghz) { + cap = cap | 0x04; + } + return cap; + } else { + qWarning()<<"[KyNetworkDeviceResourse]"< Date: Fri, 15 Oct 2021 15:18:55 +0800 Subject: [PATCH 16/19] add getApinfoBySsid --- .../dbus-interface/kylinapconnectitem.cpp | 1 + src/backend/dbus-interface/kylinapconnectitem.h | 2 ++ .../dbus-interface/kylinconnectresource.cpp | 8 ++++++++ src/backend/dbusadaptor.cpp | 8 ++++++++ src/backend/dbusadaptor.h | 1 + src/frontend/mainwindow.cpp | 6 +++++- src/frontend/mainwindow.h | 1 + src/frontend/tab-pages/wlanpage.cpp | 16 ++++++++++++++++ src/frontend/tab-pages/wlanpage.h | 1 + 9 files changed, 43 insertions(+), 1 deletion(-) diff --git a/src/backend/dbus-interface/kylinapconnectitem.cpp b/src/backend/dbus-interface/kylinapconnectitem.cpp index 2a94b4aa..d7e4ea2e 100644 --- a/src/backend/dbus-interface/kylinapconnectitem.cpp +++ b/src/backend/dbus-interface/kylinapconnectitem.cpp @@ -7,6 +7,7 @@ KyApConnectItem::KyApConnectItem(QObject *parent) : QObject(parent) m_connectUuid = ""; m_ifaceName = ""; m_password = ""; + m_band = ""; m_isActivated = false; } diff --git a/src/backend/dbus-interface/kylinapconnectitem.h b/src/backend/dbus-interface/kylinapconnectitem.h index 9ead7b6d..76569b06 100644 --- a/src/backend/dbus-interface/kylinapconnectitem.h +++ b/src/backend/dbus-interface/kylinapconnectitem.h @@ -16,7 +16,9 @@ public: QString m_connectUuid; QString m_ifaceName; QString m_password; + QString m_band; bool m_isActivated; + }; #endif // KYLINAPCONNECTITEM_H diff --git a/src/backend/dbus-interface/kylinconnectresource.cpp b/src/backend/dbus-interface/kylinconnectresource.cpp index ef266586..026a512d 100644 --- a/src/backend/dbus-interface/kylinconnectresource.cpp +++ b/src/backend/dbus-interface/kylinconnectresource.cpp @@ -8,6 +8,9 @@ #include #include +const QString str2GBand = "2.4Ghz"; +const QString str5GBand = "5Ghz"; + static bool subLanListSort(const KyConnectItem* info1, const KyConnectItem* info2) { QString name1 = info1->m_connectName; @@ -549,6 +552,11 @@ KyApConnectItem *KyConnectResourse::getApConnectItem(NetworkManager::Connection: KyApConnectItem *apConnectItem = new KyApConnectItem(); apConnectItem->m_connectName = connectPtr->name(); apConnectItem->m_connectUuid = connectPtr->uuid(); + if (wirelessSetting->band() == NetworkManager::WirelessSetting::FrequencyBand::A) { + apConnectItem->m_band = str2GBand; + } else if (wirelessSetting->band() == NetworkManager::WirelessSetting::FrequencyBand::Bg) { + apConnectItem->m_band = str5GBand; + } apConnectItem->m_ifaceName = settingPtr->interfaceName(); apConnectItem->m_isActivated = m_networkResourceInstance->isActiveConnection(connectPtr->uuid()); diff --git a/src/backend/dbusadaptor.cpp b/src/backend/dbusadaptor.cpp index ea26d293..05762e36 100644 --- a/src/backend/dbusadaptor.cpp +++ b/src/backend/dbusadaptor.cpp @@ -219,6 +219,14 @@ QStringList DbusAdaptor::getStoredApInfo() return list; } +QStringList DbusAdaptor::getApInfoBySsid(QString devName, QString ssid) +{ + QStringList list; + list.clear(); + parent()->getApInfoBySsid(devName, ssid, list); + return list; +} + //扫描 void DbusAdaptor::reScan() diff --git a/src/backend/dbusadaptor.h b/src/backend/dbusadaptor.h index 3a383c6d..a96a674e 100644 --- a/src/backend/dbusadaptor.h +++ b/src/backend/dbusadaptor.h @@ -80,6 +80,7 @@ public Q_SLOTS: // METHODS void deactiveWirelessAp(const QString apName, const QString uuid); //获取热点 QStringList getStoredApInfo(); + QStringList getApInfoBySsid(QString devName, QString ssid); //wifi扫描 void reScan(); Q_SIGNALS: // SIGNALS diff --git a/src/frontend/mainwindow.cpp b/src/frontend/mainwindow.cpp index f8d6db02..a0ae7554 100644 --- a/src/frontend/mainwindow.cpp +++ b/src/frontend/mainwindow.cpp @@ -437,12 +437,16 @@ void MainWindow::deactiveWirelessAp(const QString apName, const QString uuid) * @brief MainWindow::activeWirelessAp 获取热点，供dbus调用 * @param list */ +void MainWindow::getApInfoBySsid(QString devName, QString ssid, QStringList &list) +{ + m_wlanWidget->getApInfoBySsid(devName, ssid, list); +} + void MainWindow::getStoredApInfo(QStringList &list) { m_wlanWidget->getStoredApInfo(list); } - void MainWindow::setWiredDeviceEnable(const QString& devName, bool enable) { m_lanWidget->setWiredDeviceEnable(devName, enable); diff --git a/src/frontend/mainwindow.h b/src/frontend/mainwindow.h index d028bc37..f67611b9 100644 --- a/src/frontend/mainwindow.h +++ b/src/frontend/mainwindow.h @@ -35,6 +35,7 @@ public: void deactiveWirelessAp(const QString apName, const QString uuid); //获取热点 void getStoredApInfo(QStringList &list); + void getApInfoBySsid(QString devName, QString ssid, QStringList &list); //有线连接断开 void activateWired(const QString& devName, const QString& connUuid); void deactivateWired(const QString& devName, const QString& connUuid); diff --git a/src/frontend/tab-pages/wlanpage.cpp b/src/frontend/tab-pages/wlanpage.cpp index 75e8a1a4..c4f9a272 100644 --- a/src/frontend/tab-pages/wlanpage.cpp +++ b/src/frontend/tab-pages/wlanpage.cpp @@ -842,6 +842,22 @@ void WlanPage::getStoredApInfo(QStringList &list) list << apConnectItemList.at(0)->m_password; list << apConnectItemList.at(0)->m_ifaceName; list << (apConnectItemList.at(0)->m_isActivated? "true":"false"); + list << apConnectItemList.at(0)->m_connectUuid; + list << apConnectItemList.at(0)->m_band; + } +} + +void WlanPage::getApInfoBySsid(QString devName, QString ssid, QStringList &list) +{ + list.clear(); + QList apConnectItemList; + m_apConnectResource->getApConnections(apConnectItemList); + for (int i = 0; i < apConnectItemList.size(); i++) { + if (apConnectItemList.at(i)->m_connectName == ssid + && apConnectItemList.at(i)->m_ifaceName == devName) { + list << apConnectItemList.at(i)->m_password; + list << apConnectItemList.at(i)->m_band; + } } } diff --git a/src/frontend/tab-pages/wlanpage.h b/src/frontend/tab-pages/wlanpage.h index 75a79600..9e0639a2 100644 --- a/src/frontend/tab-pages/wlanpage.h +++ b/src/frontend/tab-pages/wlanpage.h @@ -36,6 +36,7 @@ public: void deactiveWirelessAp(const QString apName, const QString uuid); //获取热点 void getStoredApInfo(QStringList &list); + void getApInfoBySsid(QString devName, QString ssid, QStringList &list); void activateWireless(const QString& devName, const QString& ssid); void deactivateWireless(const QString& devName, const QString& ssid); From ea1b89434adc8cf1506a4b03c17d0e63e4532542 Mon Sep 17 00:00:00 2001 From: king Date: Fri, 15 Oct 2021 17:48:44 +0800 Subject: [PATCH 17/19] Fix --- src/frontend/list-items/lanlistitem.cpp | 6 ++++++ src/frontend/list-items/listitem.cpp | 7 +++++++ src/frontend/list-items/listitem.h | 5 +++++ src/frontend/list-items/wlanlistitem.cpp | 6 ++++++ src/frontend/netdetails/netdetail.cpp | 6 ++++++ src/frontend/netdetails/netdetail.h | 5 +++++ src/frontend/tab-pages/lanpage.cpp | 3 +-- src/frontend/tab-pages/wlanpage.cpp | 2 -- 8 files changed, 36 insertions(+), 4 deletions(-) diff --git a/src/frontend/list-items/lanlistitem.cpp b/src/frontend/list-items/lanlistitem.cpp index a08850e7..5f99d10f 100644 --- a/src/frontend/list-items/lanlistitem.cpp +++ b/src/frontend/list-items/lanlistitem.cpp @@ -82,11 +82,17 @@ void LanListItem::onRightButtonClicked() void LanListItem::onInfoButtonClicked() { + if(isDetailShow){ + qDebug() << "has show the detail page,and do not show again" << Q_FUNC_INFO << __LINE__; + return; + } if(m_data){ qDebug()<<"Net active or not:"<m_connectName, m_data->m_connectUuid, m_isActive,false, false, this); + connect(netDetail, &NetDetail::detailPageClose, this, &LanListItem::onDetailShow); netDetail->show(); + emit this->detailShow(true); } else{ qDebug() << "On lan info button clicked! But there is no wlan connect " ; diff --git a/src/frontend/list-items/listitem.cpp b/src/frontend/list-items/listitem.cpp index 021402c0..07c973c4 100644 --- a/src/frontend/list-items/listitem.cpp +++ b/src/frontend/list-items/listitem.cpp @@ -13,9 +13,11 @@ ListItem::ListItem(QWidget *parent) : QFrame(parent) { + isDetailShow = false; initUI(); initConnection(); connect(qApp, &QApplication::paletteChanged, this, &ListItem::onPaletteChanged); + connect(this, &ListItem::detailShow, this, &ListItem::onDetailShow); // m_itemFrame->installEventFilter(this); } @@ -160,3 +162,8 @@ void ListItem::onPaletteChanged() pal.setColor(QPalette::Window, qApp->palette().base().color()); this->setPalette(pal); } + +void ListItem::onDetailShow(bool isShow) +{ + isDetailShow = isShow; +} diff --git a/src/frontend/list-items/listitem.h b/src/frontend/list-items/listitem.h index 36f04f97..2e19c6c5 100644 --- a/src/frontend/list-items/listitem.h +++ b/src/frontend/list-items/listitem.h @@ -39,6 +39,7 @@ protected: public: QVBoxLayout * m_mainLayout = nullptr; QHBoxLayout * m_hItemLayout = nullptr; + bool isDetailShow; private: void initUI(); void initConnection(); @@ -46,6 +47,10 @@ private: public slots: virtual void onNetButtonClicked() = 0; void onPaletteChanged(); + void onDetailShow(bool isShow); + +signals: + void detailShow(bool isShow); }; #endif // LISTITEM_H diff --git a/src/frontend/list-items/wlanlistitem.cpp b/src/frontend/list-items/wlanlistitem.cpp index 45f9162d..3738f306 100644 --- a/src/frontend/list-items/wlanlistitem.cpp +++ b/src/frontend/list-items/wlanlistitem.cpp @@ -265,11 +265,17 @@ void WlanListItem::refreshIcon() void WlanListItem::onInfoButtonClicked() { //ZJP_TODO 呼出无线详情页 + if(isDetailShow){ + qDebug() << "has show the detail page,and do not show again" << Q_FUNC_INFO << __LINE__; + return; + } if(m_data){ qDebug()<<"Net active or not:"<m_NetSsid, m_data->m_connectUuid, m_isActive, true, !m_data->m_isConfigured, this); + connect(netDetail, &NetDetail::detailPageClose, this, &WlanListItem::onDetailShow); netDetail->show(); + emit this->detailShow(true); } else{ qDebug() << "On wlan info button clicked! But there is no wlan connect " ; diff --git a/src/frontend/netdetails/netdetail.cpp b/src/frontend/netdetails/netdetail.cpp index 0b1de9d3..7f5286c5 100644 --- a/src/frontend/netdetails/netdetail.cpp +++ b/src/frontend/netdetails/netdetail.cpp @@ -102,6 +102,12 @@ void NetDetail::paintEvent(QPaintEvent *event) return QDialog::paintEvent(event); } +void NetDetail::closeEvent(QCloseEvent *event) +{ + emit this->detailPageClose(false); + return QDialog::closeEvent(event); +} + void NetDetail::centerToScreen() { QDesktopWidget* m = QApplication::desktop(); diff --git a/src/frontend/netdetails/netdetail.h b/src/frontend/netdetails/netdetail.h index d6c721a0..2ca50cf9 100644 --- a/src/frontend/netdetails/netdetail.h +++ b/src/frontend/netdetails/netdetail.h @@ -19,6 +19,7 @@ #include #include #include +#include #include "detailpage.h" #include "ipv4page.h" @@ -37,6 +38,7 @@ public: ~NetDetail(); protected: void paintEvent(QPaintEvent *event); + void closeEvent(QCloseEvent *event); private: void initUI(); @@ -127,5 +129,8 @@ private: private slots: void on_btnConfirm_clicked(); void on_btnForget_clicked(); + +signals: + void detailPageClose(bool on); }; #endif // NETDETAIL_H diff --git a/src/frontend/tab-pages/lanpage.cpp b/src/frontend/tab-pages/lanpage.cpp index ebb8e846..b9ecdc05 100644 --- a/src/frontend/tab-pages/lanpage.cpp +++ b/src/frontend/tab-pages/lanpage.cpp @@ -789,12 +789,11 @@ void LanPage::onUpdateLanlist(QString uuid, if (state == NetworkManager::ActiveConnection::State::Activated) { updateActivatedConnectionArea(uuid); m_isLanConnected = true; - emit this->lanConnectChanged(); } else if (state == NetworkManager::ActiveConnection::State::Deactivated) { updateConnectionArea(uuid); m_isLanConnected = false; - emit this->lanConnectChanged(); } + emit this->lanConnectChanged(); return; } diff --git a/src/frontend/tab-pages/wlanpage.cpp b/src/frontend/tab-pages/wlanpage.cpp index 260dc82f..420f2c3f 100644 --- a/src/frontend/tab-pages/wlanpage.cpp +++ b/src/frontend/tab-pages/wlanpage.cpp @@ -254,8 +254,6 @@ void WlanPage::getActiveWlan() m_activatedWlanSSid.clear(); m_activatedWlanUuid.clear(); WlanListItem *wlanItemWidget = new WlanListItem(); - connect(wlanItemWidget, &WlanListItem::itemHeightChanged, this, &WlanPage::onItemHeightChanged); - connect(wlanItemWidget, &WlanListItem::connectButtonClicked, this, &WlanPage::onConnectButtonClicked); qDebug() << "There is no activated wlan." << Q_FUNC_INFO << __LINE__ ; QListWidgetItem *wlanItem = new QListWidgetItem(); wlanItem->setSizeHint(QSize(m_activatedNetListWidget->width(), wlanItemWidget->height())); From 2e09adefdb58a199fb778407e848d997bc9bdf2c Mon Sep 17 00:00:00 2001 From: jzxc95 <907297917@qq.com> Date: Fri, 15 Oct 2021 20:29:12 +0800 Subject: [PATCH 18/19] fix conflict && debian error --- debian/control | 1 + debian/rules | 2 +- src/frontend/netdetails/netdetail.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index c34468cd..1041c26e 100644 --- a/debian/control +++ b/debian/control @@ -23,6 +23,7 @@ Rules-Requires-Root: no Homepage: https://github.com/ukui/kylin-nm Vcs-Git: https://github.com/ukui/kylin-nm.git Vcs-Browser: https://github.com/ukui/kylin-nm + Package: kylin-nm Architecture: any Depends: network-manager (>=1.2.6), diff --git a/debian/rules b/debian/rules index 9454d51a..2da18dca 100755 --- a/debian/rules +++ b/debian/rules @@ -30,5 +30,5 @@ override_dh_auto_build: dh_auto_build -- $(MAKE_OPTS) override_dh_shlibdeps: - dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info + dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info diff --git a/src/frontend/netdetails/netdetail.h b/src/frontend/netdetails/netdetail.h index 950670af..396788a8 100644 --- a/src/frontend/netdetails/netdetail.h +++ b/src/frontend/netdetails/netdetail.h @@ -129,9 +129,9 @@ private: private slots: void on_btnConfirm_clicked(); void on_btnForget_clicked(); + void onPaletteChanged(); signals: void detailPageClose(bool on); - void onPaletteChanged(); }; #endif // NETDETAIL_H From 400999f1b1dd3c1ccf9337c5b16178ed9b5bb97a Mon Sep 17 00:00:00 2001 From: jzxc95 <907297917@qq.com> Date: Mon, 18 Oct 2021 10:02:46 +0800 Subject: [PATCH 19/19] modify setWirelessEnable && when property change reactive connection --- src/backend/dbusadaptor.cpp | 21 +++++++++++---------- src/frontend/mainwindow.cpp | 6 ++++++ src/frontend/mainwindow.h | 2 ++ src/frontend/netdetails/netdetail.cpp | 25 ++++++++++++++++--------- src/frontend/tab-pages/wlanpage.cpp | 15 +++++++++++++++ src/frontend/tab-pages/wlanpage.h | 2 ++ 6 files changed, 52 insertions(+), 19 deletions(-) diff --git a/src/backend/dbusadaptor.cpp b/src/backend/dbusadaptor.cpp index 05762e36..b5684d1a 100644 --- a/src/backend/dbusadaptor.cpp +++ b/src/backend/dbusadaptor.cpp @@ -78,16 +78,17 @@ void DbusAdaptor::setWiredSwitchEnable(bool enable) void DbusAdaptor::setWirelessSwitchEnable(bool enable) { //todo mainwindow调用backend 对开关 打开/关闭 - if (QGSettings::isSchemaInstalled(GSETTINGS_SCHEMA_KYLIN_NM)) { - QGSettings *gsetting = new QGSettings(GSETTINGS_SCHEMA_KYLIN_NM); - if (gsetting->get(KEY_WIRELESS_SWITCH).toBool() != enable) { - gsetting->set(KEY_WIRELESS_SWITCH, enable); - } - delete gsetting; - gsetting = nullptr; - } else { - qDebug()<<"isSchemaInstalled false"; - } +// if (QGSettings::isSchemaInstalled(GSETTINGS_SCHEMA_KYLIN_NM)) { +// QGSettings *gsetting = new QGSettings(GSETTINGS_SCHEMA_KYLIN_NM); +// if (gsetting->get(KEY_WIRELESS_SWITCH).toBool() != enable) { +// gsetting->set(KEY_WIRELESS_SWITCH, enable); +// } +// delete gsetting; +// gsetting = nullptr; +// } else { +// qDebug()<<"isSchemaInstalled false"; +// } + parent()->setWirelessSwitchEnable(enable); } //启用/禁用网卡 diff --git a/src/frontend/mainwindow.cpp b/src/frontend/mainwindow.cpp index c88ad2c4..73fcf2e4 100644 --- a/src/frontend/mainwindow.cpp +++ b/src/frontend/mainwindow.cpp @@ -448,6 +448,12 @@ void MainWindow::getStoredApInfo(QStringList &list) m_wlanWidget->getStoredApInfo(list); } +//无线开关 +void MainWindow::setWirelessSwitchEnable(bool enable) +{ + m_wlanWidget->setWirelessSwitchEnable(enable); +} + void MainWindow::setWiredDeviceEnable(const QString& devName, bool enable) { m_lanWidget->setWiredDeviceEnable(devName, enable); diff --git a/src/frontend/mainwindow.h b/src/frontend/mainwindow.h index f67611b9..da632ee5 100644 --- a/src/frontend/mainwindow.h +++ b/src/frontend/mainwindow.h @@ -42,6 +42,8 @@ public: //无线连接断开 void activateWireless(const QString& devName, const QString& ssid); void deactivateWireless(const QString& devName, const QString& ssid); + //无线总开关 + void setWirelessSwitchEnable(bool enable); void setWiredDeviceEnable(const QString& devName, bool enable); diff --git a/src/frontend/netdetails/netdetail.cpp b/src/frontend/netdetails/netdetail.cpp index 8f85ed15..6091af7d 100644 --- a/src/frontend/netdetails/netdetail.cpp +++ b/src/frontend/netdetails/netdetail.cpp @@ -831,17 +831,24 @@ bool NetDetail::updateConnect() m_wiredConnOperation->updateWiredConnect(m_uuid, connetSetting); } - if (isWlan && securityPage->checkIsChanged(m_info)) { - KySecuType secuType; - KyEapMethodType enterpriseType; - securityPage->getSecuType(secuType, enterpriseType); - if (secuType == WPA_AND_WPA2_ENTERPRISE) { - updateWirelessEnterPriseConnect(enterpriseType); - } else { - updateWirelessPersonalConnect(); + bool securityChange = false; + if (isWlan) { + securityChange = securityPage->checkIsChanged(m_info); + if (securityChange) { + KySecuType secuType; + KyEapMethodType enterpriseType; + securityPage->getSecuType(secuType, enterpriseType); + if (secuType == WPA_AND_WPA2_ENTERPRISE) { + updateWirelessEnterPriseConnect(enterpriseType); + } else { + updateWirelessPersonalConnect(); + } } + } + + if (ipv4Change || ipv6Change || securityChange) { if (isActive) { - //安全性变化 断开-重连 + //信息变化 断开-重连 m_wirelessConnOpration->activateConnection(m_uuid, m_deviceName); } } diff --git a/src/frontend/tab-pages/wlanpage.cpp b/src/frontend/tab-pages/wlanpage.cpp index 1db5d3ee..f7af2fbe 100644 --- a/src/frontend/tab-pages/wlanpage.cpp +++ b/src/frontend/tab-pages/wlanpage.cpp @@ -970,6 +970,21 @@ void WlanPage::showDetailPage(QString devName, QString ssid) netDetail->show(); } +void WlanPage::setWirelessSwitchEnable(bool enable) +{ + qDebug() << "dbus setWirelessSwitchEnable = " << enable << __LINE__; + //应该先检测是否有无线网卡可用，才改变开关状态 + m_netDeviceResource->getNetworkDeviceList(NetworkManager::Device::Type::Wifi, m_devList); + if (m_devList.isEmpty()) { + qDebug() << "have no device to use " << Q_FUNC_INFO << __LINE__; + //检测不到无线网卡不再触发click信号 + m_netSwitch->setSwitchStatus(false); + m_netSwitch->setEnabled(false); + }else{ + m_wirelessConnectOpreation->setWirelessEnabled(enable); + } +} + void WlanPage::getWirelessDeviceCap(QMap &map) { for (int i = 0; i < m_devList.size(); ++i) { diff --git a/src/frontend/tab-pages/wlanpage.h b/src/frontend/tab-pages/wlanpage.h index ebebb1f2..10c8a824 100644 --- a/src/frontend/tab-pages/wlanpage.h +++ b/src/frontend/tab-pages/wlanpage.h @@ -39,6 +39,8 @@ public: void getApInfoBySsid(QString devName, QString ssid, QStringList &list); void activateWireless(const QString& devName, const QString& ssid); void deactivateWireless(const QString& devName, const QString& ssid); + //无线总开关 + void setWirelessSwitchEnable(bool enable); void showDetailPage(QString devName, QString uuid);