From eb1a31d64642b5b0ec8adc609763a33e4a25b414 Mon Sep 17 00:00:00 2001 From: luoqing Date: Thu, 25 Aug 2022 19:21:48 +0800 Subject: [PATCH 1/2] feature(audio&network):Add labels to volume and network plugins to support automated testing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 音量和网络插件添加标签，以支持自动化测试 --- plugins/audio/src/plugin/input-page.ui | 6 ++++ plugins/audio/src/plugin/output-page.ui | 9 +++++ plugins/network/src/connection-itemwidget.cpp | 31 ++++++++-------- plugins/network/src/connection-lists.cpp | 8 +++-- plugins/network/src/connection-show-page.cpp | 1 + plugins/network/src/connection-show-page.ui | 3 ++ plugins/network/src/plugin/details-page.ui | 3 ++ .../network/src/plugin/manager/manager.cpp | 18 ++++------ .../src/plugin/manager/vpn-manager.cpp | 8 ++--- .../network/src/plugin/manager/vpn-manager.ui | 7 ++-- .../src/plugin/manager/wired-manager.ui | 6 ++++ .../setting-widget/connection-name-widget.cpp | 1 + .../setting-widget/connection-name-widget.ui | 3 ++ .../disconnect-and-delete-button.ui | 11 +++++- .../plugin/setting-widget/ethernet-widget.cpp | 1 + .../plugin/setting-widget/ethernet-widget.ui | 9 +++++ .../src/plugin/setting-widget/ipv4-widget.ui | 20 ++++++++++- .../src/plugin/setting-widget/ipv6-widget.ui | 20 ++++++++++- .../setting-widget/text-input-dialog.cpp | 35 ++++++++++--------- .../plugin/setting-widget/vpn/vpn-ipsec.cpp | 17 +++++---- .../plugin/setting-widget/vpn/vpn-ipsec.ui | 15 ++++++++ .../plugin/setting-widget/vpn/vpn-ipvx.cpp | 13 +++---- .../src/plugin/setting-widget/vpn/vpn-ipvx.ui | 9 +++++ .../src/plugin/setting-widget/vpn/vpn-ppp.cpp | 4 +++ .../src/plugin/setting-widget/vpn/vpn-ppp.ui | 3 ++ .../plugin/setting-widget/vpn/vpn-widget.ui | 18 ++++++++++ .../wireless-security-widget.ui | 12 +++++++ .../plugin/setting-widget/wireless-widget.cpp | 17 ++++----- .../plugin/setting-widget/wireless-widget.ui | 9 +++++ 29 files changed, 239 insertions(+), 78 deletions(-) diff --git a/plugins/audio/src/plugin/input-page.ui b/plugins/audio/src/plugin/input-page.ui index 386e573..c291ef0 100644 --- a/plugins/audio/src/plugin/input-page.ui +++ b/plugins/audio/src/plugin/input-page.ui @@ -62,6 +62,9 @@ 36 + + ComboBoxInputDevices + @@ -127,6 +130,9 @@ Qt::NoFocus + + SliderVolumeSetting + Qt::Horizontal diff --git a/plugins/audio/src/plugin/output-page.ui b/plugins/audio/src/plugin/output-page.ui index 3451ea9..529d386 100644 --- a/plugins/audio/src/plugin/output-page.ui +++ b/plugins/audio/src/plugin/output-page.ui @@ -80,6 +80,9 @@ 36 + + ComboBoxOutputDevices + @@ -169,6 +172,9 @@ Qt::NoFocus + + SlilderVolumeSetting + Qt::Horizontal @@ -236,6 +242,9 @@ Qt::NoFocus + + SliderVolumeBalance + Qt::Horizontal diff --git a/plugins/network/src/connection-itemwidget.cpp b/plugins/network/src/connection-itemwidget.cpp index f16e76c..93d69d7 100644 --- a/plugins/network/src/connection-itemwidget.cpp +++ b/plugins/network/src/connection-itemwidget.cpp @@ -14,14 +14,14 @@ #include "connection-itemwidget.h" #include +#include +#include #include #include -#include #include "animation-loading-label.h" -#include // 使用默认析构函数，父对象被释放时，会释放子对象 -ConnectionItemWidget::ConnectionItemWidget( QWidget* parent) : KiranFrame(parent) +ConnectionItemWidget::ConnectionItemWidget(QWidget* parent) : KiranFrame(parent) { initUI(); } @@ -32,7 +32,7 @@ void ConnectionItemWidget::initUI() initPluginItemWidget(); setDrawBroder(false); setAttribute(Qt::WA_Hover); - connect(Kiran::StylePalette::instance(),&Kiran::StylePalette::themeChanged,this,&ConnectionItemWidget::handleThemeChanged); + connect(Kiran::StylePalette::instance(), &Kiran::StylePalette::themeChanged, this, &ConnectionItemWidget::handleThemeChanged); connect(m_editButton, &QPushButton::clicked, this, &ConnectionItemWidget::editButtonClicked); } @@ -47,10 +47,10 @@ void ConnectionItemWidget::initPluginItemWidget() m_connectionTypeIcon->setVisible(false); m_activatedLabel->setVisible(false); -// auto pixmap = QApplication::style()->standardPixmap(QStyle::SP_ArrowRight); + // auto pixmap = QApplication::style()->standardPixmap(QStyle::SP_ArrowRight); m_editButton->setIcon(trayIconColorSwitch(":/kcp-network-images/details-info.svg")); - m_editButton->setIconSize(QSize(16,16)); - m_editButton->setFixedSize(30,36); + m_editButton->setIconSize(QSize(16, 16)); + m_editButton->setFixedSize(30, 36); m_editButton->setFlat(true); m_horizonLayout->addWidget(m_connectionTypeIcon); @@ -61,10 +61,10 @@ void ConnectionItemWidget::initPluginItemWidget() m_horizonLayout->setMargin(0); this->setLayout(m_horizonLayout); - this->setContentsMargins(10,0,3,0); + this->setContentsMargins(10, 0, 3, 0); } -//TODO:名称过长进行缩略 +// TODO:名称过长进行缩略 void ConnectionItemWidget::setName(const QString& name) { QString nameStr = name; @@ -75,6 +75,7 @@ void ConnectionItemWidget::setName(const QString& name) // } // KLOG_DEBUG() << "elidedText:" << nameStr; m_connectionName->setText(nameStr); + m_editButton->setAccessibleName(QString("ButtonEditConnectionName::%1").arg(nameStr)); } QString ConnectionItemWidget::getName() @@ -82,7 +83,7 @@ QString ConnectionItemWidget::getName() return m_connectionName->text(); } -//TODO:其他状态信息的显示，以及优化 +// TODO:其他状态信息的显示，以及优化 void ConnectionItemWidget::activatedStatus() { QPixmap pixmap(":/kcp-network-images/correct.png"); @@ -164,7 +165,7 @@ void ConnectionItemWidget::setOtherNetworkIcon() void ConnectionItemWidget::handleThemeChanged(Kiran::PaletteType paletteType) { - if(m_connectionTypeIcon->pixmap() != nullptr) + if (m_connectionTypeIcon->pixmap() != nullptr) { QImage image = m_connectionTypeIcon->pixmap()->toImage(); image.invertPixels(QImage::InvertRgb); @@ -174,12 +175,12 @@ void ConnectionItemWidget::handleThemeChanged(Kiran::PaletteType paletteType) m_editButton->setIcon(trayIconColorSwitch(":/kcp-network-images/details-info.svg")); } -QPixmap ConnectionItemWidget::trayIconColorSwitch(const QString &iconPath) +QPixmap ConnectionItemWidget::trayIconColorSwitch(const QString& iconPath) { - //icon原本为浅色 + // icon原本为浅色 QIcon icon(iconPath); - QPixmap pixmap = icon.pixmap(16,16); - if( Kiran::StylePalette::instance()->paletteType() != Kiran::PALETTE_DARK ) + QPixmap pixmap = icon.pixmap(16, 16); + if (Kiran::StylePalette::instance()->paletteType() != Kiran::PALETTE_DARK) { QImage image = pixmap.toImage(); image.invertPixels(QImage::InvertRgb); diff --git a/plugins/network/src/connection-lists.cpp b/plugins/network/src/connection-lists.cpp index d1453b5..0552d6a 100644 --- a/plugins/network/src/connection-lists.cpp +++ b/plugins/network/src/connection-lists.cpp @@ -97,7 +97,7 @@ void ConnectionLists::handleConnectionItemClicked(QListWidgetItem* item) QWidget* widget = this->itemWidget(item); TrayItemWidget* trayItemWidget = qobject_cast(widget); - + if (isWireless) { // Note:signalStrength == -1 对应连接隐藏网络 @@ -249,6 +249,8 @@ void ConnectionLists::addConnectionToLists(Connection::Ptr ptr, const QString& d var.setValue(connectionInfo); // item中保存connection的相关信息 item->setData(Qt::UserRole, var); + item->setData(Qt::AccessibleTextRole, QString("WiredConnectionItem::%1").arg(connectionInfo.id)); + if (m_itemShowType == ITEM_WIDGET_TYPE_PLUGIN) { this->setItemWidget(item, connectionItemWidget); @@ -411,6 +413,7 @@ void ConnectionLists::addWirelessNetworkToLists(WirelessNetwork::Ptr network, co QVariant var; var.setValue(connectionInfo); item->setData(Qt::UserRole, var); + item->setData(Qt::AccessibleTextRole, QString("WirelessConnectionItem::%1").arg(connectionInfo.id)); this->addItem(item); if (m_itemShowType == ITEM_WIDGET_TYPE_PLUGIN) @@ -467,6 +470,7 @@ void ConnectionLists::showOtherWirelessItem() QVariant var; var.setValue(connectionInfo); item->setData(Qt::UserRole, var); + item->setData(Qt::AccessibleTextRole, QString("ShowOtherWireless")); this->addItem(item); if (m_itemShowType == ITEM_WIDGET_TYPE_PLUGIN) @@ -668,7 +672,7 @@ void ConnectionLists::showInputPasswordWidgetOfItem(QListWidgetItem* item) QWidget* widget = itemWidget(item); TrayItemWidget* trayItemWidget = qobject_cast(widget); trayItemWidget->showInputPasswordWidget(); - connect(trayItemWidget, &TrayItemWidget::sendPassword, this, &ConnectionLists::handleSendPassword,Qt::UniqueConnection); + connect(trayItemWidget, &TrayItemWidget::sendPassword, this, &ConnectionLists::handleSendPassword, Qt::UniqueConnection); } void ConnectionLists::handleSendPassword(const QString& password) diff --git a/plugins/network/src/connection-show-page.cpp b/plugins/network/src/connection-show-page.cpp index ae50b06..805e738 100644 --- a/plugins/network/src/connection-show-page.cpp +++ b/plugins/network/src/connection-show-page.cpp @@ -55,6 +55,7 @@ void ConnectionShowPage::initUI() { // switchButton Checked 默认为false m_switchButton = new KiranSwitchButton(this); + m_switchButton->setAccessibleName(QString("SwitchEnableWireless")); initSwitchButton(); ui->titleLayout->addWidget(m_switchButton); diff --git a/plugins/network/src/connection-show-page.ui b/plugins/network/src/connection-show-page.ui index 4127d90..0a30a7f 100644 --- a/plugins/network/src/connection-show-page.ui +++ b/plugins/network/src/connection-show-page.ui @@ -114,6 +114,9 @@ + + ButtonCreateConnection + diff --git a/plugins/network/src/plugin/details-page.ui b/plugins/network/src/plugin/details-page.ui index a35b99b..f8bc657 100644 --- a/plugins/network/src/plugin/details-page.ui +++ b/plugins/network/src/plugin/details-page.ui @@ -136,6 +136,9 @@ 36 + + ComboBoxDetailsSelectConnection + diff --git a/plugins/network/src/plugin/manager/manager.cpp b/plugins/network/src/plugin/manager/manager.cpp index ff89bd1..a1799a2 100644 --- a/plugins/network/src/plugin/manager/manager.cpp +++ b/plugins/network/src/plugin/manager/manager.cpp @@ -31,17 +31,14 @@ Manager::~Manager() void Manager::initNotifierConnection() { //该信号并不能判断连接是否真正Connected/Activated,只能判断一个连接被加入到激活容器中 - connect(notifier(), &Notifier::activeConnectionAdded, this, &Manager::handleActiveConnectionAdded,Qt::UniqueConnection); - connect(notifier(), &Notifier::activeConnectionRemoved, this, &Manager::handleActiveConnectionRemoved,Qt::UniqueConnection); + connect(notifier(), &Notifier::activeConnectionAdded, this, &Manager::handleActiveConnectionAdded, Qt::UniqueConnection); + connect(notifier(), &Notifier::activeConnectionRemoved, this, &Manager::handleActiveConnectionRemoved, Qt::UniqueConnection); //连接Wired时触发，而连接VPN时没有触发该信号，暂时不使用该信号 - // connect(notifier(), &Notifier::statusChanged, [=](NetworkManager::Status status) { - // KLOG_DEBUG() << "NetworkManager::Status:" << status; - // - // }); + // connect(notifier(), &Notifier::statusChanged, this, [this](NetworkManager::Status status) {}); - connect(settingsNotifier(), &SettingsNotifier::connectionAdded, this, &Manager::handleNotifierConnectionAdded,Qt::UniqueConnection); - connect(settingsNotifier(), &SettingsNotifier::connectionRemoved, this,&Manager::handleNotifierConnectionRemoved,Qt::UniqueConnection); + connect(settingsNotifier(), &SettingsNotifier::connectionAdded, this, &Manager::handleNotifierConnectionAdded, Qt::UniqueConnection); + connect(settingsNotifier(), &SettingsNotifier::connectionRemoved, this, &Manager::handleNotifierConnectionRemoved, Qt::UniqueConnection); } void Manager::refreshConnectionLists() @@ -71,7 +68,7 @@ void Manager::handleActiveConnectionRemoved(const QString &activepath) void Manager::handleActiveConnectionStateChanged(ActiveConnection::State state) { - auto activeConnection = qobject_cast(sender()); + auto activeConnection = qobject_cast(sender()); QString path = activeConnection->path(); switch (state) { @@ -106,7 +103,6 @@ void Manager::handleStateDeactivated(const QString &deactivatedPath) { } -//XXX:可以优化 void Manager::getDeviceList(Device::Type deviceType) { const Device::List deviceList = networkInterfaces(); @@ -126,10 +122,8 @@ void Manager::getDeviceList(Device::Type deviceType) void Manager::handleStateActivating(const QString &activatedPath) { - } void Manager::handleDeviceStateChanged(NetworkManager::Device::State newstate, NetworkManager::Device::State oldstate, NetworkManager::Device::StateChangeReason reason) { - } \ No newline at end of file diff --git a/plugins/network/src/plugin/manager/vpn-manager.cpp b/plugins/network/src/plugin/manager/vpn-manager.cpp index e4aecaf..8573610 100644 --- a/plugins/network/src/plugin/manager/vpn-manager.cpp +++ b/plugins/network/src/plugin/manager/vpn-manager.cpp @@ -55,7 +55,7 @@ void VpnManager::initUI() // XXX:是否使用模板提升通用性 void VpnManager::initConnection() { - connect(ui->connectionShowPage, &ConnectionShowPage::requestCreatConnection, [=]() + connect(ui->connectionShowPage, &ConnectionShowPage::requestCreatConnection, this, [this]() { //默认创建vpn类型：L2TP ui->vpnTypeWidget->setVisible(true); @@ -71,7 +71,7 @@ void VpnManager::initConnection() connect(ui->connectionShowPage, &ConnectionShowPage::requestEditConnection, this, &VpnManager::handleRequestEditConnection); connect(ui->connectionShowPage, &ConnectionShowPage::requestActivateCurrentItemConnection, this, &VpnManager::handleRequestActivateConnection); - connect(ui->vpnType, QOverload::of(&QComboBox::currentIndexChanged), [=](int index) + connect(ui->vpnType, QOverload::of(&QComboBox::currentIndexChanged), this, [this](int index) { VpnType type = ui->vpnType->currentData().value(); ui->vpnTypeStacked->setCurrentIndex(type); @@ -91,7 +91,7 @@ void VpnManager::initConnection() connect(ui->l2tpSetting, &VpnL2tpSetting::returnPreviousPage, this, &VpnManager::handleReturnPreviousPage); connect(ui->pptpSetting, &VpnPptpSetting::returnPreviousPage, this, &VpnManager::handleReturnPreviousPage); - connect(ui->saveButton, &QPushButton::clicked, [=]() + connect(ui->saveButton, &QPushButton::clicked, this, [this]() { int index = ui->vpnTypeStacked->currentIndex(); switch (index) @@ -114,7 +114,7 @@ void VpnManager::initConnection() break; } }); - connect(ui->connectionShowPage, &ConnectionShowPage::connectionUpdated, [=](const QString &path) + connect(ui->connectionShowPage, &ConnectionShowPage::connectionUpdated, this, [this](const QString &path) { KLOG_DEBUG() << "Connection::updated:" << path; //移除后再加载进来以更新信息 diff --git a/plugins/network/src/plugin/manager/vpn-manager.ui b/plugins/network/src/plugin/manager/vpn-manager.ui index ab3b35c..dce65fa 100644 --- a/plugins/network/src/plugin/manager/vpn-manager.ui +++ b/plugins/network/src/plugin/manager/vpn-manager.ui @@ -13,6 +13,9 @@ VpnManager + + VpnManager + 0 @@ -83,8 +86,8 @@ 0 0 - 658 - 754 + 153 + 115 diff --git a/plugins/network/src/plugin/manager/wired-manager.ui b/plugins/network/src/plugin/manager/wired-manager.ui index 7f466c4..8e1903c 100644 --- a/plugins/network/src/plugin/manager/wired-manager.ui +++ b/plugins/network/src/plugin/manager/wired-manager.ui @@ -148,6 +148,9 @@ 40 + + ButtonSave + Save @@ -189,6 +192,9 @@ 40 + + ButtonReturn + Return diff --git a/plugins/network/src/plugin/setting-widget/connection-name-widget.cpp b/plugins/network/src/plugin/setting-widget/connection-name-widget.cpp index 5ee8b62..4495fb5 100644 --- a/plugins/network/src/plugin/setting-widget/connection-name-widget.cpp +++ b/plugins/network/src/plugin/setting-widget/connection-name-widget.cpp @@ -36,6 +36,7 @@ ConnectionNameWidget::~ConnectionNameWidget() void ConnectionNameWidget::initUI() { m_autoConnection = new KiranSwitchButton(this); + m_autoConnection->setAccessibleName(QString("SwitchAutoConnection")); ui->autoConnectionLayout->addWidget(m_autoConnection); m_autoConnection->setChecked(true); ui->connectionName->setPlaceholderText(tr("Required")); diff --git a/plugins/network/src/plugin/setting-widget/connection-name-widget.ui b/plugins/network/src/plugin/setting-widget/connection-name-widget.ui index 731ed4a..4ec4382 100644 --- a/plugins/network/src/plugin/setting-widget/connection-name-widget.ui +++ b/plugins/network/src/plugin/setting-widget/connection-name-widget.ui @@ -73,6 +73,9 @@ 36 + + EditConnectionName + diff --git a/plugins/network/src/plugin/setting-widget/disconnect-and-delete-button.ui b/plugins/network/src/plugin/setting-widget/disconnect-and-delete-button.ui index a323c78..6da5078 100644 --- a/plugins/network/src/plugin/setting-widget/disconnect-and-delete-button.ui +++ b/plugins/network/src/plugin/setting-widget/disconnect-and-delete-button.ui @@ -7,7 +7,7 @@ 0 0 357 - 94 + 138 @@ -31,6 +31,9 @@ + + ButtonDisconnect + Disconnect @@ -38,6 +41,9 @@ + + ButtonDelete + Delete @@ -45,6 +51,9 @@ + + ButtonIgnore + Ignore diff --git a/plugins/network/src/plugin/setting-widget/ethernet-widget.cpp b/plugins/network/src/plugin/setting-widget/ethernet-widget.cpp index ae43125..c4f82e5 100644 --- a/plugins/network/src/plugin/setting-widget/ethernet-widget.cpp +++ b/plugins/network/src/plugin/setting-widget/ethernet-widget.cpp @@ -36,6 +36,7 @@ EthernetWidget::~EthernetWidget() void EthernetWidget::initUI() { m_mtuButton = new KiranSwitchButton(this); + m_mtuButton->setAccessibleName(QString("SwitchMTUButton")); ui->mtuLayout->addWidget(m_mtuButton); ui->customMTU->setVisible(false); ui->customMTU->setMinimum(0); diff --git a/plugins/network/src/plugin/setting-widget/ethernet-widget.ui b/plugins/network/src/plugin/setting-widget/ethernet-widget.ui index cdbada3..14ee375 100644 --- a/plugins/network/src/plugin/setting-widget/ethernet-widget.ui +++ b/plugins/network/src/plugin/setting-widget/ethernet-widget.ui @@ -55,6 +55,9 @@ 36 + + ComboBoxDeviceMac + @@ -88,6 +91,9 @@ 36 + + EditDeviceMac + @@ -141,6 +147,9 @@ 36 + + SpinBoxCustomMTU + diff --git a/plugins/network/src/plugin/setting-widget/ipv4-widget.ui b/plugins/network/src/plugin/setting-widget/ipv4-widget.ui index 1469281..026e26d 100644 --- a/plugins/network/src/plugin/setting-widget/ipv4-widget.ui +++ b/plugins/network/src/plugin/setting-widget/ipv4-widget.ui @@ -7,7 +7,7 @@ 0 0 706 - 493 + 498 @@ -52,6 +52,9 @@ 36 + + ComboBoxIpv4Method + @@ -100,6 +103,9 @@ 36 + + EditIpv4Address + @@ -130,6 +136,9 @@ 36 + + EditIpv4Netmask + @@ -160,6 +169,9 @@ 36 + + EditIpv4Gateway + @@ -193,6 +205,9 @@ 36 + + EditIpv4PreferredDNS + @@ -223,6 +238,9 @@ 36 + + EditIpv4AlternateDNS + diff --git a/plugins/network/src/plugin/setting-widget/ipv6-widget.ui b/plugins/network/src/plugin/setting-widget/ipv6-widget.ui index 88e89a0..fe0cf1e 100644 --- a/plugins/network/src/plugin/setting-widget/ipv6-widget.ui +++ b/plugins/network/src/plugin/setting-widget/ipv6-widget.ui @@ -7,7 +7,7 @@ 0 0 616 - 481 + 510 @@ -55,6 +55,9 @@ 36 + + ComboBoxIpv6Method + @@ -103,6 +106,9 @@ 36 + + EditIpv6Address + @@ -133,6 +139,9 @@ 36 + + SpinBoxIpv6Prefix + @@ -163,6 +172,9 @@ 36 + + EditIpv6Gateway + @@ -196,6 +208,9 @@ 36 + + EditIpv6PreferredDNS + @@ -226,6 +241,9 @@ 36 + + EditIpv6AlternateDNS + diff --git a/plugins/network/src/plugin/setting-widget/text-input-dialog.cpp b/plugins/network/src/plugin/setting-widget/text-input-dialog.cpp index 942d42f..74f3782 100644 --- a/plugins/network/src/plugin/setting-widget/text-input-dialog.cpp +++ b/plugins/network/src/plugin/setting-widget/text-input-dialog.cpp @@ -12,8 +12,8 @@ * Author: luoqing */ -#include #include "text-input-dialog.h" +#include TextInputDialog::TextInputDialog(QWidget *parent) : KiranMessageBox(parent) { @@ -34,38 +34,39 @@ void TextInputDialog::init() void TextInputDialog::initUI() { m_lineEdit = new QLineEdit(this); - addWidgetToDialog(m_lineEdit,Qt::AlignVCenter); - m_lineEdit->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred); + addWidgetToDialog(m_lineEdit, Qt::AlignVCenter); + m_lineEdit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); setTitle(tr("Tips")); -// setText(tr("Please input password")); + // setText(tr("Please input password")); - m_confirmButton = new QPushButton(tr("Yes")); + m_confirmButton = new QPushButton(tr("Yes")); m_cancelButton = new QPushButton(tr("Cancel")); - addButton(m_confirmButton,QDialogButtonBox::AcceptRole); - addButton(m_cancelButton,QDialogButtonBox::RejectRole); -} + m_confirmButton->setAccessibleName(QString("ButtonConfirm")); + m_cancelButton->setAccessibleName(QString("ButtonCancel")); + addButton(m_confirmButton, QDialogButtonBox::AcceptRole); + addButton(m_cancelButton, QDialogButtonBox::RejectRole); +} void TextInputDialog::initConnection() { - connect(m_lineEdit,&QLineEdit::textEdited,[=](){ + connect(m_lineEdit, &QLineEdit::textEdited, [=]() + { if(m_lineEdit->text().isEmpty()) m_confirmButton->setEnabled(false); else - m_confirmButton->setEnabled(true); - }); + m_confirmButton->setEnabled(true); }); - connect(m_confirmButton,&QPushButton::clicked,[=](){ + connect(m_confirmButton, &QPushButton::clicked, [=]() + { if(m_lineEdit->echoMode() == QLineEdit::Password) emit password(m_lineEdit->text()); else emit ssid(m_lineEdit->text()); - this->close(); - }); + this->close(); }); - connect(m_cancelButton,&QPushButton::clicked,[=](){ - this->close(); - }); + connect(m_cancelButton, &QPushButton::clicked, [=]() + { this->close(); }); } void TextInputDialog::setlineEditEchoMode(QLineEdit::EchoMode echoMode) diff --git a/plugins/network/src/plugin/setting-widget/vpn/vpn-ipsec.cpp b/plugins/network/src/plugin/setting-widget/vpn/vpn-ipsec.cpp index 85a1ecc..d51d9d5 100644 --- a/plugins/network/src/plugin/setting-widget/vpn/vpn-ipsec.cpp +++ b/plugins/network/src/plugin/setting-widget/vpn/vpn-ipsec.cpp @@ -13,9 +13,9 @@ */ #include "vpn-ipsec.h" -#include "ui_vpn-ipsec.h" #include #include +#include "ui_vpn-ipsec.h" using namespace NetworkManager; VpnIPsec::VpnIPsec(QWidget *parent) : QWidget(parent), ui(new Ui::VpnIPsec) @@ -33,6 +33,7 @@ VpnIPsec::~VpnIPsec() void VpnIPsec::initUI() { m_enableIPsec = new KiranSwitchButton(this); + m_enableIPsec->setAccessibleName(QString("SwitchEnableIPsec")); ui->enableIPsecLayout->addWidget(m_enableIPsec); m_enableIPsec->setChecked(false); ui->IPsecWidget->setVisible(false); @@ -40,9 +41,8 @@ void VpnIPsec::initUI() void VpnIPsec::initConnection() { - connect(m_enableIPsec,&QAbstractButton::toggled,[=](bool checked){ - ui->IPsecWidget->setVisible(checked); - }); + connect(m_enableIPsec, &QAbstractButton::toggled, [=](bool checked) + { ui->IPsecWidget->setVisible(checked); }); } void VpnIPsec::setVpnSetting(const VpnSetting::Ptr &vpnSetting) @@ -54,14 +54,17 @@ void VpnIPsec::saveSettings() { m_dataMap = m_vpnSetting->data(); - if (m_enableIPsec->isChecked()) { + if (m_enableIPsec->isChecked()) + { m_dataMap.insert("ipsec-enabled", "yes"); m_dataMap.insert("ipsec-group-name", ui->groupName->text()); m_dataMap.insert("ipsec-gateway-id", ui->groupId->text()); m_dataMap.insert("ipsec-psk", ui->preSharedKey->text()); m_dataMap.insert("ipsec-ike", ui->ipsecIKE->text()); m_dataMap.insert("ipsec-esp", ui->ipsecESP->text()); - } else { + } + else + { m_dataMap.remove("ipsec-enabled"); m_dataMap.remove("ipsec-group-name"); m_dataMap.remove("ipsec-gateway-id"); @@ -77,7 +80,7 @@ void VpnIPsec::saveSettings() void VpnIPsec::showSettings() { - if(m_vpnSetting != nullptr) + if (m_vpnSetting != nullptr) { NMStringMap dataMap = m_vpnSetting->data(); m_enableIPsec->setChecked(dataMap.value("ipsec-enabled") == "yes"); diff --git a/plugins/network/src/plugin/setting-widget/vpn/vpn-ipsec.ui b/plugins/network/src/plugin/setting-widget/vpn/vpn-ipsec.ui index 6f0e8d6..a789a33 100644 --- a/plugins/network/src/plugin/setting-widget/vpn/vpn-ipsec.ui +++ b/plugins/network/src/plugin/setting-widget/vpn/vpn-ipsec.ui @@ -103,6 +103,9 @@ 36 + + EditGroupName + @@ -133,6 +136,9 @@ 36 + + EditGroupId + @@ -163,6 +169,9 @@ 36 + + EditPreSharedKey + @@ -193,6 +202,9 @@ 36 + + EditIpsecIKE + @@ -223,6 +235,9 @@ 36 + + EditIpsecESP + diff --git a/plugins/network/src/plugin/setting-widget/vpn/vpn-ipvx.cpp b/plugins/network/src/plugin/setting-widget/vpn/vpn-ipvx.cpp index 1cc1eee..6e2a76e 100644 --- a/plugins/network/src/plugin/setting-widget/vpn/vpn-ipvx.cpp +++ b/plugins/network/src/plugin/setting-widget/vpn/vpn-ipvx.cpp @@ -13,8 +13,8 @@ */ #include "vpn-ipvx.h" #include -#include "ui_vpn-ipvx.h" #include +#include "ui_vpn-ipvx.h" using namespace NetworkManager; Q_DECLARE_METATYPE(NetworkManager::Ipv4Setting::ConfigMethod) @@ -36,6 +36,7 @@ void VpnIpvx::initUI() ui->ipv4Method->addItem(tr("Auto"), Ipv4Setting::ConfigMethod::Automatic); m_neverDefault = new KiranSwitchButton(this); + m_neverDefault->setAccessibleName(QString("SwitchOnlyAppliedInCorrespondingResources")); ui->neverDefaultLayout->addWidget(m_neverDefault); } @@ -65,11 +66,11 @@ void VpnIpvx::saveSettings() m_ipv4Setting->setNeverDefault(m_neverDefault->isChecked()); QList ipv4DNS; - if(!ui->ipv4PreferredDNS->text().isEmpty()) + if (!ui->ipv4PreferredDNS->text().isEmpty()) { ipv4DNS << QHostAddress(ui->ipv4PreferredDNS->text()); } - if(!ui->ipv4AlternateDNS->text().isEmpty()) + if (!ui->ipv4AlternateDNS->text().isEmpty()) { ipv4DNS << QHostAddress(ui->ipv4AlternateDNS->text()); } @@ -79,15 +80,15 @@ void VpnIpvx::saveSettings() void VpnIpvx::showSeittngs() { - if(m_ipv4Setting != nullptr) + if (m_ipv4Setting != nullptr) { - if(m_ipv4Setting->method() == Ipv4Setting::ConfigMethod::Automatic) + if (m_ipv4Setting->method() == Ipv4Setting::ConfigMethod::Automatic) { int ipv4MethodIndex = ui->ipv4Method->findData(Ipv4Setting::ConfigMethod::Automatic); ui->ipv4Method->setCurrentIndex(ipv4MethodIndex); } else - {//预留 + { //预留 } m_neverDefault->setChecked(m_ipv4Setting->neverDefault()); diff --git a/plugins/network/src/plugin/setting-widget/vpn/vpn-ipvx.ui b/plugins/network/src/plugin/setting-widget/vpn/vpn-ipvx.ui index 4d39fba..f9a0929 100644 --- a/plugins/network/src/plugin/setting-widget/vpn/vpn-ipvx.ui +++ b/plugins/network/src/plugin/setting-widget/vpn/vpn-ipvx.ui @@ -52,6 +52,9 @@ 36 + + ComboBoxVPNIpv4Method + @@ -109,6 +112,9 @@ 36 + + EditVPNIpv4PreferredDNS + @@ -142,6 +148,9 @@ 36 + + EditIpv4AlternateDNS + diff --git a/plugins/network/src/plugin/setting-widget/vpn/vpn-ppp.cpp b/plugins/network/src/plugin/setting-widget/vpn/vpn-ppp.cpp index 383d3e4..7f3192e 100644 --- a/plugins/network/src/plugin/setting-widget/vpn/vpn-ppp.cpp +++ b/plugins/network/src/plugin/setting-widget/vpn/vpn-ppp.cpp @@ -33,7 +33,10 @@ VpnPpp::~VpnPpp() void VpnPpp::initUI() { m_useMPPE = new KiranSwitchButton(this); + m_useMPPE->setAccessibleName(QString("SwitchUseMPPE")); m_statefulMPPE = new KiranSwitchButton(this); + m_statefulMPPE->setAccessibleName(QString("SwitchStatefulMPPE")); + ui->useMPPELayout->addWidget(m_useMPPE); ui->statefulMPPELayout->addWidget(m_statefulMPPE); @@ -61,6 +64,7 @@ void VpnPpp::initOptionsButton(const QStringList &supportOptions) QLabel *strLabel = new QLabel(str, this); KiranSwitchButton *switchButton = new KiranSwitchButton(this); switchButton->setProperty("option", option); + switchButton->setAccessibleName(str); m_optionsButtonMap[option] = switchButton; QHBoxLayout *horizontalLayout = new QHBoxLayout(); diff --git a/plugins/network/src/plugin/setting-widget/vpn/vpn-ppp.ui b/plugins/network/src/plugin/setting-widget/vpn/vpn-ppp.ui index 41ee8b9..f0f6088 100644 --- a/plugins/network/src/plugin/setting-widget/vpn/vpn-ppp.ui +++ b/plugins/network/src/plugin/setting-widget/vpn/vpn-ppp.ui @@ -106,6 +106,9 @@ 36 + + ComboBoxMppeSecurity + diff --git a/plugins/network/src/plugin/setting-widget/vpn/vpn-widget.ui b/plugins/network/src/plugin/setting-widget/vpn/vpn-widget.ui index ff5939d..e9c9298 100644 --- a/plugins/network/src/plugin/setting-widget/vpn/vpn-widget.ui +++ b/plugins/network/src/plugin/setting-widget/vpn/vpn-widget.ui @@ -61,6 +61,9 @@ 36 + + EditVPNGateway + @@ -97,6 +100,9 @@ 36 + + EditVPNUserName + @@ -130,6 +136,9 @@ Qt::WheelFocus + + ComboBoxVPNPasswordOptions + @@ -175,10 +184,16 @@ 36 + + EditVPNPassword + + + ButtonPasswordVisual + PushButton @@ -212,6 +227,9 @@ 36 + + EditNTDomain + diff --git a/plugins/network/src/plugin/setting-widget/wireless-security-widget.ui b/plugins/network/src/plugin/setting-widget/wireless-security-widget.ui index a3c03aa..398c8ec 100644 --- a/plugins/network/src/plugin/setting-widget/wireless-security-widget.ui +++ b/plugins/network/src/plugin/setting-widget/wireless-security-widget.ui @@ -55,6 +55,9 @@ 36 + + ComboBoxWirelessSecurityOption + @@ -104,6 +107,9 @@ 36 + + ComboBoxWirelessPasswordOption + @@ -149,10 +155,16 @@ 36 + + EditWirelessPassword + + + ButtonWirelessPasswordVisual + PushButton diff --git a/plugins/network/src/plugin/setting-widget/wireless-widget.cpp b/plugins/network/src/plugin/setting-widget/wireless-widget.cpp index dac2faa..5ac525c 100644 --- a/plugins/network/src/plugin/setting-widget/wireless-widget.cpp +++ b/plugins/network/src/plugin/setting-widget/wireless-widget.cpp @@ -13,11 +13,11 @@ */ #include "wireless-widget.h" -#include "ui_wireless-widget.h" -#include "kiran-switch-button.h" +#include #include #include -#include +#include "kiran-switch-button.h" +#include "ui_wireless-widget.h" using namespace NetworkManager; WirelessWidget::WirelessWidget(QWidget *parent) : QWidget(parent), ui(new Ui::WirelessWidget) @@ -37,11 +37,12 @@ void WirelessWidget::initUI() ui->ssidEdit->setPlaceholderText(tr("Required")); ui->ssidEdit->setEnabled(false); m_mtuButton = new KiranSwitchButton(this); + m_mtuButton->setAccessibleName(QString("ButtonWirelessMTU")); ui->mtuLayout->addWidget(m_mtuButton); ui->customMTU->setVisible(false); ui->customMTU->setMinimum(0); ui->customMTU->setMaximum(10000); - //UserData设为空""，为了匹配不指定设备的情况 + // UserData设为空""，为了匹配不指定设备的情况 ui->deviceMac->addItem(tr("No device specified"), ""); initMacComboBox(); } @@ -59,7 +60,7 @@ void WirelessWidget::setWirelessSetting(const WirelessSetting::Ptr &wirelessSett //区分连接隐藏网络和已存在网络的Setting void WirelessWidget::saveSettings() { - if(m_wirelessSetting != nullptr) + if (m_wirelessSetting != nullptr) { QString macAddress = ui->deviceMac->currentData().toString(); KLOG_DEBUG() << "macAddress:" << macAddress; @@ -70,7 +71,7 @@ void WirelessWidget::saveSettings() void WirelessWidget::showSettings() { - if(m_wirelessSetting != nullptr) + if (m_wirelessSetting != nullptr) { QString deviceMac = m_wirelessSetting->macAddress().toHex(':').toUpper(); quint32 mtu = m_wirelessSetting->mtu(); @@ -90,7 +91,6 @@ void WirelessWidget::showSettings() void WirelessWidget::setOtherWirelessSetting() { - } void WirelessWidget::resetSettings() @@ -101,7 +101,6 @@ void WirelessWidget::resetSettings() ui->customMTU->setVisible(false); } - void WirelessWidget::clearPtr() { m_wirelessSetting.clear(); @@ -116,7 +115,6 @@ void WirelessWidget::handleCustomMTUChanged(bool checked) ui->customMTU->setVisible(checked); } - void WirelessWidget::initMacComboBox() { const Device::List deviceList = networkInterfaces(); @@ -136,4 +134,3 @@ void WirelessWidget::initMacComboBox() } } } - diff --git a/plugins/network/src/plugin/setting-widget/wireless-widget.ui b/plugins/network/src/plugin/setting-widget/wireless-widget.ui index 350c245..e83f2fa 100644 --- a/plugins/network/src/plugin/setting-widget/wireless-widget.ui +++ b/plugins/network/src/plugin/setting-widget/wireless-widget.ui @@ -55,6 +55,9 @@ 36 + + EditSsid + @@ -88,6 +91,9 @@ 36 + + ComboBoxWirelessMacAddress + @@ -135,6 +141,9 @@ 36 + + SpinBoxWirelessCustomMTU + -- 2.33.0