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.

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

Jump to bottom

Sleep screen wording fixes #11647

Merged
merged 5 commits into from
Apr 9, 2024
Merged

Sleep screen wording fixes #11647

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d05c608
screensaver remnants erased.
Commodore64user Apr 9, 2024
dcf0bf4
screensaver remnants removed, et al.
Commodore64user Apr 9, 2024
75301ac
oops, fixing my on mistake (ss -> wallpaper)
Commodore64user Apr 9, 2024
7d915e9
'no fill' for background fill
Commodore64user Apr 9, 2024
8fe9505
Update frontend/ui/elements/screensaver_menu.lua
Frenzie Apr 9, 2024
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
8 changes: 4 additions & 4 deletions frontend/ui/elements/screensaver_menu.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ return {
sub_item_table = {
genMenuItem(_("Black fill"), "screensaver_img_background", "black"),
genMenuItem(_("White fill"), "screensaver_img_background", "white"),
genMenuItem(_("Leave background as-is"), "screensaver_img_background", "none", nil, true),
genMenuItem(_("No fill"), "screensaver_img_background", "none", nil, true),
Commodore64user marked this conversation as resolved.
Show resolved Hide resolved
-- separator
{
text_func = function()
Expand All @@ -67,7 +67,7 @@ return {
},
},
{
text = _("Delay screen update after wake-up"),
text = _("Wake-up screen delay"),
Frenzie marked this conversation as resolved.
Show resolved Hide resolved
sub_item_table = {
genMenuItem(_("No delay"), "screensaver_delay", "disable"),
genMenuItem(_("1 second"), "screensaver_delay", "1"),
Expand Down Expand Up @@ -133,14 +133,14 @@ return {
},
{
text = _("Background fill"),
help_text = _("This option will only become available, if you have selected 'Leave screen as-is' as screensaver and have 'Sleep screen message' on."),
help_text = _("This option will only become available, if you have selected 'Leave screen as-is' as wallpaper and have 'Sleep screen message' on."),
enabled_func = function()
return G_reader_settings:readSetting("screensaver_type") == "disable" and G_reader_settings:isTrue("screensaver_show_message")
end,
sub_item_table = {
genMenuItem(_("Black fill"), "screensaver_msg_background", "black"),
genMenuItem(_("White fill"), "screensaver_msg_background", "white"),
genMenuItem(_("Leave background as-is"), "screensaver_msg_background", "none", nil, true),
genMenuItem(_("No fill"), "screensaver_msg_background", "none", nil, true),
},
},
{
Expand Down
2 changes: 1 addition & 1 deletion frontend/ui/screensaver.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ function Screensaver:setMessage()
or self.default_screensaver_message
local input_dialog
input_dialog = InputDialog:new{
title = _("Screensaver message"),
title = _("Sleep screen message"),
description = _([[
Enter a custom message to be displayed on the sleep screen. The following escape sequences are available:
%T title
Expand Down
Loading