Archives/koreader
2
0
Fork 0
mirror of https://github.com/koreader/koreader synced 2024-11-16 06:12:56 +00:00
Code Issues Projects Releases Wiki Activity

Remove DFULL_SCREEN (#5695)

Browse Source
This commit is contained in:
Robert 2019-12-27 23:03:31 +01:00 committed by Frans de Jonge
parent 7fb2db8f02
commit c3a0bd4def
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.luacheckrc
View File

@ -13,7 +13,6 @@ read_globals = {
"KOBO_TOUCH_MIRRORED",
"KOBO_SYNC_BRIGHTNESS_WITH_NICKEL",
"DHINTCOUNT",
"DFULL_SCREEN",
"DSCROLL_MODE",
"DGLOBALGAMMA",
"DRENDER_MODE",

3
defaults.lua
View File

@ -11,7 +11,8 @@
DHINTCOUNT = 1
-- full screen mode, 1 for true, 0 for false
DFULL_SCREEN = 1
-- no longer needed
--DFULL_SCREEN = 1
-- scroll mode, 1 for true, 0 for false
DSCROLL_MODE = 1

2
frontend/ui/data/koptoptions.lua
View File

@ -59,7 +59,7 @@ local KoptOptions = {
name_text = S.PROGRESS_BAR,
toggle = {S.OFF, S.ON},
values = {1, 0},
default_value = DFULL_SCREEN,
default_value = 1,
event = "SetFullScreen",
args = {true, false},
show = false,

24
spec/unit/defaults_spec.lua
View File

@ -8,8 +8,7 @@ describe("defaults module", function()
it("should load all defaults from defaults.lua", function()
Defaults:init()
assert.is_same(108, #Defaults.defaults_name)
assert.is_same("DFULL_SCREEN", Defaults.defaults_name[54])
assert.is_same(107, #Defaults.defaults_name)
end)
it("should save changes to defaults.persistent.lua", function()
@ -20,13 +19,12 @@ describe("defaults module", function()
Defaults.changed[20] = true
Defaults.changed[47] = true
Defaults.changed[54] = true
Defaults.changed[87] = true
Defaults.changed[103] = true
Defaults.changed[86] = true
Defaults.changed[102] = true
Defaults:saveSettings()
assert.is_same(108, #Defaults.defaults_name)
assert.is_same("DFULL_SCREEN", Defaults.defaults_name[54])
assert.is_same("SEARCH_LIBRARY_PATH", Defaults.defaults_name[103])
assert.is_same("DTAP_ZONE_BACKWARD", Defaults.defaults_name[87])
assert.is_same(107, #Defaults.defaults_name)
assert.is_same("SEARCH_LIBRARY_PATH", Defaults.defaults_name[102])
assert.is_same("DTAP_ZONE_BACKWARD", Defaults.defaults_name[86])
assert.is_same("DCREREADER_CONFIG_WORD_SPACING_LARGE", Defaults.defaults_name[47])
assert.is_same("DCREREADER_CONFIG_H_MARGIN_SIZES_XXX_LARGE", Defaults.defaults_name[20])
local fd = io.open(persistent_filename, "r")
@ -47,7 +45,7 @@ DCREREADER_CONFIG_H_MARGIN_SIZES_XXX_LARGE = {
[1] = 50,
[2] = 50
}
DFULL_SCREEN = 1
DGLOBALGAMMA = 1
]],
fd:read("*a"))
fd:close()
@ -56,8 +54,8 @@ DFULL_SCREEN = 1
Defaults:init()
Defaults.changed[54] = true
Defaults.defaults_value[54] = 2
Defaults.changed[87] = true
Defaults.defaults_value[87] = {
Defaults.changed[86] = true
Defaults.defaults_value[86] = {
y = 10,
x = 10.125,
h = 20.25,
@ -82,7 +80,7 @@ DCREREADER_CONFIG_H_MARGIN_SIZES_XXX_LARGE = {
[2] = 50,
[1] = 50
}
DFULL_SCREEN = 2
DGLOBALGAMMA = 2
]],
fd:read("*a"))
fd:close()
@ -118,7 +116,7 @@ DCREREADER_CONFIG_H_MARGIN_SIZES_LARGE = {
[1] = 15
}
DHINTCOUNT = 2
DFULL_SCREEN = 1
DGLOBALGAMMA = 1
DCREREADER_VIEW_MODE = "page"
]],
fd:read("*a"))