averello/koreader-mirror
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-12-13 20:36:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

cre word gap: use values from defaults.lua (#4045)

Browse Source
This commit is contained in:
sebastien
2018-07-03 15:29:04 +02:00
committed by poire-z
parent d8e58a08fd
commit 71ff69ec4f
4 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.luacheckrc
View File

@@ -69,6 +69,9 @@ read_globals = {
"DCREREADER_CONFIG_LINE_SPACE_PERCENT_SMALL",
"DCREREADER_CONFIG_LINE_SPACE_PERCENT_MEDIUM",
"DCREREADER_CONFIG_LINE_SPACE_PERCENT_LARGE",
"DCREREADER_CONFIG_WORD_GAP_SMALL",
"DCREREADER_CONFIG_WORD_GAP_MEDIUM",
"DCREREADER_CONFIG_WORD_GAP_LARGE",
"DCREREADER_PROGRESS_BAR",
"DMINIBAR_TOC_MARKER_WIDTH",
"DMINIBAR_HEIGHT",

5
defaults.lua
View File

@@ -125,6 +125,11 @@ DCREREADER_CONFIG_LINE_SPACE_PERCENT_SMALL = 90
DCREREADER_CONFIG_LINE_SPACE_PERCENT_MEDIUM = 100
DCREREADER_CONFIG_LINE_SPACE_PERCENT_LARGE = 120
-- word gap percentage
DCREREADER_CONFIG_WORD_GAP_SMALL = 50
DCREREADER_CONFIG_WORD_GAP_MEDIUM = 75
DCREREADER_CONFIG_WORD_GAP_LARGE = 100
-- crereader progress bar
-- 0 for top "full" progress bar
-- 1 for bottom "mini" progress bar

14
frontend/ui/data/creoptions.lua
View File

@@ -170,9 +170,17 @@ local CreOptions = {
name = "space_condensing",
name_text = S.WORD_GAP,
toggle = {S.SMALL, S.MEDIUM, S.LARGE},
values = {50, 75, 100},
default_value = 75,
args = {50, 75, 100},
values = {
DCREREADER_CONFIG_WORD_GAP_SMALL,
DCREREADER_CONFIG_WORD_GAP_MEDIUM,
DCREREADER_CONFIG_WORD_GAP_LARGE,
},
default_value = DCREREADER_CONFIG_WORD_GAP_MEDIUM,
args = {
DCREREADER_CONFIG_WORD_GAP_SMALL,
DCREREADER_CONFIG_WORD_GAP_MEDIUM,
DCREREADER_CONFIG_WORD_GAP_LARGE,
},
event = "SetSpaceCondensing",
name_text_hold_callback = optionsutil.showValues,
-- used by showValues

34
spec/unit/defaults_spec.lua
View File

@@ -8,8 +8,8 @@ describe("defaults module", function()
it("should load all defaults from defaults.lua", function()
Defaults:init()
assert.is_same(#Defaults.defaults_name, 74)
assert.is_same(Defaults.defaults_name[25], 'DHINTCOUNT')
assert.is_same(#Defaults.defaults_name, 77)
assert.is_same(Defaults.defaults_name[28], 'DHINTCOUNT')
end)
it("should save changes to defaults.persistent.lua", function()
@@ -18,16 +18,16 @@ describe("defaults module", function()
-- not in persistent but checked in defaults
Defaults.changed[11] = true
Defaults.changed[16] = true
Defaults.changed[25] = true
Defaults.changed[60] = true
Defaults.changed[74] = true
Defaults.changed[19] = true
Defaults.changed[28] = true
Defaults.changed[63] = true
Defaults.changed[77] = true
Defaults:saveSettings()
assert.is_same(#Defaults.defaults_name, 74)
assert.is_same(Defaults.defaults_name[25], 'DHINTCOUNT')
assert.is_same(Defaults.defaults_name[74], 'SEARCH_TITLE')
assert.is_same(Defaults.defaults_name[60], 'DTAP_ZONE_MENU')
assert.is_same(Defaults.defaults_name[16], 'DCREREADER_VIEW_MODE')
assert.is_same(#Defaults.defaults_name, 77)
assert.is_same(Defaults.defaults_name[28], 'DHINTCOUNT')
assert.is_same(Defaults.defaults_name[77], 'SEARCH_TITLE')
assert.is_same(Defaults.defaults_name[63], 'DTAP_ZONE_MENU')
assert.is_same(Defaults.defaults_name[19], 'DCREREADER_VIEW_MODE')
assert.is_same(Defaults.defaults_name[11],
'DCREREADER_CONFIG_MARGIN_SIZES_LARGE')
local fd = io.open(persistent_filename, "r")
@@ -54,10 +54,10 @@ DTAP_ZONE_MENU = {
-- in persistent
Defaults:init()
Defaults.changed[25] = true
Defaults.defaults_value[25] = 2
Defaults.changed[60] = true
Defaults.defaults_value[60] = {
Defaults.changed[28] = true
Defaults.defaults_value[28] = 2
Defaults.changed[63] = true
Defaults.defaults_value[63] = {
y = 10,
x = 10.125,
h = 20.25,
@@ -107,8 +107,8 @@ DHINTCOUNT = 2
-- in persistent
Defaults:init()
Defaults.changed[25] = true
Defaults.defaults_value[25] = 1
Defaults.changed[28] = true
Defaults.defaults_value[28] = 1
Defaults:saveSettings()
fd = io.open(persistent_filename)
assert.Equals(