添加登录背景设置标题
This commit is contained in:
liuxinhao
parent
61d3b3de0e
commit
8eb5fa4b02
163
0011-fix-login-background-Add-login-background-setting-ti.patch
Normal file
163
0011-fix-login-background-Add-login-background-setting-ti.patch
Normal file
@ -0,0 +1,163 @@
|
||||
From a1615021c9e2c89558338108755420077e6658e1 Mon Sep 17 00:00:00 2001
|
||||
From: liuxinhao <liuxinhao@kylinsec.com.cn>
|
||||
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</sou
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="235"/>
|
||||
- <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="394"/>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="399"/>
|
||||
<source>Save</source>
|
||||
<translation>保存</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="249"/>
|
||||
- <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="408"/>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="413"/>
|
||||
<source>Reset</source>
|
||||
<translation>重置</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="284"/>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="272"/>
|
||||
+ <source>login background setting</source>
|
||||
+ <translation>登录背景设置</translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="289"/>
|
||||
<source>Scale Mode</source>
|
||||
<translation>缩放模式</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="295"/>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="300"/>
|
||||
<source>auto</source>
|
||||
<translation>自动</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="296"/>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="301"/>
|
||||
<source>manual</source>
|
||||
<translation>手动</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="297"/>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="302"/>
|
||||
<source>disable</source>
|
||||
<translation>禁用</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="303"/>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="308"/>
|
||||
<source>Scale Factor</source>
|
||||
<translation>缩放比例</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="328"/>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="333"/>
|
||||
<source>Enable manual input user login</source>
|
||||
<translation>允许手动输入用户名登录</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="353"/>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="358"/>
|
||||
<source>Show User List</source>
|
||||
<translation>显示用户列表</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="460"/>
|
||||
- <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="536"/>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="465"/>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="541"/>
|
||||
<source>Configuration changed</source>
|
||||
<translation>配置已改变</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="461"/>
|
||||
- <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="537"/>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="466"/>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="542"/>
|
||||
<source>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</source>
|
||||
<translation>配置文件已被修改，如果继续保存所有额外的修改将会被覆盖，选择丢弃将丢弃所有的修改并重新加载新的配置文件</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="514"/>
|
||||
- <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="584"/>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="519"/>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="589"/>
|
||||
<source>Save failed, reload</source>
|
||||
<translation>保存失败，已重新加载</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="518"/>
|
||||
- <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="594"/>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="523"/>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="599"/>
|
||||
<source>Saved successfully</source>
|
||||
<translation>保存成功</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="588"/>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="593"/>
|
||||
<source>Save failed: %1</source>
|
||||
<translation>保存失败: %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="713"/>
|
||||
+ <location filename="../src/lightdm-greeter/kiran-cpanel-greeter/setting-window.cpp" line="718"/>
|
||||
<source>Please ensure that one of the two options is turned on!</source>
|
||||
<translation>请确保两个选项之一被打开!</translation>
|
||||
</message>
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -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 <liuxinhao@kylinsec.com.cn> - 2.5.1-8.kb1
|
||||
* Thu Jan 18 2024 liuxinhao <liuxinhao@kylinsec.com.cn> - 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 <liuxinhao@kylinsec.com.cn> - 2.5.1-7.kb1
|
||||
- KYOS-B: fix updateEditorGeometry to update the wrong size of ItemWidgets in QStyledItemDelegate(#16513)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user