Standardize: long-press/hold to long-press (#8185)

* Gestures: standardize hold to long-press

* Common settings menu: standardize hold to long-press

* Readerstyletweak: standardize hold to long-press

* Readersearch: standardize hold to long-press
reviewable/pr8189/r1
hius07 3 years ago committed by GitHub
parent 71cea5a9f6
commit ab4e27908b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -9,6 +9,7 @@ local Notification = require("ui/widget/notification")
local UIManager = require("ui/uimanager") local UIManager = require("ui/uimanager")
local logger = require("logger") local logger = require("logger")
local _ = require("gettext") local _ = require("gettext")
local Screen = Device.screen
local T = require("ffi/util").template local T = require("ffi/util").template
local ReaderSearch = InputContainer:new{ local ReaderSearch = InputContainer:new{
@ -106,6 +107,7 @@ function ReaderSearch:onShowFulltextSearchInput()
end end
self.input_dialog = InputDialog:new{ self.input_dialog = InputDialog:new{
title = _("Enter text to search for"), title = _("Enter text to search for"),
width = math.floor(Screen:getWidth() * 0.9),
input = self.last_search_text, input = self.last_search_text,
buttons = { buttons = {
{ {
@ -143,7 +145,7 @@ function ReaderSearch:onShowFulltextSearchInput()
} }
self.input_dialog:addWidget(self.check_button_case) self.input_dialog:addWidget(self.check_button_case)
self.check_button_regex = CheckButton:new{ self.check_button_regex = CheckButton:new{
text = _("Regular expression (hold for help)"), text = _("Regular expression (long-press for help)"),
checked = self.use_regex, checked = self.use_regex,
parent = self.input_dialog, parent = self.input_dialog,
max_width = self.input_dialog._input_widget.width, max_width = self.input_dialog._input_widget.width,

@ -359,7 +359,7 @@ function ReaderStyleTweak:init()
-- enabled tweaks / none (without the need to disable each of -- enabled tweaks / none (without the need to disable each of
-- them) -- them)
table.insert(self.tweaks_table, { table.insert(self.tweaks_table, {
text = _("Enable style tweaks (hold for info)"), text = _("Enable style tweaks (long-press for help)"),
checked_func = function() return self.enabled end, checked_func = function() return self.enabled end,
callback = function() callback = function()
self.enabled = not self.enabled self.enabled = not self.enabled
@ -547,7 +547,7 @@ You can enable individual tweaks on this book with a tap, or view more details a
local book_tweak_item = { local book_tweak_item = {
text_func = function() text_func = function()
if self.book_style_tweak then if self.book_style_tweak then
return _("Book-specific tweak (hold to edit)") return _("Book-specific tweak (long-press to edit)")
else else
return _("Book-specific tweak") return _("Book-specific tweak")
end end

@ -238,7 +238,7 @@ common_settings.screen_notification = require("ui/elements/screen_notification_m
common_settings.menu_activate = require("ui/elements/menu_activate") common_settings.menu_activate = require("ui/elements/menu_activate")
common_settings.screen_disable_double_tab = require("ui/elements/screen_disable_double_tap_table") common_settings.screen_disable_double_tab = require("ui/elements/screen_disable_double_tap_table")
common_settings.ignore_hold_corners = { common_settings.ignore_hold_corners = {
text = _("Ignore hold on corners"), text = _("Ignore long-press on corners"),
checked_func = function() checked_func = function()
return G_reader_settings:isTrue("ignore_hold_corners") return G_reader_settings:isTrue("ignore_hold_corners")
end, end,

@ -584,15 +584,15 @@ Default value: %1]]), GestureDetector.TWO_FINGER_TAP_DURATION/1000),
end, end,
}, },
{ {
text = _("Hold interval"), text = _("Long-press interval"),
keep_menu_open = true, keep_menu_open = true,
callback = function() callback = function()
local SpinWidget = require("ui/widget/spinwidget") local SpinWidget = require("ui/widget/spinwidget")
local GestureDetector = require("device/gesturedetector") local GestureDetector = require("device/gesturedetector")
local items = SpinWidget:new{ local items = SpinWidget:new{
title_text = _("Hold interval"), title_text = _("Long-press interval"),
info_text = T(_([[ info_text = T(_([[
If a touch is not released in this interval, it is considered a hold (or long-press). On document's text, single word selection is then triggered. If a touch is not released in this interval, it is considered a long-press. On document text, single word selection will then be triggered.
The interval value is in milliseconds and can range from 100 (0.1 seconds) to 2000 (2 seconds). The interval value is in milliseconds and can range from 100 (0.1 seconds) to 2000 (2 seconds).
Default value: %1]]), GestureDetector.HOLD_INTERVAL/1000), Default value: %1]]), GestureDetector.HOLD_INTERVAL/1000),
@ -674,7 +674,7 @@ function Gestures:addToMainMenu(menu_items)
sub_item_table = self:genSubItemTable({"tap_top_left_corner", "tap_top_right_corner", "tap_left_bottom_corner", "tap_right_bottom_corner"}), sub_item_table = self:genSubItemTable({"tap_top_left_corner", "tap_top_right_corner", "tap_left_bottom_corner", "tap_right_bottom_corner"}),
}, },
{ {
text = _("Hold corner"), text = _("Long-press on corner"),
sub_item_table = self:genSubItemTable({"hold_top_left_corner", "hold_top_right_corner", "hold_bottom_left_corner", "hold_bottom_right_corner"}), sub_item_table = self:genSubItemTable({"hold_top_left_corner", "hold_top_right_corner", "hold_bottom_left_corner", "hold_bottom_right_corner"}),
}, },
{ {

Loading…
Cancel
Save