From ddf6f3616c035b7986266eddeb3dd2d47afd3f0c Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Sat, 12 Aug 2023 00:03:36 +0200 Subject: [PATCH] Menu: Amend the previous commit Kindle animations are Reader only ;). --- frontend/ui/elements/page_turns.lua | 14 ++++++ frontend/ui/elements/platform_navigation.lua | 49 +++++++------------- 2 files changed, 32 insertions(+), 31 deletions(-) diff --git a/frontend/ui/elements/page_turns.lua b/frontend/ui/elements/page_turns.lua index 8b14be642..ff7ca49bc 100644 --- a/frontend/ui/elements/page_turns.lua +++ b/frontend/ui/elements/page_turns.lua @@ -1,3 +1,4 @@ +local Device = require("device") local Event = require("ui/event") local ReaderUI = require("apps/reader/readerui") local UIManager = require("ui/uimanager") @@ -170,4 +171,17 @@ When enabled the UI direction for the Table of Contents, Book Map, and Page Brow } } +if Device:canDoSwipeAnimation() then + table.insert(PageTurns.sub_item_table, { + text =_("Page turn animations"), + checked_func = function() + return G_reader_settings:isTrue("swipe_animations") + end, + callback = function() + UIManager:broadcastEvent(Event:new("TogglePageChangeAnimation")) + end, + separator = true, + }) +end + return PageTurns diff --git a/frontend/ui/elements/platform_navigation.lua b/frontend/ui/elements/platform_navigation.lua index 55c3d800d..b38a52694 100644 --- a/frontend/ui/elements/platform_navigation.lua +++ b/frontend/ui/elements/platform_navigation.lua @@ -1,41 +1,28 @@ local Device = require("device") + +-- Everything in there requires physicla page turn keys ;). +if Device:hasKeys() then + -- No menu entry at all if we don't have any + return {} +end + local Event = require("ui/event") local UIManager = require("ui/uimanager") local _ = require("gettext") local PlatformNav = { text = _("Page turn behavior"), -- Mainly so as to differentiate w/ "Page Turns" when in readermenu... - sub_item_table = {}, + sub_item_table = { + { + text = _("Invert page turn buttons"), + checked_func = function() + return G_reader_settings:isTrue("input_invert_page_turn_keys") + end, + callback = function() + UIManager:broadcastEvent(Event:new("SwapPageTurnButtons")) + end, + } + }, } -if Device:canDoSwipeAnimation() then - table.insert(PlatformNav.sub_item_table, { - text =_("Page turn animations"), - checked_func = function() - return G_reader_settings:isTrue("swipe_animations") - end, - callback = function() - UIManager:broadcastEvent(Event:new("TogglePageChangeAnimation")) - end, - separator = true, - }) -end - -if Device:hasKeys() then - table.insert(PlatformNav.sub_item_table, { - text = _("Invert page turn buttons"), - checked_func = function() - return G_reader_settings:isTrue("input_invert_page_turn_keys") - end, - callback = function() - UIManager:broadcastEvent(Event:new("SwapPageTurnButtons")) - end, - }) -end - --- No menu item at all if it's empty -if #PlatformNav.sub_item_table == 0 then - return {} -end - return PlatformNav