From 27ee3ec221c797c04833e53d13662b648ce81a76 Mon Sep 17 00:00:00 2001 From: kylinsecos_admin Date: Wed, 2 Mar 2022 13:58:51 +0800 Subject: [PATCH] fix slider no updatedfix slider no updated and Macro definition and Add Requires gtk-update-icon-cache Signed-off-by: kylinsecos_admin (cherry picked from commit 924b9dce0d1655396b32383fbee1b319252a7ba3) --- ...lider-no-updated-and-Macro--92293804.patch | 376 ++++++++++++++++++ kiran-cpanel-power.spec | 13 +- 2 files changed, 388 insertions(+), 1 deletion(-) create mode 100644 0008-fix-slider_idleTime-fix-slider-no-updated-and-Macro--92293804.patch diff --git a/0008-fix-slider_idleTime-fix-slider-no-updated-and-Macro--92293804.patch b/0008-fix-slider_idleTime-fix-slider-no-updated-and-Macro--92293804.patch new file mode 100644 index 0000000..cc81084 --- /dev/null +++ b/0008-fix-slider_idleTime-fix-slider-no-updated-and-Macro--92293804.patch @@ -0,0 +1,376 @@ +From 92293804996c908b967b21cd32305b19a3da5fa9 Mon Sep 17 00:00:00 2001 +From: luoqing +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 @@ + + + +- + BatterySettingsPage + 电池设置 + + + + +- + After idle for more than the following time, the computer will execute + 空闲超过以下时间后，计算机将执行 + + + + +- + When the battery is lit up, it will be executed + 电池电量将用尽时 + + + + +- + The monitor will turn off when it is idle + 显示器空闲以下时间关闭 + + + + +- + Reduce screen brightness when idle + 空闲时减少亮度 + + +- ++ + Display Off + 关闭显示器 + + +- +- ++ ++ + Suspend + 挂起 + + +- +- ++ ++ + Shutdown + 关机 + + +- +- ++ ++ + Hibernate + 休眠 + + +- +- ++ ++ + Do nothing + 不执行操作 + +@@ -73,22 +68,21 @@ + + + +- + CPanelPowerWidget + + + +- ++ + General Settings + 通用设置 + + +- ++ + Power Settings + 电源设置 + + +- ++ + Battery Settings + 电池设置 + +@@ -98,12 +92,11 @@ + + + +- + CPanelPowerWindow + + + +- ++ + Power Manager + 电源管理 + +@@ -113,56 +106,48 @@ + + + +- + GeneralSettingsPage + 通用设置页面 + + + + +- + When the power button is pressed + 按下电源按钮时 + + + + +- + When the suspend button is pressed + 按下挂起按钮时 + + + + +- + When closing the lid + 合上盖子操作 + + + + +- + Display brightness setting + 显示亮度设置 + + + + +- + 0% + + + + + +- + Regard computer as idle after + 于此时间后视计算机为空闲 + + + + +- + Lock screen when idle + 计算机空闲时锁定屏幕 + +@@ -171,55 +156,54 @@ + 空闲如下时间锁定屏幕 + + +- +- ++ ++ + shutdown + 关机 + + +- +- +- ++ ++ ++ + hibernate + 休眠 + + +- +- +- ++ ++ ++ + suspend + 挂起 + + +- +- ++ ++ + display off + 关闭显示器 + + +- +- + ++ ++ + do nothing + 不执行操作 + + +- ++ + ERROR + 错误 + + +- + brightness adjustment not available +- 亮度调整不可用 ++ 亮度调整不可用 + + +- ++ + %1hour + %1小时 + + +- ++ + %1minute + %1分钟 + +@@ -229,46 +213,43 @@ + + + +- + PowerSettingsPage + 电源设置页面 + + + + +- + After idle for more than the following time, the computer will execute + 空闲超过以下时间后，计算机将执行 + + + + +- + The monitor will turn off when it is idle + 显示器空闲以下时间关闭 + + +- ++ + Display Off + 关闭显示器 + + +- ++ + Suspend + 挂起 + + +- ++ + Shutdown + 关机 + + +- ++ + Hibernate + 休眠 + + +- ++ + Do nothing + 不执行操作 + +@@ -276,22 +257,22 @@ + + QObject + +- ++ + %1Day + %1天 + + +- ++ + %1Hour + %1小时 + + +- ++ + %1Minute + %1分钟 + + +- ++ + never + 从不 + +-- +2.27.0 + diff --git a/kiran-cpanel-power.spec b/kiran-cpanel-power.spec index 858a260..d215915 100644 --- a/kiran-cpanel-power.spec +++ b/kiran-cpanel-power.spec @@ -1,6 +1,6 @@ Name: kiran-cpanel-power Version: 2.2.0 -Release: 1.kb7 +Release: 3 Summary: Kiran Power Manager Summary(zh_CN): 电源管理 @@ -14,6 +14,7 @@ Patch0004: 0003-fix-brightness-abnormal-settings-brightness-8406922f.patch Patch0005: 0004-fix-view-fix-ui-description-error-f3096927.patch Patch0006: 0005-fix-brightness-set-minmum-brightness-to-20-957b0262.patch Patch0007: 0007-refactor-license-update-license-8996b258.patch +Patch0008: 0008-fix-slider_idleTime-fix-slider-no-updated-and-Macro--92293804.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -36,6 +37,7 @@ Requires: kiran-log-qt5 Requires: gsettings-qt Requires: kiran-screensaver >= 2.2.0-6 Requires: upower +Requires: gtk-update-icon-cache %description %{summary}. @@ -66,6 +68,15 @@ gtk-update-icon-cache -f /usr/share/icons/hicolor/ rm -rf %{buildroot} %changelog +* Tue Mar 01 2022 longcheng - 2.2.0-3 +- KYOS-B: Add Requires gtk-update-icon-cache + +* Thu Feb 24 2022 chendingjian - 2.2.0-2 +- rebuild for KY3.4-MATE-modules-dev + +* Mon Feb 21 2022 luoqing - 2.2.0-1.kb9 +- KYOS-B: fix slider no updated (#50147) + * Mon Jan 24 2022 liuxinhao - 2.2.0-1.kb7 - KYBD: update license