[UX] Set global settings independent of local setting (#5522)

This commit is contained in:
yparitcher
2019-10-25 11:25:26 -04:00
committed by Frans de Jonge
parent 6c68df42ec
commit aa165cefe9
6 changed files with 116 additions and 50 deletions

View File

@@ -9,6 +9,7 @@ local InputDialog = require("ui/widget/inputdialog")
local JSON = require("json")
local KeyValuePage = require("ui/widget/keyvaluepage")
local LuaData = require("luadata")
local MultiConfirmBox = require("ui/widget/multiconfirmbox")
local NetworkMgr = require("ui/network/manager")
local Trapper = require("ui/trapper")
local UIManager = require("ui/uimanager")
@@ -249,7 +250,7 @@ If you'd like to change the order in which dictionaries are queried (and their r
self.disable_fuzzy_search = not self.disable_fuzzy_search
end,
hold_callback = function()
self:makeDisableFuzzyDefault(self.disable_fuzzy_search)
self:toggleFuzzyDefault()
end,
separator = true,
},
@@ -950,21 +951,37 @@ function ReaderDictionary:onSaveSettings()
self.ui.doc_settings:saveSetting("disable_fuzzy_search", self.disable_fuzzy_search)
end
function ReaderDictionary:makeDisableFuzzyDefault(disable_fuzzy_search)
logger.dbg("disable fuzzy search", self.disable_fuzzy_search)
UIManager:show(ConfirmBox:new{
function ReaderDictionary:toggleFuzzyDefault()
local disable_fuzzy_search = G_reader_settings:isTrue("disable_fuzzy_search")
UIManager:show(MultiConfirmBox:new{
text = T(
disable_fuzzy_search
and _("Disable fuzzy search by default?")
or _("Enable fuzzy search by default?")
and _([[
Would you like to enable or disable fuzzy search by default?
Fuzzy search can match epuisante, épuisante and épuisantes to épuisant, even if only the latter has an entry in the dictionary. It can be disabled to improve performance, but it might be worthwhile to look into disabling unneeded dictionaries before disabling fuzzy search.
The current default (★) is disabled.]])
or _([[
Would you like to enable or disable fuzzy search by default?
Fuzzy search can match epuisante, épuisante and épuisantes to épuisant, even if only the latter has an entry in the dictionary. It can be disabled to improve performance, but it might be worthwhile to look into disabling unneeded dictionaries before disabling fuzzy search.
The current default (★) is enabled.]])
),
ok_text = T(
disable_fuzzy_search
and _("Disable")
or _("Enable")
),
ok_callback = function()
G_reader_settings:saveSetting("disable_fuzzy_search", disable_fuzzy_search)
choice1_text_func = function()
return disable_fuzzy_search and _("Disable (★)") or _("Disable")
end,
choice1_enabled = not disable_fuzzy_search,
choice1_callback = function()
G_reader_settings:saveSetting("disable_fuzzy_search", true)
end,
choice2_text_func = function()
return disable_fuzzy_search and _("Enable") or _("Enable (★)")
end,
choice2_enabled = disable_fuzzy_search,
choice2_callback = function()
G_reader_settings:saveSetting("disable_fuzzy_search", false)
end,
})
end