diff --git a/0001-feat-accessibleName-updates-accessiblename.patch b/0001-feat-accessibleName-updates-accessiblename.patch new file mode 100644 index 0000000000000000000000000000000000000000..5ab50e8892ced559b1cdaeb3bd695662192b84ee --- /dev/null +++ b/0001-feat-accessibleName-updates-accessiblename.patch @@ -0,0 +1,1867 @@ +From 46fe23801dc879e36e49c3296e60d6ee7ea23a31 Mon Sep 17 00:00:00 2001 +From: liuxinhao +Date: Thu, 25 Aug 2022 16:38:12 +0800 +Subject: [PATCH] feat(accessibleName): updates accessiblename +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 部分组件更新可访问名称,支持自动化测试 +--- + .../kiran-module-widget.cpp | 1 + + .../advance-settings-page/advance-settings.ui | 15 +++++++ + .../auth-manager-page/auth-manager-page.ui | 6 +++ + .../face-enroll-dialog/face-enroll-dialog.ui | 12 ++++++ + .../fingerprint-enroll-dialog.ui | 12 ++++++ + .../create-user-page/create-user-page.ui | 24 +++++++++++ + .../password-expiration-policy-page.ui | 30 ++++++++++++-- + .../select-avatar-page/select-avatar-page.cpp | 4 ++ + .../pages/user-info-page/user-info-page.ui | 15 +++++++ + plugins/account/src/widgets/hover-tips.h | 2 - + .../src/common/setting-brief-widget.cpp | 1 + + plugins/appearance/src/pages/font/fonts.ui | 18 ++++++++ + plugins/appearance/src/pages/theme/themes.cpp | 1 + + .../src/pages/wallpaper/wallpaper.ui | 6 +++ + .../display/src/kiran-display-config-item.cpp | 1 + + .../src/kiran-display-configuration-panel.cpp | 3 +- + .../src/kiran-display-configuration-panel.ui | 15 +++++++ + .../src/kiran-display-configuration.ui | 41 ++++++++++++++++++- + plugins/keybinding/src/shortcut-item.cpp | 1 + + plugins/keybinding/src/shortcut.cpp | 4 ++ + plugins/keybinding/src/shortcut.ui | 35 +++++++++++++++- + .../src/pages/general/general-page.ui | 12 ++++++ + .../keyboard/src/pages/layout/layout-page.ui | 6 +++ + plugins/mouse/src/mouse-page.ui | 12 ++++++ + plugins/mouse/src/touchpad-page.ui | 24 +++++++++++ + .../battery-settings-page.cpp | 1 + + .../battery-settings/battery-settings-page.ui | 27 ++++++++++-- + .../general-settings-page.cpp | 1 + + .../general-settings/general-settings-page.ui | 24 ++++++++++- + .../power-settings/power-settings-page.ui | 18 ++++++-- + plugins/system/src/kylinsec-logo.cpp | 1 + + .../hardware-information.ui | 6 +++ + .../change-host-name-widget.ui | 9 ++++ + .../system-information/license-agreement.ui | 13 +++++- + .../system-information/system-information.ui | 24 +++++++++++ + .../date-time-settings/date-time-settings.ui | 6 +++ + .../display-format-settings.cpp | 1 + + .../display-format-settings.ui | 18 ++++++-- + .../timezone-settings/time-zone-settings.ui | 6 +++ + .../src/timezone/kiran-time-zone-list.cpp | 4 +- + .../timedate/src/timezone/kiran-time-zone.cpp | 1 + + plugins/timedate/src/widgets/date-spinbox.h | 12 ++++-- + plugins/timedate/src/widgets/kiran-clock.cpp | 1 + + .../src/widgets/kiran-date-picker-widget.cpp | 1 + + .../src/widgets/kiran-time-picker-widget.cpp | 1 + + .../timedate/src/widgets/scroll-picker.cpp | 1 + + src/category-widget.cpp | 3 ++ + src/panel-window.cpp | 1 + + 48 files changed, 455 insertions(+), 26 deletions(-) + +diff --git a/lib/common-widgets/kiran-module-widget/kiran-module-widget.cpp b/lib/common-widgets/kiran-module-widget/kiran-module-widget.cpp +index 77df10b..d455b46 100644 +--- a/lib/common-widgets/kiran-module-widget/kiran-module-widget.cpp ++++ b/lib/common-widgets/kiran-module-widget/kiran-module-widget.cpp +@@ -101,6 +101,7 @@ void KiranModuleWidget::setPlugins(const PluginHelperPtrList &plugins) + } + item->setData(ROLE_PLUGIN_HELPER_INDEX, i); + item->setData(ROLE_SUBITEM_ID, subItem.id); ++ item->setData(Qt::AccessibleTextRole,QString("ControlPanelSubItem::%1").arg(subItem.name)); + ui->list_subItems->addItem(item); + } + } +diff --git a/plugins/account/src/pages/advance-settings-page/advance-settings.ui b/plugins/account/src/pages/advance-settings-page/advance-settings.ui +index b417305..89c984f 100644 +--- a/plugins/account/src/pages/advance-settings-page/advance-settings.ui ++++ b/plugins/account/src/pages/advance-settings-page/advance-settings.ui +@@ -71,6 +71,9 @@ + + Qt::NoContextMenu + ++ ++ EditLoginShell ++ + + + +@@ -140,6 +143,9 @@ + + Qt::NoContextMenu + ++ ++ EditSpecifyUserID ++ + + + +@@ -200,6 +206,9 @@ + + Qt::NoContextMenu + ++ ++ EditSpecifyUserHome ++ + + + +@@ -258,6 +267,9 @@ + 40 + + ++ ++ ButtonConfirm ++ + + confirm + +@@ -299,6 +311,9 @@ + 40 + + ++ ++ ButtonCancel ++ + + cancel + +diff --git a/plugins/account/src/pages/auth-manager-page/auth-manager-page.ui b/plugins/account/src/pages/auth-manager-page/auth-manager-page.ui +index 7843c86..3d48d4a 100644 +--- a/plugins/account/src/pages/auth-manager-page/auth-manager-page.ui ++++ b/plugins/account/src/pages/auth-manager-page/auth-manager-page.ui +@@ -210,6 +210,9 @@ + 40 + + ++ ++ ButtonSave ++ + + save + +@@ -251,6 +254,9 @@ + 40 + + ++ ++ ButtonReturn ++ + + return + +diff --git a/plugins/account/src/pages/biometric-enroll-dialog/face-enroll-dialog/face-enroll-dialog.ui b/plugins/account/src/pages/biometric-enroll-dialog/face-enroll-dialog/face-enroll-dialog.ui +index 8010528..97666a6 100644 +--- a/plugins/account/src/pages/biometric-enroll-dialog/face-enroll-dialog/face-enroll-dialog.ui ++++ b/plugins/account/src/pages/biometric-enroll-dialog/face-enroll-dialog/face-enroll-dialog.ui +@@ -47,6 +47,9 @@ + 274 + + ++ ++ EnrollProgressBar ++ + + + +@@ -59,6 +62,9 @@ + + + ++ ++ LabelEnrollTips ++ + + balabalalbala... + +@@ -120,6 +126,9 @@ + 40 + + ++ ++ ButtonSave ++ + + save + +@@ -158,6 +167,9 @@ + 40 + + ++ ++ ButtonCancel ++ + + cancel + +diff --git a/plugins/account/src/pages/biometric-enroll-dialog/fingerprint-enroll-dialog/fingerprint-enroll-dialog.ui b/plugins/account/src/pages/biometric-enroll-dialog/fingerprint-enroll-dialog/fingerprint-enroll-dialog.ui +index 7c2c441..cd2d807 100644 +--- a/plugins/account/src/pages/biometric-enroll-dialog/fingerprint-enroll-dialog/fingerprint-enroll-dialog.ui ++++ b/plugins/account/src/pages/biometric-enroll-dialog/fingerprint-enroll-dialog/fingerprint-enroll-dialog.ui +@@ -47,6 +47,9 @@ + 260 + + ++ ++ EnrollProgressBar ++ + + + +@@ -66,6 +69,9 @@ + 0 + + ++ ++ EnrollTips ++ + + balabalalbala... + +@@ -130,6 +136,9 @@ + 40 + + ++ ++ ButtonSave ++ + + save + +@@ -168,6 +177,9 @@ + 40 + + ++ ++ ButtonCancel ++ + + cancel + +diff --git a/plugins/account/src/pages/create-user-page/create-user-page.ui b/plugins/account/src/pages/create-user-page/create-user-page.ui +index cccb479..7e6024f 100644 +--- a/plugins/account/src/pages/create-user-page/create-user-page.ui ++++ b/plugins/account/src/pages/create-user-page/create-user-page.ui +@@ -70,6 +70,9 @@ + 150 + + ++ ++ UserAvatarWidget ++ + + + +@@ -129,6 +132,9 @@ + + Qt::NoContextMenu + ++ ++ EditUserName ++ + + + +@@ -172,6 +178,9 @@ + 36 + + ++ ++ ComboUserType ++ + + + +@@ -221,6 +230,9 @@ + 36 + + ++ ++ EditPasswd ++ + + + +@@ -270,6 +282,9 @@ + 36 + + ++ ++ EditPasswdConfirm ++ + + + +@@ -287,6 +302,9 @@ + + + ++ ++ ButtonAdvanceSetting ++ + + true + +@@ -385,6 +403,9 @@ + 60 + + ++ ++ ButtonConfirm ++ + + Confirm + +@@ -432,6 +453,9 @@ + 60 + + ++ ++ ButtonCancel ++ + + Cancel + +diff --git a/plugins/account/src/pages/passwd-expiration-policy/password-expiration-policy-page.ui b/plugins/account/src/pages/passwd-expiration-policy/password-expiration-policy-page.ui +index 6f0241e..284b1ff 100644 +--- a/plugins/account/src/pages/passwd-expiration-policy/password-expiration-policy-page.ui ++++ b/plugins/account/src/pages/passwd-expiration-policy/password-expiration-policy-page.ui +@@ -63,6 +63,9 @@ + + + ++ ++ SpinBoxUserExpires ++ + + yyyy-MM-dd + +@@ -104,6 +107,9 @@ + + + ++ ++ LabelLastPasswdChange ++ + + 1990-01-01 + +@@ -144,7 +150,11 @@ + + + +- ++ ++ ++ SpinBoxMaximumValidDays ++ ++ + + + +@@ -181,7 +191,11 @@ + + + +- ++ ++ ++ SpinBoxPromptBeforeExpiration ++ ++ + + + +@@ -218,7 +232,11 @@ + + + +- ++ ++ ++ SpinBoxPasswdInactiveTime ++ ++ + + + +@@ -276,6 +294,9 @@ + 40 + + ++ ++ ButtonSave ++ + + save + +@@ -317,6 +338,9 @@ + 40 + + ++ ++ ButtonReturn ++ + + return + +diff --git a/plugins/account/src/pages/select-avatar-page/select-avatar-page.cpp b/plugins/account/src/pages/select-avatar-page/select-avatar-page.cpp +index 229595a..4fd6d24 100644 +--- a/plugins/account/src/pages/select-avatar-page/select-avatar-page.cpp ++++ b/plugins/account/src/pages/select-avatar-page/select-avatar-page.cpp +@@ -143,6 +143,7 @@ void SelectAvatarPage::initUI() + + btn = new QPushButton(this); + btn->setObjectName("btn_confirm"); ++ btn->setAccessibleName("ButtonConfirm"); + btn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + btn->setFixedSize(110, 40); + btn->setText(tr("Confirm")); +@@ -156,6 +157,7 @@ void SelectAvatarPage::initUI() + + btn = new QPushButton(this); + btn->setObjectName("btn_return"); ++ btn->setAccessibleName("ButtonReturn"); + btn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + btn->setFixedSize(110, 40); + btn->setText(tr("Return")); +@@ -168,6 +170,7 @@ void SelectAvatarPage::initUI() + + loadAvatar(); + m_addButton = addAvatar(":/kcp-account/images/create-user-avatar.png", AVATAR_ADD, false); ++ m_addButton->setAccessibleName("ButtonAddAvatar"); + connect(m_addButton, &AvatarItemButton::clicked, [this]() + { + //1.选择图片 +@@ -221,6 +224,7 @@ AvatarItemButton *SelectAvatarPage::addAvatar(const QString &iconPath, AvatarTyp + } + btn->setIcon(iconPath); + btn->setFixedSize(80, 80); ++ btn->setAccessibleName(QString("AvatarItemButton::%1").arg(iconPath)); + if (type != AVATAR_ADD) + { + btn->setCheckable(true); +diff --git a/plugins/account/src/pages/user-info-page/user-info-page.ui b/plugins/account/src/pages/user-info-page/user-info-page.ui +index 4499cfa..b0c9cbe 100644 +--- a/plugins/account/src/pages/user-info-page/user-info-page.ui ++++ b/plugins/account/src/pages/user-info-page/user-info-page.ui +@@ -619,6 +619,9 @@ + 40 + + ++ ++ EditCurrentPasswd ++ + + + +@@ -669,6 +672,9 @@ + 40 + + ++ ++ EditNewPasswd ++ + + + +@@ -718,6 +724,9 @@ + 40 + + ++ ++ EditNewPasswdAgain ++ + + + +@@ -776,6 +785,9 @@ + 40 + + ++ ++ EditPasswdSave ++ + + Save + +@@ -817,6 +829,9 @@ + 40 + + ++ ++ EditPasswdCancel ++ + + Cancel + +diff --git a/plugins/account/src/widgets/hover-tips.h b/plugins/account/src/widgets/hover-tips.h +index 60a8c3a..733f65f 100644 +--- a/plugins/account/src/widgets/hover-tips.h ++++ b/plugins/account/src/widgets/hover-tips.h +@@ -45,9 +45,7 @@ public: + ~HoverTips(); + + void setTimeout(quint32 ms); +- + void setIcon(HoverTipsTypeEnum typeEnum, const QString &icon); +- + void show(HoverTipsTypeEnum typeEnum, const QString &msg); + void hide(); + +diff --git a/plugins/appearance/src/common/setting-brief-widget.cpp b/plugins/appearance/src/common/setting-brief-widget.cpp +index d5d1114..ebffec0 100644 +--- a/plugins/appearance/src/common/setting-brief-widget.cpp ++++ b/plugins/appearance/src/common/setting-brief-widget.cpp +@@ -28,6 +28,7 @@ using namespace Kiran; + SettingBriefWidget::SettingBriefWidget(QString title, int type, QWidget *parent) : QWidget(parent), + ui(new Ui::SettingBriefWidget) + { ++ setAccessibleName("SettingBriefWidget"); + ui->setupUi(this); + initUI(title); + setAttribute(Qt::WA_Hover); +diff --git a/plugins/appearance/src/pages/font/fonts.ui b/plugins/appearance/src/pages/font/fonts.ui +index 66a939b..5871048 100644 +--- a/plugins/appearance/src/pages/font/fonts.ui ++++ b/plugins/appearance/src/pages/font/fonts.ui +@@ -96,6 +96,9 @@ + 40 + + ++ ++ ComboAppFontName ++ + + 10 + +@@ -118,6 +121,9 @@ + 40 + + ++ ++ ComboAppFontSize ++ + + 5 + +@@ -172,6 +178,9 @@ + 40 + + ++ ++ ComboTitleFontName ++ + + + +@@ -188,6 +197,9 @@ + 40 + + ++ ++ ComboTitleFontSize ++ + + 5 + +@@ -242,6 +254,9 @@ + 40 + + ++ ++ ComboMonospaceFontName ++ + + + +@@ -258,6 +273,9 @@ + 40 + + ++ ++ ComboMonospaceFontSize ++ + + 5 + +diff --git a/plugins/appearance/src/pages/theme/themes.cpp b/plugins/appearance/src/pages/theme/themes.cpp +index 6e18872..7899399 100644 +--- a/plugins/appearance/src/pages/theme/themes.cpp ++++ b/plugins/appearance/src/pages/theme/themes.cpp +@@ -293,6 +293,7 @@ void Themes::createThemeWidget() + for (int i = 0; i < SETTING_THEME_NUM; i++) + { + ThemeWidget *themeWidget = new ThemeWidget(m_themesName.at(i), m_currentTheme, this); ++ themeWidget->setAccessibleName(QString("ThemeWidget::%1").arg(m_themesName.at(i))); + if (m_themesName.at(i) == m_currentTheme) + m_themeWidgetGroup->setCurrentWidget(themeWidget); + +diff --git a/plugins/appearance/src/pages/wallpaper/wallpaper.ui b/plugins/appearance/src/pages/wallpaper/wallpaper.ui +index 3d0aaea..01a04c3 100644 +--- a/plugins/appearance/src/pages/wallpaper/wallpaper.ui ++++ b/plugins/appearance/src/pages/wallpaper/wallpaper.ui +@@ -85,6 +85,9 @@ + 112 + + ++ ++ FrameLockScreenPreview ++ + + + 0 +@@ -112,6 +115,9 @@ + 112 + + ++ ++ FrameDesktopPreivew ++ + + + 0 +diff --git a/plugins/display/src/kiran-display-config-item.cpp b/plugins/display/src/kiran-display-config-item.cpp +index a3e89f1..bf279c8 100644 +--- a/plugins/display/src/kiran-display-config-item.cpp ++++ b/plugins/display/src/kiran-display-config-item.cpp +@@ -19,6 +19,7 @@ + KiranDisplayConfigItem::KiranDisplayConfigItem(QWidget *parent) : QPushButton(parent), m_mousePress(false), m_mouseDrag(false), + m_statusType(QEvent::None), m_enabled(true), m_anchorByBtn(NULL), m_rotateDrect(DISPLAY_ROTATION_0), m_displayReflectType(DISPLAY_REFLECT_NORMAL) + { ++ setAccessibleName("KiranDisplayConfigItem"); + setCheckable(true); + setAttribute(Qt::WA_Hover,true); + installEventFilter(this); +diff --git a/plugins/display/src/kiran-display-configuration-panel.cpp b/plugins/display/src/kiran-display-configuration-panel.cpp +index 1fc84a6..a80b531 100644 +--- a/plugins/display/src/kiran-display-configuration-panel.cpp ++++ b/plugins/display/src/kiran-display-configuration-panel.cpp +@@ -32,7 +32,8 @@ KiranDisplayConfigurationPanel::KiranDisplayConfigurationPanel(QWidget *parent) + ui(new Ui::KiranDisplayConfigurationPanel) + { + ui->setupUi(this); +- ++ setAccessibleName("KiranDisplayConfigurationPanel"); ++ + ui->pushButton_left->setThemeIcon(QPixmap(":/kcp-display/images/rotation-left.svg"),PALETTE_DARK); + ui->pushButton_right->setThemeIcon(QPixmap(":/kcp-display/images/rotation-right.svg"),PALETTE_DARK); + ui->pushButton_horizontal->setThemeIcon(QPixmap(":/kcp-display/images/flip-h.svg"),PALETTE_DARK); +diff --git a/plugins/display/src/kiran-display-configuration-panel.ui b/plugins/display/src/kiran-display-configuration-panel.ui +index 85d2162..c5829a0 100644 +--- a/plugins/display/src/kiran-display-configuration-panel.ui ++++ b/plugins/display/src/kiran-display-configuration-panel.ui +@@ -121,6 +121,9 @@ + + Rotate left 90 degrees + ++ ++ ButtonLeft ++ + + + +@@ -152,6 +155,9 @@ + + Rotate right 90 degrees + ++ ++ ButtonRight ++ + + + +@@ -183,6 +189,9 @@ + + Turn left and right + ++ ++ ButtonHorizontal ++ + + + +@@ -217,6 +226,9 @@ + + upside down + ++ ++ ButtonVertical ++ + + + +@@ -251,6 +263,9 @@ + + Identification display + ++ ++ ButtonIdentifying ++ + + + +diff --git a/plugins/display/src/kiran-display-configuration.ui b/plugins/display/src/kiran-display-configuration.ui +index f9cae01..c54875b 100644 +--- a/plugins/display/src/kiran-display-configuration.ui ++++ b/plugins/display/src/kiran-display-configuration.ui +@@ -88,6 +88,9 @@ + 30 + + ++ ++ ButtonCopyDisplay ++ + + + QPushButton { +@@ -137,6 +140,9 @@ QPushButton { + 30 + + ++ ++ ButtonExtendedDisplay ++ + + + QPushButton { +@@ -235,7 +241,7 @@ QPushButton { + + + +- 1 ++ 0 + + + +@@ -280,6 +286,9 @@ QPushButton { + 36 + + ++ ++ ComboResolutionRatio ++ + + + +@@ -313,6 +322,9 @@ QPushButton { + 36 + + ++ ++ ComboRefreshRate ++ + + + +@@ -343,6 +355,9 @@ QPushButton { + 36 + + ++ ++ ComboZoomRate ++ + + + Automatic +@@ -413,6 +428,9 @@ QPushButton { + 40 + + ++ ++ ButtonApply ++ + + + +@@ -435,6 +453,9 @@ QPushButton { + 40 + + ++ ++ ButtonClose ++ + + + +@@ -583,6 +604,9 @@ QPushButton { + 0 + + ++ ++ SwitchExtraPrimary ++ + + + +@@ -621,6 +645,9 @@ QPushButton { + 36 + + ++ ++ ComboExtraResolutionRatio ++ + + + +@@ -654,6 +681,9 @@ QPushButton { + 36 + + ++ ++ ComboExtraRefreshRate ++ + + + +@@ -684,6 +714,9 @@ QPushButton { + 36 + + ++ ++ ComboExtraZoomRate ++ + + + Automatic +@@ -751,6 +784,9 @@ QPushButton { + 40 + + ++ ++ ButtonExtraApply ++ + + + +@@ -773,6 +809,9 @@ QPushButton { + 40 + + ++ ++ ButtonExtraCancel ++ + + + +diff --git a/plugins/keybinding/src/shortcut-item.cpp b/plugins/keybinding/src/shortcut-item.cpp +index 4441106..64c99e5 100644 +--- a/plugins/keybinding/src/shortcut-item.cpp ++++ b/plugins/keybinding/src/shortcut-item.cpp +@@ -27,6 +27,7 @@ ShortcutItem::ShortcutItem(int type, ShortcutInfoPtr shortcutInfo, QWidget *pare + ui(new Ui::ShortcutItem) + { + ui->setupUi(this); ++ setAccessibleName("ShortcutItem"); + m_shortcutInfo = shortcutInfo; + m_type = type; + +diff --git a/plugins/keybinding/src/shortcut.cpp b/plugins/keybinding/src/shortcut.cpp +index 3298fea..6723c2e 100644 +--- a/plugins/keybinding/src/shortcut.cpp ++++ b/plugins/keybinding/src/shortcut.cpp +@@ -101,6 +101,7 @@ void Shortcut::initUI() + QHBoxLayout *hLayoutCustomApp = new QHBoxLayout(ui->lineEdit_custom_app); + m_btnCustomApp = new QToolButton; + m_btnCustomApp->setObjectName("btn_custom_app"); ++ m_btnCustomApp->setAccessibleName("ButtonAddCustomApp"); + m_btnCustomApp->setText(tr("Add")); + m_btnCustomApp->setFixedSize(56, 30); + m_btnCustomApp->setCursor(Qt::PointingHandCursor); +@@ -112,6 +113,7 @@ void Shortcut::initUI() + QHBoxLayout *hLayoutModifyApp = new QHBoxLayout(ui->lineEdit_modify_app); + m_btnModifyApp = new QToolButton; + m_btnModifyApp->setObjectName("btn_modify_app"); ++ m_btnModifyApp->setAccessibleName("ButtonModifyApp"); + m_btnModifyApp->setText(tr("Add")); + m_btnModifyApp->setFixedSize(56, 30); + m_btnModifyApp->setCursor(Qt::PointingHandCursor); +@@ -122,12 +124,14 @@ void Shortcut::initUI() + + m_lECustomKey = new CustomLineEdit; + m_lECustomKey->setPlaceholderText(tr("Please press the new shortcut key")); ++ m_lECustomKey->setAccessibleName("EditCustomPressNewShotcut"); + m_lECustomKey->installEventFilter(this); + ui->vlayout_custom_key->addWidget(m_lECustomKey); + connect(m_lECustomKey, &CustomLineEdit::inputKeyCodes, this, &Shortcut::handleInputKeycode); + + m_lEModifyKey = new CustomLineEdit; + m_lEModifyKey->setPlaceholderText(tr("Please press the new shortcut key")); ++ m_lEModifyKey->setAccessibleName("EditPressNewShotcut"); + m_lEModifyKey->installEventFilter(this); + ui->vlayout_modify_key->addWidget(m_lEModifyKey); + connect(m_lEModifyKey, &CustomLineEdit::inputKeyCodes, this, &Shortcut::handleInputKeycode); +diff --git a/plugins/keybinding/src/shortcut.ui b/plugins/keybinding/src/shortcut.ui +index 680a20c..8c971de 100644 +--- a/plugins/keybinding/src/shortcut.ui ++++ b/plugins/keybinding/src/shortcut.ui +@@ -32,7 +32,7 @@ + + + +- 0 ++ 2 + + + +@@ -74,6 +74,9 @@ + + Qt::ClickFocus + ++ ++ EditSearch ++ + + + +@@ -336,6 +339,9 @@ + 40 + + ++ ++ ButtonAddShortcut ++ + + Add + +@@ -371,6 +377,9 @@ + 40 + + ++ ++ ButtonReset ++ + + Reset + +@@ -436,6 +445,9 @@ + 40 + + ++ ++ EditCustomShortcutName ++ + + + +@@ -466,6 +478,9 @@ + 40 + + ++ ++ EditShortcutApp ++ + + + +@@ -529,6 +544,9 @@ + 40 + + ++ ++ ButtonAdd ++ + + Add + +@@ -564,6 +582,9 @@ + 40 + + ++ ++ ButtonCancel ++ + + Cancel + +@@ -629,6 +650,9 @@ + 40 + + ++ ++ EditShortcutName ++ + + + +@@ -672,6 +696,9 @@ + 40 + + ++ ++ EditShortcutApp ++ + + + +@@ -736,6 +763,9 @@ + 40 + + ++ ++ ButtonSave ++ + + Save + +@@ -771,6 +801,9 @@ + 40 + + ++ ++ ButtonReturn ++ + + return + +diff --git a/plugins/keyboard/src/pages/general/general-page.ui b/plugins/keyboard/src/pages/general/general-page.ui +index 3667b24..2edfe8c 100644 +--- a/plugins/keyboard/src/pages/general/general-page.ui ++++ b/plugins/keyboard/src/pages/general/general-page.ui +@@ -63,6 +63,9 @@ + + + ++ ++ SwitchRepeatKey ++ + + + +@@ -101,6 +104,9 @@ + + + ++ ++ SliderRepeatDelay ++ + + 100 + +@@ -182,6 +188,9 @@ + + + ++ ++ SliderRepeatInterval ++ + + 0 + +@@ -261,6 +270,9 @@ + 40 + + ++ ++ EditTestRepeatKey ++ + + + +diff --git a/plugins/keyboard/src/pages/layout/layout-page.ui b/plugins/keyboard/src/pages/layout/layout-page.ui +index f69bead..2aa6857 100644 +--- a/plugins/keyboard/src/pages/layout/layout-page.ui ++++ b/plugins/keyboard/src/pages/layout/layout-page.ui +@@ -293,6 +293,9 @@ + 40 + + ++ ++ ButtonAddLayout ++ + + Addition + +@@ -334,6 +337,9 @@ + 40 + + ++ ++ ButtonReturn ++ + + Return + +diff --git a/plugins/mouse/src/mouse-page.ui b/plugins/mouse/src/mouse-page.ui +index bb364b8..ac241bf 100644 +--- a/plugins/mouse/src/mouse-page.ui ++++ b/plugins/mouse/src/mouse-page.ui +@@ -99,6 +99,9 @@ + 36 + + ++ ++ ComboSelectMouseHand ++ + + + +@@ -126,6 +129,9 @@ + + + ++ ++ SliderMouseMotionAcceleration ++ + + 0 + +@@ -226,6 +232,9 @@ + + + ++ ++ SwitchMouseNatturalScroll ++ + + + +@@ -276,6 +285,9 @@ + + + ++ ++ SwitchMiddleEmulation ++ + + + +diff --git a/plugins/mouse/src/touchpad-page.ui b/plugins/mouse/src/touchpad-page.ui +index e80d703..e1c5c82 100644 +--- a/plugins/mouse/src/touchpad-page.ui ++++ b/plugins/mouse/src/touchpad-page.ui +@@ -102,6 +102,9 @@ + + + ++ ++ SwitchTouchPadEnable ++ + + + +@@ -149,6 +152,9 @@ + 36 + + ++ ++ ComboTouchPadHand ++ + + + +@@ -201,6 +207,9 @@ + + + ++ ++ SliderTouchPadMotionAcceleration ++ + + 50 + +@@ -291,6 +300,9 @@ + 36 + + ++ ++ ComboClickMethod ++ + + + +@@ -335,6 +347,9 @@ + 36 + + ++ ++ ComboScrollMethod ++ + + + +@@ -380,6 +395,9 @@ + + + ++ ++ ComboNaturalScroll ++ + + + +@@ -428,6 +446,9 @@ + + + ++ ++ SwitchTypingEnable ++ + + + +@@ -476,6 +497,9 @@ + + + ++ ++ SwtichTapToClick ++ + + + +diff --git a/plugins/power/src/pages/battery-settings/battery-settings-page.cpp b/plugins/power/src/pages/battery-settings/battery-settings-page.cpp +index 222d9bb..05832f6 100644 +--- a/plugins/power/src/pages/battery-settings/battery-settings-page.cpp ++++ b/plugins/power/src/pages/battery-settings/battery-settings-page.cpp +@@ -96,6 +96,7 @@ void BatterySettingsPage::initUI() + + ///空闲时减少屏幕亮度 + m_reduceBrightnessSwitch = new KiranSwitchButton(this); ++ m_reduceBrightnessSwitch->setAccessibleName("SwitchReduceBrightness"); + ui->layout_reduceBrightness->insertWidget(ui->layout_reduceBrightness->count(), m_reduceBrightnessSwitch); + } + +diff --git a/plugins/power/src/pages/battery-settings/battery-settings-page.ui b/plugins/power/src/pages/battery-settings/battery-settings-page.ui +index 76d758e..3fcfefe 100644 +--- a/plugins/power/src/pages/battery-settings/battery-settings-page.ui ++++ b/plugins/power/src/pages/battery-settings/battery-settings-page.ui +@@ -55,10 +55,18 @@ + 10 + + +- ++ ++ ++ ComboIdleTime ++ ++ + + +- ++ ++ ++ ComboIdleAction ++ ++ + + + +@@ -72,6 +80,9 @@ + + + ++ ++ ++ + + When the battery is lit up, it will be executed + +@@ -88,7 +99,11 @@ + 10 + + +- ++ ++ ++ ComboLowBatteryAction ++ ++ + + + +@@ -118,7 +133,11 @@ + 10 + + +- ++ ++ ++ ComboMonitorTurnOffIdleTime ++ ++ + + + +diff --git a/plugins/power/src/pages/general-settings/general-settings-page.cpp b/plugins/power/src/pages/general-settings/general-settings-page.cpp +index 2a7ae13..60823cd 100644 +--- a/plugins/power/src/pages/general-settings/general-settings-page.cpp ++++ b/plugins/power/src/pages/general-settings/general-settings-page.cpp +@@ -162,6 +162,7 @@ void GeneralSettingsPage::initUI() + + //空闲时是否锁定屏幕及屏保 + m_btn_lockScreen = new KiranSwitchButton(this); ++ m_btn_lockScreen->setAccessibleName("ButtonIdleLockScreen"); + ui->layout_sliderLabel->addWidget(m_btn_lockScreen); + + //NOTE: 根据#48515缺陷单所做修改,隐藏挂起按钮相关配置项，后续若有需要再进行打开 +diff --git a/plugins/power/src/pages/general-settings/general-settings-page.ui b/plugins/power/src/pages/general-settings/general-settings-page.ui +index 0ab1909..5ed9536 100644 +--- a/plugins/power/src/pages/general-settings/general-settings-page.ui ++++ b/plugins/power/src/pages/general-settings/general-settings-page.ui +@@ -49,7 +49,11 @@ + 10 + + +- ++ ++ ++ ComboPowerButtonAction ++ ++ + + + +@@ -73,7 +77,11 @@ + 10 + + +- ++ ++ ++ ComboSuspendAction ++ ++ + + + +@@ -137,6 +145,9 @@ + 40 + + ++ ++ ComboCloseLidAction ++ + + + +@@ -183,6 +194,9 @@ + + + ++ ++ SliderDisplayBrightness ++ + + Qt::Horizontal + +@@ -197,6 +211,9 @@ + + + ++ ++ ++ + + Regard computer as idle after + +@@ -243,6 +260,9 @@ + + + ++ ++ SliderComputerIdleTime ++ + + Qt::Horizontal + +diff --git a/plugins/power/src/pages/power-settings/power-settings-page.ui b/plugins/power/src/pages/power-settings/power-settings-page.ui +index bf411a5..af0e1e1 100644 +--- a/plugins/power/src/pages/power-settings/power-settings-page.ui ++++ b/plugins/power/src/pages/power-settings/power-settings-page.ui +@@ -55,10 +55,18 @@ + 10 + + +- ++ ++ ++ ComboIdleTime ++ ++ + + +- ++ ++ ++ ComboIdleAction ++ ++ + + + +@@ -88,7 +96,11 @@ + 10 + + +- ++ ++ ++ ComboMonitorTrunOffIdleTime ++ ++ + + + +diff --git a/plugins/system/src/kylinsec-logo.cpp b/plugins/system/src/kylinsec-logo.cpp +index 8178fd5..a5e09f0 100644 +--- a/plugins/system/src/kylinsec-logo.cpp ++++ b/plugins/system/src/kylinsec-logo.cpp +@@ -11,6 +11,7 @@ + + KylinsecLogo::KylinsecLogo(QWidget *parent) + { ++ setAccessibleName("KylinsecLogo"); + } + + KylinsecLogo::~KylinsecLogo() +diff --git a/plugins/system/src/pages/hardware-information/hardware-information.ui b/plugins/system/src/pages/hardware-information/hardware-information.ui +index 51eaec5..23da897 100644 +--- a/plugins/system/src/pages/hardware-information/hardware-information.ui ++++ b/plugins/system/src/pages/hardware-information/hardware-information.ui +@@ -145,6 +145,9 @@ + + + ++ ++ LabelCpuInfo ++ + + TextLabel + +@@ -205,6 +208,9 @@ + + + ++ ++ LabelMemoryInfo ++ + + TextLabel + +diff --git a/plugins/system/src/pages/system-information/change-host-name-widget.ui b/plugins/system/src/pages/system-information/change-host-name-widget.ui +index a677bbc..a98cf16 100644 +--- a/plugins/system/src/pages/system-information/change-host-name-widget.ui ++++ b/plugins/system/src/pages/system-information/change-host-name-widget.ui +@@ -113,6 +113,9 @@ + 40 + + ++ ++ EditHostName ++ + + + +@@ -163,6 +166,9 @@ + 40 + + ++ ++ ButtonSaveHostName ++ + + Save + +@@ -198,6 +204,9 @@ + 40 + + ++ ++ ButtonCancelChangeHostName ++ + + Cancel + +diff --git a/plugins/system/src/pages/system-information/license-agreement.ui b/plugins/system/src/pages/system-information/license-agreement.ui +index 727cc85..66ea1a0 100644 +--- a/plugins/system/src/pages/system-information/license-agreement.ui ++++ b/plugins/system/src/pages/system-information/license-agreement.ui +@@ -66,6 +66,9 @@ + Noto Sans CJK SC + + ++ ++ BrowserLicense ++ + + QFrame::NoFrame + +@@ -76,8 +79,8 @@ + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + p, li { white-space: pre-wrap; } +-</style></head><body style=" font-family:'Noto Sans CJK SC'; font-size:10pt; font-weight:400; font-style:normal;"> +-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;"><br /></p></body></html> ++</style></head><body style=" font-family:'Noto Sans CJK SC'; font-size:9pt; font-weight:400; font-style:normal;"> ++<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> + + + +@@ -119,6 +122,9 @@ p, li { white-space: pre-wrap; } + 40 + + ++ ++ ButtonExportLicense ++ + + Export + +@@ -160,6 +166,9 @@ p, li { white-space: pre-wrap; } + 40 + + ++ ++ ButtonCloseLicense ++ + + Close + +diff --git a/plugins/system/src/pages/system-information/system-information.ui b/plugins/system/src/pages/system-information/system-information.ui +index 5beafd2..ff2ce51 100644 +--- a/plugins/system/src/pages/system-information/system-information.ui ++++ b/plugins/system/src/pages/system-information/system-information.ui +@@ -145,6 +145,9 @@ + + + ++ ++ ++ + + Host Name: + +@@ -165,6 +168,9 @@ + + + ++ ++ LabelHostName ++ + + TextLabel + +@@ -196,6 +202,9 @@ + 28 + + ++ ++ ButtonChangeHostName ++ + + Change + +@@ -256,6 +265,9 @@ + + + ++ ++ LabelSystemVersion ++ + + TextLabel + +@@ -331,6 +343,9 @@ + + + ++ ++ LabelKernelVersion ++ + + TextLabel + +@@ -394,6 +409,9 @@ + + + ++ ++ LabelSystemArch ++ + + TextLabel + +@@ -469,6 +487,9 @@ + 28 + + ++ ++ ButtonShowEULA ++ + + Show + +@@ -541,6 +562,9 @@ + 28 + + ++ ++ ButtonShowVersionLicense ++ + + Show + +diff --git a/plugins/timedate/src/pages/date-time-settings/date-time-settings.ui b/plugins/timedate/src/pages/date-time-settings/date-time-settings.ui +index 9baa147..210b99d 100644 +--- a/plugins/timedate/src/pages/date-time-settings/date-time-settings.ui ++++ b/plugins/timedate/src/pages/date-time-settings/date-time-settings.ui +@@ -148,6 +148,9 @@ + 40 + + ++ ++ ButtonSave ++ + + save + +@@ -189,6 +192,9 @@ + 40 + + ++ ++ ButtonReset ++ + + reset + +diff --git a/plugins/timedate/src/pages/display-format-settings/display-format-settings.cpp b/plugins/timedate/src/pages/display-format-settings/display-format-settings.cpp +index c96f330..7a3beef 100644 +--- a/plugins/timedate/src/pages/display-format-settings/display-format-settings.cpp ++++ b/plugins/timedate/src/pages/display-format-settings/display-format-settings.cpp +@@ -37,6 +37,7 @@ void DisplayFormatSettings::init() + KiranTimeDateGlobalData* globalData = KiranTimeDateGlobalData::instance(); + + m_showSecondSwitch = new KiranSwitchButton(this); ++ m_showSecondSwitch->setAccessibleName("SwitchShowSeconds"); + ui->layout_timeSeconds->addWidget(m_showSecondSwitch); + + /* ComboBox填充数据 */ +diff --git a/plugins/timedate/src/pages/display-format-settings/display-format-settings.ui b/plugins/timedate/src/pages/display-format-settings/display-format-settings.ui +index 0435982..6e53f4b 100644 +--- a/plugins/timedate/src/pages/display-format-settings/display-format-settings.ui ++++ b/plugins/timedate/src/pages/display-format-settings/display-format-settings.ui +@@ -50,7 +50,11 @@ + + + +- ++ ++ ++ ComboLongDateDisplayFormat ++ ++ + + + +@@ -73,7 +77,11 @@ + + + +- ++ ++ ++ ComboShortDateDisplayFormat ++ ++ + + + +@@ -93,7 +101,11 @@ + + + +- ++ ++ ++ ComboTimeFormat ++ ++ + + + +diff --git a/plugins/timedate/src/pages/timezone-settings/time-zone-settings.ui b/plugins/timedate/src/pages/timezone-settings/time-zone-settings.ui +index dea9ec4..691c28c 100644 +--- a/plugins/timedate/src/pages/timezone-settings/time-zone-settings.ui ++++ b/plugins/timedate/src/pages/timezone-settings/time-zone-settings.ui +@@ -112,6 +112,9 @@ + 40 + + ++ ++ ButtonSave ++ + + save + +@@ -153,6 +156,9 @@ + 40 + + ++ ++ ButtonReturn ++ + + reset + +diff --git a/plugins/timedate/src/timezone/kiran-time-zone-list.cpp b/plugins/timedate/src/timezone/kiran-time-zone-list.cpp +index b2a2a46..5e016ae 100644 +--- a/plugins/timedate/src/timezone/kiran-time-zone-list.cpp ++++ b/plugins/timedate/src/timezone/kiran-time-zone-list.cpp +@@ -30,7 +30,7 @@ KiranTimeZoneList::KiranTimeZoneList(QWidget *parent) : + m_timeoutSearchTaskID(0) + { + ui->setupUi(this); +- ++ setAccessibleName("TimeZoneList"); + setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed); + } + +@@ -53,6 +53,7 @@ bool KiranTimeZoneList::initAllTimeZone() + iter!=globalData->allTimeZoneListEndIter(); + iter++){ + item = new KiranTimeZoneItem(*iter,ui->timezone); ++ item->setAccessibleName(QString("TimeZone::%1").arg(iter->zone_city)); + if(iter->zone_id==m_seletedZoneID){ + item->setisSelected(true); + } +@@ -115,6 +116,7 @@ void KiranTimeZoneList::search() + iter++){ + if(iter->zone_city.contains(m_keyword) ){ + item = new KiranTimeZoneItem(*iter,ui->filter_timezone); ++ item->setAccessibleName(QString("FilterTimeZone::%1").arg(iter->zone_city)); + item->setHeightLightKeyword(m_keyword); + if(iter->zone_id==m_seletedZoneID){ + item->setisSelected(true); +diff --git a/plugins/timedate/src/timezone/kiran-time-zone.cpp b/plugins/timedate/src/timezone/kiran-time-zone.cpp +index 29b630f..0bf7365 100644 +--- a/plugins/timedate/src/timezone/kiran-time-zone.cpp ++++ b/plugins/timedate/src/timezone/kiran-time-zone.cpp +@@ -36,6 +36,7 @@ KiranTimeZone::KiranTimeZone(QWidget *parent) : + { + ui->setupUi(this); + setAttribute(Qt::WA_TranslucentBackground); ++ setAccessibleName("TimeZoneWidget"); + ui->edit_search->installEventFilter(this); + initUI();; + } +diff --git a/plugins/timedate/src/widgets/date-spinbox.h b/plugins/timedate/src/widgets/date-spinbox.h +index 3dcd3b8..d50c7a4 100644 +--- a/plugins/timedate/src/widgets/date-spinbox.h ++++ b/plugins/timedate/src/widgets/date-spinbox.h +@@ -10,7 +10,9 @@ class YearSpinBox:public QSpinBox + { + Q_OBJECT + public: +- explicit YearSpinBox(QWidget* parent=nullptr):QSpinBox(parent){} ++ explicit YearSpinBox(QWidget* parent=nullptr):QSpinBox(parent){ ++ setAccessibleName("SpinBoxYear"); ++ } + ~YearSpinBox(){} + protected: + virtual QString textFromValue(int val) const Q_DECL_OVERRIDE{ +@@ -24,7 +26,9 @@ class MonthSpinBox:public QSpinBox + { + Q_OBJECT + public: +- explicit MonthSpinBox(QWidget* parent=nullptr):QSpinBox(parent){} ++ explicit MonthSpinBox(QWidget* parent=nullptr):QSpinBox(parent){ ++ setAccessibleName("SpinBoxMonth"); ++ } + ~MonthSpinBox(){} + protected: + virtual QString textFromValue(int val) const Q_DECL_OVERRIDE{ +@@ -38,7 +42,9 @@ class DaySpinBox:public QSpinBox + { + Q_OBJECT + public: +- explicit DaySpinBox(QWidget* parent=nullptr):QSpinBox(parent){} ++ explicit DaySpinBox(QWidget* parent=nullptr):QSpinBox(parent){ ++ setAccessibleName("SpinBoxDay"); ++ } + ~DaySpinBox(){} + protected: + virtual QString textFromValue(int val) const Q_DECL_OVERRIDE{ +diff --git a/plugins/timedate/src/widgets/kiran-clock.cpp b/plugins/timedate/src/widgets/kiran-clock.cpp +index dc2917a..55b3202 100644 +--- a/plugins/timedate/src/widgets/kiran-clock.cpp ++++ b/plugins/timedate/src/widgets/kiran-clock.cpp +@@ -18,6 +18,7 @@ KiranClock::KiranClock(QWidget *parent) + { + loadPixmap(); + initShadow(); ++ setAccessibleName("Clock"); + m_updateTimerID = startTimer(1000); + } + +diff --git a/plugins/timedate/src/widgets/kiran-date-picker-widget.cpp b/plugins/timedate/src/widgets/kiran-date-picker-widget.cpp +index 4b3ea8f..b42f0ec 100644 +--- a/plugins/timedate/src/widgets/kiran-date-picker-widget.cpp ++++ b/plugins/timedate/src/widgets/kiran-date-picker-widget.cpp +@@ -7,6 +7,7 @@ KiranDatePickerWidget::KiranDatePickerWidget(QWidget *parent) : + { + ui->setupUi(this); + initUI(); ++ setAccessibleName("DatePicker"); + } + + KiranDatePickerWidget::~KiranDatePickerWidget() +diff --git a/plugins/timedate/src/widgets/kiran-time-picker-widget.cpp b/plugins/timedate/src/widgets/kiran-time-picker-widget.cpp +index 09b158c..b75e99a 100644 +--- a/plugins/timedate/src/widgets/kiran-time-picker-widget.cpp ++++ b/plugins/timedate/src/widgets/kiran-time-picker-widget.cpp +@@ -17,6 +17,7 @@ KiranTimePickerWidget::KiranTimePickerWidget(QWidget *parent) : + { + ui->setupUi(this); + initUI(); ++ setAccessibleName("TimePicker"); + } + + KiranTimePickerWidget::KiranTimePickerWidget(KiranTimePickerWidget::TimePickerType type, QWidget *parent) : +diff --git a/plugins/timedate/src/widgets/scroll-picker.cpp b/plugins/timedate/src/widgets/scroll-picker.cpp +index ed091f5..a1728be 100644 +--- a/plugins/timedate/src/widgets/scroll-picker.cpp ++++ b/plugins/timedate/src/widgets/scroll-picker.cpp +@@ -30,6 +30,7 @@ ScrollPicker::ScrollPicker(QWidget *parent) + m_hoverIncreaseFont(3) + { + setAttribute(Qt::WA_Hover); ++ setAccessibleName("ScrollPicker"); + init(); + } + +diff --git a/src/category-widget.cpp b/src/category-widget.cpp +index 4a0580e..8decac4 100644 +--- a/src/category-widget.cpp ++++ b/src/category-widget.cpp +@@ -31,6 +31,8 @@ CategoryWidget::~CategoryWidget() + + void CategoryWidget::init() + { ++ setAccessibleName("ControlPanelCategory"); ++ + //初始化阴影 + QColor shadowColor(0,0,0,255*0.9); + m_dropShadowEffect = new QGraphicsDropShadowEffect(this); +@@ -152,6 +154,7 @@ void CategoryWidget::loadCategories() + auto category = categories.at(i); + auto categoryInfo = category->getCategoryDesktopInfo(); + auto categoryItem = new CategoryItem(); ++ categoryItem->setAccessibleName(QString("ControlPanelCategory::%1").arg(categoryInfo.categoryName)); + categoryItem->setText(categoryInfo.name); + categoryItem->setIcon(QIcon(categoryInfo.icon)); + categoryItem->setFixedHeight(50); +diff --git a/src/panel-window.cpp b/src/panel-window.cpp +index bb31f65..fbb0a6e 100644 +--- a/src/panel-window.cpp ++++ b/src/panel-window.cpp +@@ -51,6 +51,7 @@ void PanelWindow::initUI() + + //添加搜索框 + auto *searchBox = new SearchEdit(this); ++ searchBox->setAccessibleName("ControlPanelSearchEdit"); + searchBox->setFixedSize(352, 30); + getTitlebarCustomLayout()->addWidget(searchBox); + setTitlebarCustomLayoutAlignHCenter(true); +-- +2.33.0 +