diff --git a/src/backthread.cpp b/src/backthread.cpp index 63cdc958..15877374 100644 --- a/src/backthread.cpp +++ b/src/backthread.cpp @@ -259,7 +259,7 @@ void BackThread::execConnWifiPWD(QString connName, QString password, QString con } QString line = file.readLine(); file.close(); - qDebug()<<"debug: chenlelin "<< line; + qDebug()<<"connect result of wifi: "<< line; if (line.indexOf("successfully") != -1) { emit connDone(0); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index b95b81d4..c7dc5728 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -2712,6 +2712,9 @@ void MainWindow::connWifiDone(int connFlag) objKyDBus->showDesktopNotify(txt); } else if (connFlag == 3) { syslog(LOG_DEBUG, "Launch kylin-nm, Wi-Fi already connected"); + } else if (connFlag == 4) { + QString txt(tr("Confirm your Wi-Fi password")); + objKyDBus->showDesktopNotify(txt); } } diff --git a/src/oneconnform.cpp b/src/oneconnform.cpp index 2722827c..0fe15fdd 100644 --- a/src/oneconnform.cpp +++ b/src/oneconnform.cpp @@ -746,7 +746,8 @@ void OneConnForm::slotConnWifiResult(int connFlag) if (connFlag == 2) { mw->is_stop_check_net_state = 0; } else { - connType = "RequestPassword"; + mw->is_stop_check_net_state = 0; + //connType = "RequestPassword"; } //设置输入密码框被选中 @@ -757,11 +758,11 @@ void OneConnForm::slotConnWifiResult(int connFlag) if (connFlag == 1) { // 使用配置文件连接失败,需要删除该配置文件 - QString txt(tr("Conn Wifi Failed"));//"连接 Wifi 失败" - syslog(LOG_DEBUG, "Try to connect wifi named %s, but failed, will delete it's configuration file", lbNameText->text().toUtf8().data()); + //QString txt(tr("Connect Wifi Failed"));//"连接 Wifi 失败" + //syslog(LOG_DEBUG, "Try to connect wifi named %s, but failed, will delete it's configuration file", lbNameText->text().toUtf8().data()); - KylinDBus kylindbus; - kylindbus.showDesktopNotify(txt); + //KylinDBus kylindbus; + //kylindbus.showDesktopNotify(txt); //QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli connection delete '" + ui->lbName->text() + "';notify-send '" + txt + "...' -t 3800"; QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli connection delete '" + lbNameText->text() + "'"; int status = system(cmd.toUtf8().data()); diff --git a/translations/kylin-nm_bo.ts b/translations/kylin-nm_bo.ts index 9f9c0981..24f243f1 100644 --- a/translations/kylin-nm_bo.ts +++ b/translations/kylin-nm_bo.ts @@ -1210,20 +1210,20 @@ MainWindow - + kylin-nm - + Advanced - - + + Ethernet @@ -1239,7 +1239,7 @@ - + Wifi @@ -1254,29 +1254,29 @@ - + No wireless card detected - - - - - + + + + + Not connected - - - - - - - - - + + + + + + + + + Disconnected @@ -1296,79 +1296,84 @@ - + Show MainWindow - + NetOn,IfName: - + No Other Wired Network Scheme - + No Other Wireless Network Scheme - - - - + + + + Wired connection - - - - + + + + Ethernet connection - + Without Lan Cable - + MAC Address Mismatch - + Confirm your Wi-Fi password or usable of wireless card - - + + Confirm your Wi-Fi password + + + + + NetOn, - + Wired net is disconnected - + Wi-Fi is disconnected - + Conn Ethernet Success - + Conn Wifi Success @@ -1433,11 +1438,6 @@ Confirm your Wi-Fi password or usable of wireless card - - - Conn Wifi Failed - - OneLancForm diff --git a/translations/kylin-nm_tr.qm b/translations/kylin-nm_tr.qm index 201e8a5e..1bd6ccde 100644 Binary files a/translations/kylin-nm_tr.qm and b/translations/kylin-nm_tr.qm differ diff --git a/translations/kylin-nm_tr.ts b/translations/kylin-nm_tr.ts index e0f7d88b..3c8b1862 100644 --- a/translations/kylin-nm_tr.ts +++ b/translations/kylin-nm_tr.ts @@ -1368,7 +1368,7 @@ MainWindow - + kylin-nm @@ -1378,14 +1378,14 @@ - + Advanced Gelişmiş - - + + Ethernet Kablolu Ağ @@ -1395,7 +1395,7 @@ - + Wifi Wi-Fi @@ -1418,93 +1418,98 @@ - + Show MainWindow Ana Pencereyi Göster - + No wireless card detected - - - - - + + + + + Not connected Bağlanamadı - - - - - - - - - + + + + + + + + + Disconnected Bağlantı Kesildi - + NetOn,IfName: - + No Other Wired Network Scheme Başka Kablolu Ağ Düzeni Yok - + No Other Wireless Network Scheme Başka Kablosuz Ağ Düzeni Yok - - - - + + + + Wired connection - - - - + + + + Ethernet connection - + Wired net is disconnected Kablolu ağ bağlantısı kesildi - + Wi-Fi is disconnected Kablosuz bağlantı kesildi - + Without Lan Cable - + MAC Address Mismatch - + Confirm your Wi-Fi password or usable of wireless card Kablosuz şifrenizi veya kablosuz kart kullanılabilirliğini onaylayın + + + Confirm your Wi-Fi password + Wi-Fi parolasını doğrula + Ethernet Networks @@ -1526,8 +1531,8 @@ Listede kullanılabilir ağ yok - - + + NetOn, @@ -1561,7 +1566,7 @@ Kablosuz listesini şimdi güncelle - + Conn Ethernet Success Ethernet Bağlantısı Başarılı @@ -1570,7 +1575,7 @@ Ethernet Bağlantısı Hatası - + Conn Wifi Success Wi-Fi Bağlantısı Başarılı @@ -1667,9 +1672,8 @@ Kablosuz şifrenizi veya kablosuz kart kullanılabilirliğini onaylayın - Conn Wifi Failed - Wifi Bağlantısı Başarısız + Wifi Bağlantısı Başarısız diff --git a/translations/kylin-nm_zh_CN.qm b/translations/kylin-nm_zh_CN.qm index 3560188f..a6914a1f 100644 Binary files a/translations/kylin-nm_zh_CN.qm and b/translations/kylin-nm_zh_CN.qm differ diff --git a/translations/kylin-nm_zh_CN.ts b/translations/kylin-nm_zh_CN.ts index f237cefa..de22328a 100644 --- a/translations/kylin-nm_zh_CN.ts +++ b/translations/kylin-nm_zh_CN.ts @@ -1328,7 +1328,7 @@ MainWindow - + kylin-nm 网络工具 @@ -1338,14 +1338,14 @@ - + Advanced 设置网络 - - + + Ethernet 有线网络 @@ -1355,7 +1355,7 @@ - + Wifi 无线网络 @@ -1378,93 +1378,98 @@ 飞行模式 - + Show MainWindow 显示网络连接界面 - + No wireless card detected 未检测到无线网卡 - - - - - + + + + + Not connected 当前未连接任何网络 - - - - - - - - - + + + + + + + + + Disconnected 未连接 - + NetOn,IfName: 已连接,网卡: - + No Other Wired Network Scheme 列表中无其他有线网络 - + No Other Wireless Network Scheme 未检测到其他无线网络 - - - - + + + + Wired connection 有线连接 - - - - + + + + Ethernet connection 以太网连接 - + Wired net is disconnected 断开有线网络 - + Wi-Fi is disconnected 断开无线网络 - + Without Lan Cable 未插入对应网卡网线 - + MAC Address Mismatch 有线网MAC地址不匹配 - + Confirm your Wi-Fi password or usable of wireless card 请确认Wi-Fi密码或无线设备 + + + Confirm your Wi-Fi password + 请再次确认Wi-Fi密码 + Ethernet Networks @@ -1486,8 +1491,8 @@ 列表暂无可连接网络 - - + + NetOn, 已连接, @@ -1521,7 +1526,7 @@ 正在更新 Wi-Fi列表 - + Conn Ethernet Success 连接有线网络成功 @@ -1530,7 +1535,7 @@ 连接有线网络失败 - + Conn Wifi Success 连接无线网络成功 @@ -1622,11 +1627,6 @@ Confirm your Wi-Fi password or usable of wireless card 请确认Wi-Fi密码或无线设备 - - - Conn Wifi Failed - 连接无线网络失败 - OneLancForm