From cb27c423148f6bfc8d8c25bd823a18447f625cb1 Mon Sep 17 00:00:00 2001 From: Simon Steinbeiss Date: Thu, 7 Nov 2019 01:04:29 +0100 Subject: settings: Unclutter system and display tabs Both tabs now use Stackswitchers to allow users to switch between the "on battery" and "on ac" settings. This gets rid of the huge table we used to have and makes it easier to hide all "on battery" settings. --- data/interfaces/xfpm-settings.ui | 1769 ++++++++++++++++++-------------------- 1 file changed, 823 insertions(+), 946 deletions(-) (limited to 'data/interfaces/xfpm-settings.ui') diff --git a/data/interfaces/xfpm-settings.ui b/data/interfaces/xfpm-settings.ui index 597d54fd..2d71adb7 100644 --- a/data/interfaces/xfpm-settings.ui +++ b/data/interfaces/xfpm-settings.ui @@ -303,7 +303,7 @@ True True - + True False 12 @@ -499,113 +499,6 @@ 0 - - - True - False - 0 - none - - - True - False - 18 - 3 - 18 - 6 - 18 - - - True - False - On battery - True - - - 1 - 0 - - - - - True - False - Plugged in - True - - - 2 - 0 - - - - - True - False - When laptop lid is closed: - 0 - - - 0 - 1 - - - - - True - False - True - - - - - 0 - - - - - 1 - 1 - - - - - True - False - True - - - - - 0 - - - - - 2 - 1 - - - - - - - - - - True - False - <b>Laptop Lid</b> - True - - - - - False - True - 1 - - True @@ -731,56 +624,43 @@ - + True False 12 vertical 6 - + True False - 0 - none + center + center + 6 + system-stack + + + False + True + 0 + + + + + True + False + slide-left-right - + True False - 18 - 6 - 6 6 - 18 - True - - - True - False - On battery - True - - - 1 - 0 - - - - - True - False - Plugged in - True - - - 2 - 0 - - + 12 True False + 18 When inactive for 0 @@ -833,52 +713,28 @@ - + True False - vertical - - - True - True - system-sleep-inactivity-on-ac-adjustment - 0 - 0 - False - - - - - False - True - 0 - - + True + - - True - False - False - 0.5 - - - True - True - 1 - + + + 0 + - 2 - 2 + 1 + 1 True False + 18 System sleep mode: 0 @@ -888,13 +744,55 @@ - + + True + False + <b>System power saving</b> + True + 0 + + + 0 + 0 + 2 + + + + + True + False + 12 + <b>Laptop Lid</b> + True + 0 + + + 0 + 3 + 2 + + + + + True + False + 18 + When laptop lid is closed: + 0 + + + 0 + 4 + + + + True False True - + - + 0 @@ -902,51 +800,187 @@ 1 - 1 + 4 + + + page0 + On battery + + + + + True + False + 6 + 12 - + + True + False + 18 + When laptop lid is closed: + 0 + + + 0 + 4 + + + + True False True - + - + 0 - 2 - 1 + 1 + 4 - + + True + False + 12 + <b>Laptop Lid</b> + True + 0 + + + 0 + 3 + 2 + - - - - - True - False - <b>System power saving</b> - True - - - - + + + True + False + 18 + When inactive for + 0 + + + 0 + 2 + + + + + True + False + vertical + + + True + True + system-sleep-inactivity-on-ac-adjustment + 0 + 0 + False + + + + + False + True + 0 + + + + + True + False + False + 0.5 + + + True + True + 1 + + + + + 1 + 2 + + + + + True + False + True + + + + + 0 + + + + + 1 + 1 + + + + + True + False + 18 + System sleep mode: + 0 + + + 0 + 1 + + + + + True + False + <b>System power saving</b> + True + 0 + + + 0 + 0 + 2 + + + + + page1 + Plugged in + 1 + + + + False True - 0 + 1 True False + 12 0 none @@ -1070,13 +1104,14 @@ False True - 1 + 2 True False + 6 0 none @@ -1094,6 +1129,7 @@ True True False + 6 True @@ -1117,7 +1153,7 @@ False True - 2 + 3 @@ -1137,549 +1173,667 @@ - + True False + start + True 12 vertical - 18 + 6 + + + True + False + center + center + 6 + display-stack + + + True + True + 0 + + True False - vertical - + True False + <b>Display power management</b> + True + + + False + True + 0 + + + + + True + True + Let the power manager handle display power management (DPMS) instead of X11. + + + + False + True + end + 1 + + + + + False + True + 1 + + + + + True + False + slide-left-right + + + True + False + 6 + 12 + + + True + False + 18 + Blank after + 0 + + + 0 + 0 + + - + True False - <b>Display power management</b> + vertical + + + True + True + True + display-blank-on-battery-adjustment + 0 + 0 + False + + + + + False + True + 0 + + + + + True + False + False + 0.5 + + + False + True + 1 + + + + + 1 + 0 + + + + + True + False + vertical + + + True + True + True + dpms-sleep-on-battery-adjustment + 0 + 0 + False + + + + + False + True + 0 + + + + + True + False + False + 0.5 + + + False + True + 1 + + + + + 1 + 1 + + + + + True + False + 18 + Put to sleep after + 0 + + + 0 + 1 + + + + + True + False + 18 + Switch off after + 0 + + + 0 + 2 + + + + + True + False + True + vertical + + + True + True + True + dpms-off-on-battery-adjustment + 0 + 0 + False + + + + + False + True + 0 + + + + + True + False + False + 0.5 + + + False + True + 1 + + + + + 1 + 2 + + + + + True + False + 18 + On inactivity reduce to + 0 + + + 0 + 4 + + + + + True + False + 18 + Reduce after + 0 + + + 0 + 5 + + + + + True + False + vertical + + + True + True + True + brightness-level-on-battery-adjustment + 0 + 0 + False + + + + + False + True + 0 + + + + + True + False + False + 0.5 + + + False + True + 1 + + + + + 1 + 4 + + + + + True + False + vertical + + + True + True + True + brightness-inactivity-on-battery-adjustment + 0 + 0 + False + + + + + False + True + 0 + + + + + True + False + False + 0.5 + + + False + True + 1 + + + + + 1 + 5 + + + + + True + False + 12 + <b>Brightness reduction</b> True + 0 - False - True - 0 + 0 + 3 + 2 + + + page0 + On battery + + + + + True + False + 6 + 12 - + True - True - Let the power manager handle display power management (DPMS) instead of X11. - + False + vertical + + + True + True + True + display-blank-on-ac-adjustment + 0 + 0 + False + + + + + False + True + 0 + + + + + True + False + False + 0.5 + + + False + True + 1 + + - False - True - end - 1 + 1 + 0 + + + + + True + False + 18 + Blank after + 0 + + + 0 + 0 + + + + + True + False + 18 + Put to sleep after + 0 + + + 0 + 1 + + + + + True + False + 18 + Switch off after + 0 + + + 0 + 2 + + + + + True + False + 12 + <b>Brightness reduction</b> + True + 0 + + + 0 + 3 + 2 + + + + + True + False + 18 + 6 + On inactivity reduce to + 0 + + + 0 + 4 + + + + + True + False + 18 + Reduce after + 0 + + + 0 + 5 - - - True - True - 0 - - - - - True - False - 18 - 12 - 12 - 6 - + True False vertical - True - + True - False - Blank after - 0 + True + True + dpms-sleep-on-ac-adjustment + 0 + 0 + False + + - True + False True 0 - + True + False False - Put to sleep after - 0 + 0.5 - True + False True 1 - - - True - False - Switch off after - 0 - - - True - True - 2 - - - False - True - 0 + 1 + 1 - + True False vertical - True - + True - False - 6 - True - - - True - False - vertical - - - True - False - On battery - True - 1 - - - True - True - 0 - - - - - True - False - vertical - - - True - True - display-blank-on-battery-adjustment - 0 - 0 - False - - - - - False - True - 0 - - - - - True - False - False - 0.5 - - - False - True - 1 - - - - - True - True - 1 - - - - - True - True - 0 - - - - - True - False - vertical - - - True - False - Plugged in - True - 1 - - - True - True - 0 - - - - - True - False - vertical - - - True - True - display-blank-on-ac-adjustment - 0 - 0 - False - - - - - False - True - 0 - - - - - True - False - False - 0.5 - - - False - True - 1 - - - - - True - True - 1 - - - - - True - True - 1 - - + True + True + dpms-off-on-ac-adjustment + 0 + 0 + False + + - True + False True 0 - + True + False False - center - 6 - True - - - True - False - vertical - - - True - True - dpms-sleep-on-battery-adjustment - 0 - 0 - False - - - - - False - True - 0 - - - - - True - False - False - 0.5 - - - False - True - 1 - - - - - True - True - 0 - - - - - True - False - vertical - - - True - True - dpms-sleep-on-ac-adjustment - 0 - 0 - False - - - - - False - True - 0 - - - - - True - False - False - 0.5 - - - False - True - 1 - - - - - True - True - 1 - - + 0.5 - True + False True 1 + + + 1 + 2 + + + + + True + False + 6 + vertical + + + True + True + True + brightness-level-on-ac-adjustment + 0 + 0 + False + + + + + False + True + 0 + + - + True + False False - center - 6 - True - - - True - False - vertical - - - True - True - dpms-off-on-battery-adjustment - 0 - 0 - False - - - - - False - True - 0 - - - - - True - False - False - 0.5 - - - False - True - 1 - - - - - True - True - 0 - - - - - True - False - vertical - - - True - True - dpms-off-on-ac-adjustment - 0 - 0 - False - - - - - False - True - 0 - - - - - True - False - False - 0.5 - - - False - True - 1 - - - - - True - True - 1 - - + 0.5 - True + False True - 2 + 1 - True - True - 1 + 1 + 4 - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - 0 - none - - - True - False - 18 - 12 - vertical - + True False - 6 + True + vertical - + True - False - vertical - True - - - True - False - On inactivity reduce to - 0 - - - True - True - 0 - - - - - True - False - Reduce after - 0 - - - True - True - 1 - - + True + brightness-inactivity-on-ac-adjustment + 0 + 0 + False + + False @@ -1688,296 +1842,36 @@ - + True + False False - vertical - True - - - True - False - center - 6 - True - - - True - False - vertical - - - True - False - On battery - True - 1 - - - True - True - 0 - - - - - True - False - vertical - - - True - True - brightness-level-on-battery-adjustment - 0 - 0 - False - - - - - False - True - 0 - - - - - True - False - False - 0.5 - - - False - True - 1 - - - - - True - True - 1 - - - - - True - True - 0 - - - - - True - False - vertical - - - True - False - Plugged in - True - 1 - - - True - True - 0 - - - - - True - False - vertical - - - True - True - brightness-level-on-ac-adjustment - 0 - 0 - False - - - - - False - True - 0 - - - - - True - False - False - 0.5 - - - False - True - 1 - - - - - True - True - 1 - - - - - True - True - 1 - - - - - True - True - 0 - - - - - True - False - center - 6 - True - - - True - False - vertical - - - True - True - brightness-inactivity-on-battery-adjustment - 0 - 0 - False - - - - - False - True - 0 - - - - - True - False - False - 0.5 - - - False - True - 1 - - - - - True - True - 0 - - - - - True - False - vertical - - - True - True - brightness-inactivity-on-ac-adjustment - 0 - 0 - False - - - - - False - True - 0 - - - - - True - False - False - 0.5 - - - False - True - 1 - - - - - True - True - 1 - - - - - True - True - 1 - - + 0.5 - True + False True 1 - True - True - 0 + 1 + 5 - - - - True - False - <b>Brightness reduction</b> - True - + + page1 + Plugged in + 1 + - False + True True - 2 + 3 @@ -2194,21 +2088,4 @@ - - - - - - - - - - - - - - - - - -- cgit v1.2.1