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

Merge branch 'mobilehotspot-modify' into 'dbus-interface' 

控制面板移动热点密码输入提示信息

See merge request kylin-desktop/kylin-nm!643
This commit is contained in:
赵世旭 2022-06-29 08:07:11 +00:00
parent 42a644109d 70cc6df774
commit a42a29b655
7 changed files with 130 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
plugins/mobilehotspot/mobilehotspotwidget.cpp
View File

@ -1,5 +1,6 @@
#include "mobilehotspotwidget.h"
#include <QDebug>
#include <QFormLayout>
#define LABEL_RECT 17, 0, 105, 23
#define CONTENTS_MARGINS 0, 0, 0, 0
@ -7,11 +8,16 @@
#define FRAME_MIN_SIZE 550, 60
#define FRAME_MAX_SIZE 16777215, 16777215
#define CONTECT_FRAME_MAX_SIZE 16777215, 60
#define HINT_TEXT_MARGINS 8, 0, 0, 0
#define FRAME_MIN_SIZE 550, 60
#define LABLE_MIN_WIDTH 188
#define COMBOBOX_MIN_WIDTH 200
#define LINE_MAX_SIZE 16777215, 1
#define LINE_MIN_SIZE 0, 1
#define ICON_SIZE 24,24
#define PASSWORD_FRAME_MIN_SIZE 550, 86
#define PASSWORD_FRAME_MAX_SIZE 16777215, 86
#define PASSWORD_ITEM_MARGINS 16, 12, 16, 14
#define WIRELESS 1
@ -84,8 +90,9 @@ bool MobileHotspotWidget::eventFilter(QObject *watched, QEvent *event)
return true;
}
if (event->type() == QEvent::MouseButtonRelease) {
if (watched == m_switchBtn) {
if (watched == m_switchBtn) {
if (event->type() == QEvent::MouseButtonRelease) {
if (!m_interface->isValid()) {
return true;
}
@ -112,10 +119,10 @@ bool MobileHotspotWidget::eventFilter(QObject *watched, QEvent *event)
}
showDesktopNotify(tr("start to open hotspot ") + m_apNameLine->text());
QDBusReply<void> reply = m_interface->call("activeWirelessAp",
m_apNameLine->text(),
m_pwdNameLine->text(),
m_freqBandComboBox->currentText(),
m_interfaceComboBox->currentText());
m_apNameLine->text(),
m_pwdNameLine->text(),
m_freqBandComboBox->currentText(),
m_interfaceComboBox->currentText());
if (!reply.isValid()) {
qDebug() << "[MobileHotspotWidget] call deactiveWirelessAp failed ";
return true;
@ -123,6 +130,12 @@ bool MobileHotspotWidget::eventFilter(QObject *watched, QEvent *event)
}
return true;
}
} else if (watched == m_pwdNameLine) {
if (m_pwdNameLine->text().length() < 8) {
m_pwdHintLabel->setText(tr("Contains at least 8 characters")); //至少包含8个字符
} else {
m_pwdHintLabel->clear();
}
}
return QWidget::eventFilter(watched, event);
}
@ -394,22 +407,35 @@ void MobileHotspotWidget::setPasswordFrame()
/* Password */
m_passwordFrame = new QFrame(this);
m_passwordFrame->setFrameShape(QFrame::Shape::NoFrame);
m_passwordFrame->setMinimumSize(FRAME_MIN_SIZE);
m_passwordFrame->setMaximumSize(CONTECT_FRAME_MAX_SIZE);
QHBoxLayout *passwordHLayout = new QHBoxLayout();
m_passwordFrame->setMinimumSize(PASSWORD_FRAME_MIN_SIZE);
m_passwordFrame->setMaximumSize(PASSWORD_FRAME_MAX_SIZE);
m_pwdLabel = new QLabel(tr("Password"), this);
m_pwdLabel->setMinimumWidth(LABLE_MIN_WIDTH);
m_pwdNameLine = new KPasswordEdit(this);
m_pwdNameLine->setClearButtonEnabled(false);//禁用ClearBtn按钮X
m_pwdNameLine->setMinimumWidth(COMBOBOX_MIN_WIDTH);
passwordHLayout->setContentsMargins(ITEM_MARGINS);
passwordHLayout->setSpacing(0);
passwordHLayout->addWidget(m_pwdLabel);
passwordHLayout->addWidget(m_pwdNameLine);
m_pwdHintLabel= new QLabel(this);
m_pwdHintLabel->setFixedHeight(20);
m_pwdHintLabel->setContentsMargins(HINT_TEXT_MARGINS);
m_passwordFrame->setLayout(passwordHLayout);
QPalette hintTextColor;
hintTextColor.setColor(QPalette::WindowText, Qt::red);
m_pwdHintLabel->setPalette(hintTextColor);
QWidget *pwdInputWidget = new QWidget(this);
QVBoxLayout *pwdInputVLayout = new QVBoxLayout(pwdInputWidget);
pwdInputVLayout->setContentsMargins(CONTENTS_MARGINS);
pwdInputVLayout->setSpacing(0);
pwdInputVLayout->addWidget(m_pwdNameLine);
pwdInputVLayout->addWidget(m_pwdHintLabel);
QFormLayout *pwdLayout = new QFormLayout(m_passwordFrame);
pwdLayout->setContentsMargins(PASSWORD_ITEM_MARGINS);
pwdLayout->setSpacing(0);
pwdLayout->addRow(m_pwdLabel, pwdInputWidget);
m_pwdNameLine->installEventFilter(this);
}
void MobileHotspotWidget::setFreqBandFrame()

1
plugins/mobilehotspot/mobilehotspotwidget.h
View File

@ -46,6 +46,7 @@ private:
QLabel *m_switchLabel;
QLabel *m_apNameLabel;
QLabel *m_pwdLabel;
QLabel *m_pwdHintLabel;
QLabel *m_freqBandLabel;
QLabel *m_interfaceLabel;

39
plugins/mobilehotspot/translations/bo.ts
View File

@ -24,79 +24,84 @@
<context>
<name>MobileHotspotWidget</name>
<message>
<location filename="../mobilehotspotwidget.cpp" line="30"/>
<location filename="../mobilehotspotwidget.cpp" line="36"/>
<source>ukui control center</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="33"/>
<location filename="../mobilehotspotwidget.cpp" line="39"/>
<source>ukui control center desktop message</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="102"/>
<location filename="../mobilehotspotwidget.cpp" line="100"/>
<source>wirless switch is close or no wireless device</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="106"/>
<location filename="../mobilehotspotwidget.cpp" line="104"/>
<source>start to close hotspot</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="115"/>
<location filename="../mobilehotspotwidget.cpp" line="113"/>
<source>hotpots name or device is invalid</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="119"/>
<location filename="../mobilehotspotwidget.cpp" line="117"/>
<source>can not create hotspot with password length less than eight!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="122"/>
<location filename="../mobilehotspotwidget.cpp" line="120"/>
<source>start to open hotspot </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="155"/>
<location filename="../mobilehotspotwidget.cpp" line="135"/>
<source>Contains at least 8 characters</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="159"/>
<source>Hotspot</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="227"/>
<location filename="../mobilehotspotwidget.cpp" line="532"/>
<location filename="../mobilehotspotwidget.cpp" line="231"/>
<location filename="../mobilehotspotwidget.cpp" line="537"/>
<source>hotspot already close</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="367"/>
<location filename="../mobilehotspotwidget.cpp" line="371"/>
<source>Open</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="388"/>
<location filename="../mobilehotspotwidget.cpp" line="392"/>
<source>Wi-Fi Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="410"/>
<location filename="../mobilehotspotwidget.cpp" line="413"/>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="448"/>
<location filename="../mobilehotspotwidget.cpp" line="451"/>
<source>Frequency band</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="473"/>
<location filename="../mobilehotspotwidget.cpp" line="477"/>
<source>Net card</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="548"/>
<location filename="../mobilehotspotwidget.cpp" line="556"/>
<location filename="../mobilehotspotwidget.cpp" line="553"/>
<location filename="../mobilehotspotwidget.cpp" line="561"/>
<source>hotspot already open</source>
<translation type="unfinished"></translation>
</message>

39
plugins/mobilehotspot/translations/bo_CN.ts
View File

@ -24,79 +24,84 @@
<context>
<name>MobileHotspotWidget</name>
<message>
<location filename="../mobilehotspotwidget.cpp" line="30"/>
<location filename="../mobilehotspotwidget.cpp" line="36"/>
<source>ukui control center</source>
<translation>ཝུའུ་ཁི་ལན་གྱི་ཚོད་འཛིན་ལྟེ་གནས།</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="33"/>
<location filename="../mobilehotspotwidget.cpp" line="39"/>
<source>ukui control center desktop message</source>
<translation>ukui ཚོད་འཛིན་ལྟེ་གནས་ཀྱི་ཅོག་ངོས་ཆ་འཕྲིན།</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="102"/>
<location filename="../mobilehotspotwidget.cpp" line="100"/>
<source>wirless switch is close or no wireless device</source>
<translation>སྐུད་མེད་གློག་སྒོ་རྒྱག་པའམ་ཡང་ན་སྐུད་མེད་སྒྲིག་ཆས་མེད་པ།</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="106"/>
<location filename="../mobilehotspotwidget.cpp" line="104"/>
<source>start to close hotspot</source>
<translation>སྒོ་རྒྱག་འགོ་བརྩམས།</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="115"/>
<location filename="../mobilehotspotwidget.cpp" line="113"/>
<source>hotpots name or device is invalid</source>
<translation>ཚ་བ་ཆེ་བའི་མིང་ངམ་སྒྲིག་ཆས་ལ་ནུས་པ་མེད།</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="119"/>
<location filename="../mobilehotspotwidget.cpp" line="117"/>
<source>can not create hotspot with password length less than eight!</source>
<translation>གསང་གྲངས་ཀྱི་རིང་ཚད་ནི་གླེང་མང་བའི་གནད་དོན་བརྒྱད་ལས་ཆུང་བ་བྱེད་མི་རུང་།!</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="122"/>
<location filename="../mobilehotspotwidget.cpp" line="120"/>
<source>start to open hotspot </source>
<translation>ཚ་ཚ་འུར་འུར་གྱི་སྒོ་མོ་ཕྱེ་འགོ་བརྩམས། </translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="155"/>
<location filename="../mobilehotspotwidget.cpp" line="135"/>
<source>Contains at least 8 characters</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="159"/>
<source>Hotspot</source>
<translation>ཚ་བ་ཆེ་བ།</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="227"/>
<location filename="../mobilehotspotwidget.cpp" line="532"/>
<location filename="../mobilehotspotwidget.cpp" line="231"/>
<location filename="../mobilehotspotwidget.cpp" line="537"/>
<source>hotspot already close</source>
<translation>ཚ་བ་ཆེ་བའི་གནད་དོན་ཐག་ཉེ་རུ་སོང་ཡོད།</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="367"/>
<location filename="../mobilehotspotwidget.cpp" line="371"/>
<source>Open</source>
<translation>སྒོ་ཕྱེ་བ།</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="388"/>
<location filename="../mobilehotspotwidget.cpp" line="392"/>
<source>Wi-Fi Name</source>
<translation>Wi-Fiཡི་མིང་།</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="410"/>
<location filename="../mobilehotspotwidget.cpp" line="413"/>
<source>Password</source>
<translation>གསང་གྲངས།</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="448"/>
<location filename="../mobilehotspotwidget.cpp" line="451"/>
<source>Frequency band</source>
<translation>ཐེངས་གྲངས་ཀྱི་རོལ་ཆའི་རུ་ཁག</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="473"/>
<location filename="../mobilehotspotwidget.cpp" line="477"/>
<source>Net card</source>
<translation>དྲ་རྒྱའི་བྱང་བུ།</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="548"/>
<location filename="../mobilehotspotwidget.cpp" line="556"/>
<location filename="../mobilehotspotwidget.cpp" line="553"/>
<location filename="../mobilehotspotwidget.cpp" line="561"/>
<source>hotspot already open</source>
<translation>ཚ་བ་ཆེ་བའི་གནད་དོན་དེ་སྒོ་ཕྱེ་ཟིན།</translation>
</message>

39
plugins/mobilehotspot/translations/tr.ts
View File

@ -24,79 +24,84 @@
<context>
<name>MobileHotspotWidget</name>
<message>
<location filename="../mobilehotspotwidget.cpp" line="30"/>
<location filename="../mobilehotspotwidget.cpp" line="36"/>
<source>ukui control center</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="33"/>
<location filename="../mobilehotspotwidget.cpp" line="39"/>
<source>ukui control center desktop message</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="102"/>
<location filename="../mobilehotspotwidget.cpp" line="100"/>
<source>wirless switch is close or no wireless device</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="106"/>
<location filename="../mobilehotspotwidget.cpp" line="104"/>
<source>start to close hotspot</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="115"/>
<location filename="../mobilehotspotwidget.cpp" line="113"/>
<source>hotpots name or device is invalid</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="119"/>
<location filename="../mobilehotspotwidget.cpp" line="117"/>
<source>can not create hotspot with password length less than eight!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="122"/>
<location filename="../mobilehotspotwidget.cpp" line="120"/>
<source>start to open hotspot </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="155"/>
<location filename="../mobilehotspotwidget.cpp" line="135"/>
<source>Contains at least 8 characters</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="159"/>
<source>Hotspot</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="227"/>
<location filename="../mobilehotspotwidget.cpp" line="532"/>
<location filename="../mobilehotspotwidget.cpp" line="231"/>
<location filename="../mobilehotspotwidget.cpp" line="537"/>
<source>hotspot already close</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="367"/>
<location filename="../mobilehotspotwidget.cpp" line="371"/>
<source>Open</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="388"/>
<location filename="../mobilehotspotwidget.cpp" line="392"/>
<source>Wi-Fi Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="410"/>
<location filename="../mobilehotspotwidget.cpp" line="413"/>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="448"/>
<location filename="../mobilehotspotwidget.cpp" line="451"/>
<source>Frequency band</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="473"/>
<location filename="../mobilehotspotwidget.cpp" line="477"/>
<source>Net card</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="548"/>
<location filename="../mobilehotspotwidget.cpp" line="556"/>
<location filename="../mobilehotspotwidget.cpp" line="553"/>
<location filename="../mobilehotspotwidget.cpp" line="561"/>
<source>hotspot already open</source>
<translation type="unfinished"></translation>
</message>

BIN
plugins/mobilehotspot/translations/zh_CN.qm
View File

Binary file not shown.

39
plugins/mobilehotspot/translations/zh_CN.ts
View File

@ -24,79 +24,84 @@
<context>
<name>MobileHotspotWidget</name>
<message>
<location filename="../mobilehotspotwidget.cpp" line="30"/>
<location filename="../mobilehotspotwidget.cpp" line="36"/>
<source>ukui control center</source>
<translation>控制面板</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="33"/>
<location filename="../mobilehotspotwidget.cpp" line="39"/>
<source>ukui control center desktop message</source>
<translation>控制面板桌面通知</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="102"/>
<location filename="../mobilehotspotwidget.cpp" line="100"/>
<source>wirless switch is close or no wireless device</source>
<translation>无线开关已关闭或不存在有热点功能的无线网卡</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="106"/>
<location filename="../mobilehotspotwidget.cpp" line="104"/>
<source>start to close hotspot</source>
<translation>开始关闭热点</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="115"/>
<location filename="../mobilehotspotwidget.cpp" line="113"/>
<source>hotpots name or device is invalid</source>
<translation>热点名称或设备错误</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="119"/>
<location filename="../mobilehotspotwidget.cpp" line="117"/>
<source>can not create hotspot with password length less than eight!</source>
<translation>不能创建密码长度小于八位的热点！</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="122"/>
<location filename="../mobilehotspotwidget.cpp" line="120"/>
<source>start to open hotspot </source>
<translation>开始创建热点</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="155"/>
<location filename="../mobilehotspotwidget.cpp" line="135"/>
<source>Contains at least 8 characters</source>
<translation>至少包含8个字符</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="159"/>
<source>Hotspot</source>
<translation>移动热点</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="227"/>
<location filename="../mobilehotspotwidget.cpp" line="532"/>
<location filename="../mobilehotspotwidget.cpp" line="231"/>
<location filename="../mobilehotspotwidget.cpp" line="537"/>
<source>hotspot already close</source>
<translation>热点已关闭</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="367"/>
<location filename="../mobilehotspotwidget.cpp" line="371"/>
<source>Open</source>
<translation>开启</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="388"/>
<location filename="../mobilehotspotwidget.cpp" line="392"/>
<source>Wi-Fi Name</source>
<translation>Wi-Fi名称</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="410"/>
<location filename="../mobilehotspotwidget.cpp" line="413"/>
<source>Password</source>
<translation>网络密码</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="448"/>
<location filename="../mobilehotspotwidget.cpp" line="451"/>
<source>Frequency band</source>
<translation>网络频带</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="473"/>
<location filename="../mobilehotspotwidget.cpp" line="477"/>
<source>Net card</source>
<translation>共享网卡端口</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="548"/>
<location filename="../mobilehotspotwidget.cpp" line="556"/>
<location filename="../mobilehotspotwidget.cpp" line="553"/>
<location filename="../mobilehotspotwidget.cpp" line="561"/>
<source>hotspot already open</source>
<translation>热点已开启</translation>
</message>