Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport cinnamon-desktop changes, nightlight #402

Closed
wants to merge 14 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions data/org.cinnamon.settings-daemon.plugins.color.gschema.xml.in.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<schemalist>
<enum id="schedule_mode">
<value value="0" nick="auto"/>
<value value="1" nick="manual"/>
</enum>
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.cinnamon.settings-daemon.plugins.color" path="/org/cinnamon/settings-daemon/plugins/color/">
<key name="recalibrate-display-threshold" type="u">
<default>0</default>
Expand All @@ -10,5 +14,35 @@
<summary>The duration a printer profile is valid</summary>
<description>This is the number of days after which the printer color profile is considered invalid.</description>
</key>
<key name="night-light-enabled" type="b">
<default>false</default>
<summary>If the night light mode is enabled</summary>
<description>Night light mode changes the color temperature of your display when the sun has gone down or at preset times.</description>
</key>
<key name="night-light-temperature" type="u">
<default>2700</default>
<summary>Temperature of the display when enabled</summary>
<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>
</key>
<key name="night-light-schedule-mode" enum="schedule_mode">
<default>'auto'</default>
<summary>Set the way start and stop times are determined</summary>
<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>
</key>
<key name="night-light-schedule-from" type="d">
<default>20.00</default>
<summary>The start time</summary>
<description>When “night-light-schedule-automatic” is disabled, use this start time in hours from midnight.</description>
</key>
<key name="night-light-schedule-to" type="d">
<default>6.00</default>
<summary>The end time</summary>
<description>When “night-light-schedule-automatic” is disabled, use this end time in hours from midnight.</description>
</key>
<key name="night-light-last-coordinates" type="(dd)">
<default>(91,181)</default>
<summary>The last detected position</summary>
<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>
</key>
</schema>
</schemalist>
3 changes: 3 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ endif
cc = meson.get_compiler('c')
math = cc.find_library('m', required: false)

has_timerfd_create = cc.has_function('timerfd_create')

csd_conf = configuration_data()
csd_conf.set_quoted('GTKBUILDERDIR', gtkbuilderdir)
csd_conf.set_quoted('CINNAMON_SETTINGS_LOCALEDIR', localedir)
Expand All @@ -108,6 +110,7 @@ csd_conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
csd_conf.set_quoted('LIBEXECDIR', join_paths(prefix, libexecdir))
csd_conf.set_quoted('SYSCONFDIR', sysconfdir)
csd_conf.set_quoted('LIBDIR', libdir)
csd_conf.set10('HAVE_TIMERFD', has_timerfd_create)

if gudev.found()
cargs += '-DHAVE_GUDEV'
Expand Down
1 change: 1 addition & 0 deletions plugins/a11y-settings/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ executable(
include_directories: [include_dirs, common_inc],
dependencies: a11y_settings_deps,
c_args: [
'-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
'-DPLUGIN_NAME="@0@"'.format(plugin_name),
],
install: true,
Expand Down
1 change: 1 addition & 0 deletions plugins/automount/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ executable(
include_directories: [include_dirs, common_inc],
dependencies: automount_deps,
c_args: [
'-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
'-DPLUGIN_NAME="@0@"'.format(plugin_name),
],
install_rpath: join_paths(prefix, apilibdir),
Expand Down
1 change: 1 addition & 0 deletions plugins/background/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ executable(
include_directories: [include_dirs, common_inc],
dependencies: background_deps,
c_args: [
'-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
'-DPLUGIN_NAME="@0@"'.format(plugin_name),
],
install: true,
Expand Down
1 change: 1 addition & 0 deletions plugins/clipboard/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ executable(
include_directories: [include_dirs, common_inc],
dependencies: clipboard_deps,
c_args: [
'-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
'-DPLUGIN_NAME="@0@"'.format(plugin_name),
],
install: true,
Expand Down
Loading
Loading