From 752ec49c6f50301139eefbb3553e5a856b74497a Mon Sep 17 00:00:00 2001 From: hius07 <62179190+hius07@users.noreply.github.com> Date: Wed, 5 May 2021 21:43:43 +0300 Subject: [PATCH] FM: Make "Refresh content" an actual Event/Gesture (#7592) * And enable it by default in the FM as the "hold on top-right corner" Gesture, instead of the onHold handler of the "+" button. --- frontend/apps/filemanager/filemanager.lua | 15 ++++++++------- frontend/dispatcher.lua | 2 ++ plugins/gestures.koplugin/defaults.lua | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/frontend/apps/filemanager/filemanager.lua b/frontend/apps/filemanager/filemanager.lua index a95076dd7..a7ec0611a 100644 --- a/frontend/apps/filemanager/filemanager.lua +++ b/frontend/apps/filemanager/filemanager.lua @@ -131,13 +131,6 @@ function FileManager:setupLayout() padding_right = Size.padding.large, padding_bottom = 0, callback = function() self:onShowPlusMenu() end, - hold_callback = function() - self:onRefresh() - UIManager:show(InfoMessage:new{ - text = _("Content refreshed."), - timeout = 2, - }) - end, } self.path_text = TextWidget:new{ @@ -1194,4 +1187,12 @@ function FileManager:onHome() return self:goHome() end +function FileManager:onRefreshContent() + self:onRefresh() + UIManager:show(InfoMessage:new{ + text = _("Content refreshed."), + timeout = 2, + }) +end + return FileManager diff --git a/frontend/dispatcher.lua b/frontend/dispatcher.lua index 99832e0b9..ddd418e1a 100644 --- a/frontend/dispatcher.lua +++ b/frontend/dispatcher.lua @@ -90,6 +90,7 @@ local settingsList = { -- filemanager settings folder_up = { category="none", event="FolderUp", title=_("Folder up"), filemanager=true}, show_plus_menu = { category="none", event="ShowPlusMenu", title=_("Show plus menu"), filemanager=true}, + refresh_content = { category="none", event="RefreshContent", title=_("Refresh content"), filemanager=true}, folder_shortcuts = { category="none", event="ShowFolderShortcutsDialog", title=_("Folder shortcuts"), filemanager=true, separator=true,}, -- reader settings @@ -217,6 +218,7 @@ local dispatcher_menu_order = { -- filemanager "folder_up", "show_plus_menu", + "refresh_content", "folder_shortcuts", -- reader diff --git a/plugins/gestures.koplugin/defaults.lua b/plugins/gestures.koplugin/defaults.lua index 7f27f34c5..4fa1273df 100644 --- a/plugins/gestures.koplugin/defaults.lua +++ b/plugins/gestures.koplugin/defaults.lua @@ -8,7 +8,7 @@ return { tap_right_bottom_corner = nil, tap_left_bottom_corner = Device:hasFrontlight() and {toggle_frontlight = true,} or nil, hold_top_left_corner = nil, - hold_top_right_corner = nil, + hold_top_right_corner = {refresh_content = true,}, hold_bottom_left_corner = nil, hold_bottom_right_corner = nil, one_finger_swipe_left_edge_down = Device:hasFrontlight() and {decrease_frontlight = 0,} or nil,