diff --git a/0001-Adjust-font-size.patch b/0001-Adjust-font-size.patch new file mode 100644 index 0000000..a5af334 --- /dev/null +++ b/0001-Adjust-font-size.patch @@ -0,0 +1,1618 @@ +From ef3dcefc5796c97ec1a89995ac354c9101ca4e03 Mon Sep 17 00:00:00 2001 +From: chenlelin +Date: Thu, 15 Oct 2020 13:52:09 +0800 +Subject: [PATCH] Adjust font size + +--- + src/confform.cpp | 2 +- + src/mainwindow.cpp | 15 ++- + src/mainwindow.ui | 5 + + src/oneconnform.cpp | 18 ++- + src/onelancform.cpp | 16 +-- + translations/kylin-nm_bo.ts | 165 ++++++++++++------------ + translations/kylin-nm_tr.ts | 165 ++++++++++++------------ + translations/kylin-nm_zh_CN.ts | 165 ++++++++++++------------ + wireless-security/dlgconnhidwifi.cpp | 4 +- + wireless-security/dlgconnhidwifiwpa.cpp | 4 +- + 10 files changed, 283 insertions(+), 276 deletions(-) + +diff --git a/src/confform.cpp b/src/confform.cpp +index 4ccd72d..a83fc34 100644 +--- a/src/confform.cpp ++++ b/src/confform.cpp +@@ -69,7 +69,7 @@ ConfForm::ConfForm(QWidget *parent) : + ui->wdHead->setStyleSheet("#wdHead{border:none}"); + ui->wgManual->setStyleSheet("#wgManual{border:none}"); + ui->wdBottom->setStyleSheet("#wdBottom{border:none}"); +-// ui->lbLeftupTitle->setStyleSheet("QLabel{border:0px;font-size:20px;color:rgba(255,255,255,0.97);background-color:transparent;}"); ++ ui->lbLeftupTitle->setStyleSheet("QLabel{font-size:20px;}"); + // ui->lbName->setStyleSheet(labelQss); + // ui->lbTxt1->setStyleSheet(labelQss); + // ui->lbTxt2->setStyleSheet(labelQss); +diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp +index d74cdb9..78fa74f 100644 +--- a/src/mainwindow.cpp ++++ b/src/mainwindow.cpp +@@ -24,6 +24,7 @@ + #include "wireless-security/dlgconnhidwifi.h" + + #include ++#include + + QString llname, lwname, hideWiFiConn; + int currentActWifiSignalLv, count_loop; +@@ -225,7 +226,8 @@ void MainWindow::createTopLanUI() + lbTopLanList->setText(tr("Ethernet Networks"));//"可用网络列表" + lbTopLanList->resize(W_MIDDLE_WORD, H_MIDDLE_WORD); + lbTopLanList->move(X_MIDDLE_WORD, H_NORMAL_ITEM + H_GAP_UP); +-// lbTopLanList->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.97);}"); ++ QFont fontTopLanList( "Noto Sans CJK SC", 14); ++ lbTopLanList->setFont(fontTopLanList); + lbTopLanList->show(); + /*新建有线网按钮*/ + btnCreateNet = new QPushButton(topLanListWidget); +@@ -248,7 +250,8 @@ void MainWindow::createTopWifiUI() + lbTopWifiList->setText(tr("Wifi Networks"));//"可用网络列表" + lbTopWifiList->resize(W_MIDDLE_WORD, H_MIDDLE_WORD); + lbTopWifiList->move(X_MIDDLE_WORD, H_NORMAL_ITEM + H_GAP_UP); +-// lbTopWifiList->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.97);}"); ++ QFont fontTopWifiList( "Noto Sans CJK SC", 14); ++ lbTopWifiList->setFont(fontTopWifiList); + lbTopWifiList->show(); + /*新建有线网按钮*/ + btnAddNet = new QPushButton(topWifiListWidget); +@@ -309,7 +312,7 @@ void MainWindow::createListAreaUI() + lbLanList = new QLabel(lanListWidget); + lbWifiList = new QLabel(wifiListWidget); + +-// ui->lbNetwork->setStyleSheet("QLabel{font-size:20px;color:rgba(255,255,255,0.97);}"); ++ ui->lbNetwork->setStyleSheet("QLabel{font-size:20px;}"); + ui->lbNetwork->show(); + + topLanListWidget->setStyleSheet("QWidget{border:none;}"); +@@ -318,8 +321,8 @@ void MainWindow::createListAreaUI() + topWifiListWidget->setStyleSheet("QWidget{border:none;}"); + topWifiListWidget->setStyleSheet("background-color:transparent;"); + +-// lbLoadUp->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.57);}"); +-// lbLoadDown->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.57);}"); ++ lbLoadUp->setStyleSheet("QLabel{font-size:14px;}"); ++ lbLoadDown->setStyleSheet("QLabel{font-size:14px;}"); + lbLoadUp->setText("0KB/s"); + lbLoadDown->setText("0KB/s."); + this->on_setNetSpeed(); +@@ -2209,7 +2212,7 @@ void MainWindow::disNetDone() + ui->lbNetListBG->setStyleSheet(btnOnQss); + ui->lbWifiListBG->setStyleSheet(btnOffQss); + +- ui->lbNetwork->setText("有线网络"); ++ ui->lbNetwork->setText(tr("Ethernet")); + btnWireless->hide(); + //ui->lbBtnWifiBG->hide(); + //ui->lbBtnWifiBall->hide(); +diff --git a/src/mainwindow.ui b/src/mainwindow.ui +index 9f80f05..02b4eca 100644 +--- a/src/mainwindow.ui ++++ b/src/mainwindow.ui +@@ -101,6 +101,11 @@ + 20 + + ++ ++ ++ 20 ++ ++ + + + +diff --git a/src/oneconnform.cpp b/src/oneconnform.cpp +index e6f6bbc..aa6a97d 100644 +--- a/src/oneconnform.cpp ++++ b/src/oneconnform.cpp +@@ -50,8 +50,8 @@ OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf + ui->lePassword->setEchoMode(QLineEdit::Normal); + ui->btnConnPWD->setEnabled(false); + +- leQssLow = "QLineEdit{border:none;background:transparent;font-family:Noto Sans CJK SC;}"; +- leQssHigh = "QLineEdit{border:none;background:transparent;font-family:Noto Sans CJK SC;}"; ++ leQssLow = "QLineEdit{border:none;background:transparent;font-family:Noto Sans CJK SC;font-size:14px;}"; ++ leQssHigh = "QLineEdit{border:none;background:transparent;font-family:Noto Sans CJK SC;font-size:14px;}"; + + ui->leInfo_1->setStyleSheet(leQssLow); + ui->leInfo_2->setStyleSheet(leQssLow); +@@ -63,11 +63,9 @@ OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf + ui->wbg->setStyleSheet("#wbg{border-radius:4px;background-color:rgba(156,156,156,0);}"); + ui->wbg_2->setStyleSheet("#wbg_2{border-radius:4px;background-color:rgba(156,156,156,0.1);}"); + ui->wbg_3->setStyleSheet("#wbg_3{border-radius:4px;background-color:rgba(156,156,156,0.1);}"); +-// ui->lbName->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.91);}"); +-// ui->lbConned->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.57);}"); +-// ui->lePassword->setStyleSheet("QLineEdit{border:1px solid rgba(61,107,229,1);border-radius:4px;" +-// "background:rgba(0,0,0,0.2);color:rgba(255,255,255,0.35);font-size:14px;}"); +- ui->lePassword->setStyleSheet("QLineEdit{border:1px solid rgba(61,107,229,1);border-radius:4px;background:rgba(0,0,0,0.2);}"); ++ ui->lbName->setStyleSheet("QLabel{font-size:14px;}"); ++ ui->lbConned->setStyleSheet("QLabel{font-size:14px;}"); ++ ui->lePassword->setStyleSheet("QLineEdit{border:1px solid rgba(61,107,229,1);font-size:14px;}"); + ui->checkBoxPwd->setStyleSheet("QCheckBox::indicator {width: 18px; height: 9px;}" + "QCheckBox::indicator:checked {image: url(:/res/h/show-pwd.png);}" + "QCheckBox::indicator:unchecked {image: url(:/res/h/hide-pwd.png);}"); +@@ -80,9 +78,9 @@ OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf + ui->btnConnPWD->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);color:white;font-size:14px;}" + "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(255,255,255,0.2);}" + "QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0.08);}"); +-// ui->btnDisConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);color:white;font-size:14px;}" +-// "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(255,255,255,0.2);}" +-// "QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0.08);}"); ++ //ui->btnDisConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);color:white;font-size:14px;}" ++ // "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(255,255,255,0.2);}" ++ // "QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0.08);}"); + ui->btnHideConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);color:white;font-size:14px;}" + "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(107,142,235,1);}" + "QPushButton:Pressed{border-radius:4px;background-color:rgba(50,87,202,1);}"); +diff --git a/src/onelancform.cpp b/src/onelancform.cpp +index b23e387..5dd6634 100644 +--- a/src/onelancform.cpp ++++ b/src/onelancform.cpp +@@ -34,10 +34,8 @@ OneLancForm::OneLancForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf + + ui->lbConned->setAlignment(Qt::AlignLeft); + +-// leQssLow = "QLineEdit{border:none;background:transparent;font-size:14px;color:rgba(255,255,255,0.57);font-family:Noto Sans CJK SC;}"; +-// leQssHigh = "QLineEdit{border:none;background:transparent;font-size:14px;color:rgba(255,255,255,0.91);font-family:Noto Sans CJK SC;}"; +- leQssLow = "QLineEdit{border:none;background:transparent;font-family:Noto Sans CJK SC;}"; +- leQssHigh = "QLineEdit{border:none;background:transparent;font-family:Noto Sans CJK SC;}"; ++ leQssLow = "QLineEdit{border:none;background:transparent;font-family:Noto Sans CJK SC;font-size:14px;}"; ++ leQssHigh = "QLineEdit{border:none;background:transparent;font-family:Noto Sans CJK SC;font-size:14px;}"; + + ui->leInfo_1->setStyleSheet(leQssLow); + ui->leInfo_2->setStyleSheet(leQssLow); +@@ -46,17 +44,17 @@ OneLancForm::OneLancForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf + ui->btnInfo->setStyleSheet("QPushButton{border:none;background:transparent;}"); + ui->wbg->setStyleSheet("#wbg{border-radius:4px;background-color:rgba(156,156,156,0.1);}"); + ui->wbg_2->setStyleSheet("#wbg_2{border-radius:4px;background-color:rgba(156,156,156,0);}"); +-// ui->lbName->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.91);}"); +-// ui->lbConned->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.57);}"); ++ ui->lbName->setStyleSheet("QLabel{font-size:14px;}"); ++ ui->lbConned->setStyleSheet("QLabel{font-size:14px;}"); + ui->btnConnSub->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);color:white;font-size:14px;}" + "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(107,142,235,1);}" + "QPushButton:Pressed{border-radius:4px;background-color:rgba(50,87,202,1);}"); + ui->btnConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);color:white;font-size:14px;}" + "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(107,142,235,1);}" + "QPushButton:Pressed{border-radius:4px;background-color:rgba(50,87,202,1);}"); +-// ui->btnDisConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);color:white;font-size:14px;}" +-// "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(255,255,255,0.2);}" +-// "QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0.08);}"); ++ //ui->btnDisConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);color:white;font-size:14px;}" ++ // "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(255,255,255,0.2);}" ++ // "QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0.08);}"); + ui->lbWaiting->setStyleSheet("QLabel{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);}"); + ui->lbWaitingIcon->setStyleSheet("QLabel{border:0px;background-color:transparent;}"); + +diff --git a/translations/kylin-nm_bo.ts b/translations/kylin-nm_bo.ts +index 5916ae2..27188a5 100644 +--- a/translations/kylin-nm_bo.ts ++++ b/translations/kylin-nm_bo.ts +@@ -9,97 +9,97 @@ + + + +- ++ + LAN name: + + + +- ++ + Method: + + + +- ++ + Address: + + + +- ++ + Netmask: + + + +- ++ + Gateway: + + + +- ++ + DNS 1: + + + +- ++ + DNS 2: + + + +- ++ + Edit Conn + + + +- ++ + Auto(DHCP) + + + +- ++ + Manual + + + +- ++ + Cancel + + + +- ++ + Save + + + +- ++ + Ok + + + +- ++ + Can not create new wired network for without wired card + + + +- ++ + New network already created + + + +- ++ + New network settings already finished + + + +- ++ + New settings already effective + + + +- ++ + Edit Network + + + +- ++ + Add Wired Network + + +@@ -112,47 +112,47 @@ + + + +- ++ + Add Hidden Wi-Fi + + + +- ++ + Connection + + + +- ++ + Wi-Fi name + + + +- ++ + Wi-Fi security + + + +- ++ + Cancel + + + +- ++ + Connect + + + +- ++ + C_reate… + + + +- ++ + None + + + +- ++ + WPA & WPA2 Personal + + +@@ -1107,52 +1107,52 @@ + + + +- ++ + Add Hidden Wi-Fi + + + +- ++ + Connection + + + +- ++ + Wi-Fi name + + + +- ++ + Wi-Fi security + + + +- ++ + Password + + + +- ++ + Cancel + + + +- ++ + Connect + + + +- ++ + C_reate… + + + +- ++ + None + + + +- ++ + WPA & WPA2 Personal + + +@@ -1209,19 +1209,20 @@ + MainWindow + + +- ++ + kylin-nm + + + +- +- ++ ++ + Advanced + + + +- +- ++ ++ ++ + Ethernet + + +@@ -1236,45 +1237,45 @@ + + + +- +- ++ ++ + Wifi + + + +- ++ + HotSpot + + + +- ++ + FlyMode + + + +- ++ + No wireless card detected + + + +- +- +- +- +- ++ ++ ++ ++ ++ + Not connected + + + +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ + Disconnected + + +@@ -1289,58 +1290,58 @@ + + + +- ++ + No usable network in the list + + + +- ++ + Show MainWindow + + + +- ++ + No Other Wired Network Scheme + + + +- ++ + No Other Wireless Network Scheme + + + +- ++ + Confirm your Wi-Fi password or usable of wireless card + + + +- +- ++ ++ + NetOn, + + + +- ++ + Wired net is disconnected + + + +- ++ + Wi-Fi is disconnected + + + +- ++ + Conn Ethernet Success + + + +- ++ + Conn Ethernet Fail + + + +- ++ + Conn Wifi Success + + +@@ -1367,7 +1368,7 @@ + + + +- ++ + Input Password... + + +@@ -1402,7 +1403,7 @@ + + + +- ++ + Conn Wifi Failed + + +@@ -1426,28 +1427,28 @@ + + + +- +- ++ ++ + No Configuration + + + +- ++ + IPv4： + + + +- ++ + IPv6： + + + +- ++ + MAC： + + + +- ++ + BandWidth： + + +diff --git a/translations/kylin-nm_tr.ts b/translations/kylin-nm_tr.ts +index 751cd53..7a512bd 100644 +--- a/translations/kylin-nm_tr.ts ++++ b/translations/kylin-nm_tr.ts +@@ -16,92 +16,92 @@ + Ağı düzenle + + +- ++ + LAN name: + LAN adı: + + +- ++ + Method: + Yöntem: + + +- ++ + Address: + Adres: + + +- ++ + Netmask: + Netmask: + + +- ++ + Gateway: + + + +- ++ + DNS 1: + DNS 1: + + +- ++ + DNS 2: + DNS 2: + + +- ++ + Edit Conn + Bağ. Düzenle + + +- ++ + Auto(DHCP) + Oto(DHCP) + + +- ++ + Manual + Elle + + +- ++ + Cancel + İptal + + +- ++ + Save + Kaydet + + +- ++ + Ok + Tamam + + +- ++ + Can not create new wired network for without wired card + Kablolu kart olmadan yeni kablolu ağ oluşturulamıyor + + +- ++ + New network already created + Yeni ağ zaten oluşturuldu + + +- ++ + New network settings already finished + Yeni ağ ayarları zaten tamamlandı + + +- ++ + Edit Network + Ağı Düzenle + + +- ++ + Add Wired Network + Kablolu Ağ Ekle + +@@ -114,7 +114,7 @@ + Kablolu ağın yapılandırmasını başarıyla değiştirildi + + +- ++ + New settings already effective + Yeni ayarlar zaten etkili + +@@ -122,47 +122,47 @@ + + DlgConnHidWifi + +- ++ + Add Hidden Wi-Fi + Gizli Wi-Fi Ekle + + +- ++ + Connection + Bağlantı + + +- ++ + Wi-Fi name + Wi-Fi adı + + +- ++ + Wi-Fi security + Wi-Fi güvenlik + + +- ++ + Cancel + İptal + + +- ++ + Connect + Bağlantı + + +- ++ + C_reate… + Oluştur... + + +- ++ + None + Yok + + +- ++ + WPA & WPA2 Personal + WPA & WPA2 Kişisel + +@@ -1138,52 +1138,52 @@ + Gizli Wi-Fi Ağına Bağlan + + +- ++ + Add Hidden Wi-Fi + Gizli Wi-Fi Ekle + + +- ++ + Connection + Bağlantı: + + +- ++ + Wi-Fi name + Wi-Fi adı: + + +- ++ + Wi-Fi security + Wi-Fi güvenlik: + + +- ++ + Password + Parola: + + +- ++ + Cancel + İptal + + +- ++ + Connect + Bağlan + + +- ++ + C_reate… + Oluştur... + + +- ++ + None + Yok + + +- ++ + WPA & WPA2 Personal + WPA & WPA2 Kişisel + +@@ -1255,7 +1255,7 @@ + MainWindow + + +- ++ + kylin-nm + + +@@ -1264,14 +1264,15 @@ + Ağ + + +- +- ++ ++ + Advanced + Gelişmiş + + +- +- ++ ++ ++ + Ethernet + Kablolu Ağ + +@@ -1280,8 +1281,8 @@ + Gizli Ağı Bağlan + + +- +- ++ ++ + Wifi + Wi-Fi + +@@ -1294,69 +1295,69 @@ + Pasif + + +- ++ + HotSpot + HotSpot + + +- ++ + FlyMode + + + +- ++ + Show MainWindow + Ana Pencereyi Göster + + +- ++ + No wireless card detected + + + +- +- +- +- +- ++ ++ ++ ++ ++ + Not connected + Bağlanamadı + + +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ + Disconnected + Bağlantı Kesildi + + +- ++ + 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 net is disconnected + Kablolu ağ bağlantısı kesildi + + +- ++ + Wi-Fi is disconnected + Kablosuz bağlantı kesildi + + +- ++ + Confirm your Wi-Fi password or usable of wireless card + Kablosuz şifrenizi veya kablosuz kart kullanılabilirliğini onaylayın + +@@ -1376,13 +1377,13 @@ + Gizli Wi-Fi + + +- ++ + No usable network in the list + Listede kullanılabilir ağ yok + + +- +- ++ ++ + NetOn, + + +@@ -1416,17 +1417,17 @@ + Kablosuz listesini şimdi güncelle + + +- ++ + Conn Ethernet Success + Ethernet Bağlantısı Başarılı + + +- ++ + Conn Ethernet Fail + Ethernet Bağlantısı Hatası + + +- ++ + Conn Wifi Success + Wi-Fi Bağlantısı Başarılı + +@@ -1468,7 +1469,7 @@ + + + +- ++ + Input Password... + Parola gir... + +@@ -1515,7 +1516,7 @@ + Fiziksel adres: + + +- ++ + Conn Wifi Failed + Wifi Bağlantısı Başarısız + +@@ -1543,28 +1544,28 @@ + Bağlantıyı Kes + + +- +- ++ ++ + No Configuration + Yapılandırma Yok + + +- ++ + IPv4： + IPv4 adresi: + + +- ++ + IPv6： + IPv6 adresi: + + +- ++ + BandWidth： + Bant genişliği: + + +- ++ + MAC： + Fiziksel adres: + +diff --git a/translations/kylin-nm_zh_CN.ts b/translations/kylin-nm_zh_CN.ts +index ee93ae0..9f2d0c9 100644 +--- a/translations/kylin-nm_zh_CN.ts ++++ b/translations/kylin-nm_zh_CN.ts +@@ -16,92 +16,92 @@ + 编辑网络设置 + + +- ++ + LAN name: + 网络名称： + + +- ++ + Method: + 编辑IP设置: + + +- ++ + Address: + IP地址: + + +- ++ + Netmask: + 子网掩码: + + +- ++ + Gateway: + 默认网关: + + +- ++ + DNS 1: + 首选DNS: + + +- ++ + DNS 2: + 备选DNS: + + +- ++ + Edit Conn + 网络设置 + + +- ++ + Auto(DHCP) + 自动(DHCP) + + +- ++ + Manual + 手动 + + +- ++ + Cancel + 取消 + + +- ++ + Save + 保存 + + +- ++ + Ok + 确定 + + +- ++ + Can not create new wired network for without wired card + 缺少有线网卡 无法新建网络 + + +- ++ + New network already created + 已创建新的有线网络 + + +- ++ + New network settings already finished + 新的网络配置已经完成 + + +- ++ + Edit Network + 编辑网络设置 + + +- ++ + Add Wired Network + 新建有线网络 + +@@ -114,7 +114,7 @@ + 新的设置已经生效 + + +- ++ + New settings already effective + 新的设置已经生效 + +@@ -122,47 +122,47 @@ + + DlgConnHidWifi + +- ++ + Add Hidden Wi-Fi + 加入隐藏Wi-Fi + + +- ++ + Connection + 连接设置: + + +- ++ + Wi-Fi name + 网络名称: + + +- ++ + Wi-Fi security + Wi-Fi 安全性: + + +- ++ + Cancel + 取消 + + +- ++ + Connect + 连接 + + +- ++ + C_reate… + 新建... + + +- ++ + None + 无 + + +- ++ + WPA & WPA2 Personal + WPA 及 WPA2 个人 + +@@ -1138,52 +1138,52 @@ + 连接到隐藏 Wi-Fi 网络 + + +- ++ + Add Hidden Wi-Fi + 加入隐藏Wi-Fi + + +- ++ + Connection + 连接设置: + + +- ++ + Wi-Fi name + 网络名称: + + +- ++ + Wi-Fi security + Wi-Fi 安全性: + + +- ++ + Password + 密码: + + +- ++ + Cancel + 取消 + + +- ++ + Connect + 连接 + + +- ++ + C_reate… + 新建... + + +- ++ + None + 无 + + +- ++ + WPA & WPA2 Personal + WPA 及 WPA2 个人 + +@@ -1263,7 +1263,7 @@ + MainWindow + + +- ++ + kylin-nm + 网络工具 + +@@ -1272,14 +1272,15 @@ + 网络 + + +- +- ++ ++ + Advanced + 设置网络 + + +- +- ++ ++ ++ + Ethernet + 有线网络 + +@@ -1288,8 +1289,8 @@ + 加入网络 + + +- +- ++ ++ + Wifi + 无线网络 + +@@ -1302,69 +1303,69 @@ + 已关闭 + + +- ++ + HotSpot + 个人热点 + + +- ++ + FlyMode + 飞行模式 + + +- ++ + Show MainWindow + 显示网络连接界面 + + +- ++ + No wireless card detected + 未检测到无线网卡 + + +- +- +- +- +- ++ ++ ++ ++ ++ + Not connected + 当前未连接任何网络 + + +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ + Disconnected + 未连接 + + +- ++ + No Other Wired Network Scheme + 列表中无其他有线网络 + + +- ++ + No Other Wireless Network Scheme + 未检测到其他无线网络 + + +- ++ + Wired net is disconnected + 断开有线网络 + + +- ++ + Wi-Fi is disconnected + 断开无线网络 + + +- ++ + Confirm your Wi-Fi password or usable of wireless card + 请确认Wi-Fi密码或无线设备 + +@@ -1384,13 +1385,13 @@ + 加入网络 + + +- ++ + No usable network in the list + 列表暂无可连接网络 + + +- +- ++ ++ + NetOn, + 已连接， + +@@ -1424,17 +1425,17 @@ + 正在更新 Wi-Fi列表 + + +- ++ + Conn Ethernet Success + 连接有线网络成功 + + +- ++ + Conn Ethernet Fail + 连接有线网络失败 + + +- ++ + Conn Wifi Success + 连接无线网络成功 + +@@ -1476,7 +1477,7 @@ + + + +- ++ + Input Password... + 输入密码... + +@@ -1519,7 +1520,7 @@ + 物理地址： + + +- ++ + Conn Wifi Failed + 连接无线网络失败 + +@@ -1547,28 +1548,28 @@ + 断开 + + +- +- ++ ++ + No Configuration + 未配置 + + +- ++ + IPv4： + IPv4地址： + + +- ++ + IPv6： + IPv6地址： + + +- ++ + BandWidth： + 带宽： + + +- ++ + MAC： + 物理地址： + +diff --git a/wireless-security/dlgconnhidwifi.cpp b/wireless-security/dlgconnhidwifi.cpp +index 1cbb280..7cb1f75 100644 +--- a/wireless-security/dlgconnhidwifi.cpp ++++ b/wireless-security/dlgconnhidwifi.cpp +@@ -49,9 +49,9 @@ DlgConnHidWifi::DlgConnHidWifi(int type, MainWindow *mainWindow, QWidget *parent + + MyQss objQss; + +-// ui->lbBoder->setStyleSheet("QLabel{border-radius:6px;background-color:rgba(19,19,20,0.95);border:1px solid rgba(255, 255, 255, 0.05);}"); ++ ui->lbBoder->setStyleSheet("QLabel{border-radius:6px;background-color:rgba(19,19,20,0.95);border:1px solid rgba(255, 255, 255, 0.05);}"); + ui->lbBoder->hide(); +-// ui->lbLeftupTitle->setStyleSheet("QLabel{border:0px;font-size:20px;color:rgba(255,255,255,0.97);background-color:transparent;}"); ++ ui->lbLeftupTitle->setStyleSheet("QLabel{font-size:20px;}"); + // ui->lbConn->setStyleSheet(objQss.labelQss); + // ui->lbNetName->setStyleSheet(objQss.labelQss); + // ui->lbSecurity->setStyleSheet(objQss.labelQss); +diff --git a/wireless-security/dlgconnhidwifiwpa.cpp b/wireless-security/dlgconnhidwifiwpa.cpp +index 0a02a9d..022df7f 100644 +--- a/wireless-security/dlgconnhidwifiwpa.cpp ++++ b/wireless-security/dlgconnhidwifiwpa.cpp +@@ -48,9 +48,9 @@ DlgConnHidWifiWpa::DlgConnHidWifiWpa(int type, MainWindow *mainWindow, QWidget * + + MyQss objQss; + +-// ui->lbBoder->setStyleSheet("QLabel{border-radius:6px;background-color:rgba(19,19,20,0.95);border:1px solid rgba(255, 255, 255, 0.05);}"); ++ ui->lbBoder->setStyleSheet("QLabel{border-radius:6px;background-color:rgba(19,19,20,0.95);border:1px solid rgba(255, 255, 255, 0.05);}"); + ui->lbBoder->hide(); +-// ui->lbLeftupTitle->setStyleSheet("QLabel{border:0px;font-size:20px;color:rgba(255,255,255,0.97);background-color:transparent;}"); ++ ui->lbLeftupTitle->setStyleSheet("QLabel{font-size:20px;}"); + // ui->lbConn->setStyleSheet(objQss.labelQss); + // ui->lbNetName->setStyleSheet(objQss.labelQss); + // ui->lbSecurity->setStyleSheet(objQss.labelQss); +-- +2.33.0 + diff --git a/kylin-nm.spec b/kylin-nm.spec index 9f39f94..9b822ed 100644 --- a/kylin-nm.spec +++ b/kylin-nm.spec @@ -1,11 +1,12 @@ Name: kylin-nm Version: 3.0.2 -Release: 8 +Release: 9 Summary: Gui Applet tool for display and edit network simply License: GPL-3+ URL: https://github.com/ukui/kylin-nm/ Source0: %{name}-%{version}.tar.gz Patch0: 0001-Change-the-distance-between-mainwindow-and-taskbar.patch +Patch1: 0001-Adjust-font-size.patch BuildRequires: qt5-qtbase-devel BuildRequires: qtchooser @@ -26,6 +27,7 @@ Requires: network-manager-applet %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-nm.pro @@ -52,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/kylin-nm.1.gz %changelog +* Wed Jun 29 2022 huayadong - 3.0.2-9 +- Adjust font size + * Wed Jun 29 2022 huayadong - 3.0.2-8 - Change the distance between mainwindow and taskbar