This commit is contained in:
liushanwen 2021-01-07 20:35:21 +08:00
commit 3da9af3acb
9 changed files with 334 additions and 229 deletions

View File

@ -1090,6 +1090,7 @@ void KylinDBus::connectWiredNet(QString netName)
}
dbusArgs.endArray();
//获取到所需的信息后,接下来进行连接
QDBusReply<QDBusObjectPath> connectionReply = m_interface.call("ActivateConnection",
QVariant::fromValue(objNet),
QVariant::fromValue(connWiredPath),

View File

@ -314,6 +314,11 @@ void MainWindow::createListAreaUI()
lbLoadDown->setStyleSheet("QLabel{font-size:14px;}");
lbLoadUp->setText("0KB/s");
lbLoadDown->setText("0KB/s.");
lbLoadUp->hide();
lbLoadDown->hide();
lbLoadUpImg->hide();
lbLoadDownImg->hide();
this->on_setNetSpeed();
scrollAreal->setStyleSheet("QScrollArea{border:none;}");
@ -1205,17 +1210,6 @@ void MainWindow::onBtnNetListClicked(int flag)
BackThread *bt = new BackThread();
IFace *iface = bt->execGetIface();
// lbLoadDown->show();
// lbLoadUp->show();
// lbLoadDownImg->show();
// lbLoadUpImg->show();
// if (iface->lstate != 0) {
// lbLoadDown->hide();
// lbLoadUp->hide();
// lbLoadDownImg->hide();
// lbLoadUpImg->hide();
// }
lbLoadDown->hide();
lbLoadUp->hide();
lbLoadDownImg->hide();
@ -1262,10 +1256,6 @@ void MainWindow::on_btnWifiList_clicked()
BackThread *bt = new BackThread();
IFace *iface = bt->execGetIface();
lbLoadDown->show();
lbLoadUp->show();
lbLoadDownImg->show();
lbLoadUpImg->show();
if (iface->wstate != 0) {
lbLoadDown->hide();
lbLoadUp->hide();
@ -1511,10 +1501,10 @@ void MainWindow::getLanListDone(QStringList slist)
if (!objKyDBus->dbusLanIpv4.isEmpty()) {
if (objKyDBus->dbusActiveLanIpv4 != objKyDBus->dbusLanIpv4) {
//在第三方nm-connection-editor进行新的IP配置后重新连接网络
objKyDBus->connectWiredNet(nname);
//objKyDBus->connectWiredNet(nname);
} else if ((oldActLanName == actLanSsidName.at(kk)) && (oldDbusActLanDNS != objKyDBus->dbusActLanDNS)) {
//在第三方nm-connection-editor进行新的DNS配置后重新连接网络
objKyDBus->connectWiredNet(nname);
//objKyDBus->connectWiredNet(nname);
}
}
@ -1715,7 +1705,6 @@ void MainWindow::loadWifiListDone(QStringList slist)
}
if (wname != "" && wname != "--") {
// 当前连接的wifi
// if (wname == actWifiName) {
if (wname == actWifissid) {
connect(ccf, SIGNAL(selectedOneWifiForm(QString,int)), this, SLOT(oneTopWifiFormSelected(QString,int)));
connect(ccf, SIGNAL(disconnActiveWifi()), this, SLOT(activeWifiDisconn()));

View File

@ -168,12 +168,14 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifi.cpp" line="169"/>
<location filename="../wireless-security/dlghidewifi.cpp" line="175"/>
<location filename="../wireless-security/dlghidewifi.cpp" line="260"/>
<source>Conn Wifi Success</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifi.cpp" line="174"/>
<location filename="../wireless-security/dlghidewifi.cpp" line="180"/>
<location filename="../wireless-security/dlghidewifi.cpp" line="265"/>
<source>Confirm your Wi-Fi password or usable of wireless card</source>
<translation type="unfinished"></translation>
</message>
@ -1093,70 +1095,77 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="64"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="66"/>
<source>Add Hidden Wi-Fi</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="65"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="67"/>
<source>Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="66"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="68"/>
<source>Wi-Fi name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="67"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="69"/>
<source>Wi-Fi security</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="68"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="70"/>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="69"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="71"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="70"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="72"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="72"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="74"/>
<source>C_reate</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="95"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="97"/>
<source>None</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="96"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="98"/>
<source>WPA and WPA2 Personal</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="97"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="99"/>
<source>WPA and WPA2 Enterprise</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="179"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="187"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="276"/>
<source>Conn Wifi Success</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="184"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="192"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="281"/>
<source>Confirm your Wi-Fi password or usable of wireless card</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="379"/>
<source>Selected Wifi has not been scanned.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DlgHotspotCreate</name>
@ -1210,170 +1219,172 @@
<name>MainWindow</name>
<message>
<location filename="../src/mainwindow.ui" line="14"/>
<location filename="../src/mainwindow.cpp" line="572"/>
<location filename="../src/mainwindow.cpp" line="574"/>
<source>kylin-nm</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="387"/>
<location filename="../src/mainwindow.cpp" line="577"/>
<location filename="../src/mainwindow.cpp" line="386"/>
<location filename="../src/mainwindow.cpp" line="579"/>
<source>Advanced</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="334"/>
<location filename="../src/mainwindow.cpp" line="1220"/>
<location filename="../src/mainwindow.cpp" line="2398"/>
<location filename="../src/mainwindow.cpp" line="333"/>
<location filename="../src/mainwindow.cpp" line="1226"/>
<location filename="../src/mainwindow.cpp" line="2448"/>
<source>Ethernet</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="227"/>
<location filename="../src/mainwindow.cpp" line="226"/>
<source>New LAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="251"/>
<location filename="../src/mainwindow.cpp" line="250"/>
<source>Hide WiFi</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="348"/>
<location filename="../src/mainwindow.cpp" line="1275"/>
<location filename="../src/mainwindow.cpp" line="347"/>
<location filename="../src/mainwindow.cpp" line="1281"/>
<source>Wifi</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="367"/>
<location filename="../src/mainwindow.cpp" line="366"/>
<source>HotSpot</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="377"/>
<location filename="../src/mainwindow.cpp" line="376"/>
<source>FlyMode</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1186"/>
<location filename="../src/mainwindow.cpp" line="1188"/>
<source>No wireless card detected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1305"/>
<location filename="../src/mainwindow.cpp" line="1370"/>
<location filename="../src/mainwindow.cpp" line="1603"/>
<location filename="../src/mainwindow.cpp" line="2412"/>
<location filename="../src/mainwindow.cpp" line="2485"/>
<location filename="../src/mainwindow.cpp" line="1309"/>
<location filename="../src/mainwindow.cpp" line="1335"/>
<location filename="../src/mainwindow.cpp" line="1400"/>
<location filename="../src/mainwindow.cpp" line="1634"/>
<location filename="../src/mainwindow.cpp" line="2462"/>
<location filename="../src/mainwindow.cpp" line="2535"/>
<source>Not connected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1308"/>
<location filename="../src/mainwindow.cpp" line="1372"/>
<location filename="../src/mainwindow.cpp" line="1514"/>
<location filename="../src/mainwindow.cpp" line="1515"/>
<location filename="../src/mainwindow.cpp" line="1606"/>
<location filename="../src/mainwindow.cpp" line="1701"/>
<location filename="../src/mainwindow.cpp" line="1873"/>
<location filename="../src/mainwindow.cpp" line="2414"/>
<location filename="../src/mainwindow.cpp" line="2487"/>
<location filename="../src/mainwindow.cpp" line="1313"/>
<location filename="../src/mainwindow.cpp" line="1338"/>
<location filename="../src/mainwindow.cpp" line="1402"/>
<location filename="../src/mainwindow.cpp" line="1544"/>
<location filename="../src/mainwindow.cpp" line="1545"/>
<location filename="../src/mainwindow.cpp" line="1637"/>
<location filename="../src/mainwindow.cpp" line="1750"/>
<location filename="../src/mainwindow.cpp" line="1923"/>
<location filename="../src/mainwindow.cpp" line="2464"/>
<location filename="../src/mainwindow.cpp" line="2537"/>
<source>Disconnected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="217"/>
<location filename="../src/mainwindow.cpp" line="216"/>
<source>Ethernet Networks</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="241"/>
<location filename="../src/mainwindow.cpp" line="240"/>
<source>Wifi Networks</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="281"/>
<location filename="../src/mainwindow.cpp" line="280"/>
<source>No usable network in the list</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="576"/>
<location filename="../src/mainwindow.cpp" line="578"/>
<source>Show MainWindow</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1472"/>
<location filename="../src/mainwindow.cpp" line="1502"/>
<source>NetOn,IfName:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1538"/>
<location filename="../src/mainwindow.cpp" line="1568"/>
<source>No Other Wired Network Scheme</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1723"/>
<location filename="../src/mainwindow.cpp" line="1772"/>
<source>No Other Wireless Network Scheme</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1896"/>
<location filename="../src/mainwindow.cpp" line="1900"/>
<location filename="../src/mainwindow.cpp" line="1905"/>
<location filename="../src/mainwindow.cpp" line="1909"/>
<location filename="../src/mainwindow.cpp" line="1946"/>
<location filename="../src/mainwindow.cpp" line="1950"/>
<location filename="../src/mainwindow.cpp" line="1955"/>
<location filename="../src/mainwindow.cpp" line="1959"/>
<source>Wired connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1914"/>
<location filename="../src/mainwindow.cpp" line="1918"/>
<location filename="../src/mainwindow.cpp" line="1923"/>
<location filename="../src/mainwindow.cpp" line="1927"/>
<location filename="../src/mainwindow.cpp" line="1964"/>
<location filename="../src/mainwindow.cpp" line="1968"/>
<location filename="../src/mainwindow.cpp" line="1973"/>
<location filename="../src/mainwindow.cpp" line="1977"/>
<source>Ethernet connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2677"/>
<location filename="../src/mainwindow.cpp" line="2733"/>
<source>Without Lan Cable</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2685"/>
<location filename="../src/mainwindow.cpp" line="2741"/>
<source>MAC Address Mismatch</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2711"/>
<location filename="../src/mainwindow.cpp" line="2767"/>
<source>Confirm your Wi-Fi password or usable of wireless card</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2716"/>
<location filename="../src/mainwindow.cpp" line="2772"/>
<source>Confirm your Wi-Fi password</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1466"/>
<location filename="../src/mainwindow.cpp" line="1679"/>
<location filename="../src/mainwindow.cpp" line="1496"/>
<location filename="../src/mainwindow.cpp" line="1728"/>
<source>NetOn,</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2335"/>
<location filename="../src/mainwindow.cpp" line="2385"/>
<source>Wired net is disconnected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2361"/>
<location filename="../src/mainwindow.cpp" line="2411"/>
<source>Wi-Fi is disconnected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2668"/>
<location filename="../src/mainwindow.cpp" line="2724"/>
<source>Conn Ethernet Success</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2705"/>
<location filename="../src/mainwindow.cpp" line="2761"/>
<source>Conn Wifi Success</source>
<translation type="unfinished"></translation>
</message>
@ -1562,7 +1573,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/wpawifidialog.cpp" line="252"/>
<location filename="../src/wpawifidialog.cpp" line="256"/>
<source>WPA &amp; WPA2</source>
<translation type="unfinished"></translation>
</message>

View File

@ -182,12 +182,14 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifi.cpp" line="169"/>
<location filename="../wireless-security/dlghidewifi.cpp" line="175"/>
<location filename="../wireless-security/dlghidewifi.cpp" line="260"/>
<source>Conn Wifi Success</source>
<translation type="unfinished">Wi-Fi Bağlantısı Başarılı</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifi.cpp" line="174"/>
<location filename="../wireless-security/dlghidewifi.cpp" line="180"/>
<location filename="../wireless-security/dlghidewifi.cpp" line="265"/>
<source>Confirm your Wi-Fi password or usable of wireless card</source>
<translation type="unfinished">Kablosuz şifrenizi veya kablosuz kart kullanılabilirliğini onaylayın</translation>
</message>
@ -1224,70 +1226,77 @@
<translation>Gizli Wi-Fi ına Bağlan</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="64"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="66"/>
<source>Add Hidden Wi-Fi</source>
<translation type="unfinished">Gizli Wi-Fi Ekle</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="65"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="67"/>
<source>Connection</source>
<translation type="unfinished">Bağlantı:</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="66"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="68"/>
<source>Wi-Fi name</source>
<translation type="unfinished">Wi-Fi adı:</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="67"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="69"/>
<source>Wi-Fi security</source>
<translation type="unfinished">Wi-Fi güvenlik:</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="68"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="70"/>
<source>Password</source>
<translation type="unfinished">Parola:</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="69"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="71"/>
<source>Cancel</source>
<translation type="unfinished">İptal</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="70"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="72"/>
<source>Connect</source>
<translation type="unfinished">Bağlan</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="72"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="74"/>
<source>C_reate</source>
<translation type="unfinished">Oluştur...</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="95"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="97"/>
<source>None</source>
<translation type="unfinished">Yok</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="96"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="98"/>
<source>WPA and WPA2 Personal</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="97"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="99"/>
<source>WPA and WPA2 Enterprise</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="179"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="187"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="276"/>
<source>Conn Wifi Success</source>
<translation type="unfinished">Wi-Fi Bağlantısı Başarılı</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="184"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="192"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="281"/>
<source>Confirm your Wi-Fi password or usable of wireless card</source>
<translation type="unfinished">Kablosuz şifrenizi veya kablosuz kart kullanılabilirliğini onaylayın</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="379"/>
<source>Selected Wifi has not been scanned.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>WPA &amp; WPA2 Personal</source>
<translation type="obsolete">WPA &amp; WPA2 Kişisel</translation>
@ -1368,7 +1377,7 @@
<name>MainWindow</name>
<message>
<location filename="../src/mainwindow.ui" line="14"/>
<location filename="../src/mainwindow.cpp" line="572"/>
<location filename="../src/mainwindow.cpp" line="574"/>
<source>kylin-nm</source>
<translation></translation>
</message>
@ -1377,15 +1386,15 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="387"/>
<location filename="../src/mainwindow.cpp" line="577"/>
<location filename="../src/mainwindow.cpp" line="386"/>
<location filename="../src/mainwindow.cpp" line="579"/>
<source>Advanced</source>
<translation>Gelişmiş</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="334"/>
<location filename="../src/mainwindow.cpp" line="1220"/>
<location filename="../src/mainwindow.cpp" line="2398"/>
<location filename="../src/mainwindow.cpp" line="333"/>
<location filename="../src/mainwindow.cpp" line="1226"/>
<location filename="../src/mainwindow.cpp" line="2448"/>
<source>Ethernet</source>
<translation>Kablolu </translation>
</message>
@ -1394,8 +1403,8 @@
<translation type="vanished">Gizli ı Bağlan</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="348"/>
<location filename="../src/mainwindow.cpp" line="1275"/>
<location filename="../src/mainwindow.cpp" line="347"/>
<location filename="../src/mainwindow.cpp" line="1281"/>
<source>Wifi</source>
<translation>Wi-Fi</translation>
</message>
@ -1408,136 +1417,138 @@
<translation type="vanished">Pasif</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="367"/>
<location filename="../src/mainwindow.cpp" line="366"/>
<source>HotSpot</source>
<translation>HotSpot</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="377"/>
<location filename="../src/mainwindow.cpp" line="376"/>
<source>FlyMode</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="576"/>
<location filename="../src/mainwindow.cpp" line="578"/>
<source>Show MainWindow</source>
<translation>Ana Pencereyi Göster</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1186"/>
<location filename="../src/mainwindow.cpp" line="1188"/>
<source>No wireless card detected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1305"/>
<location filename="../src/mainwindow.cpp" line="1370"/>
<location filename="../src/mainwindow.cpp" line="1603"/>
<location filename="../src/mainwindow.cpp" line="2412"/>
<location filename="../src/mainwindow.cpp" line="2485"/>
<location filename="../src/mainwindow.cpp" line="1309"/>
<location filename="../src/mainwindow.cpp" line="1335"/>
<location filename="../src/mainwindow.cpp" line="1400"/>
<location filename="../src/mainwindow.cpp" line="1634"/>
<location filename="../src/mainwindow.cpp" line="2462"/>
<location filename="../src/mainwindow.cpp" line="2535"/>
<source>Not connected</source>
<translation>Bağlanamadı</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1308"/>
<location filename="../src/mainwindow.cpp" line="1372"/>
<location filename="../src/mainwindow.cpp" line="1514"/>
<location filename="../src/mainwindow.cpp" line="1515"/>
<location filename="../src/mainwindow.cpp" line="1606"/>
<location filename="../src/mainwindow.cpp" line="1701"/>
<location filename="../src/mainwindow.cpp" line="1873"/>
<location filename="../src/mainwindow.cpp" line="2414"/>
<location filename="../src/mainwindow.cpp" line="2487"/>
<location filename="../src/mainwindow.cpp" line="1313"/>
<location filename="../src/mainwindow.cpp" line="1338"/>
<location filename="../src/mainwindow.cpp" line="1402"/>
<location filename="../src/mainwindow.cpp" line="1544"/>
<location filename="../src/mainwindow.cpp" line="1545"/>
<location filename="../src/mainwindow.cpp" line="1637"/>
<location filename="../src/mainwindow.cpp" line="1750"/>
<location filename="../src/mainwindow.cpp" line="1923"/>
<location filename="../src/mainwindow.cpp" line="2464"/>
<location filename="../src/mainwindow.cpp" line="2537"/>
<source>Disconnected</source>
<translation>Bağlantı Kesildi</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1472"/>
<location filename="../src/mainwindow.cpp" line="1502"/>
<source>NetOn,IfName:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1538"/>
<location filename="../src/mainwindow.cpp" line="1568"/>
<source>No Other Wired Network Scheme</source>
<translation type="unfinished">Başka Kablolu Düzeni Yok</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1723"/>
<location filename="../src/mainwindow.cpp" line="1772"/>
<source>No Other Wireless Network Scheme</source>
<translation type="unfinished">Başka Kablosuz Düzeni Yok</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1896"/>
<location filename="../src/mainwindow.cpp" line="1900"/>
<location filename="../src/mainwindow.cpp" line="1905"/>
<location filename="../src/mainwindow.cpp" line="1909"/>
<location filename="../src/mainwindow.cpp" line="1946"/>
<location filename="../src/mainwindow.cpp" line="1950"/>
<location filename="../src/mainwindow.cpp" line="1955"/>
<location filename="../src/mainwindow.cpp" line="1959"/>
<source>Wired connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1914"/>
<location filename="../src/mainwindow.cpp" line="1918"/>
<location filename="../src/mainwindow.cpp" line="1923"/>
<location filename="../src/mainwindow.cpp" line="1927"/>
<location filename="../src/mainwindow.cpp" line="1964"/>
<location filename="../src/mainwindow.cpp" line="1968"/>
<location filename="../src/mainwindow.cpp" line="1973"/>
<location filename="../src/mainwindow.cpp" line="1977"/>
<source>Ethernet connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2335"/>
<location filename="../src/mainwindow.cpp" line="2385"/>
<source>Wired net is disconnected</source>
<translation type="unfinished">Kablolu bağlantısı kesildi</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2361"/>
<location filename="../src/mainwindow.cpp" line="2411"/>
<source>Wi-Fi is disconnected</source>
<translation type="unfinished">Kablosuz bağlantı kesildi</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2677"/>
<location filename="../src/mainwindow.cpp" line="2733"/>
<source>Without Lan Cable</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2685"/>
<location filename="../src/mainwindow.cpp" line="2741"/>
<source>MAC Address Mismatch</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2711"/>
<location filename="../src/mainwindow.cpp" line="2767"/>
<source>Confirm your Wi-Fi password or usable of wireless card</source>
<translation type="unfinished">Kablosuz şifrenizi veya kablosuz kart kullanılabilirliğini onaylayın</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2716"/>
<location filename="../src/mainwindow.cpp" line="2772"/>
<source>Confirm your Wi-Fi password</source>
<translation type="unfinished">Wi-Fi parolasını doğrula</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="217"/>
<location filename="../src/mainwindow.cpp" line="216"/>
<source>Ethernet Networks</source>
<translation>Ethernet Ağları</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="227"/>
<location filename="../src/mainwindow.cpp" line="226"/>
<source>New LAN</source>
<translation type="unfinished">Yeni LAN</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="251"/>
<location filename="../src/mainwindow.cpp" line="250"/>
<source>Hide WiFi</source>
<translation>Gizli Wi-Fi</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="281"/>
<location filename="../src/mainwindow.cpp" line="280"/>
<source>No usable network in the list</source>
<translation type="unfinished">Listede kullanılabilir yok</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1466"/>
<location filename="../src/mainwindow.cpp" line="1679"/>
<location filename="../src/mainwindow.cpp" line="1496"/>
<location filename="../src/mainwindow.cpp" line="1728"/>
<source>NetOn,</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="241"/>
<location filename="../src/mainwindow.cpp" line="240"/>
<source>Wifi Networks</source>
<translation>Wi-Fi Ağları</translation>
</message>
@ -1566,7 +1577,7 @@
<translation type="vanished">Kablosuz listesini şimdi güncelle</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2668"/>
<location filename="../src/mainwindow.cpp" line="2724"/>
<source>Conn Ethernet Success</source>
<translation>Ethernet Bağlantısı Başarılı</translation>
</message>
@ -1575,7 +1586,7 @@
<translation type="vanished">Ethernet Bağlantısı Hatası</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2705"/>
<location filename="../src/mainwindow.cpp" line="2761"/>
<source>Conn Wifi Success</source>
<translation>Wi-Fi Bağlantısı Başarılı</translation>
</message>
@ -1807,7 +1818,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/wpawifidialog.cpp" line="252"/>
<location filename="../src/wpawifidialog.cpp" line="256"/>
<source>WPA &amp; WPA2</source>
<translation type="unfinished"></translation>
</message>

Binary file not shown.

View File

@ -182,12 +182,14 @@
<translation>WPA WPA2 </translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifi.cpp" line="169"/>
<location filename="../wireless-security/dlghidewifi.cpp" line="175"/>
<location filename="../wireless-security/dlghidewifi.cpp" line="260"/>
<source>Conn Wifi Success</source>
<translation type="unfinished">线</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifi.cpp" line="174"/>
<location filename="../wireless-security/dlghidewifi.cpp" line="180"/>
<location filename="../wireless-security/dlghidewifi.cpp" line="265"/>
<source>Confirm your Wi-Fi password or usable of wireless card</source>
<translation type="unfinished">Wi-Fi密码或无线设备</translation>
</message>
@ -1184,70 +1186,77 @@
<translation> Wi-Fi </translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="64"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="66"/>
<source>Add Hidden Wi-Fi</source>
<translation type="unfinished">Wi-Fi</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="65"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="67"/>
<source>Connection</source>
<translation type="unfinished">:</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="66"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="68"/>
<source>Wi-Fi name</source>
<translation type="unfinished">:</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="67"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="69"/>
<source>Wi-Fi security</source>
<translation type="unfinished">Wi-Fi :</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="68"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="70"/>
<source>Password</source>
<translation type="unfinished">:</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="69"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="71"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="70"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="72"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="72"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="74"/>
<source>C_reate</source>
<translation type="unfinished">...</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="95"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="97"/>
<source>None</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="96"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="98"/>
<source>WPA and WPA2 Personal</source>
<translation type="unfinished">WPA WPA2 </translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="97"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="99"/>
<source>WPA and WPA2 Enterprise</source>
<translation type="unfinished">WPA WPA2 </translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="179"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="187"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="276"/>
<source>Conn Wifi Success</source>
<translation type="unfinished">线</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="184"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="192"/>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="281"/>
<source>Confirm your Wi-Fi password or usable of wireless card</source>
<translation type="unfinished">Wi-Fi密码或无线设备</translation>
</message>
<message>
<location filename="../wireless-security/dlghidewifiwpa.cpp" line="379"/>
<source>Selected Wifi has not been scanned.</source>
<translation type="unfinished">wifi</translation>
</message>
<message>
<source>WEP 40/128-bit Key (Hex or ASCII)</source>
<translation type="obsolete">WEP 40/128 (ASCII)</translation>
@ -1328,7 +1337,7 @@
<name>MainWindow</name>
<message>
<location filename="../src/mainwindow.ui" line="14"/>
<location filename="../src/mainwindow.cpp" line="572"/>
<location filename="../src/mainwindow.cpp" line="574"/>
<source>kylin-nm</source>
<translation></translation>
</message>
@ -1337,15 +1346,15 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="387"/>
<location filename="../src/mainwindow.cpp" line="577"/>
<location filename="../src/mainwindow.cpp" line="386"/>
<location filename="../src/mainwindow.cpp" line="579"/>
<source>Advanced</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="334"/>
<location filename="../src/mainwindow.cpp" line="1220"/>
<location filename="../src/mainwindow.cpp" line="2398"/>
<location filename="../src/mainwindow.cpp" line="333"/>
<location filename="../src/mainwindow.cpp" line="1226"/>
<location filename="../src/mainwindow.cpp" line="2448"/>
<source>Ethernet</source>
<translation>线</translation>
</message>
@ -1354,8 +1363,8 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="348"/>
<location filename="../src/mainwindow.cpp" line="1275"/>
<location filename="../src/mainwindow.cpp" line="347"/>
<location filename="../src/mainwindow.cpp" line="1281"/>
<source>Wifi</source>
<translation>线</translation>
</message>
@ -1368,136 +1377,138 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="367"/>
<location filename="../src/mainwindow.cpp" line="366"/>
<source>HotSpot</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="377"/>
<location filename="../src/mainwindow.cpp" line="376"/>
<source>FlyMode</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="576"/>
<location filename="../src/mainwindow.cpp" line="578"/>
<source>Show MainWindow</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1186"/>
<location filename="../src/mainwindow.cpp" line="1188"/>
<source>No wireless card detected</source>
<translation type="unfinished">线</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1305"/>
<location filename="../src/mainwindow.cpp" line="1370"/>
<location filename="../src/mainwindow.cpp" line="1603"/>
<location filename="../src/mainwindow.cpp" line="2412"/>
<location filename="../src/mainwindow.cpp" line="2485"/>
<location filename="../src/mainwindow.cpp" line="1309"/>
<location filename="../src/mainwindow.cpp" line="1335"/>
<location filename="../src/mainwindow.cpp" line="1400"/>
<location filename="../src/mainwindow.cpp" line="1634"/>
<location filename="../src/mainwindow.cpp" line="2462"/>
<location filename="../src/mainwindow.cpp" line="2535"/>
<source>Not connected</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1308"/>
<location filename="../src/mainwindow.cpp" line="1372"/>
<location filename="../src/mainwindow.cpp" line="1514"/>
<location filename="../src/mainwindow.cpp" line="1515"/>
<location filename="../src/mainwindow.cpp" line="1606"/>
<location filename="../src/mainwindow.cpp" line="1701"/>
<location filename="../src/mainwindow.cpp" line="1873"/>
<location filename="../src/mainwindow.cpp" line="2414"/>
<location filename="../src/mainwindow.cpp" line="2487"/>
<location filename="../src/mainwindow.cpp" line="1313"/>
<location filename="../src/mainwindow.cpp" line="1338"/>
<location filename="../src/mainwindow.cpp" line="1402"/>
<location filename="../src/mainwindow.cpp" line="1544"/>
<location filename="../src/mainwindow.cpp" line="1545"/>
<location filename="../src/mainwindow.cpp" line="1637"/>
<location filename="../src/mainwindow.cpp" line="1750"/>
<location filename="../src/mainwindow.cpp" line="1923"/>
<location filename="../src/mainwindow.cpp" line="2464"/>
<location filename="../src/mainwindow.cpp" line="2537"/>
<source>Disconnected</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1472"/>
<location filename="../src/mainwindow.cpp" line="1502"/>
<source>NetOn,IfName:</source>
<translation type="unfinished">,:</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1538"/>
<location filename="../src/mainwindow.cpp" line="1568"/>
<source>No Other Wired Network Scheme</source>
<translation type="unfinished">线</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1723"/>
<location filename="../src/mainwindow.cpp" line="1772"/>
<source>No Other Wireless Network Scheme</source>
<translation type="unfinished">线</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1896"/>
<location filename="../src/mainwindow.cpp" line="1900"/>
<location filename="../src/mainwindow.cpp" line="1905"/>
<location filename="../src/mainwindow.cpp" line="1909"/>
<location filename="../src/mainwindow.cpp" line="1946"/>
<location filename="../src/mainwindow.cpp" line="1950"/>
<location filename="../src/mainwindow.cpp" line="1955"/>
<location filename="../src/mainwindow.cpp" line="1959"/>
<source>Wired connection</source>
<translation type="unfinished">线</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1914"/>
<location filename="../src/mainwindow.cpp" line="1918"/>
<location filename="../src/mainwindow.cpp" line="1923"/>
<location filename="../src/mainwindow.cpp" line="1927"/>
<location filename="../src/mainwindow.cpp" line="1964"/>
<location filename="../src/mainwindow.cpp" line="1968"/>
<location filename="../src/mainwindow.cpp" line="1973"/>
<location filename="../src/mainwindow.cpp" line="1977"/>
<source>Ethernet connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2335"/>
<location filename="../src/mainwindow.cpp" line="2385"/>
<source>Wired net is disconnected</source>
<translation type="unfinished">线</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2361"/>
<location filename="../src/mainwindow.cpp" line="2411"/>
<source>Wi-Fi is disconnected</source>
<translation type="unfinished">线</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2677"/>
<location filename="../src/mainwindow.cpp" line="2733"/>
<source>Without Lan Cable</source>
<translation type="unfinished">线</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2685"/>
<location filename="../src/mainwindow.cpp" line="2741"/>
<source>MAC Address Mismatch</source>
<translation type="unfinished">线MAC地址不匹配</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2711"/>
<location filename="../src/mainwindow.cpp" line="2767"/>
<source>Confirm your Wi-Fi password or usable of wireless card</source>
<translation type="unfinished">Wi-Fi密码或无线设备</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2716"/>
<location filename="../src/mainwindow.cpp" line="2772"/>
<source>Confirm your Wi-Fi password</source>
<translation type="unfinished">Wi-Fi密码</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="217"/>
<location filename="../src/mainwindow.cpp" line="216"/>
<source>Ethernet Networks</source>
<translation>线</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="227"/>
<location filename="../src/mainwindow.cpp" line="226"/>
<source>New LAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="251"/>
<location filename="../src/mainwindow.cpp" line="250"/>
<source>Hide WiFi</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="281"/>
<location filename="../src/mainwindow.cpp" line="280"/>
<source>No usable network in the list</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1466"/>
<location filename="../src/mainwindow.cpp" line="1679"/>
<location filename="../src/mainwindow.cpp" line="1496"/>
<location filename="../src/mainwindow.cpp" line="1728"/>
<source>NetOn,</source>
<translation></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="241"/>
<location filename="../src/mainwindow.cpp" line="240"/>
<source>Wifi Networks</source>
<translation>线</translation>
</message>
@ -1526,7 +1537,7 @@
<translation type="vanished"> Wi-Fi列表</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2668"/>
<location filename="../src/mainwindow.cpp" line="2724"/>
<source>Conn Ethernet Success</source>
<translation>线</translation>
</message>
@ -1535,7 +1546,7 @@
<translation type="vanished">线</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="2705"/>
<location filename="../src/mainwindow.cpp" line="2761"/>
<source>Conn Wifi Success</source>
<translation>线</translation>
</message>
@ -1759,7 +1770,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/wpawifidialog.cpp" line="252"/>
<location filename="../src/wpawifidialog.cpp" line="256"/>
<source>WPA &amp; WPA2</source>
<translation type="unfinished">WPA WPA2企业</translation>
</message>

View File

@ -241,8 +241,31 @@ void DlgHideWifi::changeWindow(){
if (txt.indexOf("wpa-eap") != -1) {
QApplication::setQuitOnLastWindowClosed(false);
this->hide();
DlgHideWifiEapPeap *connHidWifiEapPeap = new DlgHideWifiEapPeap(1, ui->cbxConn->currentIndex(), mw);
connHidWifiEapPeap->show();
// DlgHideWifiEapPeap *connHidWifiEapPeap = new DlgHideWifiEapPeap(1, ui->cbxConn->currentIndex(), mw);
// connHidWifiEapPeap->show();
WpaWifiDialog * wpadlg = new WpaWifiDialog(mw, ui->cbxConn->currentText());
QPoint pos = QCursor::pos();
QRect primaryGeometry;
for (QScreen *screen : qApp->screens()) {
if (screen->geometry().contains(pos)) {
primaryGeometry = screen->geometry();
}
}
if (primaryGeometry.isEmpty()) {
primaryGeometry = qApp->primaryScreen()->geometry();
}
wpadlg->move(primaryGeometry.width() / 2 - wpadlg->width() / 2, primaryGeometry.height() / 2 - wpadlg->height() / 2);
wpadlg->show();
connect(wpadlg, &WpaWifiDialog::conn_done, this, [ = ]() {
QString txt(tr("Conn Wifi Success"));
mw->objKyDBus->showDesktopNotify(txt);
mw->on_btnWifiList_clicked();
});
connect(wpadlg, &WpaWifiDialog::conn_failed, this, [ = ]() {
QString txt(tr("Confirm your Wi-Fi password or usable of wireless card"));
mw->objKyDBus->showDesktopNotify(txt);
mw->on_btnWifiList_clicked();
});
}
}else {
isUsed = ui->cbxConn->currentIndex();

View File

@ -257,8 +257,31 @@ void DlgHideWifiWpa::changeWindow()
if (txt.indexOf("wpa-eap") != -1) {
QApplication::setQuitOnLastWindowClosed(false);
this->hide();
DlgHideWifiEapPeap *connHidWifiEapPeap = new DlgHideWifiEapPeap(1, ui->cbxConn->currentIndex(), mw);
connHidWifiEapPeap->show();
// DlgHideWifiEapPeap *connHidWifiEapPeap = new DlgHideWifiEapPeap(1, ui->cbxConn->currentIndex(), mw);
// connHidWifiEapPeap->show();
WpaWifiDialog * wpadlg = new WpaWifiDialog(mw, ui->cbxConn->currentText());
QPoint pos = QCursor::pos();
QRect primaryGeometry;
for (QScreen *screen : qApp->screens()) {
if (screen->geometry().contains(pos)) {
primaryGeometry = screen->geometry();
}
}
if (primaryGeometry.isEmpty()) {
primaryGeometry = qApp->primaryScreen()->geometry();
}
wpadlg->move(primaryGeometry.width() / 2 - wpadlg->width() / 2, primaryGeometry.height() / 2 - wpadlg->height() / 2);
wpadlg->show();
connect(wpadlg, &WpaWifiDialog::conn_done, this, [ = ]() {
QString txt(tr("Conn Wifi Success"));
mw->objKyDBus->showDesktopNotify(txt);
mw->on_btnWifiList_clicked();
});
connect(wpadlg, &WpaWifiDialog::conn_failed, this, [ = ]() {
QString txt(tr("Confirm your Wi-Fi password or usable of wireless card"));
mw->objKyDBus->showDesktopNotify(txt);
mw->on_btnWifiList_clicked();
});
}
}else {
QApplication::setQuitOnLastWindowClosed(false);
@ -289,7 +312,7 @@ void DlgHideWifiWpa::on_btnConnect_clicked()
QString wifiName = ui->leNetName->text();
QString wifiPassword = ui->lePassword->text();
BackThread *bt = new BackThread();
strWifiname = wifiName;
strWifiPassword = wifiPassword;
if (isUsed == 0) {
@ -326,12 +349,41 @@ void DlgHideWifiWpa::on_btnConnect_clicked()
//QTimer::singleShot(8*1000, this, SLOT(on_execSecConn() ));
});
} else {
bt->execConnWifi(wifiName);
QTimer::singleShot(4*1000, this, SLOT(emitSignal() ));
shellProcess = new QProcess(this);
shellProcess->start("nmcli -f ssid device wifi");
connect(shellProcess, &QProcess::readyRead, [ = ]() {
QString output = shellProcess->readAll();
shellOutput += output;
});
connect(shellProcess, SIGNAL(finished(int)), this, SLOT(finishedProcess(int)));
}
this->close();
}
void DlgHideWifiWpa::finishedProcess(int state) {
if (! state) syslog(LOG_ERR, "Scan wifi list failed in functin on_btnConnect_clicked() in dlghidewifiwpa.cpp 359.");
wlist = shellOutput.split("\n");
bool is_hidden = true;
foreach (QString wifi, wlist) {
if (wifi.trimmed() == ui->leNetName->text()) {
is_hidden = false;
}
}
if (! is_hidden) {
BackThread *bt = new BackThread();
bt->execConnWifi(ui->leNetName->text());
QTimer::singleShot(4*1000, this, SLOT(emitSignal() ));
} else {
//已保存的wifi没有在wifi列表找到隐藏wifi保存后也会出现在wifi列表则当前区域无法连接此wifi
syslog(LOG_DEBUG, "Choosen wifi can not be sacnned in finishedProcess() in dlghidewifiwpa.cpp 377.");
QString txt(tr("Selected Wifi has not been scanned."));
mw->objKyDBus->showDesktopNotify(txt);
emit this->stopSignal();
emit reSetWifiList();
}
shellProcess->deleteLater();
}
void DlgHideWifiWpa::on_checkBoxPwd_stateChanged(int arg1)
{
if (arg1 == 0) {

View File

@ -22,6 +22,7 @@
#include <QDialog>
#include <QMouseEvent>
#include <QThread>
#include <QProcess>
class MainWindow;
@ -58,6 +59,8 @@ private slots:
void on_lePassword_textEdited(const QString &arg1);
void finishedProcess(int res);
signals:
void reSetWifiList();
void stopSignal();
@ -79,6 +82,10 @@ private:
bool isPress;
QPoint winPos;
QPoint dragPos;
QString shellOutput = "";
QStringList wlist;
QProcess * shellProcess;
};
#endif // DLGCONNHIDWIFIWPA_H