From 92293804996c908b967b21cd32305b19a3da5fa9 Mon Sep 17 00:00:00 2001
From: luoqing <luoqing@kylinos.com.cn>
Date: Fri, 18 Feb 2022 16:35:11 +0800
Subject: [PATCH] fix(slider_idleTime) : fix slider no updated and Macro
 definition
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复“于此时间后视计算机空闲”设置后滑动条未更新
- 宏定义KEY_IDLE_DELAY

Closes #50147
---
 .../general-settings-page.cpp                 |  6 +-
 translations/kiran-cpanel-power.zh_CN.ts      | 95 ++++++++-----------
 2 files changed, 42 insertions(+), 59 deletions(-)

diff --git a/src/pages/general-settings/general-settings-page.cpp b/src/pages/general-settings/general-settings-page.cpp
index 38284f1..cdddb4c 100644
--- a/src/pages/general-settings/general-settings-page.cpp
+++ b/src/pages/general-settings/general-settings-page.cpp
@@ -28,7 +28,8 @@
 
 #define MATE_SESSION_SCHEMA_ID "org.mate.session"
 #define KIRAN_SESSION_SCHEMA_ID "com.kylinsec.kiran.session-manager"
-#define KEY_IDLE_DELAY "idle-delay"
+//#define KEY_IDLE_DELAY "idle-delay"
+#define KEY_IDLE_DELAY "idleDelay"
 #define DEFAULT_IDLE_DELAY 5
 
 #define SCHEMA_KIRAN_SCREENSAVER        "com.kylinsec.kiran.screensaver"
@@ -280,6 +281,7 @@ void GeneralSettingsPage::load()
         QSignalBlocker idleTimerSwitchBlocker(m_btn_lockScreen);
         int idleTime = m_sessionSettings->get(KEY_IDLE_DELAY).toInt();
         updateIdleTimeLabel(idleTime);
+        ui->slider_idleTime->setValue(idleTime);
     }
     else
     {
@@ -371,4 +373,4 @@ void GeneralSettingsPage::updateIdleTimeLabel(int min)
     idleTime = temp.join(" ");
 
     ui->label_idleTime->setText(idleTime);
-}
\ No newline at end of file
+}
diff --git a/translations/kiran-cpanel-power.zh_CN.ts b/translations/kiran-cpanel-power.zh_CN.ts
index 1a46089..7ca50f2 100644
--- a/translations/kiran-cpanel-power.zh_CN.ts
+++ b/translations/kiran-cpanel-power.zh_CN.ts
@@ -6,64 +6,59 @@
     <message>
         <location filename="../src/pages/battery-settings/battery-settings-page.ui" line="14"/>
         <location filename="../build/kiran-cpanel-power_autogen/include/ui_battery-settings-page.h" line="159"/>
-        <location filename="../cmake-build-debug/kiran-cpanel-power_autogen/include/ui_battery-settings-page.h" line="159"/>
         <source>BatterySettingsPage</source>
         <translation>电池设置</translation>
     </message>
     <message>
         <location filename="../src/pages/battery-settings/battery-settings-page.ui" line="43"/>
         <location filename="../build/kiran-cpanel-power_autogen/include/ui_battery-settings-page.h" line="160"/>
-        <location filename="../cmake-build-debug/kiran-cpanel-power_autogen/include/ui_battery-settings-page.h" line="160"/>
         <source>After idle for more than the following time, the computer will execute</source>
         <translation>空闲超过以下时间后，计算机将执行</translation>
     </message>
     <message>
         <location filename="../src/pages/battery-settings/battery-settings-page.ui" line="76"/>
         <location filename="../build/kiran-cpanel-power_autogen/include/ui_battery-settings-page.h" line="161"/>
-        <location filename="../cmake-build-debug/kiran-cpanel-power_autogen/include/ui_battery-settings-page.h" line="161"/>
         <source>When the battery is lit up, it will be executed</source>
         <translation>电池电量将用尽时</translation>
     </message>
     <message>
         <location filename="../src/pages/battery-settings/battery-settings-page.ui" line="106"/>
         <location filename="../build/kiran-cpanel-power_autogen/include/ui_battery-settings-page.h" line="162"/>
-        <location filename="../cmake-build-debug/kiran-cpanel-power_autogen/include/ui_battery-settings-page.h" line="162"/>
         <source>The monitor will turn off when it is idle</source>
         <translation>显示器空闲以下时间关闭</translation>
     </message>
     <message>
         <location filename="../src/pages/battery-settings/battery-settings-page.ui" line="136"/>
         <location filename="../build/kiran-cpanel-power_autogen/include/ui_battery-settings-page.h" line="163"/>
-        <location filename="../cmake-build-debug/kiran-cpanel-power_autogen/include/ui_battery-settings-page.h" line="163"/>
         <source>Reduce screen brightness when idle</source>
         <translation>空闲时减少亮度</translation>
     </message>
     <message>
-        <location filename="../src/pages/battery-settings/battery-settings-page.cpp" line="59"/>
+        <location filename="../src/pages/battery-settings/battery-settings-page.cpp" line="68"/>
         <source>Display Off</source>
         <translation>关闭显示器</translation>
     </message>
     <message>
-        <location filename="../src/pages/battery-settings/battery-settings-page.cpp" line="60"/>
-        <location filename="../src/pages/battery-settings/battery-settings-page.cpp" line="76"/>
+        <location filename="../src/pages/battery-settings/battery-settings-page.cpp" line="69"/>
+        <location filename="../src/pages/battery-settings/battery-settings-page.cpp" line="85"/>
         <source>Suspend</source>
         <translation>挂起</translation>
     </message>
     <message>
-        <location filename="../src/pages/battery-settings/battery-settings-page.cpp" line="61"/>
-        <location filename="../src/pages/battery-settings/battery-settings-page.cpp" line="77"/>
+        <location filename="../src/pages/battery-settings/battery-settings-page.cpp" line="70"/>
+        <location filename="../src/pages/battery-settings/battery-settings-page.cpp" line="86"/>
         <source>Shutdown</source>
         <translation>关机</translation>
     </message>
     <message>
-        <location filename="../src/pages/battery-settings/battery-settings-page.cpp" line="62"/>
-        <location filename="../src/pages/battery-settings/battery-settings-page.cpp" line="78"/>
+        <location filename="../src/pages/battery-settings/battery-settings-page.cpp" line="71"/>
+        <location filename="../src/pages/battery-settings/battery-settings-page.cpp" line="87"/>
         <source>Hibernate</source>
         <translation>休眠</translation>
     </message>
     <message>
-        <location filename="../src/pages/battery-settings/battery-settings-page.cpp" line="63"/>
-        <location filename="../src/pages/battery-settings/battery-settings-page.cpp" line="79"/>
+        <location filename="../src/pages/battery-settings/battery-settings-page.cpp" line="72"/>
+        <location filename="../src/pages/battery-settings/battery-settings-page.cpp" line="88"/>
         <source>Do nothing</source>
         <translation>不执行操作</translation>
     </message>
@@ -73,22 +68,21 @@
     <message>
         <location filename="../src/cpanel-power-widget.ui" line="14"/>
         <location filename="../build/kiran-cpanel-power_autogen/include/ui_cpanel-power-widget.h" line="97"/>
-        <location filename="../cmake-build-debug/kiran-cpanel-power_autogen/include/ui_cpanel-power-widget.h" line="97"/>
         <source>CPanelPowerWidget</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/cpanel-power-widget.cpp" line="57"/>
+        <location filename="../src/cpanel-power-widget.cpp" line="65"/>
         <source>General Settings</source>
         <translation>通用设置</translation>
     </message>
     <message>
-        <location filename="../src/cpanel-power-widget.cpp" line="68"/>
+        <location filename="../src/cpanel-power-widget.cpp" line="76"/>
         <source>Power Settings</source>
         <translation>电源设置</translation>
     </message>
     <message>
-        <location filename="../src/cpanel-power-widget.cpp" line="81"/>
+        <location filename="../src/cpanel-power-widget.cpp" line="89"/>
         <source>Battery Settings</source>
         <translation>电池设置</translation>
     </message>
@@ -98,12 +92,11 @@
     <message>
         <location filename="../src/app-build-src/cpanel-power-window.ui" line="17"/>
         <location filename="../build/kiran-cpanel-power_autogen/include/ui_cpanel-power-window.h" line="35"/>
-        <location filename="../cmake-build-debug/kiran-cpanel-power_autogen/include/ui_cpanel-power-window.h" line="35"/>
         <source>CPanelPowerWindow</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/app-build-src/cpanel-power-window.cpp" line="17"/>
+        <location filename="../src/app-build-src/cpanel-power-window.cpp" line="25"/>
         <source>Power Manager</source>
         <translation>电源管理</translation>
     </message>
@@ -113,56 +106,48 @@
     <message>
         <location filename="../src/pages/general-settings/general-settings-page.ui" line="14"/>
         <location filename="../build/kiran-cpanel-power_autogen/include/ui_general-settings-page.h" line="241"/>
-        <location filename="../cmake-build-debug/kiran-cpanel-power_autogen/include/ui_general-settings-page.h" line="241"/>
         <source>GeneralSettingsPage</source>
         <translation>通用设置页面</translation>
     </message>
     <message>
         <location filename="../src/pages/general-settings/general-settings-page.ui" line="40"/>
         <location filename="../build/kiran-cpanel-power_autogen/include/ui_general-settings-page.h" line="242"/>
-        <location filename="../cmake-build-debug/kiran-cpanel-power_autogen/include/ui_general-settings-page.h" line="242"/>
         <source>When the power button is pressed</source>
         <translation>按下电源按钮时</translation>
     </message>
     <message>
         <location filename="../src/pages/general-settings/general-settings-page.ui" line="64"/>
         <location filename="../build/kiran-cpanel-power_autogen/include/ui_general-settings-page.h" line="243"/>
-        <location filename="../cmake-build-debug/kiran-cpanel-power_autogen/include/ui_general-settings-page.h" line="243"/>
         <source>When the suspend button is pressed</source>
         <translation>按下挂起按钮时</translation>
     </message>
     <message>
         <location filename="../src/pages/general-settings/general-settings-page.ui" line="92"/>
         <location filename="../build/kiran-cpanel-power_autogen/include/ui_general-settings-page.h" line="244"/>
-        <location filename="../cmake-build-debug/kiran-cpanel-power_autogen/include/ui_general-settings-page.h" line="244"/>
         <source>When closing the lid</source>
         <translation>合上盖子操作</translation>
     </message>
     <message>
         <location filename="../src/pages/general-settings/general-settings-page.ui" line="153"/>
         <location filename="../build/kiran-cpanel-power_autogen/include/ui_general-settings-page.h" line="245"/>
-        <location filename="../cmake-build-debug/kiran-cpanel-power_autogen/include/ui_general-settings-page.h" line="245"/>
         <source>Display brightness setting</source>
         <translation>显示亮度设置</translation>
     </message>
     <message>
         <location filename="../src/pages/general-settings/general-settings-page.ui" line="173"/>
         <location filename="../build/kiran-cpanel-power_autogen/include/ui_general-settings-page.h" line="246"/>
-        <location filename="../cmake-build-debug/kiran-cpanel-power_autogen/include/ui_general-settings-page.h" line="246"/>
         <source>0%</source>
         <translation></translation>
     </message>
     <message>
         <location filename="../src/pages/general-settings/general-settings-page.ui" line="201"/>
         <location filename="../build/kiran-cpanel-power_autogen/include/ui_general-settings-page.h" line="247"/>
-        <location filename="../cmake-build-debug/kiran-cpanel-power_autogen/include/ui_general-settings-page.h" line="247"/>
         <source>Regard computer as idle after</source>
         <translation>于此时间后视计算机为空闲</translation>
     </message>
     <message>
         <location filename="../src/pages/general-settings/general-settings-page.ui" line="264"/>
         <location filename="../build/kiran-cpanel-power_autogen/include/ui_general-settings-page.h" line="249"/>
-        <location filename="../cmake-build-debug/kiran-cpanel-power_autogen/include/ui_general-settings-page.h" line="249"/>
         <source>Lock screen when idle</source>
         <translation>计算机空闲时锁定屏幕</translation>
     </message>
@@ -171,55 +156,54 @@
         <translation type="vanished">空闲如下时间锁定屏幕</translation>
     </message>
     <message>
-        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="106"/>
-        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="119"/>
+        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="116"/>
+        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="129"/>
         <source>shutdown</source>
         <translation>关机</translation>
     </message>
     <message>
-        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="107"/>
-        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="113"/>
-        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="118"/>
+        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="117"/>
+        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="123"/>
+        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="128"/>
         <source>hibernate</source>
         <translation>休眠</translation>
     </message>
     <message>
-        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="108"/>
-        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="112"/>
-        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="117"/>
+        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="118"/>
+        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="122"/>
+        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="127"/>
         <source>suspend</source>
         <translation>挂起</translation>
     </message>
     <message>
-        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="109"/>
-        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="114"/>
+        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="119"/>
+        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="124"/>
         <source>display off</source>
         <translation>关闭显示器</translation>
     </message>
     <message>
-        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="110"/>
-        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="115"/>
         <location filename="../src/pages/general-settings/general-settings-page.cpp" line="120"/>
+        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="125"/>
+        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="130"/>
         <source>do nothing</source>
         <translation>不执行操作</translation>
     </message>
     <message>
-        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="178"/>
+        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="188"/>
         <source>ERROR</source>
         <translation>错误</translation>
     </message>
     <message>
-        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="329"/>
         <source>brightness adjustment not available</source>
-        <translation>亮度调整不可用</translation>
+        <translation type="vanished">亮度调整不可用</translation>
     </message>
     <message>
-        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="354"/>
+        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="367"/>
         <source>%1hour</source>
         <translation>%1小时</translation>
     </message>
     <message>
-        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="358"/>
+        <location filename="../src/pages/general-settings/general-settings-page.cpp" line="371"/>
         <source>%1minute</source>
         <translation>%1分钟</translation>
     </message>
@@ -229,46 +213,43 @@
     <message>
         <location filename="../src/pages/power-settings/power-settings-page.ui" line="14"/>
         <location filename="../build/kiran-cpanel-power_autogen/include/ui_power-settings-page.h" line="112"/>
-        <location filename="../cmake-build-debug/kiran-cpanel-power_autogen/include/ui_power-settings-page.h" line="112"/>
         <source>PowerSettingsPage</source>
         <translation>电源设置页面</translation>
     </message>
     <message>
         <location filename="../src/pages/power-settings/power-settings-page.ui" line="43"/>
         <location filename="../build/kiran-cpanel-power_autogen/include/ui_power-settings-page.h" line="113"/>
-        <location filename="../cmake-build-debug/kiran-cpanel-power_autogen/include/ui_power-settings-page.h" line="113"/>
         <source>After idle for more than the following time, the computer will execute</source>
         <translation>空闲超过以下时间后，计算机将执行</translation>
     </message>
     <message>
         <location filename="../src/pages/power-settings/power-settings-page.ui" line="76"/>
         <location filename="../build/kiran-cpanel-power_autogen/include/ui_power-settings-page.h" line="114"/>
-        <location filename="../cmake-build-debug/kiran-cpanel-power_autogen/include/ui_power-settings-page.h" line="114"/>
         <source>The monitor will turn off when it is idle</source>
         <translation>显示器空闲以下时间关闭</translation>
     </message>
     <message>
-        <location filename="../src/pages/power-settings/power-settings-page.cpp" line="55"/>
+        <location filename="../src/pages/power-settings/power-settings-page.cpp" line="63"/>
         <source>Display Off</source>
         <translation>关闭显示器</translation>
     </message>
     <message>
-        <location filename="../src/pages/power-settings/power-settings-page.cpp" line="56"/>
+        <location filename="../src/pages/power-settings/power-settings-page.cpp" line="64"/>
         <source>Suspend</source>
         <translation>挂起</translation>
     </message>
     <message>
-        <location filename="../src/pages/power-settings/power-settings-page.cpp" line="57"/>
+        <location filename="../src/pages/power-settings/power-settings-page.cpp" line="65"/>
         <source>Shutdown</source>
         <translation>关机</translation>
     </message>
     <message>
-        <location filename="../src/pages/power-settings/power-settings-page.cpp" line="58"/>
+        <location filename="../src/pages/power-settings/power-settings-page.cpp" line="66"/>
         <source>Hibernate</source>
         <translation>休眠</translation>
     </message>
     <message>
-        <location filename="../src/pages/power-settings/power-settings-page.cpp" line="59"/>
+        <location filename="../src/pages/power-settings/power-settings-page.cpp" line="67"/>
         <source>Do nothing</source>
         <translation>不执行操作</translation>
     </message>
@@ -276,22 +257,22 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/common/common.cpp" line="21"/>
+        <location filename="../src/common/common.cpp" line="31"/>
         <source>%1Day</source>
         <translation>%1天</translation>
     </message>
     <message>
-        <location filename="../src/common/common.cpp" line="25"/>
+        <location filename="../src/common/common.cpp" line="35"/>
         <source>%1Hour</source>
         <translation>%1小时</translation>
     </message>
     <message>
-        <location filename="../src/common/common.cpp" line="29"/>
+        <location filename="../src/common/common.cpp" line="39"/>
         <source>%1Minute</source>
         <translation>%1分钟</translation>
     </message>
     <message>
-        <location filename="../src/common/common.cpp" line="33"/>
+        <location filename="../src/common/common.cpp" line="43"/>
         <source>never</source>
         <translation>从不</translation>
     </message>
-- 
2.27.0