From 8eb5fa4b02e67867f5d7ea63343cb3e1782791ce Mon Sep 17 00:00:00 2001 From: liuxinhao Date: Thu, 18 Jan 2024 17:19:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=99=BB=E5=BD=95=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E8=AE=BE=E7=BD=AE=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ound-Add-login-background-setting-ti.patch | 163 ++++++++++++++++++ kiran-session-guard.spec | 6 +- 2 files changed, 167 insertions(+), 2 deletions(-) create mode 100644 0011-fix-login-background-Add-login-background-setting-ti.patch diff --git a/0011-fix-login-background-Add-login-background-setting-ti.patch b/0011-fix-login-background-Add-login-background-setting-ti.patch new file mode 100644 index 0000000..cb64c99 --- /dev/null +++ b/0011-fix-login-background-Add-login-background-setting-ti.patch @@ -0,0 +1,163 @@ +From a1615021c9e2c89558338108755420077e6658e1 Mon Sep 17 00:00:00 2001 +From: liuxinhao +Date: Thu, 18 Jan 2024 17:15:12 +0800 +Subject: [PATCH] fix(login background): Add login background setting title +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 添加登录背景设置标题 + +Closes #25063 +--- + .../kiran-cpanel-greeter/setting-window.cpp | 9 +++- + translations/kiran-cpanel-greeter.zh_CN.ts | 43 +++++++++++-------- + 2 files changed, 31 insertions(+), 21 deletions(-) + +diff --git a/src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp b/src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp +index 921e27c..5c3fd15 100644 +--- a/src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp ++++ b/src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp +@@ -154,7 +154,7 @@ QWidget *SettingWindow::initPageAutoLogin() + auto pageAutoLogin = new QWidget(this); + + auto mainLayout = new QVBoxLayout(pageAutoLogin); +- mainLayout->setContentsMargins(12, 24, 12, 0); ++ mainLayout->setContentsMargins(16, 16, 16, 0); + mainLayout->setSpacing(0); + + /* 自动登录用户总开关 */ +@@ -263,11 +263,16 @@ QWidget *SettingWindow::initPageGeneralSettings() + { + auto pageGeneralSettings = new QWidget(this); + auto mainLayout = new QVBoxLayout(pageGeneralSettings); +- mainLayout->setContentsMargins(12, 24, 12, 0); ++ mainLayout->setContentsMargins(16, 16, 16, 0); + mainLayout->setSpacing(0); + + /* 外观设置 */ + /* 图片选择控件 */ ++ auto titleLabel = new QLabel(this); ++ titleLabel->setText(tr("login background setting")); ++ mainLayout->addWidget(titleLabel); ++ mainLayout->addSpacerItem(new QSpacerItem(10,10,QSizePolicy::Minimum,QSizePolicy::Fixed)); ++ + m_imageSelector = new KiranImageSelector(this); + m_imageSelector->setFixedHeight(148); + mainLayout->addWidget(m_imageSelector); +diff --git a/translations/kiran-cpanel-greeter.zh_CN.ts b/translations/kiran-cpanel-greeter.zh_CN.ts +index fbe76f5..5468e6f 100644 +--- a/translations/kiran-cpanel-greeter.zh_CN.ts ++++ b/translations/kiran-cpanel-greeter.zh_CN.ts +@@ -110,84 +110,89 @@ Select discard to discard the modification and reload the new configuration + + +- ++ + Save + 保存 + + + +- ++ + Reset + 重置 + + +- ++ ++ login background setting ++ 登录背景设置 ++ ++ ++ + Scale Mode + 缩放模式 + + +- ++ + auto + 自动 + + +- ++ + manual + 手动 + + +- ++ + disable + 禁用 + + +- ++ + Scale Factor + 缩放比例 + + +- ++ + Enable manual input user login + 允许手动输入用户名登录 + + +- ++ + Show User List + 显示用户列表 + + +- +- ++ ++ + Configuration changed + 配置已改变 + + +- +- ++ ++ + The external configuration file has changed + If you choose to save, all external changes will be overwritten + Select discard to discard the modification and reload the new configuration + 配置文件已被修改，如果继续保存所有额外的修改将会被覆盖，选择丢弃将丢弃所有的修改并重新加载新的配置文件 + + +- +- ++ ++ + Save failed, reload + 保存失败，已重新加载 + + +- +- ++ ++ + Saved successfully + 保存成功 + + +- ++ + Save failed: %1 + 保存失败: %1 + + +- ++ + Please ensure that one of the two options is turned on! + 请确保两个选项之一被打开! + +-- +2.33.0 + diff --git a/kiran-session-guard.spec b/kiran-session-guard.spec index ee7e5e4..a028333 100644 --- a/kiran-session-guard.spec +++ b/kiran-session-guard.spec @@ -1,6 +1,6 @@ Name: kiran-session-guard Version: 2.5.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Kiran desktop environment login and lock screen dialog Summary(zh_CN): Kiran桌面环境登录和解锁框 @@ -17,6 +17,7 @@ Patch0007: 0007-fix-kiran-session-guard-fits-the-Qt5.9.7-interface.patch Patch0008: 0008-fix-styleditemdelegate-updateEditorGeometry-to-updat.patch Patch0009: 0009-fix-autologin-timeout-Fix-issues-caused-by-automatic.patch Patch0010: 0010-fix-scale-Fix-the-issue-of-manual-scaling-not-taking.patch +Patch0011: 0011-fix-login-background-Add-login-background-setting-ti.patch %define SHOW_VIRTUAL_KEYBOARD 0 @@ -154,9 +155,10 @@ gtk-update-icon-cache -f /usr/share/icons/hicolor/ rm -rf %{buildroot} %changelog -* Thu Jan 18 2024 liuxinhao - 2.5.1-8.kb1 +* Thu Jan 18 2024 liuxinhao - 2.5.1-9 - KYOS-B: fix the issue of manual scaling not taking effect(#25011) - KYOS-B: fix issues caused by automatic login timeout(#25015) +- KYOS-B: add login background settings title(#25063) * Thu Oct 26 2023 liuxinhao - 2.5.1-7.kb1 - KYOS-B: fix updateEditorGeometry to update the wrong size of ItemWidgets in QStyledItemDelegate(#16513)