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

Fix: #56269 CA file end with .pfx could be choosen to connect 802.1x wifi.

This commit is contained in:
zhangjiaping 2021-06-03 19:15:09 +08:00
parent 932b6be735
commit 0da6bc7bcc
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,7 +1,7 @@
kylin-nm (3.0.1-1kylin49hw1) v101.hw; urgency=medium
kylin-nm (3.0.1-1kylin49) v101; urgency=medium
* BUG号：#49773
* 需求号：无
* BUG号：无
* 需求号：#33308
* 其他改动：无
-- zhangjiaping <zhangjiaping@kylinos.cn> Wed, 02 Jun 2021 17:53:12 +0800

6
src/wpawifidialog.cpp
View File

@ -387,7 +387,7 @@ void WpaWifiDialog::initCombox() {
if (str.contains("Choose from file...") || str.contains("从文件选择..."))
{
QString fileName = QFileDialog::getOpenFileName(this, tr("Choose a CA certificate"), "recent:///",
tr("CA Files (*.pem *.der *.p12 *.crt)"));
tr("CA Files (*.pem *.der *.p12 *.crt *.cer *.pfx)"));
if (!fileName.isNull()) {
m_wifiConfig->caCert = fileName;
QStringList nameList = fileName.split("/");
@ -410,7 +410,7 @@ void WpaWifiDialog::initCombox() {
if (str.contains("Choose from file...") || str.contains("从文件选择..."))
{
QString fileName = QFileDialog::getOpenFileName(this, tr("Choose a CA certificate"), "recent:///",
tr("CA Files (*.pem *.der *.p12 *.crt)"));
tr("CA Files (*.pem *.der *.p12 *.crt *.cer *.pfx)"));
if (!fileName.isNull()) {
m_wifiConfig->clientCert = fileName;
QStringList nameList = fileName.split("/");
@ -433,7 +433,7 @@ void WpaWifiDialog::initCombox() {
if (str.contains("Choose from file...") || str.contains("从文件选择..."))
{
QString fileName = QFileDialog::getOpenFileName(this, tr("Choose a CA certificate"), "recent:///",
tr("CA Files (*.pem *.der *.p12 *.crt *.key)"));
tr("CA Files (*.pem *.der *.p12 *.crt *.key *.cer *.pfx)"));
if (!fileName.isNull()) {
m_wifiConfig->privateKey = fileName;
QStringList nameList = fileName.split("/");

BIN
translations/kylin-nm_zh_CN.qm
View File

Binary file not shown.

8
translations/kylin-nm_zh_CN.ts
View File

@ -1946,13 +1946,13 @@
<message>
<location filename="../src/wpawifidialog.cpp" line="381"/>
<location filename="../src/wpawifidialog.cpp" line="404"/>
<source>CA Files (*.pem *.der *.p12 *.crt)</source>
<translation type="unfinished"></translation>
<source>CA Files (*.pem *.der *.p12 *.crt *.cer *.pfx)</source>
<translation>CA 文件 (*.pem *.der *.p12 *.crt *.cer *.pfx)</translation>
</message>
<message>
<location filename="../src/wpawifidialog.cpp" line="427"/>
<source>CA Files (*.pem *.der *.p12 *.crt *.key)</source>
<translation type="unfinished"></translation>
<source>CA Files (*.pem *.der *.p12 *.crt *.key *.cer *.pfx)</source>
<translation>CA 文件 (*.pem *.der *.p12 *.crt *.key *.cer *.pfx)</translation>
</message>
<message>
<location filename="../src/wpawifidialog.cpp" line="931"/>