diff --git a/gsettings-desktop-schemas.spec b/gsettings-desktop-schemas.spec index 86a3df7..e4b11ce 100644 --- a/gsettings-desktop-schemas.spec +++ b/gsettings-desktop-schemas.spec @@ -17,6 +17,9 @@ Source1: org.gnome.desktop.interface.rhel.gschema.override # https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/merge_requests/111 Patch: 0001-schema-Add-restart-enabled-on-screensaver-schema.patch +# RHEL-127146 +Patch: screen-time-limits.patch + BuildRequires: gettext BuildRequires: glib2-devel >= 2.31.0 BuildRequires: gobject-introspection-devel diff --git a/screen-time-limits.patch b/screen-time-limits.patch new file mode 100644 index 0000000..7bee565 --- /dev/null +++ b/screen-time-limits.patch @@ -0,0 +1,131 @@ +From 74487ff3188413f5c0175b49d549b01262d783bf Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Wed, 24 Apr 2024 16:38:34 +0100 +Subject: [PATCH 1/2] schemas: Add screen-time-limits schema + +This will allow implementing screen time reminders / daily usage limits +in the shell, while having the settings for it in gnome-control-center. + +Signed-off-by: Philip Withnall + +Helps: https://gitlab.gnome.org/Teams/Design/initiatives/-/issues/130 +--- + po/POTFILES.in | 1 + + schemas/meson.build | 1 + + ....desktop.screen-time-limits.gschema.xml.in | 29 +++++++++++++++++++ + 3 files changed, 31 insertions(+) + create mode 100644 schemas/org.gnome.desktop.screen-time-limits.gschema.xml.in + +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 8137e6e..4618fd3 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -20,6 +20,7 @@ schemas/org.gnome.desktop.notifications.gschema.xml.in + schemas/org.gnome.desktop.peripherals.gschema.xml.in + schemas/org.gnome.desktop.privacy.gschema.xml.in + schemas/org.gnome.desktop.screensaver.gschema.xml.in ++schemas/org.gnome.desktop.screen-time-limits.gschema.xml.in + schemas/org.gnome.desktop.search-providers.gschema.xml.in + schemas/org.gnome.desktop.session.gschema.xml.in + schemas/org.gnome.desktop.sound.gschema.xml.in +diff --git a/schemas/meson.build b/schemas/meson.build +index 250bb45..289faa8 100644 +--- a/schemas/meson.build ++++ b/schemas/meson.build +@@ -21,6 +21,7 @@ schemas = [ + 'org.gnome.desktop.datetime.gschema.xml', + 'org.gnome.desktop.media-handling.gschema.xml', + 'org.gnome.desktop.screensaver.gschema.xml', ++ 'org.gnome.desktop.screen-time-limits.gschema.xml', + 'org.gnome.desktop.search-providers.gschema.xml', + 'org.gnome.desktop.wm.keybindings.gschema.xml', + 'org.gnome.desktop.wm.preferences.gschema.xml', +diff --git a/schemas/org.gnome.desktop.screen-time-limits.gschema.xml.in b/schemas/org.gnome.desktop.screen-time-limits.gschema.xml.in +new file mode 100644 +index 0000000..28615db +--- /dev/null ++++ b/schemas/org.gnome.desktop.screen-time-limits.gschema.xml.in +@@ -0,0 +1,29 @@ ++ ++ ++ ++ ++ ++ Enable screen time ++ ++ Enable overall screen time functionality. ++ ++ false ++ ++ ++ ++ Daily screen time limit ++ The limit on the amount of daily screen time the user is allowed, in seconds. ++ 28800 ++ ++ ++ ++ ++ Grayscale once limit is reached ++ Whether to make the screen grayscale once the user’s screen time limit is reached. ++ true ++ ++ ++ +-- +2.51.1 + + +From da89e64f33808a775c05984397d5ee14f5c2ba52 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Mon, 20 Jan 2025 17:18:07 +0000 +Subject: [PATCH 2/2] schemas: Split data recording and limits in screen time + limits schema + +As decided in +https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/3306, users +need to be able to enable screen time recording while not having limits +enabled, so they can see a chart of their usage without it actually +limiting their behaviour. + +Signed-off-by: Philip Withnall + +Helps: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/3306 +--- + ...g.gnome.desktop.screen-time-limits.gschema.xml.in | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/schemas/org.gnome.desktop.screen-time-limits.gschema.xml.in b/schemas/org.gnome.desktop.screen-time-limits.gschema.xml.in +index 28615db..a4e9f2c 100644 +--- a/schemas/org.gnome.desktop.screen-time-limits.gschema.xml.in ++++ b/schemas/org.gnome.desktop.screen-time-limits.gschema.xml.in +@@ -5,14 +5,20 @@ + --> + + +- +- Enable screen time ++ ++ Enable screen time history + +- Enable overall screen time functionality. ++ Enable basic screen time functionality, recording usage data for viewing history. + + false + + ++ ++ Enable daily screen time limit ++ Enable imposing a screen time limit on the user, as set in daily-limit-seconds. ++ false ++ ++ + + Daily screen time limit + The limit on the amount of daily screen time the user is allowed, in seconds. +-- +2.51.1 +