99 lines
4.0 KiB
Diff
99 lines
4.0 KiB
Diff
From b42c72001b7c25e11e9f480694176cb71ba9a4f8 Mon Sep 17 00:00:00 2001
|
|
From: liuxinhao <liuxinhao@kylinos.com.cn>
|
|
Date: Fri, 14 Jan 2022 14:41:30 +0800
|
|
Subject: [PATCH 2/5] refactor(view): hide configuration items made by suspend
|
|
button
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
- 隐藏挂起按钮相关配置
|
|
|
|
Closes #48515
|
|
---
|
|
src/pages/general-settings/general-settings-page.cpp | 7 +++++++
|
|
src/pages/general-settings/general-settings-page.ui | 6 +++---
|
|
translations/kiran-cpanel-power.zh_CN.ts | 8 ++++----
|
|
3 files changed, 14 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/pages/general-settings/general-settings-page.cpp b/src/pages/general-settings/general-settings-page.cpp
|
|
index 40d4423..af5e795 100644
|
|
--- a/src/pages/general-settings/general-settings-page.cpp
|
|
+++ b/src/pages/general-settings/general-settings-page.cpp
|
|
@@ -153,6 +153,13 @@ void GeneralSettingsPage::initUI()
|
|
//空闲时是否锁定屏幕及屏保
|
|
m_btn_lockScreen = new KiranSwitchButton(this);
|
|
ui->layout_sliderLabel->addWidget(m_btn_lockScreen);
|
|
+
|
|
+ //NOTE: 根据#48515缺陷单所做修改,隐藏挂起按钮相关配置项，后续若有需要再进行打开
|
|
+ ui->layout_suspendlabel->setMargin(0);
|
|
+ ui->label_suspend->setVisible(false);
|
|
+
|
|
+ ui->layout_suspend->setMargin(0);
|
|
+ ui->combo_suspendButton->setVisible(false);
|
|
}
|
|
|
|
void GeneralSettingsPage::initConnection()
|
|
diff --git a/src/pages/general-settings/general-settings-page.ui b/src/pages/general-settings/general-settings-page.ui
|
|
index bca33de..0ab1909 100644
|
|
--- a/src/pages/general-settings/general-settings-page.ui
|
|
+++ b/src/pages/general-settings/general-settings-page.ui
|
|
@@ -54,12 +54,12 @@
|
|
</layout>
|
|
</item>
|
|
<item>
|
|
- <layout class="QHBoxLayout" name="horizontalLayout_3">
|
|
+ <layout class="QHBoxLayout" name="layout_suspendlabel">
|
|
<property name="topMargin">
|
|
<number>24</number>
|
|
</property>
|
|
<item>
|
|
- <widget class="QLabel" name="label_2">
|
|
+ <widget class="QLabel" name="label_suspend">
|
|
<property name="text">
|
|
<string>When the suspend button is pressed</string>
|
|
</property>
|
|
@@ -68,7 +68,7 @@
|
|
</layout>
|
|
</item>
|
|
<item>
|
|
- <layout class="QHBoxLayout" name="horizontalLayout_4">
|
|
+ <layout class="QHBoxLayout" name="layout_suspend">
|
|
<property name="topMargin">
|
|
<number>10</number>
|
|
</property>
|
|
diff --git a/translations/kiran-cpanel-power.zh_CN.ts b/translations/kiran-cpanel-power.zh_CN.ts
|
|
index 24099fc..f6ce17b 100644
|
|
--- a/translations/kiran-cpanel-power.zh_CN.ts
|
|
+++ b/translations/kiran-cpanel-power.zh_CN.ts
|
|
@@ -204,22 +204,22 @@
|
|
<translation>不执行操作</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/pages/general-settings/general-settings-page.cpp" line="171"/>
|
|
+ <location filename="../src/pages/general-settings/general-settings-page.cpp" line="178"/>
|
|
<source>ERROR</source>
|
|
<translation>错误</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/pages/general-settings/general-settings-page.cpp" line="335"/>
|
|
+ <location filename="../src/pages/general-settings/general-settings-page.cpp" line="328"/>
|
|
<source>brightness adjustment not available</source>
|
|
<translation>亮度调整不可用</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/pages/general-settings/general-settings-page.cpp" line="359"/>
|
|
+ <location filename="../src/pages/general-settings/general-settings-page.cpp" line="352"/>
|
|
<source>%1hour</source>
|
|
<translation>%1小时</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/pages/general-settings/general-settings-page.cpp" line="363"/>
|
|
+ <location filename="../src/pages/general-settings/general-settings-page.cpp" line="356"/>
|
|
<source>%1minute</source>
|
|
<translation>%1分钟</translation>
|
|
</message>
|
|
--
|
|
2.27.0
|
|
|