[screensaver menu] remove gesture based option from NT devices by Commodore64user · Pull Request #12747 · koreader/koreader

Commodore64user · 2024-11-17T02:11:59Z

what's new:

Added a new local function getUntilTapOrKeyPressText to return appropriate text based on whether the device is a touch device or not.
Refactored the return statement to use a local menu_items table.
Conditionally added the Until 'exit sleep screen' gesture menu item only to touch devices.

issue was first documented here #12744

This change is

…rKeyPressText function

mergen3107 · 2024-11-17T03:17:02Z

Conditionally added the "Until 'exit sleep screen' gesture" menu item only for touch devices.

@Commodore64user
Can you please also make it so it unchecks it if 1) device is non-touch; and 2) this setting was on in the settings.readerl.lua? This will definitely help, because I scratched my head when it was on - I had to also press a key after power button to let KOReader open it (there is no frontlight on K4NT, so I didn't see any indication that it was waiting for "gesture" after power button :D)

…n gesture'

Commodore64user · 2024-11-17T12:27:36Z

according to this comment here

koreader/frontend/ui/screensaver.lua

Lines 414 to 426 in fd37272

    
           -- These 2 (optional) parameters are to support poweroff and reboot actions on Kobo (c.f., UIManager) 
        
           self.prefix = event and event .. "_" or "" -- "", "poweroff_" or "reboot_" 
        
           self.event_message = event_message 
        
           if G_reader_settings:has(self.prefix .. "screensaver_type") then 
        
               self.screensaver_type = G_reader_settings:readSetting(self.prefix .. "screensaver_type") 
        
           else 
        
               if event and G_reader_settings:isFalse("screensaver_hide_fallback_msg") then 
        
                   -- Display the provided event_message over the screensaver, 
        
                   -- so the user can distinguish between suspend (no overlay), 
        
                   -- and reboot/poweroff (overlaid message). 
        
                   self.overlay_message = self.event_message 
        
               end 
        
           end

it appears the "Hide reboot/poweroff message" is kobo specific, should it be removed from non kobo devices?

koreader/frontend/ui/elements/screensaver_menu.lua

Lines 167 to 175 in fd37272

    
           { 
        
               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, 
        
           },

NiLuJe · 2024-11-17T14:44:03Z

it appears the "Hide reboot/poweroff message" is kobo specific, should it be removed from non kobo devices?

No, that comment is misleading/outdated, it's actually available anywhere we can control poweroff/reboot.

NiLuJe · 2024-11-17T14:46:19Z

anywhere we can control poweroff/reboot.

i.e., canReboot & canPowerOff Device caps.

NiLuJe · 2024-11-17T14:49:29Z

 }
+
+if Device:isTouchDevice() then
+    table.insert(menu_items[1].sub_item_table[8].sub_item_table,


Possibly #menu_items[1].sub_item_table instead of 8? (Assuming it's indeed the final element).

Or anything else you might come up with to avoid the magic number, basically ;).

~~iterating through all the elements and matching the name of the sub_item_table ("Postpone screen update after wake-up")?~~ ignore that

(Assuming it's indeed the final element).

it isn't. it the 8th/9

"Show book cover on sleep screen" "Show custom image or cover on sleep screen" "Show random image from folder on sleep screen" "Show reading progress on sleep screen" "Show book status on sleep screen" "Leave screen as-is" "Border fill, rotation, and fit" 8. "Postpone screen update after wake-up" -- this is the one "Custom images"

Can't you just on line 97:

- -- "Until 'exit sleep screen' gesture" is added later to touch devices + Device:isTouchDevice() and genMenuItem(_("Until 'exit sleep screen' gesture"), "screensaver_delay", "gesture") or nil

that works, yes.

Commodore64user · 2024-11-17T15:28:59Z

anywhere we can control poweroff/reboot.

i.e., canReboot & canPowerOff Device caps.

AND or OR?

NiLuJe · 2024-11-17T16:11:05Z

AND or OR?

U+0026 ;p.

poire-z · 2024-11-21T20:12:23Z

                    genMenuItem(_("5 seconds"), "screensaver_delay", "5"),
-                    genMenuItem(_("Until a tap"), "screensaver_delay", "tap"),
-                    genMenuItem(_("Until 'exit sleep screen' gesture"), "screensaver_delay", "gesture"),
+                    genMenuItem(getUntilTapOrKeyPressText(), "screensaver_delay", "tap"),


Not worth a function 80 lines away, you can inline that:
genMenuItem(Device:isTouchDevice() and _("Until a tap") or _("Until a key press"), "screensaver_delay", "tap"),

(as I did, but opposite in #12771)

this was done prior to realising that trick worked inside that function

I just learned it today myself :D
_meta.lua:
https://github.com/koreader/koreader/pull/12766/files

poire-z · 2024-11-21T20:13:30Z

            },
-            {
-                text = _("Hide reboot/poweroff message"),


If this is the last item in the array, you can use:

Device:canReboot() and Device:canPowerOff() and { text... } or nil

instead of the table.insert() below.

will do then

poire-z · 2024-11-22T00:00:47Z

-return {
+
+local menu_items = {


You can now keep the original return {.

hius07 · 2024-11-22T05:48:56Z

koreader/frontend/ui/elements/screensaver_menu.lua

Line 41 in f38f63f

separator = true,

Looks like a wrong line.

poire-z · 2024-11-22T08:14:20Z


 -- Date at which the last migration snippet was added
-local CURRENT_MIGRATION_DATE = 20240928
+local CURRENT_MIGRATION_DATE = 20241117


(Update the date to the day this gets a chance to be merged :))

mmm what does that mean? today? I thought the specific date was irrelevant so long as it was a number larger than the previously used one.

it indeed just needs to be larger than the previous one - but best to have it precise so we know when things happened and are not misleaded.
Today is fine if the PR is ready (dunno about @hius07 last comment), even if merged tomorrow.

Commodore64user · 2024-11-23T17:54:57Z

Happy 50th commit-versary to me. 😬🥂

mergen3107 · 2024-11-23T18:02:28Z

And your Commodore 64!

…der#12747)

add conditional to 'Until exit sleep screen gesture' and getUntilTapO…

1e09f47

…rKeyPressText function

Commodore64user added 2 commits November 17, 2024 11:59

add migration for NT users that have selected 'Until exit sleep scree…

1ecfcee

…n gesture'

add comment and break down conditional to improve readability

98c1ab4

NiLuJe reviewed Nov 17, 2024

View reviewed changes

Commodore64user added 2 commits November 17, 2024 16:45

add conditionals to reboot/poweroff and rewrite exit sleep screen

0354736

he said ampersand, duh

9df8927

Commodore64user mentioned this pull request Nov 21, 2024

[Non Touch Devices] Replace "until a tap" with "until a button press" (Screen Saver) #12771

Closed

Commodore64user requested review from NiLuJe and poire-z November 21, 2024 20:03

poire-z reviewed Nov 21, 2024

View reviewed changes

inline device checks

3e06ea1

poire-z reviewed Nov 22, 2024

View reviewed changes

the return of return

f38f63f

poire-z reviewed Nov 22, 2024

View reviewed changes

Commodore64user added 2 commits November 22, 2024 09:57

update migration date and remove stray separator

45ea116

oops, apparently i had missed some dates

ab7c5af

poire-z approved these changes Nov 23, 2024

View reviewed changes

NiLuJe approved these changes Nov 23, 2024

View reviewed changes

Frenzie added this to the 2025.01 milestone Nov 23, 2024

Frenzie merged commit de7c592 into koreader:master Nov 23, 2024

Commodore64user deleted the sleep-screen branch November 23, 2024 20:34

0xstillb pushed a commit to 0xstillb/koreader-thai that referenced this pull request May 9, 2026

[screensaver menu] remove gesture based option from NT devices (korea…

0db6ce5

…der#12747)

Uh oh!

Uh oh!

Conversation

Commodore64user commented Nov 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

what's new:

Uh oh!

mergen3107 commented Nov 17, 2024

Uh oh!

Commodore64user commented Nov 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

NiLuJe commented Nov 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

NiLuJe commented Nov 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Commodore64user Nov 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Commodore64user commented Nov 17, 2024

Uh oh!

NiLuJe commented Nov 17, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hius07 commented Nov 22, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Commodore64user commented Nov 23, 2024

Uh oh!

mergen3107 commented Nov 23, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Commodore64user commented Nov 17, 2024 •

edited

Loading

Commodore64user commented Nov 17, 2024 •

edited

Loading

NiLuJe commented Nov 17, 2024 •

edited

Loading

NiLuJe commented Nov 17, 2024 •

edited

Loading

Commodore64user Nov 17, 2024 •

edited

Loading