From a568566a1efede69052651923c150a60acc3088c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Mon, 26 Apr 2021 11:50:20 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D0=BF=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D1=8F=20MAT?=
 =?UTF-8?q?E,=20Cinnamon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 profiles/ini.env                                          | 4 ++--
 .../calculate-utils/ini.example/3-example.profile         | 4 ++--
 .../2-user/gnome-extra/Cinnamon-3.0/cinnamon              | 4 ++--
 .../6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate   | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/profiles/ini.env b/profiles/ini.env
index c2008a90a..11f4699b9 100644
--- a/profiles/ini.env
+++ b/profiles/ini.env
@@ -12,9 +12,9 @@ mouse-clickpolicy = single
 mouse-doubleclick-delayed = 400
 mouse-lefthanded = off
 power-computer-sleep = 0
-power-display-sleep = 30
+power-display-sleep = 16
 screensaver-activation = on
-screensaver-delay = 10
+screensaver-delay = 15
 screensaver-lock = on
 wallpaper-cycle = 0
 wm-panel-main-autohide = off
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/3-example.profile b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/3-example.profile
index b41ac4094..51d2a66a8 100644
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/3-example.profile
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/3-example.profile
@@ -194,7 +194,7 @@
 #?os_install_locale_language==fr#
 # Mettre en veille après (secondes), '0', ne jamais arrêter
 #os_install_locale_language#
-; power-display-sleep = 30
+; power-display-sleep = 16
 
 #in#
 #?in(os_linux_pkglist, CLDM)!=#
@@ -220,7 +220,7 @@
 #?os_install_locale_language==fr#
 # Économiseur d’écran activé après (minutes)
 #os_install_locale_language#
-; screensaver-delay = 10
+; screensaver-delay = 15
 
 #in#
 #?in(os_linux_pkglist, CLDM)!=#
diff --git a/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/cinnamon b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/cinnamon
index 6267abd87..de9bb3be0 100644
--- a/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/cinnamon
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/cinnamon
@@ -114,8 +114,8 @@ three-finger-click=3
 button-power='interactive'
 lid-close-battery-action='suspend'
 lid-close-ac-action='suspend'
-sleep-display-ac=900
-sleep-display-battery=900
+sleep-display-ac=#-sum(sleep,60*#-ini(profile.power-display-sleep)-#)-#
+sleep-display-battery=#-sum(sleep,60*#-ini(profile.power-display-sleep)-#)-#
 #?os_root_type==livecd#
 lock-on-suspend=false
 #!os_root_type#
diff --git a/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate
index 83f4b7de0..12d0331f7 100644
--- a/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate
@@ -151,18 +151,18 @@ switch-to-workspace-4='<Primary>F4'
 theme='coco'
 
 [power-manager]
-sleep-computer-ac=900
-sleep-display-ac=900
+sleep-computer-ac=#-sum(sleep,60*#-ini(profile.power-computer-sleep)-#)-#
+sleep-display-ac=#-sum(sleep,60*#-ini(profile.power-display-sleep)-#)-#
 button-lid-ac='suspend'
 button-lid-battery='suspend'
 
 [screensaver]
-#?os_root_type!=livecd#
+#?ini(profile.screensaver-activation)!=off&&os_root_type!=livecd#
 idle-activation-enabled=true
 #!ini#
 idle-activation-enabled=false
 #ini#
-#?os_root_type!=livecd#
+#?ini(profile.screensaver-lock)!=off&&os_root_type!=livecd#
 lock-enabled=true
 #!ini#
 lock-enabled=false