Skip to content

Commit 8c5b745

Browse files
committed
backport cinnamon-desktop changes, nightlight
1 parent 1cc8225 commit 8c5b745

33 files changed

Lines changed: 5668 additions & 3865 deletions

data/org.cinnamon.settings-daemon.plugins.color.gschema.xml.in.in

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
<schemalist>
2+
<enum id="schedule_mode">
3+
<value value="0" nick="auto"/>
4+
<value value="1" nick="manual"/>
5+
</enum>
26
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.cinnamon.settings-daemon.plugins.color" path="/org/cinnamon/settings-daemon/plugins/color/">
37
<key name="recalibrate-display-threshold" type="u">
48
<default>0</default>
@@ -10,5 +14,35 @@
1014
<summary>The duration a printer profile is valid</summary>
1115
<description>This is the number of days after which the printer color profile is considered invalid.</description>
1216
</key>
17+
<key name="night-light-enabled" type="b">
18+
<default>false</default>
19+
<summary>If the night light mode is enabled</summary>
20+
<description>Night light mode changes the color temperature of your display when the sun has gone down or at preset times.</description>
21+
</key>
22+
<key name="night-light-temperature" type="u">
23+
<default>2700</default>
24+
<summary>Temperature of the display when enabled</summary>
25+
<description>This temperature in Kelvin is used to modify the screen tones when night light mode is enabled. Higher values are bluer, lower redder.</description>
26+
</key>
27+
<key name="night-light-schedule-mode" enum="schedule_mode">
28+
<default>'auto'</default>
29+
<summary>Set the way start and stop times are determined</summary>
30+
<description>Setting to 'auto' will use the system timezone to determine sunrise and sunset. Using 'manual' mode allows specifying exact start and stop times (night-light-schedule-from and -to).</description>
31+
</key>
32+
<key name="night-light-schedule-from" type="d">
33+
<default>20.00</default>
34+
<summary>The start time</summary>
35+
<description>When “night-light-schedule-automatic” is disabled, use this start time in hours from midnight.</description>
36+
</key>
37+
<key name="night-light-schedule-to" type="d">
38+
<default>6.00</default>
39+
<summary>The end time</summary>
40+
<description>When “night-light-schedule-automatic” is disabled, use this end time in hours from midnight.</description>
41+
</key>
42+
<key name="night-light-last-coordinates" type="(dd)">
43+
<default>(91,181)</default>
44+
<summary>The last detected position</summary>
45+
<description>When location services are available this represents the last detected location. The default value is an invalid value to ensure it is always updated at startup.</description>
46+
</key>
1347
</schema>
1448
</schemalist>

meson.build

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ endif
9898
cc = meson.get_compiler('c')
9999
math = cc.find_library('m', required: false)
100100

101+
has_timerfd_create = cc.has_function('timerfd_create')
102+
101103
csd_conf = configuration_data()
102104
csd_conf.set_quoted('GTKBUILDERDIR', gtkbuilderdir)
103105
csd_conf.set_quoted('CINNAMON_SETTINGS_LOCALEDIR', localedir)
@@ -108,6 +110,7 @@ csd_conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
108110
csd_conf.set_quoted('LIBEXECDIR', join_paths(prefix, libexecdir))
109111
csd_conf.set_quoted('SYSCONFDIR', sysconfdir)
110112
csd_conf.set_quoted('LIBDIR', libdir)
113+
csd_conf.set10('HAVE_TIMERFD', has_timerfd_create)
111114

112115
if gudev.found()
113116
cargs += '-DHAVE_GUDEV'

0 commit comments

Comments
 (0)