From ea20357fa6a20b034a1990749dc8f1e3b129d316 Mon Sep 17 00:00:00 2001 From: SomeGuy <97603719+Commodore64user@users.noreply.github.com> Date: Tue, 12 Mar 2024 02:02:54 +0000 Subject: [PATCH] Update screensaver_menu.lua wording changes and rearrangement of the whole menu --- frontend/ui/elements/screensaver_menu.lua | 183 ++++++++++++---------- 1 file changed, 101 insertions(+), 82 deletions(-) diff --git a/frontend/ui/elements/screensaver_menu.lua b/frontend/ui/elements/screensaver_menu.lua index 120c046d7..0b47cefa6 100644 --- a/frontend/ui/elements/screensaver_menu.lua +++ b/frontend/ui/elements/screensaver_menu.lua @@ -28,112 +28,131 @@ local function genMenuItem(text, setting, value, enabled_func, separator) end return { - genMenuItem(_("Use last book's cover as screensaver"), "screensaver_type", "cover", hasLastFile), - genMenuItem(_("Use book status as screensaver"), "screensaver_type", "bookstatus", hasLastFile), - genMenuItem(_("Use random image from folder as screensaver"), "screensaver_type", "random_image"), - genMenuItem(_("Use document cover as screensaver"), "screensaver_type", "document_cover"), - genMenuItem(_("Use image as screensaver"), "screensaver_type", "image_file"), - genMenuItem(_("Use reading progress as screensaver"), "screensaver_type", "readingprogress", isReaderProgressEnabled), - genMenuItem(_("Leave screen as-is"), "screensaver_type", "disable", nil, true), - -- separator - { - text = _("Add message to screensaver"), - checked_func = function() - return G_reader_settings:isTrue("screensaver_show_message") - end, - callback = function() - G_reader_settings:toggle("screensaver_show_message") - end, - separator = true, - }, - -- separator + { - text = _("Settings"), + text = _("Lock Screen"), sub_item_table = { + + genMenuItem(_("Show book cover on lock screen"), "screensaver_type", "cover", hasLastFile), + genMenuItem(_("Show custom image on lock screen"), "screensaver_type", "image_file"), + genMenuItem(_("Show multiple custom images on lock screen"), "screensaver_type", "random_image"), + genMenuItem(_("Show document cover on lock screen"), "screensaver_type", "document_cover"), + genMenuItem(_("Show reading progress on lock screen"), "screensaver_type", "readingprogress", isReaderProgressEnabled), + genMenuItem(_("Show book status on lock screen"), "screensaver_type", "bookstatus", hasLastFile), + genMenuItem(_("Lock the screen in current state"), "screensaver_type", "disable", nil, true), + separator = true, + + { - text = _("Screensaver folder"), - keep_menu_open = true, - callback = function() - Screensaver:chooseFolder() - end, + text = _("Fill-in Borders"), + sub_item_table = { + genMenuItem(_("Black"), "screensaver_img_background", "black"), + genMenuItem(_("White"), "screensaver_img_background", "white"), + genMenuItem(_("Leave as-is"), "screensaver_img_background", "none", nil, true), + -- separator + { + text_func = function() + local percentage = G_reader_settings:readSetting("screensaver_stretch_limit_percentage") + if G_reader_settings:isTrue("screensaver_stretch_images") and percentage then + return T(_("Stretch to fit screen (with limit: %1 %)"), percentage) + end + return _("Stretch to Fit Screen") + end, + checked_func = function() + return G_reader_settings:isTrue("screensaver_stretch_images") + end, + callback = function(touchmenu_instance) + Screensaver:setStretchLimit(touchmenu_instance) + end, + }, + }, }, { - text = _("Screensaver image"), - keep_menu_open = true, - callback = function() - Screensaver:chooseFile() - end, + text = _("Unlock Screen Delay"), + sub_item_table = { + genMenuItem(_("Never"), "screensaver_delay", "disable"), + genMenuItem(_("1 second"), "screensaver_delay", "1"), + genMenuItem(_("3 seconds"), "screensaver_delay", "3"), + genMenuItem(_("5 seconds"), "screensaver_delay", "5"), + genMenuItem(_("Unlock with tap"), "screensaver_delay", "tap"), + genMenuItem(_("Unlock with 'Exit Screensaver' gesture"), "screensaver_delay", "gesture"), + }, }, + }, + }, + + { + text = _("Lock Screen Message"), + sub_item_table = { { - text = _("Document cover"), - keep_menu_open = true, + text = _("Add Custom Message to Lock Screen"), + checked_func = function() + return G_reader_settings:isTrue("screensaver_show_message") + end, callback = function() - Screensaver:chooseFile(true) + G_reader_settings:toggle("screensaver_show_message") end, + separator = true, }, { - text = _("Screensaver message"), - keep_menu_open = true, + text = _("Edit Lock Screen Message"), + keep_menu_open = true, callback = function() Screensaver:setMessage() end, }, { - text = _("Covers and images settings"), + text = _("Sidebars"), sub_item_table = { - genMenuItem(_("Black background"), "screensaver_img_background", "black"), - genMenuItem(_("White background"), "screensaver_img_background", "white"), - genMenuItem(_("Leave background as-is"), "screensaver_img_background", "none", nil, true), - -- separator - { - text_func = function() - local percentage = G_reader_settings:readSetting("screensaver_stretch_limit_percentage") - if G_reader_settings:isTrue("screensaver_stretch_images") and percentage then - return T(_("Stretch to fit screen (with limit: %1 %)"), percentage) - end - return _("Stretch to fit screen") - end, - checked_func = function() - return G_reader_settings:isTrue("screensaver_stretch_images") - end, - callback = function(touchmenu_instance) - Screensaver:setStretchLimit(touchmenu_instance) - end, - }, + genMenuItem(_("Black"), "screensaver_msg_background", "black"), + genMenuItem(_("White"), "screensaver_msg_background", "white"), + genMenuItem(_("Leave as-is"), "screensaver_msg_background", "none", nil, true), }, }, { - text = _("Message settings"), + text = _("Position"), sub_item_table = { - genMenuItem(_("Black background behind message"), "screensaver_msg_background", "black"), - genMenuItem(_("White background behind message"), "screensaver_msg_background", "white"), - genMenuItem(_("Leave background as-is behind message"), "screensaver_msg_background", "none", nil, true), - -- separator - genMenuItem(_("Message position: top"), "screensaver_message_position", "top"), - genMenuItem(_("Message position: middle"), "screensaver_message_position", "middle"), - genMenuItem(_("Message position: bottom"), "screensaver_message_position", "bottom", nil, true), - -- separator - { - text = _("Hide reboot/poweroff message"), - checked_func = function() - return G_reader_settings:isTrue("screensaver_hide_fallback_msg") - end, - callback = function() - G_reader_settings:toggle("screensaver_hide_fallback_msg") - end, - }, + genMenuItem(_("Top"), "screensaver_message_position", "top"), + genMenuItem(_("Middle"), "screensaver_message_position", "middle"), + genMenuItem(_("Bottom"), "screensaver_message_position", "bottom", nil, true), }, }, { - text = _("Keep the screensaver on screen after wakeup"), - sub_item_table = { - genMenuItem(_("Disable"), "screensaver_delay", "disable"), - genMenuItem(_("For 1 second"), "screensaver_delay", "1"), - genMenuItem(_("For 3 second"), "screensaver_delay", "3"), - genMenuItem(_("For 5 second"), "screensaver_delay", "5"), - genMenuItem(_("Until a tap"), "screensaver_delay", "tap"), - genMenuItem(_("Until 'Exit screensaver' gesture"), "screensaver_delay", "gesture"), - }, + text = _("Hide reboot/poweroff Message"), + checked_func = function() + return G_reader_settings:isTrue("screensaver_hide_fallback_msg") + end, + callback = function() + G_reader_settings:toggle("screensaver_hide_fallback_msg") + end, + }, + }, + }, + + { + text = _("Custom Images"), + sub_item_table = { + { + text = _("Select Custom Image"), + keep_menu_open = true, + callback = function() + Screensaver:chooseFile() + end, + }, + { + text = _("Select folder with custom images"), + keep_menu_open = true, + callback = function() + Screensaver:chooseFolder() + end, + }, + + { + text = _("Document Cover"), + keep_menu_open = true, + callback = function() + Screensaver:chooseFile(true) + end, }, }, },