Skip to content

[WIP] Update cs_screensaver to handle new Weather widget #12516

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.

Sign up for GitHub

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

Open
queenkjuul wants to merge 2 commits into
base: master
Choose a base branch
from
+27 −8
Open

[WIP] Update cs_screensaver to handle new Weather widget #12516

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ded1fe
Update cs_screensaver to handle new Weather widget
Nov 22, 2024
3b878ac
Run makepot
Feb 20, 2025
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
35 changes: 27 additions & 8 deletions files/usr/share/cinnamon/cinnamon-settings/modules/cs_screensaver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
(3600, _("1 hour"))
]

WEATHER_UNITS_OPTIONS = [
("metric", _("Metric")),
("imperial", _("Imperial"))
]

XSCREENSAVER_PATH = "/usr/share/xscreensaver/config/"


Expand Down Expand Up @@ -93,6 +98,19 @@ def on_module_selected(self):
widget = GSettingsComboBox(_("Delay before locking"), schema, "lock-delay", LOCK_DELAY_OPTIONS, valtype=int, size_group=size_group)
widget.set_tooltip_text(_("This option defines the amount of time to wait before locking the screen, after showing the screensaver or after turning off the screen"))
settings.add_reveal_row(widget, schema, "lock-enabled")

settings = page.add_section(_("Away message"))

widget = GSettingsEntry(_("Show this message when the screen is locked"), schema, "default-message")
widget.set_child_packing(widget.content_widget, True, True, 0, Gtk.PackType.START)
widget.set_tooltip_text(_("This is the default message displayed on your lock screen"))
settings.add_row(widget)

settings.add_row(GSettingsFontButton(_("Font"), "org.cinnamon.desktop.screensaver", "font-message"))

widget = GSettingsSwitch(_("Ask for a custom message when locking the screen from the menu"), schema, "ask-for-away-message")
widget.set_tooltip_text(_("This option allows you to type a message each time you lock the screen from the menu"))
settings.add_row(widget)

# Customize
page = SettingsPage()
Expand Down Expand Up @@ -127,17 +145,18 @@ def on_module_selected(self):
widget = GSettingsFontButton(_("Date Font"), "org.cinnamon.desktop.screensaver", "font-date", size_group=size_group)
settings.add_row(widget)

settings = page.add_section(_("Away message"))
settings = page.add_section(_("Weather"))

widget = GSettingsEntry(_("Show this message when the screen is locked"), schema, "default-message")
widget.set_child_packing(widget.content_widget, True, True, 0, Gtk.PackType.START)
widget.set_tooltip_text(_("This is the default message displayed on your lock screen"))
widget = GSettingsSwitch(_("Show Weather"), schema, "show-weather")
widget.set_tooltip_text(_("Show local weather information on the screensaver"))
settings.add_row(widget)

settings.add_row(GSettingsFontButton(_("Font"), "org.cinnamon.desktop.screensaver", "font-message"))
widget = GSettingsComboBox(_("Units"), schema, "weather-units", WEATHER_UNITS_OPTIONS, valtype=str, size_group=size_group)
widget.set_tooltip_text(_("Units to use for weather display, either Metric or Imperial"))
settings.add_row(widget)

widget = GSettingsSwitch(_("Ask for a custom message when locking the screen from the menu"), schema, "ask-for-away-message")
widget.set_tooltip_text(_("This option allows you to type a message each time you lock the screen from the menu"))
widget = GSettingsEntry(_("Optional location override: LAT,LON"), schema, "weather-location")
widget.set_tooltip_text(_("Override auto-detected location with a string in format LAT,LON for example 41.85,-87.65"))
settings.add_row(widget)

settings = page.add_section(_("General"))
Expand All @@ -158,6 +177,6 @@ def on_module_selected(self):
widget.set_tooltip_text(_("Show the number of missed notifications and the battery status"))
settings.add_row(widget)

widget = GSettingsSwitch(_("Allow floating clock and album art widgets"), schema, "floating-widgets")
widget = GSettingsSwitch(_("Allow floating clock, weather, and album art widgets"), schema, "floating-widgets")
widget.set_tooltip_text(_("When the default screensaver is active, allow the clock and album art widgets to float around randomly"))
settings.add_row(widget)