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