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
3b129e2ada
koreader/frontend/ui/data/creoptions.lua

749 lines
39 KiB
Lua
Raw Normal View History

[UX] Make the reader bottom menu compatible with key navigation (#3785) * [toggleswitch] Add support for key navigation to this widget Add the onFocus an onUnfocus event handler add a new function that just circle the switch if not touch event is detected * Add key navigation to the readermenu The shortcut is still Alt-gr on sdl, to be defined on Kindle * Remove the old method of handling the Press key. Now the event is handled by the main widget who implement focusmanager and then dispatched to the currently focused item. Modify the fine font tuning only for non touch-devices See : https://github.com/koreader/koreader/pull/3785#issuecomment-375306466
2018-03-22 20:01:38 +00:00
local Device = require("device")
Landscape FM / Refactor rotation (#6309) * landscape FM / Refactor rotation refactor and simplify the orientation handling code. the user generally cares about the rotation (what direction the device is facing) and not about if koreader is displaying in portrait or landscape mode * bump base update luasocket, libjpeg-turbo, curl add logging to evernote-sdk-lua update framebuffer for proper rotation
2020-07-01 20:17:41 +00:00
local Screen = Device.screen
Embedded fonts toggle: disabled if no embedded font Have the enabled/disabled state of the toggle show the presence or not of embedded fonts in the current book. Also show the names of the embedded fonts in the help_text InfoMessage.
2022-06-11 09:08:42 +00:00
local ffiUtil = require("ffi/util")
Show current and default values in config dialog (pdf) (#3973)
2018-05-26 17:45:37 +00:00
local optionsutil = require("ui/data/optionsutil")
Refactored to use strictly locals
2013-10-18 20:38:07 +00:00
local _ = require("gettext")
Dispatcher: nil guard against access to a document instance (#7389) Also: * Properly update *all* the touch zones when rotating the FM * Unbreak (Reader) rotation labels in Dispatcher Regression since #7306
2021-03-06 18:27:23 +00:00
local C_ = _.pgettext
Embedded fonts toggle: disabled if no embedded font Have the enabled/disabled state of the toggle show the presence or not of embedded fonts in the current book. Also show the names of the embedded fonts in the help_text InfoMessage.
2022-06-11 09:08:42 +00:00
local T = ffiUtil.template
move kopt/cre options into ui/data directory & wrap strings in config options
2013-04-08 14:26:54 +00:00
Reorganize bottom menu config panels (#6131) Mostly for the PDF bottom menu. - Reorganize by topic, trying to limit the number of widgets per panel to 4. - Re-order some toggles from low to high ('off' then 'on'). - Show font size as number instead of a list of "Aa". - PDF: add more font size values, and increase usable contrast values. - Add help_text to most PDF toggle titles. - CRE line spacing: increase fine tuning min and max. Also avoid zoom advice messages on book load.
2020-05-07 18:24:12 +00:00
-- Get font size numbers as a table of strings
local tableOfNumbersToTableOfStrings = function(numbers)
local t = {}
for i, v in ipairs(numbers) do
-- We turn 17.5 into 17<sup>5</sup>
table.insert(t, tostring(v%1==0 and v or (v-v%1).."⁵"))
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
end
Reorganize bottom menu config panels (#6131) Mostly for the PDF bottom menu. - Reorganize by topic, trying to limit the number of widgets per panel to 4. - Re-order some toggles from low to high ('off' then 'on'). - Show font size as number instead of a list of "Aa". - PDF: add more font size values, and increase usable contrast values. - Add help_text to most PDF toggle titles. - CRE line spacing: increase fine tuning min and max. Also avoid zoom advice messages on book load.
2020-05-07 18:24:12 +00:00
return t
end
adjust font sizes in credocument according to screen dpi and font sizes list is moved to defaults.lua
2013-10-16 09:06:28 +00:00
CreOptions: Display weight classes names, in addition to their raw value.
2021-04-29 18:16:30 +00:00
-- OS/2 weight classes map
-- c.f., https://docs.microsoft.com/en-us/typography/opentype/spec/os2#usweightclass
local usWeightClass = {
[100] = C_("Font weight class", "Thin"),
[200] = C_("Font weight class", "Extra-light"),
[300] = C_("Font weight class", "Light"),
[400] = C_("Font weight class", "Regular"),
[500] = C_("Font weight class", "Medium"),
[600] = C_("Font weight class", "Semi-bold"),
[700] = C_("Font weight class", "Bold"),
[800] = C_("Font weight class", "Extra-bold"),
[900] = C_("Font weight class", "Black"),
}
local function weightClassToString(weight)
if usWeightClass[weight] then
return T(_("%1 (%2)"), usWeightClass[weight], weight)
else
return tostring(weight)
end
end
local function prettifyCreWeights(t)
local p = {}
for __, v in ipairs(t) do
table.insert(p, weightClassToString(v))
end
return p
end
Refactored to use strictly locals
2013-10-18 20:38:07 +00:00
local CreOptions = {
ReaderZooming: Deal with some more fallout of the new zoom modes (#7728) * Namely, ensure zoom_mode is consistent with genus & type *both ways*. (I only dealt with the "no zoom_mode" case in my original fixup). Because documents with settings dating back from before the new zoom modes had "old" zoom_mode settings mixed with "new" genus/type defaults that didn't agree with each other. It lead to super-confusing ConfigDialog behavior, because ConfigDialog was in fact not reflecting the reality. (As the source of truth is actually `zoom_mode`). * There was a snafu in manual mode, because of the extremely weird way prefixes are handled by Configurable/ReaderConfig/DocSettings/ConfigDialog. So, make sure we only have a *single* zoom_factor, and that it's updated and saved properly under the right name everywhere. Fixes inconsistencies between first swapping to manual mode, and what the ConfigDialog said/did (because again: possibly a lie), vs., re-opening the same document, which would magically use *different* settings, closer to what was expected (but still broken because of the prefix mismatch and a disagreement on defaults between the two variants). Fallout from #6885
2021-05-22 01:28:52 +00:00
prefix = "copt",
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
{
Update UI layout code to use new SVG icons - Add IconWidget, use it for icons instead of ImageWidget. Specify icons by name only, look for them (with either .svg or .png suffixes) in multiple directories (including koreader/settings/icons/ to allow customizing them). Don't crash when icon name not found, shown a black background warning icon instead. - Don't trust the icons' native sizes: replace scale_for_dpi=true with width/height=DGENERIC_ICON_SIZE, so all icons get the same (tunable) size - except in a few specific use cases. - Top and bottom menu bars: normalize, and have icons properly centered in them, extend vertical line separators up to the edges. - TOC: adjust expand/collapse icons size to items size
2020-12-19 11:18:30 +00:00
icon = "appbar.rotation",
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
options = {
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderView
Landscape FM / Refactor rotation (#6309) * landscape FM / Refactor rotation refactor and simplify the orientation handling code. the user generally cares about the rotation (what direction the device is facing) and not about if koreader is displaying in portrait or landscape mode * bump base update luasocket, libjpeg-turbo, curl add logging to evernote-sdk-lua update framebuffer for proper rotation
2020-07-01 20:17:41 +00:00
name = "rotation_mode",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("Rotation"),
Rotation icons: make 'em dynamic. (#7440) Followup to #7306. As discussed there, the only way to make everybody happy is to make 'em context-aware. At which point, trying to make the fact that it's a *device* rotation and not a *content* one come across in the icon design loses its interest, and would actually only further muddy the issue. So, these are similar is spirit to the traditional rotation icons in pretty much anything that can rotate text content, with a special inspiration from the Kindle 4 & PocketBook UI. Fix #7429
2021-03-29 03:12:22 +00:00
item_icons_func = function()
Input/Device: Refactor Gyro events handling (#9935) * Get rid of the `canToggleGSensor` Device cap, it's now mandatory for `hasGSensor` devices. (This means Kindles can now toggle the gyro, fix #9136). * This also means that `Device:toggleGSensor` is now implemented by `Generic`. * Update the Screen & Gyro rotation constants to be clearer (c.f., https://github.com/koreader/koreader-base/pull/1568) (/!\ This might conceivably break some `rotation_map` user-patches). * Input: Move the platform-specific gyro handling to Device implementations, and let Input only handle a single, custom protocol (`EV_MSC:MSC_GYRO`). * Input: Refine the `rotation_map` disable method implemented in 43b021d37cc01a924740aba34ae337d813dbf540. Instead of directly poking at the internal field, use a new method, `disableRotationMap` (/!\ Again, this might break some `rotation_map` user-patches). * Input: Minor tweaks to event adjust hooks to make them more modular, allowing the Kobo implementation to build and use a single composite hook. API compatibility maintained with wrappers.
2022-12-21 14:50:39 +00:00
if Screen:getRotationMode() == Screen.DEVICE_ROTATED_UPRIGHT then
Rotation icons: make 'em dynamic. (#7440) Followup to #7306. As discussed there, the only way to make everybody happy is to make 'em context-aware. At which point, trying to make the fact that it's a *device* rotation and not a *content* one come across in the icon design loses its interest, and would actually only further muddy the issue. So, these are similar is spirit to the traditional rotation icons in pretty much anything that can rotate text content, with a special inspiration from the Kindle 4 & PocketBook UI. Fix #7429
2021-03-29 03:12:22 +00:00
-- P, 0UR
return {
"rotation.P.90CCW",
"rotation.P.0UR",
"rotation.P.90CW",
"rotation.P.180UD",
}
Input/Device: Refactor Gyro events handling (#9935) * Get rid of the `canToggleGSensor` Device cap, it's now mandatory for `hasGSensor` devices. (This means Kindles can now toggle the gyro, fix #9136). * This also means that `Device:toggleGSensor` is now implemented by `Generic`. * Update the Screen & Gyro rotation constants to be clearer (c.f., https://github.com/koreader/koreader-base/pull/1568) (/!\ This might conceivably break some `rotation_map` user-patches). * Input: Move the platform-specific gyro handling to Device implementations, and let Input only handle a single, custom protocol (`EV_MSC:MSC_GYRO`). * Input: Refine the `rotation_map` disable method implemented in 43b021d37cc01a924740aba34ae337d813dbf540. Instead of directly poking at the internal field, use a new method, `disableRotationMap` (/!\ Again, this might break some `rotation_map` user-patches). * Input: Minor tweaks to event adjust hooks to make them more modular, allowing the Kobo implementation to build and use a single composite hook. API compatibility maintained with wrappers.
2022-12-21 14:50:39 +00:00
elseif Screen:getRotationMode() == Screen.DEVICE_ROTATED_UPSIDE_DOWN then
Rotation icons: make 'em dynamic. (#7440) Followup to #7306. As discussed there, the only way to make everybody happy is to make 'em context-aware. At which point, trying to make the fact that it's a *device* rotation and not a *content* one come across in the icon design loses its interest, and would actually only further muddy the issue. So, these are similar is spirit to the traditional rotation icons in pretty much anything that can rotate text content, with a special inspiration from the Kindle 4 & PocketBook UI. Fix #7429
2021-03-29 03:12:22 +00:00
-- P, 180UD
return {
"rotation.P.90CW",
"rotation.P.180UD",
"rotation.P.90CCW",
"rotation.P.0UR",
}
Input/Device: Refactor Gyro events handling (#9935) * Get rid of the `canToggleGSensor` Device cap, it's now mandatory for `hasGSensor` devices. (This means Kindles can now toggle the gyro, fix #9136). * This also means that `Device:toggleGSensor` is now implemented by `Generic`. * Update the Screen & Gyro rotation constants to be clearer (c.f., https://github.com/koreader/koreader-base/pull/1568) (/!\ This might conceivably break some `rotation_map` user-patches). * Input: Move the platform-specific gyro handling to Device implementations, and let Input only handle a single, custom protocol (`EV_MSC:MSC_GYRO`). * Input: Refine the `rotation_map` disable method implemented in 43b021d37cc01a924740aba34ae337d813dbf540. Instead of directly poking at the internal field, use a new method, `disableRotationMap` (/!\ Again, this might break some `rotation_map` user-patches). * Input: Minor tweaks to event adjust hooks to make them more modular, allowing the Kobo implementation to build and use a single composite hook. API compatibility maintained with wrappers.
2022-12-21 14:50:39 +00:00
elseif Screen:getRotationMode() == Screen.DEVICE_ROTATED_CLOCKWISE then
Rotation icons: make 'em dynamic. (#7440) Followup to #7306. As discussed there, the only way to make everybody happy is to make 'em context-aware. At which point, trying to make the fact that it's a *device* rotation and not a *content* one come across in the icon design loses its interest, and would actually only further muddy the issue. So, these are similar is spirit to the traditional rotation icons in pretty much anything that can rotate text content, with a special inspiration from the Kindle 4 & PocketBook UI. Fix #7429
2021-03-29 03:12:22 +00:00
-- L, 90CW
return {
"rotation.L.90CCW",
"rotation.L.0UR",
"rotation.L.90CW",
"rotation.L.180UD",
}
else
-- L, 90CCW
return {
"rotation.L.90CW",
"rotation.L.180UD",
"rotation.L.90CCW",
"rotation.L.0UR",
}
end
end,
ReaderZooming: Fix defaults handling (#7463) It appears the fancy split settings from #6885 were not being honored at all. Also: * Made sure "pagewidth" is actually the default zoom mode again, "full" had sneaked in as the default state of the zoom type toggle). * Display human-readable values in the "Make as default" popup, instead of the raw, meaningless numerical setting. * Disable zoom options when reflow is enabled, and restore 'em properly when it's disabled. Fix #7461, #7228, #7192
2021-03-30 16:47:52 +00:00
-- For Dispatcher & onMakeDefault's sake
Dispatcher: nil guard against access to a document instance (#7389) Also: * Properly update *all* the touch zones when rotating the FM * Unbreak (Reader) rotation labels in Dispatcher Regression since #7306
2021-03-06 18:27:23 +00:00
labels = {C_("Rotation", "⤹ 90°"), C_("Rotation", "↑ 0°"), C_("Rotation", "⤸ 90°"), C_("Rotation", "↓ 180°")},
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
alternate = false,
Input/Device: Refactor Gyro events handling (#9935) * Get rid of the `canToggleGSensor` Device cap, it's now mandatory for `hasGSensor` devices. (This means Kindles can now toggle the gyro, fix #9136). * This also means that `Device:toggleGSensor` is now implemented by `Generic`. * Update the Screen & Gyro rotation constants to be clearer (c.f., https://github.com/koreader/koreader-base/pull/1568) (/!\ This might conceivably break some `rotation_map` user-patches). * Input: Move the platform-specific gyro handling to Device implementations, and let Input only handle a single, custom protocol (`EV_MSC:MSC_GYRO`). * Input: Refine the `rotation_map` disable method implemented in 43b021d37cc01a924740aba34ae337d813dbf540. Instead of directly poking at the internal field, use a new method, `disableRotationMap` (/!\ Again, this might break some `rotation_map` user-patches). * Input: Minor tweaks to event adjust hooks to make them more modular, allowing the Kobo implementation to build and use a single composite hook. API compatibility maintained with wrappers.
2022-12-21 14:50:39 +00:00
values = {Screen.DEVICE_ROTATED_COUNTER_CLOCKWISE, Screen.DEVICE_ROTATED_UPRIGHT, Screen.DEVICE_ROTATED_CLOCKWISE, Screen.DEVICE_ROTATED_UPSIDE_DOWN},
copt/kopt options: deduplicate some defaults (#10893)
2023-09-13 04:49:57 +00:00
default_value = Screen.DEVICE_ROTATED_UPRIGHT,
Input/Device: Refactor Gyro events handling (#9935) * Get rid of the `canToggleGSensor` Device cap, it's now mandatory for `hasGSensor` devices. (This means Kindles can now toggle the gyro, fix #9136). * This also means that `Device:toggleGSensor` is now implemented by `Generic`. * Update the Screen & Gyro rotation constants to be clearer (c.f., https://github.com/koreader/koreader-base/pull/1568) (/!\ This might conceivably break some `rotation_map` user-patches). * Input: Move the platform-specific gyro handling to Device implementations, and let Input only handle a single, custom protocol (`EV_MSC:MSC_GYRO`). * Input: Refine the `rotation_map` disable method implemented in 43b021d37cc01a924740aba34ae337d813dbf540. Instead of directly poking at the internal field, use a new method, `disableRotationMap` (/!\ Again, this might break some `rotation_map` user-patches). * Input: Minor tweaks to event adjust hooks to make them more modular, allowing the Kobo implementation to build and use a single composite hook. API compatibility maintained with wrappers.
2022-12-21 14:50:39 +00:00
args = {Screen.DEVICE_ROTATED_COUNTER_CLOCKWISE, Screen.DEVICE_ROTATED_UPRIGHT, Screen.DEVICE_ROTATED_CLOCKWISE, Screen.DEVICE_ROTATED_UPSIDE_DOWN},
Rotation icons: make 'em dynamic. (#7440) Followup to #7306. As discussed there, the only way to make everybody happy is to make 'em context-aware. At which point, trying to make the fact that it's a *device* rotation and not a *content* one come across in the icon design loses its interest, and would actually only further muddy the issue. So, these are similar is spirit to the traditional rotation icons in pretty much anything that can rotate text content, with a special inspiration from the Kindle 4 & PocketBook UI. Fix #7429
2021-03-29 03:12:22 +00:00
current_func = function() return Screen:getRotationMode() end,
Landscape FM / Refactor rotation (#6309) * landscape FM / Refactor rotation refactor and simplify the orientation handling code. the user generally cares about the rotation (what direction the device is facing) and not about if koreader is displaying in portrait or landscape mode * bump base update luasocket, libjpeg-turbo, curl add logging to evernote-sdk-lua update framebuffer for proper rotation
2020-07-01 20:17:41 +00:00
event = "SetRotationMode",
Show current and default values in config dialog (pdf) (#3973)
2018-05-26 17:45:37 +00:00
name_text_hold_callback = optionsutil.showValues,
cre landscape view: adds 1 page / 2 pages toggable Adds a toggle switch in the Orientation bottom config menu to allow showing 1 page or 2 pages when in landscape mode. Previously, this was hardcoded to be in 2-pages modes only in some circumstances (device resolution + user dpi).
2019-03-13 12:07:30 +00:00
},
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderRolling
cre landscape view: adds 1 page / 2 pages toggable Adds a toggle switch in the Orientation bottom config menu to allow showing 1 page or 2 pages when in landscape mode. Previously, this was hardcoded to be in 2-pages modes only in some circumstances (device resolution + user dpi).
2019-03-13 12:07:30 +00:00
name = "visible_pages",
Dual pages: shown as 2 columns on a single page Rework Dual pages code so that the view is considered a single page number, so it looks more like 2-columns on a single page. This solves a few issues like: - Page number and count are consistent between top and bottom status bars - SkimTo -1/+1 doing nothing every other tap - Statistics being wrong (like "Pages read" never going over half of the book page count)
2021-01-29 00:02:19 +00:00
name_text = _("Two Columns"),
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
toggle = {_("off"), _("on")},
cre landscape view: adds 1 page / 2 pages toggable Adds a toggle switch in the Orientation bottom config menu to allow showing 1 page or 2 pages when in landscape mode. Previously, this was hardcoded to be in 2-pages modes only in some circumstances (device resolution + user dpi).
2019-03-13 12:07:30 +00:00
values = {1, 2},
default_value = 1,
args = {1, 2},
event = "SetVisiblePages",
bump crengine: parsing, lists, 2-pages mode fixes & tweaks (#7138) Includes: - EPUB: fix truncated HEAD>STYLE stylesheet - XML parsing: slightly better parsing of <script> - Update German hyphenation patterns - (chore) Silence some clang warnings - (Upstream) CSS content: fix regression with open-quote/close-quote - (Upstream) HTML lists: support the 'reversed' attribute - (Upstream) Tweak list items disc/circle/square symbols - 2-pages mode: option to skip geometry checks CRE bottom menu: allow toggling Dual Pages in portrait mode.
2021-01-13 19:26:14 +00:00
--[[ Commented out, to have it also available in portrait mode
cre landscape view: adds 1 page / 2 pages toggable Adds a toggle switch in the Orientation bottom config menu to allow showing 1 page or 2 pages when in landscape mode. Previously, this was hardcoded to be in 2-pages modes only in some circumstances (device resolution + user dpi).
2019-03-13 12:07:30 +00:00
current_func = function()
-- If not in landscape mode, shows "1" as selected
Rotation icons: make 'em dynamic. (#7440) Followup to #7306. As discussed there, the only way to make everybody happy is to make 'em context-aware. At which point, trying to make the fact that it's a *device* rotation and not a *content* one come across in the icon design loses its interest, and would actually only further muddy the issue. So, these are similar is spirit to the traditional rotation icons in pretty much anything that can rotate text content, with a special inspiration from the Kindle 4 & PocketBook UI. Fix #7429
2021-03-29 03:12:22 +00:00
if Screen:getScreenMode() ~= "landscape" then
cre landscape view: adds 1 page / 2 pages toggable Adds a toggle switch in the Orientation bottom config menu to allow showing 1 page or 2 pages when in landscape mode. Previously, this was hardcoded to be in 2-pages modes only in some circumstances (device resolution + user dpi).
2019-03-13 12:07:30 +00:00
return 1
end
-- if we return nil, ConfigDialog will pick the one from the
-- configurable as if we hadn't provided this 'current_func'
end,
bump crengine: parsing, lists, 2-pages mode fixes & tweaks (#7138) Includes: - EPUB: fix truncated HEAD>STYLE stylesheet - XML parsing: slightly better parsing of <script> - Update German hyphenation patterns - (chore) Silence some clang warnings - (Upstream) CSS content: fix regression with open-quote/close-quote - (Upstream) HTML lists: support the 'reversed' attribute - (Upstream) Tweak list items disc/circle/square symbols - 2-pages mode: option to skip geometry checks CRE bottom menu: allow toggling Dual Pages in portrait mode.
2021-01-13 19:26:14 +00:00
]]--
cre landscape view: adds 1 page / 2 pages toggable Adds a toggle switch in the Orientation bottom config menu to allow showing 1 page or 2 pages when in landscape mode. Previously, this was hardcoded to be in 2-pages modes only in some circumstances (device resolution + user dpi).
2019-03-13 12:07:30 +00:00
enabled_func = function(configurable)
bump crengine: parsing, lists, 2-pages mode fixes & tweaks (#7138) Includes: - EPUB: fix truncated HEAD>STYLE stylesheet - XML parsing: slightly better parsing of <script> - Update German hyphenation patterns - (chore) Silence some clang warnings - (Upstream) CSS content: fix regression with open-quote/close-quote - (Upstream) HTML lists: support the 'reversed' attribute - (Upstream) Tweak list items disc/circle/square symbols - 2-pages mode: option to skip geometry checks CRE bottom menu: allow toggling Dual Pages in portrait mode.
2021-01-13 19:26:14 +00:00
return optionsutil.enableIfEquals(configurable, "view_mode", 0) -- "page" mode
Rotation icons: make 'em dynamic. (#7440) Followup to #7306. As discussed there, the only way to make everybody happy is to make 'em context-aware. At which point, trying to make the fact that it's a *device* rotation and not a *content* one come across in the icon design loses its interest, and would actually only further muddy the issue. So, these are similar is spirit to the traditional rotation icons in pretty much anything that can rotate text content, with a special inspiration from the Kindle 4 & PocketBook UI. Fix #7429
2021-03-29 03:12:22 +00:00
-- and Screen:getScreenMode() == "landscape"
cre landscape view: adds 1 page / 2 pages toggable Adds a toggle switch in the Orientation bottom config menu to allow showing 1 page or 2 pages when in landscape mode. Previously, this was hardcoded to be in 2-pages modes only in some circumstances (device resolution + user dpi).
2019-03-13 12:07:30 +00:00
end,
name_text_hold_callback = optionsutil.showValues,
Dual pages: shown as 2 columns on a single page Rework Dual pages code so that the view is considered a single page number, so it looks more like 2-columns on a single page. This solves a few issues like: - Page number and count are consistent between top and bottom status bars - SkimTo -1/+1 doing nothing every other tap - Statistics being wrong (like "Pages read" never going over half of the book page count)
2021-01-29 00:02:19 +00:00
help_text = _([[Render the document on half the screen width and display two pages at once with a single page number. This makes it look like two columns.
This is disabled in scroll mode. Switching from page mode with two columns to scroll mode will cause the document to be re-rendered.]]),
cre landscape view: adds 1 page / 2 pages toggable Adds a toggle switch in the Orientation bottom config menu to allow showing 1 page or 2 pages when in landscape mode. Previously, this was hardcoded to be in 2-pages modes only in some circumstances (device resolution + user dpi).
2019-03-13 12:07:30 +00:00
},
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
}
},
Give more control over CRe margins (#4945) Without having to resort to weird custom defaults. * Split the current margins setting in three: * Horizontal margins (because you generally want those two to be balanced). * Top margin & Bottom margin (because you may want to tweak those separately to deal with quirky status bar/final line shenanigans). * Also, add a "Reclaim bar height from bottom margin" toggle to the status bar menu, to optionally make sure the status bar won't eat into the bottom margin. * Includes a free fix to diacritics popup refresh handling in the keyboard ;).
2019-05-01 00:09:01 +00:00
{
Update UI layout code to use new SVG icons - Add IconWidget, use it for icons instead of ImageWidget. Specify icons by name only, look for them (with either .svg or .png suffixes) in multiple directories (including koreader/settings/icons/ to allow customizing them). Don't crash when icon name not found, shown a black background warning icon instead. - Don't trust the icons' native sizes: replace scale_for_dpi=true with width/height=DGENERIC_ICON_SIZE, so all icons get the same (tunable) size - except in a few specific use cases. - Top and bottom menu bars: normalize, and have icons properly centered in them, extend vertical line separators up to the edges. - TOC: adjust expand/collapse icons size to items size
2020-12-19 11:18:30 +00:00
icon = "appbar.crop",
Give more control over CRe margins (#4945) Without having to resort to weird custom defaults. * Split the current margins setting in three: * Horizontal margins (because you generally want those two to be balanced). * Top margin & Bottom margin (because you may want to tweak those separately to deal with quirky status bar/final line shenanigans). * Also, add a "Reclaim bar height from bottom margin" toggle to the status bar menu, to optionally make sure the status bar won't eat into the bottom margin. * Includes a free fix to diacritics popup refresh handling in the keyboard ;).
2019-05-01 00:09:01 +00:00
options = {
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderTypeset
Give more control over CRe margins (#4945) Without having to resort to weird custom defaults. * Split the current margins setting in three: * Horizontal margins (because you generally want those two to be balanced). * Top margin & Bottom margin (because you may want to tweak those separately to deal with quirky status bar/final line shenanigans). * Also, add a "Reclaim bar height from bottom margin" toggle to the status bar menu, to optionally make sure the status bar won't eat into the bottom margin. * Includes a free fix to diacritics popup refresh handling in the keyboard ;).
2019-05-01 00:09:01 +00:00
name = "h_page_margins",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("L/R Margins"),
[UX] creoptions: add more margin values Fixes #4684.
2019-03-01 11:55:55 +00:00
buttonprogress = true,
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
values = {
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
G_defaults:readSetting("DCREREADER_CONFIG_H_MARGIN_SIZES_SMALL"),
G_defaults:readSetting("DCREREADER_CONFIG_H_MARGIN_SIZES_MEDIUM"),
G_defaults:readSetting("DCREREADER_CONFIG_H_MARGIN_SIZES_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_H_MARGIN_SIZES_X_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_H_MARGIN_SIZES_XX_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_H_MARGIN_SIZES_XXX_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_H_MARGIN_SIZES_HUGE"),
G_defaults:readSetting("DCREREADER_CONFIG_H_MARGIN_SIZES_X_HUGE"),
G_defaults:readSetting("DCREREADER_CONFIG_H_MARGIN_SIZES_XX_HUGE"),
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
},
[UX] creoptions: add more margin values Fixes #4684.
2019-03-01 11:55:55 +00:00
default_pos = 2,
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
default_value = G_defaults:readSetting("DCREREADER_CONFIG_H_MARGIN_SIZES_MEDIUM"),
Give more control over CRe margins (#4945) Without having to resort to weird custom defaults. * Split the current margins setting in three: * Horizontal margins (because you generally want those two to be balanced). * Top margin & Bottom margin (because you may want to tweak those separately to deal with quirky status bar/final line shenanigans). * Also, add a "Reclaim bar height from bottom margin" toggle to the status bar menu, to optionally make sure the status bar won't eat into the bottom margin. * Includes a free fix to diacritics popup refresh handling in the keyboard ;).
2019-05-01 00:09:01 +00:00
event = "SetPageHorizMargins",
args = {
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
G_defaults:readSetting("DCREREADER_CONFIG_H_MARGIN_SIZES_SMALL"),
G_defaults:readSetting("DCREREADER_CONFIG_H_MARGIN_SIZES_MEDIUM"),
G_defaults:readSetting("DCREREADER_CONFIG_H_MARGIN_SIZES_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_H_MARGIN_SIZES_X_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_H_MARGIN_SIZES_XX_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_H_MARGIN_SIZES_XXX_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_H_MARGIN_SIZES_HUGE"),
G_defaults:readSetting("DCREREADER_CONFIG_H_MARGIN_SIZES_X_HUGE"),
G_defaults:readSetting("DCREREADER_CONFIG_H_MARGIN_SIZES_XX_HUGE"),
Give more control over CRe margins (#4945) Without having to resort to weird custom defaults. * Split the current margins setting in three: * Horizontal margins (because you generally want those two to be balanced). * Top margin & Bottom margin (because you may want to tweak those separately to deal with quirky status bar/final line shenanigans). * Also, add a "Reclaim bar height from bottom margin" toggle to the status bar menu, to optionally make sure the status bar won't eat into the bottom margin. * Includes a free fix to diacritics popup refresh handling in the keyboard ;).
2019-05-01 00:09:01 +00:00
},
ConfigDialog: temporarily hide when showing SpinWidgets Hide bottom panel when showing a SpinWidget, so we gain on the bottom the space covered by the SpinWidget to see more how a change is affecting the book text. For clarity, rename delay_repaint & refresh_callback to hide_on_apply & when_applied_callback. Normalize SpinWidgets: have them both accept a cancel_callback and a close_callback. InfoMessage: call dissmiss_callback also on timeout.
2021-01-11 17:14:17 +00:00
hide_on_apply = true,
Give more control over CRe margins (#4945) Without having to resort to weird custom defaults. * Split the current margins setting in three: * Horizontal margins (because you generally want those two to be balanced). * Top margin & Bottom margin (because you may want to tweak those separately to deal with quirky status bar/final line shenanigans). * Also, add a "Reclaim bar height from bottom margin" toggle to the status bar menu, to optionally make sure the status bar won't eat into the bottom margin. * Includes a free fix to diacritics popup refresh handling in the keyboard ;).
2019-05-01 00:09:01 +00:00
name_text_hold_callback = optionsutil.showValuesHMargins,
Margins: allow direct input (more_options)
2020-12-21 01:02:07 +00:00
more_options = true,
more_options_param = {
CRE: allow both Top/Bottom margins fine tuning (#7104) By having the same DoubleSpinWidget launched when hitting "..." on any of Top margin or Bottom margin progress bars. DoubleSpinWidget: remove blank space when no info_text.
2021-01-02 22:15:48 +00:00
name_text = _("Left/Right Margins"),
Spinwidgets: can now get width or width_factor (#8269)
2021-10-01 18:32:16 +00:00
widget_width_factor = 0.6,
Margins: allow direct input (more_options)
2020-12-21 01:02:07 +00:00
left_min = 0,
left_max = 140,
left_step = 1,
left_hold_step = 5,
right_min = 0,
right_max = 140,
right_step = 1,
right_hold_step = 5,
},
Give more control over CRe margins (#4945) Without having to resort to weird custom defaults. * Split the current margins setting in three: * Horizontal margins (because you generally want those two to be balanced). * Top margin & Bottom margin (because you may want to tweak those separately to deal with quirky status bar/final line shenanigans). * Also, add a "Reclaim bar height from bottom margin" toggle to the status bar menu, to optionally make sure the status bar won't eat into the bottom margin. * Includes a free fix to diacritics popup refresh handling in the keyboard ;).
2019-05-01 00:09:01 +00:00
},
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderTypeset
CRe margins: add toggle to sync top and bottom margins (#4990) Also fix DogEar size update on margin change. Also re-order cre bottom tabs to be like with kopt.
2019-05-01 20:18:50 +00:00
name = "sync_t_b_page_margins",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("Sync T/B Margins"),
toggle = {_("off"), _("on")},
CRe margins: add toggle to sync top and bottom margins (#4990) Also fix DogEar size update on margin change. Also re-order cre bottom tabs to be like with kopt.
2019-05-01 20:18:50 +00:00
values = {0, 1},
default_value = 0,
CRe margins: hide bottom menu on change (#5000) So we can immediately see how's the bottom margin.
2019-05-05 08:15:13 +00:00
event = "SyncPageTopBottomMargins",
CRe margins: add toggle to sync top and bottom margins (#4990) Also fix DogEar size update on margin change. Also re-order cre bottom tabs to be like with kopt.
2019-05-01 20:18:50 +00:00
args = {false, true},
ConfigDialog: temporarily hide when showing SpinWidgets Hide bottom panel when showing a SpinWidget, so we gain on the bottom the space covered by the SpinWidget to see more how a change is affecting the book text. For clarity, rename delay_repaint & refresh_callback to hide_on_apply & when_applied_callback. Normalize SpinWidgets: have them both accept a cancel_callback and a close_callback. InfoMessage: call dissmiss_callback also on timeout.
2021-01-11 17:14:17 +00:00
hide_on_apply = true,
CRe margins: add toggle to sync top and bottom margins (#4990) Also fix DogEar size update on margin change. Also re-order cre bottom tabs to be like with kopt.
2019-05-01 20:18:50 +00:00
name_text_hold_callback = optionsutil.showValues,
help_text = _([[Keep top and bottom margins synchronized.
- 'off' allows different top and bottom margins.
- 'on' keeps top and bottom margins locked, ensuring text is vertically centered in the page.
In the top menu → Settings → Status bar, you can choose whether the bottom margin applies from the bottom of the screen, or from above the status bar.]]),
},
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderTypeset
Give more control over CRe margins (#4945) Without having to resort to weird custom defaults. * Split the current margins setting in three: * Horizontal margins (because you generally want those two to be balanced). * Top margin & Bottom margin (because you may want to tweak those separately to deal with quirky status bar/final line shenanigans). * Also, add a "Reclaim bar height from bottom margin" toggle to the status bar menu, to optionally make sure the status bar won't eat into the bottom margin. * Includes a free fix to diacritics popup refresh handling in the keyboard ;).
2019-05-01 00:09:01 +00:00
name = "t_page_margin",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("Top Margin"),
Give more control over CRe margins (#4945) Without having to resort to weird custom defaults. * Split the current margins setting in three: * Horizontal margins (because you generally want those two to be balanced). * Top margin & Bottom margin (because you may want to tweak those separately to deal with quirky status bar/final line shenanigans). * Also, add a "Reclaim bar height from bottom margin" toggle to the status bar menu, to optionally make sure the status bar won't eat into the bottom margin. * Includes a free fix to diacritics popup refresh handling in the keyboard ;).
2019-05-01 00:09:01 +00:00
buttonprogress = true,
values = {
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
G_defaults:readSetting("DCREREADER_CONFIG_T_MARGIN_SIZES_SMALL"),
G_defaults:readSetting("DCREREADER_CONFIG_T_MARGIN_SIZES_MEDIUM"),
G_defaults:readSetting("DCREREADER_CONFIG_T_MARGIN_SIZES_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_T_MARGIN_SIZES_X_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_T_MARGIN_SIZES_XX_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_T_MARGIN_SIZES_XXX_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_T_MARGIN_SIZES_HUGE"),
G_defaults:readSetting("DCREREADER_CONFIG_T_MARGIN_SIZES_X_HUGE"),
G_defaults:readSetting("DCREREADER_CONFIG_T_MARGIN_SIZES_XX_HUGE"),
Give more control over CRe margins (#4945) Without having to resort to weird custom defaults. * Split the current margins setting in three: * Horizontal margins (because you generally want those two to be balanced). * Top margin & Bottom margin (because you may want to tweak those separately to deal with quirky status bar/final line shenanigans). * Also, add a "Reclaim bar height from bottom margin" toggle to the status bar menu, to optionally make sure the status bar won't eat into the bottom margin. * Includes a free fix to diacritics popup refresh handling in the keyboard ;).
2019-05-01 00:09:01 +00:00
},
default_pos = 3,
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
default_value = G_defaults:readSetting("DCREREADER_CONFIG_T_MARGIN_SIZES_LARGE"),
Give more control over CRe margins (#4945) Without having to resort to weird custom defaults. * Split the current margins setting in three: * Horizontal margins (because you generally want those two to be balanced). * Top margin & Bottom margin (because you may want to tweak those separately to deal with quirky status bar/final line shenanigans). * Also, add a "Reclaim bar height from bottom margin" toggle to the status bar menu, to optionally make sure the status bar won't eat into the bottom margin. * Includes a free fix to diacritics popup refresh handling in the keyboard ;).
2019-05-01 00:09:01 +00:00
event = "SetPageTopMargin",
args = {
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
G_defaults:readSetting("DCREREADER_CONFIG_T_MARGIN_SIZES_SMALL"),
G_defaults:readSetting("DCREREADER_CONFIG_T_MARGIN_SIZES_MEDIUM"),
G_defaults:readSetting("DCREREADER_CONFIG_T_MARGIN_SIZES_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_T_MARGIN_SIZES_X_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_T_MARGIN_SIZES_XX_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_T_MARGIN_SIZES_XXX_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_T_MARGIN_SIZES_HUGE"),
G_defaults:readSetting("DCREREADER_CONFIG_T_MARGIN_SIZES_X_HUGE"),
G_defaults:readSetting("DCREREADER_CONFIG_T_MARGIN_SIZES_XX_HUGE"),
Give more control over CRe margins (#4945) Without having to resort to weird custom defaults. * Split the current margins setting in three: * Horizontal margins (because you generally want those two to be balanced). * Top margin & Bottom margin (because you may want to tweak those separately to deal with quirky status bar/final line shenanigans). * Also, add a "Reclaim bar height from bottom margin" toggle to the status bar menu, to optionally make sure the status bar won't eat into the bottom margin. * Includes a free fix to diacritics popup refresh handling in the keyboard ;).
2019-05-01 00:09:01 +00:00
},
ConfigDialog: temporarily hide when showing SpinWidgets Hide bottom panel when showing a SpinWidget, so we gain on the bottom the space covered by the SpinWidget to see more how a change is affecting the book text. For clarity, rename delay_repaint & refresh_callback to hide_on_apply & when_applied_callback. Normalize SpinWidgets: have them both accept a cancel_callback and a close_callback. InfoMessage: call dissmiss_callback also on timeout.
2021-01-11 17:14:17 +00:00
hide_on_apply = true,
BottomMenu: show real sizes for margins and font size (#9205)
2022-07-05 13:38:59 +00:00
name_text_hold_callback = function(configurable, opt, prefix)
optionsutil.showValues(configurable, opt, prefix, nil, "mm")
end,
Margins: allow direct input (more_options)
2020-12-21 01:02:07 +00:00
more_options = true,
more_options_param = {
CRE: fix to Top/Bottom margins fine tuning Rework eb66856d so that "Sync T/B Margins" is disabled when set Top and Bottom margins differ (previously, the bottom one was taking over the top one when it was enabled).
2021-01-11 17:14:14 +00:00
-- Allow this to tune both top and bottom margins, handling
-- 2 setting names (we'll get the exact same DoubleSpinWidget
-- in the b_page_margin setting just below)
CRE: allow both Top/Bottom margins fine tuning (#7104) By having the same DoubleSpinWidget launched when hitting "..." on any of Top margin or Bottom margin progress bars. DoubleSpinWidget: remove blank space when no info_text.
2021-01-02 22:15:48 +00:00
name_text = _("Top/Bottom Margins"),
names = { "t_page_margin", "b_page_margin" },
CRE: fix to Top/Bottom margins fine tuning Rework eb66856d so that "Sync T/B Margins" is disabled when set Top and Bottom margins differ (previously, the bottom one was taking over the top one when it was enabled).
2021-01-11 17:14:14 +00:00
event = "SetPageTopAndBottomMargin",
Spinwidgets: can now get width or width_factor (#8269)
2021-10-01 18:32:16 +00:00
widget_width_factor = 0.6,
CRE: allow both Top/Bottom margins fine tuning (#7104) By having the same DoubleSpinWidget launched when hitting "..." on any of Top margin or Bottom margin progress bars. DoubleSpinWidget: remove blank space when no info_text.
2021-01-02 22:15:48 +00:00
left_text = _("Top"),
left_min = 0,
left_max = 140,
left_step = 1,
left_hold_step = 5,
right_text = _("Bottom"),
right_min = 0,
right_max = 140,
right_step = 1,
right_hold_step = 5,
Margins: allow direct input (more_options)
2020-12-21 01:02:07 +00:00
},
Give more control over CRe margins (#4945) Without having to resort to weird custom defaults. * Split the current margins setting in three: * Horizontal margins (because you generally want those two to be balanced). * Top margin & Bottom margin (because you may want to tweak those separately to deal with quirky status bar/final line shenanigans). * Also, add a "Reclaim bar height from bottom margin" toggle to the status bar menu, to optionally make sure the status bar won't eat into the bottom margin. * Includes a free fix to diacritics popup refresh handling in the keyboard ;).
2019-05-01 00:09:01 +00:00
},
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderTypeset
Give more control over CRe margins (#4945) Without having to resort to weird custom defaults. * Split the current margins setting in three: * Horizontal margins (because you generally want those two to be balanced). * Top margin & Bottom margin (because you may want to tweak those separately to deal with quirky status bar/final line shenanigans). * Also, add a "Reclaim bar height from bottom margin" toggle to the status bar menu, to optionally make sure the status bar won't eat into the bottom margin. * Includes a free fix to diacritics popup refresh handling in the keyboard ;).
2019-05-01 00:09:01 +00:00
name = "b_page_margin",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("Bottom Margin"),
Give more control over CRe margins (#4945) Without having to resort to weird custom defaults. * Split the current margins setting in three: * Horizontal margins (because you generally want those two to be balanced). * Top margin & Bottom margin (because you may want to tweak those separately to deal with quirky status bar/final line shenanigans). * Also, add a "Reclaim bar height from bottom margin" toggle to the status bar menu, to optionally make sure the status bar won't eat into the bottom margin. * Includes a free fix to diacritics popup refresh handling in the keyboard ;).
2019-05-01 00:09:01 +00:00
buttonprogress = true,
values = {
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
G_defaults:readSetting("DCREREADER_CONFIG_B_MARGIN_SIZES_SMALL"),
G_defaults:readSetting("DCREREADER_CONFIG_B_MARGIN_SIZES_MEDIUM"),
G_defaults:readSetting("DCREREADER_CONFIG_B_MARGIN_SIZES_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_B_MARGIN_SIZES_X_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_B_MARGIN_SIZES_XX_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_B_MARGIN_SIZES_XXX_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_B_MARGIN_SIZES_HUGE"),
G_defaults:readSetting("DCREREADER_CONFIG_B_MARGIN_SIZES_X_HUGE"),
G_defaults:readSetting("DCREREADER_CONFIG_B_MARGIN_SIZES_XX_HUGE"),
Give more control over CRe margins (#4945) Without having to resort to weird custom defaults. * Split the current margins setting in three: * Horizontal margins (because you generally want those two to be balanced). * Top margin & Bottom margin (because you may want to tweak those separately to deal with quirky status bar/final line shenanigans). * Also, add a "Reclaim bar height from bottom margin" toggle to the status bar menu, to optionally make sure the status bar won't eat into the bottom margin. * Includes a free fix to diacritics popup refresh handling in the keyboard ;).
2019-05-01 00:09:01 +00:00
},
default_pos = 3,
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
default_value = G_defaults:readSetting("DCREREADER_CONFIG_B_MARGIN_SIZES_LARGE"),
Give more control over CRe margins (#4945) Without having to resort to weird custom defaults. * Split the current margins setting in three: * Horizontal margins (because you generally want those two to be balanced). * Top margin & Bottom margin (because you may want to tweak those separately to deal with quirky status bar/final line shenanigans). * Also, add a "Reclaim bar height from bottom margin" toggle to the status bar menu, to optionally make sure the status bar won't eat into the bottom margin. * Includes a free fix to diacritics popup refresh handling in the keyboard ;).
2019-05-01 00:09:01 +00:00
event = "SetPageBottomMargin",
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
args = {
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
G_defaults:readSetting("DCREREADER_CONFIG_B_MARGIN_SIZES_SMALL"),
G_defaults:readSetting("DCREREADER_CONFIG_B_MARGIN_SIZES_MEDIUM"),
G_defaults:readSetting("DCREREADER_CONFIG_B_MARGIN_SIZES_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_B_MARGIN_SIZES_X_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_B_MARGIN_SIZES_XX_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_B_MARGIN_SIZES_XXX_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_B_MARGIN_SIZES_HUGE"),
G_defaults:readSetting("DCREREADER_CONFIG_B_MARGIN_SIZES_X_HUGE"),
G_defaults:readSetting("DCREREADER_CONFIG_B_MARGIN_SIZES_XX_HUGE"),
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
},
ConfigDialog: temporarily hide when showing SpinWidgets Hide bottom panel when showing a SpinWidget, so we gain on the bottom the space covered by the SpinWidget to see more how a change is affecting the book text. For clarity, rename delay_repaint & refresh_callback to hide_on_apply & when_applied_callback. Normalize SpinWidgets: have them both accept a cancel_callback and a close_callback. InfoMessage: call dissmiss_callback also on timeout.
2021-01-11 17:14:17 +00:00
hide_on_apply = true,
BottomMenu: show real sizes for margins and font size (#9205)
2022-07-05 13:38:59 +00:00
name_text_hold_callback = function(configurable, opt, prefix)
optionsutil.showValues(configurable, opt, prefix, nil, "mm")
end,
CRe margins: add toggle to sync top and bottom margins (#4990) Also fix DogEar size update on margin change. Also re-order cre bottom tabs to be like with kopt.
2019-05-01 20:18:50 +00:00
help_text = _([[In the top menu → Settings → Status bar, you can choose whether the bottom margin applies from the bottom of the screen, or from above the status bar.]]),
Margins: allow direct input (more_options)
2020-12-21 01:02:07 +00:00
more_options = true,
more_options_param = {
CRE: allow both Top/Bottom margins fine tuning (#7104) By having the same DoubleSpinWidget launched when hitting "..." on any of Top margin or Bottom margin progress bars. DoubleSpinWidget: remove blank space when no info_text.
2021-01-02 22:15:48 +00:00
-- Similar as for t_page_margin above
name_text = _("Top/Bottom Margins"),
names = { "t_page_margin", "b_page_margin" },
CRE: fix to Top/Bottom margins fine tuning Rework eb66856d so that "Sync T/B Margins" is disabled when set Top and Bottom margins differ (previously, the bottom one was taking over the top one when it was enabled).
2021-01-11 17:14:14 +00:00
event = "SetPageTopAndBottomMargin",
Spinwidgets: can now get width or width_factor (#8269)
2021-10-01 18:32:16 +00:00
widget_width_factor = 0.6,
CRE: allow both Top/Bottom margins fine tuning (#7104) By having the same DoubleSpinWidget launched when hitting "..." on any of Top margin or Bottom margin progress bars. DoubleSpinWidget: remove blank space when no info_text.
2021-01-02 22:15:48 +00:00
left_text = _("Top"),
left_min = 0,
left_max = 140,
left_step = 1,
left_hold_step = 5,
right_text = _("Bottom"),
right_min = 0,
right_max = 140,
right_step = 1,
right_hold_step = 5,
Margins: allow direct input (more_options)
2020-12-21 01:02:07 +00:00
},
CRe margins: add toggle to sync top and bottom margins (#4990) Also fix DogEar size update on margin change. Also re-order cre bottom tabs to be like with kopt.
2019-05-01 20:18:50 +00:00
},
}
},
{
Update UI layout code to use new SVG icons - Add IconWidget, use it for icons instead of ImageWidget. Specify icons by name only, look for them (with either .svg or .png suffixes) in multiple directories (including koreader/settings/icons/ to allow customizing them). Don't crash when icon name not found, shown a black background warning icon instead. - Don't trust the icons' native sizes: replace scale_for_dpi=true with width/height=DGENERIC_ICON_SIZE, so all icons get the same (tunable) size - except in a few specific use cases. - Top and bottom menu bars: normalize, and have icons properly centered in them, extend vertical line separators up to the edges. - TOC: adjust expand/collapse icons size to items size
2020-12-19 11:18:30 +00:00
icon = "appbar.pageview",
CRe margins: add toggle to sync top and bottom margins (#4990) Also fix DogEar size update on margin change. Also re-order cre bottom tabs to be like with kopt.
2019-05-01 20:18:50 +00:00
options = {
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderView
CRe margins: add toggle to sync top and bottom margins (#4990) Also fix DogEar size update on margin change. Also re-order cre bottom tabs to be like with kopt.
2019-05-01 20:18:50 +00:00
name = "view_mode",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("View Mode"),
toggle = {_("page"), _("continuous")},
Reorganize bottom menu config panels (#6131) Mostly for the PDF bottom menu. - Reorganize by topic, trying to limit the number of widgets per panel to 4. - Re-order some toggles from low to high ('off' then 'on'). - Show font size as number instead of a list of "Aa". - PDF: add more font size values, and increase usable contrast values. - Add help_text to most PDF toggle titles. - CRE line spacing: increase fine tuning min and max. Also avoid zoom advice messages on book load.
2020-05-07 18:24:12 +00:00
values = {0, 1},
copt/kopt options: deduplicate some defaults (#10893)
2023-09-13 04:49:57 +00:00
default_value = G_defaults:readSetting("DCREREADER_VIEW_MODE") == "page" and 0 or 1,
Reorganize bottom menu config panels (#6131) Mostly for the PDF bottom menu. - Reorganize by topic, trying to limit the number of widgets per panel to 4. - Re-order some toggles from low to high ('off' then 'on'). - Show font size as number instead of a list of "Aa". - PDF: add more font size values, and increase usable contrast values. - Add help_text to most PDF toggle titles. - CRE line spacing: increase fine tuning min and max. Also avoid zoom advice messages on book load.
2020-05-07 18:24:12 +00:00
args = {"page", "scroll"},
CRe margins: add toggle to sync top and bottom margins (#4990) Also fix DogEar size update on margin change. Also re-order cre bottom tabs to be like with kopt.
2019-05-01 20:18:50 +00:00
event = "SetViewMode",
name_text_hold_callback = optionsutil.showValues,
Reorganize bottom menu config panels (#6131) Mostly for the PDF bottom menu. - Reorganize by topic, trying to limit the number of widgets per panel to 4. - Re-order some toggles from low to high ('off' then 'on'). - Show font size as number instead of a list of "Aa". - PDF: add more font size values, and increase usable contrast values. - Add help_text to most PDF toggle titles. - CRE line spacing: increase fine tuning min and max. Also avoid zoom advice messages on book load.
2020-05-07 18:24:12 +00:00
help_text = _([[- 'page' mode splits the text into pages, at the most acceptable places (page numbers and the number of pages may change when you change fonts, margins, styles, etc.).
- 'continuous' mode allows you to scroll the text like you would in a web browser (the 'Page Overlap' setting is only available in this mode).]]),
cre: toggable enhanced rendering (floats, collapsed margins...) Adds "Render mode" toggle with 4 modes, to enable some or all of crengine's new enhanced block rendering features. Use "legacy" rendering for previously opened books to not mess with bookmarks, and "web" (all of the new features) for new books. Also make available the added "HTML5" stylesheet to the Style menu.
2019-07-14 20:13:05 +00:00
},
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderTypeset
cre: toggable enhanced rendering (floats, collapsed margins...) Adds "Render mode" toggle with 4 modes, to enable some or all of crengine's new enhanced block rendering features. Use "legacy" rendering for previously opened books to not mess with bookmarks, and "web" (all of the new features) for new books. Also make available the added "HTML5" stylesheet to the Style menu.
2019-07-14 20:13:05 +00:00
name = "block_rendering_mode",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("Render Mode"),
toggle = {_("legacy"), _("flat"), _("book"), _("web")},
cre: toggable enhanced rendering (floats, collapsed margins...) Adds "Render mode" toggle with 4 modes, to enable some or all of crengine's new enhanced block rendering features. Use "legacy" rendering for previously opened books to not mess with bookmarks, and "web" (all of the new features) for new books. Also make available the added "HTML5" stylesheet to the Style menu.
2019-07-14 20:13:05 +00:00
values = {0, 1, 2, 3},
default_value = 2,
args = {0, 1, 2, 3},
event = "SetBlockRenderingMode",
name_text_hold_callback = optionsutil.showValues,
[CI] Switch to custom xgettext build to extract multiline strings (#5242) Because let's face it, it just looks much better this way. Docker image update in https://github.com/koreader/virdevenv/pull/43 Discussion in https://github.com/koreader/koreader/pull/5238#issuecomment-523675211 and https://github.com/koreader/koreader/pull/4524
2019-08-22 15:11:47 +00:00
help_text = _([[
- 'legacy' uses original CR3 block rendering code.
cre: toggable enhanced rendering (floats, collapsed margins...) Adds "Render mode" toggle with 4 modes, to enable some or all of crengine's new enhanced block rendering features. Use "legacy" rendering for previously opened books to not mess with bookmarks, and "web" (all of the new features) for new books. Also make available the added "HTML5" stylesheet to the Style menu.
2019-07-14 20:13:05 +00:00
- 'flat' ensures flat rendering with collapsing margins and accurate page breaks.
- 'book' additionally allows floats, but limits style support to avoid blank spaces and overflows.
- 'web' renders as web browsers do, allowing negative margins and possible page overflow.]]),
CRe margins: add toggle to sync top and bottom margins (#4990) Also fix DogEar size update on margin change. Also re-order cre bottom tabs to be like with kopt.
2019-05-01 20:18:50 +00:00
},
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderTypeset
CRe margins: add toggle to sync top and bottom margins (#4990) Also fix DogEar size update on margin change. Also re-order cre bottom tabs to be like with kopt.
2019-05-01 20:18:50 +00:00
name = "render_dpi",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("Zoom (dpi)"),
[UX] Add fine tune for zoom(dpi) and font size (#5432) Close: #5312
2019-09-27 10:58:40 +00:00
more_options = true,
more_options_param = {
value_hold_step = 20,
SpinWidget, DoubleSpinWidget: add units to bottom menu (#9126) * Units to bottom menu * add ¹’¹ to 96dpi
2022-06-04 07:35:33 +00:00
unit = C_("Resolution", "dpi"),
[UX] Add fine tune for zoom(dpi) and font size (#5432) Close: #5312
2019-09-27 10:58:40 +00:00
},
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
toggle = {_("off"), "48", "96¹’¹", "167", "212", "300"},
CRe margins: add toggle to sync top and bottom margins (#4990) Also fix DogEar size update on margin change. Also re-order cre bottom tabs to be like with kopt.
2019-05-01 20:18:50 +00:00
values = {0, 48, 96, 167, 212, 300},
default_value = 96,
args = {0, 48, 96, 167, 212, 300},
event = "SetRenderDPI",
help_text = _([[Sets the DPI used to scale absolute CSS units and images:
- off: ignore absolute units (old engine behavior).
- 96¹’¹: at 96 DPI, 1 CSS pixel = 1 screen pixel and images are rendered at their original dimensions.
- other values scale CSS absolute units and images by a factor (300 DPI = x3, 48 DPI = x0.5)
Using your device's actual DPI will ensure 1 cm in CSS actually translates to 1 cm on screen.
Note that your selected font size is not affected by this setting.]]),
SpinWidget, DoubleSpinWidget: add units to bottom menu (#9126) * Units to bottom menu * add ¹’¹ to 96dpi
2022-06-04 07:35:33 +00:00
name_text_hold_callback = optionsutil.showValues,
name_text_true_values = true,
show_true_value_func = function(val) -- add "dpi"
if val == 96 then
val = "96¹’¹"
end
return val ~= 0 and string.format("%s dpi", val) or _("off")
end,
CRe margins: add toggle to sync top and bottom margins (#4990) Also fix DogEar size update on margin change. Also re-order cre bottom tabs to be like with kopt.
2019-05-01 20:18:50 +00:00
},
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderFont
CRe margins: add toggle to sync top and bottom margins (#4990) Also fix DogEar size update on margin change. Also re-order cre bottom tabs to be like with kopt.
2019-05-01 20:18:50 +00:00
name = "line_spacing",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("Line Spacing"),
CRe margins: add toggle to sync top and bottom margins (#4990) Also fix DogEar size update on margin change. Also re-order cre bottom tabs to be like with kopt.
2019-05-01 20:18:50 +00:00
buttonprogress = true,
values = {
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_X_TINY"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_TINY"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_XX_SMALL"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_X_SMALL"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_SMALL"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_L_SMALL"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_MEDIUM"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_L_MEDIUM"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_XL_MEDIUM"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_XXL_MEDIUM"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_X_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_XX_LARGE"),
CRe margins: add toggle to sync top and bottom margins (#4990) Also fix DogEar size update on margin change. Also re-order cre bottom tabs to be like with kopt.
2019-05-01 20:18:50 +00:00
},
default_pos = 7,
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
default_value = G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_MEDIUM"),
[UX] Add fine tune in line spacing (#5375) See https://github.com/koreader/koreader/issues/5312#issuecomment-528506421 Progress widget has a new extra button ⋮ that triggers SpinWidget.
2019-09-14 14:30:25 +00:00
more_options = true,
more_options_param = {
Reorganize bottom menu config panels (#6131) Mostly for the PDF bottom menu. - Reorganize by topic, trying to limit the number of widgets per panel to 4. - Re-order some toggles from low to high ('off' then 'on'). - Show font size as number instead of a list of "Aa". - PDF: add more font size values, and increase usable contrast values. - Add help_text to most PDF toggle titles. - CRE line spacing: increase fine tuning min and max. Also avoid zoom advice messages on book load.
2020-05-07 18:24:12 +00:00
value_min = 50,
Reader: do not apply line spacing out of range (#10307) * readercoptlistener: fix line spacing out of range * readerkoptlistener: fix line spacing out of range * creoptions: fix line spacing limit
2023-04-13 18:43:04 +00:00
value_max = 200,
[UX] Add fine tune in line spacing (#5375) See https://github.com/koreader/koreader/issues/5312#issuecomment-528506421 Progress widget has a new extra button ⋮ that triggers SpinWidget.
2019-09-14 14:30:25 +00:00
value_step = 1,
value_hold_step = 5,
SpinWidget, DoubleSpinWidget: add units to bottom menu (#9126) * Units to bottom menu * add ¹’¹ to 96dpi
2022-06-04 07:35:33 +00:00
unit = "%",
[UX] Add fine tune in line spacing (#5375) See https://github.com/koreader/koreader/issues/5312#issuecomment-528506421 Progress widget has a new extra button ⋮ that triggers SpinWidget.
2019-09-14 14:30:25 +00:00
},
CRe margins: add toggle to sync top and bottom margins (#4990) Also fix DogEar size update on margin change. Also re-order cre bottom tabs to be like with kopt.
2019-05-01 20:18:50 +00:00
event = "SetLineSpace",
args = {
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_X_TINY"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_TINY"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_XX_SMALL"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_X_SMALL"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_SMALL"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_L_SMALL"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_MEDIUM"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_L_MEDIUM"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_XL_MEDIUM"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_XXL_MEDIUM"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_X_LARGE"),
G_defaults:readSetting("DCREREADER_CONFIG_LINE_SPACE_PERCENT_XX_LARGE"),
CRe margins: add toggle to sync top and bottom margins (#4990) Also fix DogEar size update on margin change. Also re-order cre bottom tabs to be like with kopt.
2019-05-01 20:18:50 +00:00
},
name_text_hold_callback = optionsutil.showValues,
bump crengine: word spacing and hyphenation tweaks Includes: - New option to tune word spacing: space width scale percent - Text: look for hyphenation in more words if needed - CSS: fix "hyphens:none" should override inherited "hyphens:auto" - getHtml(): grab dir= and lang= attributes from upper nodes Replace our Word Gap/Space condensing toggle/setting with a new Word Spacing toggle/setting, made of 2 values: - 1st number scales the normal width of spaces in all font (100% uses the font space width untouched) - 2nd number applies after the 1st has been applied, and tells how much these spaces can additionally be condensed to make more text fit on a line.
2019-11-28 21:39:06 +00:00
show_true_value_func = function(val) -- add "%"
[chore] replace utf8 bytes with Unicode escape sequence
2023-08-01 08:09:29 +00:00
return string.format("%d\u{202F}%%", val) -- use Narrow No-Break space here
bump crengine: word spacing and hyphenation tweaks Includes: - New option to tune word spacing: space width scale percent - Text: look for hyphenation in more words if needed - CSS: fix "hyphens:none" should override inherited "hyphens:auto" - getHtml(): grab dir= and lang= attributes from upper nodes Replace our Word Gap/Space condensing toggle/setting with a new Word Spacing toggle/setting, made of 2 values: - 1st number scales the normal width of spaces in all font (100% uses the font space width untouched) - 2nd number applies after the 1st has been applied, and tells how much these spaces can additionally be condensed to make more text fit on a line.
2019-11-28 21:39:06 +00:00
end,
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
},
}
},
{
Update UI layout code to use new SVG icons - Add IconWidget, use it for icons instead of ImageWidget. Specify icons by name only, look for them (with either .svg or .png suffixes) in multiple directories (including koreader/settings/icons/ to allow customizing them). Don't crash when icon name not found, shown a black background warning icon instead. - Don't trust the icons' native sizes: replace scale_for_dpi=true with width/height=DGENERIC_ICON_SIZE, so all icons get the same (tunable) size - except in a few specific use cases. - Top and bottom menu bars: normalize, and have icons properly centered in them, extend vertical line separators up to the edges. - TOC: adjust expand/collapse icons size to items size
2020-12-19 11:18:30 +00:00
icon = "appbar.textsize",
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
options = {
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderFont
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
name = "font_size",
A few small design fixes (#7933) Reduce CheckButton font size. Remove icons in TouchMenu truncated items popup. Fix some wording.
2021-07-05 10:38:24 +00:00
alt_name_text = _("Font Size"),
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
item_text = tableOfNumbersToTableOfStrings(G_defaults:readSetting("DCREREADER_CONFIG_FONT_SIZES")),
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
item_align_center = 1.0,
spacing = 15,
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
item_font_size = G_defaults:readSetting("DCREREADER_CONFIG_FONT_SIZES"),
values = G_defaults:readSetting("DCREREADER_CONFIG_FONT_SIZES"),
default_value = G_defaults:readSetting("DCREREADER_CONFIG_DEFAULT_FONT_SIZE"),
args = G_defaults:readSetting("DCREREADER_CONFIG_FONT_SIZES"),
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
event = "SetFontSize",
},
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderFont
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
name = "font_fine_tune",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("Font Size"),
toggle = Device:isTouchDevice() and {_("decrease"), _("increase")} or nil,
item_text = not Device:isTouchDevice() and {_("decrease"), _("increase")} or nil,
[UX] Add fine tune for zoom(dpi) and font size (#5432) Close: #5312
2019-09-27 10:58:40 +00:00
more_options = true,
more_options_param = {
Reader: do not apply font size out of range (#10295)
2023-04-04 05:11:02 +00:00
value_min = 12,
[UX] Add fine tune for zoom(dpi) and font size (#5432) Close: #5312
2019-09-27 10:58:40 +00:00
value_max = 255,
value_step = 0.5,
precision = "%.1f",
value_hold_step = 4,
name = "font_size",
name_text = _("Font Size"),
event = "SetFontSize",
},
values = {},
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
event = "ChangeSize",
Notifications: options to show none/some/more (#7718) Notification: adds some functions so it can be used as a notification manager. Have various bits of code emitting events that may generate notifications advertize themselves as the source for following notifications. Add a menu to allow selecting some subsets of sources to show or hide.
2021-05-20 21:14:11 +00:00
args = { -0.5, 0.5 },
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
alternate = false,
Show current and default values in config dialog (pdf) (#3973)
2018-05-26 17:45:37 +00:00
name_text_hold_callback = function(configurable, __, prefix)
Show current and default values in config dialog (epub) (#3952) when long-press on the title strings on the left of the buttons
2018-05-18 22:16:02 +00:00
local opt = {
name = "font_size",
name_text = _("Font Size"),
}
BottomMenu: show real sizes for margins and font size (#9205)
2022-07-05 13:38:59 +00:00
optionsutil.showValues(configurable, opt, prefix, nil, "pt")
Show current and default values in config dialog (pdf) (#3973)
2018-05-26 17:45:37 +00:00
end,
Adds Word Expansion: use of letter spacing for justification Bump crengine: - Text: fix occasional BiDi bad word splitting - Font: fix HB fallback measurement/drawing mismatches - Font: do not add letter spacing on diacritics - Text: tunable use of letter spacing for justification - Text: dont adjust space after initial quotation mark/dash (rework) - Text: fix possible bad widths after collapsed spaces xtext.cpp: pick crengine fix with HB fallback measurement/drawing mismatches Adds "Word Expansion" to bottom Font size menu, and moved "Word Spacing" there too, to balance the panels' heights to 4 items.
2020-05-03 16:06:58 +00:00
},
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderFont
Adds Word Expansion: use of letter spacing for justification Bump crengine: - Text: fix occasional BiDi bad word splitting - Font: fix HB fallback measurement/drawing mismatches - Font: do not add letter spacing on diacritics - Text: tunable use of letter spacing for justification - Text: dont adjust space after initial quotation mark/dash (rework) - Text: fix possible bad widths after collapsed spaces xtext.cpp: pick crengine fix with HB fallback measurement/drawing mismatches Adds "Word Expansion" to bottom Font size menu, and moved "Word Spacing" there too, to balance the panels' heights to 4 items.
2020-05-03 16:06:58 +00:00
name = "word_spacing",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("Word Spacing"),
[UX] Add fine tune for Word Spacing Using DoubleSpinWidget. Also keep SpinWidgets open on Apply. Added little trick: if widget has been moved, close bottom config menu on next Apply to show more of the book.
2020-05-09 11:16:12 +00:00
more_options = true,
more_options_param = {
name = "word_spacing",
name_text = _("Word spacing"),
info_text = _([[Set word spacing percentages:
- how much to scale the width of each space character from its regular width,
- by how much some of them can then be reduced to make more words fit on a line.]]),
SpinWidget, DoubleSpinWidget: add units to bottom menu (#9126) * Units to bottom menu * add ¹’¹ to 96dpi
2022-06-04 07:35:33 +00:00
left_text = _("Scaling"),
[UX] Add fine tune for Word Spacing Using DoubleSpinWidget. Also keep SpinWidgets open on Apply. Added little trick: if widget has been moved, close bottom config menu on next Apply to show more of the book.
2020-05-09 11:16:12 +00:00
left_min = 10,
left_max = 500,
left_step = 1,
left_hold_step = 10,
SpinWidget, DoubleSpinWidget: add units to bottom menu (#9126) * Units to bottom menu * add ¹’¹ to 96dpi
2022-06-04 07:35:33 +00:00
right_text = _("Reduction"),
[UX] Add fine tune for Word Spacing Using DoubleSpinWidget. Also keep SpinWidgets open on Apply. Added little trick: if widget has been moved, close bottom config menu on next Apply to show more of the book.
2020-05-09 11:16:12 +00:00
right_min = 25,
right_max = 100,
right_step = 1,
right_hold_step = 10,
SpinWidget, DoubleSpinWidget: add units to bottom menu (#9126) * Units to bottom menu * add ¹’¹ to 96dpi
2022-06-04 07:35:33 +00:00
unit = "%",
[UX] Add fine tune for Word Spacing Using DoubleSpinWidget. Also keep SpinWidgets open on Apply. Added little trick: if widget has been moved, close bottom config menu on next Apply to show more of the book.
2020-05-09 11:16:12 +00:00
event = "SetWordSpacing",
},
[i18n] Add context to various none/auto/small/medium/large (#8489) Needed for Greek and possibly other languages. Closes #8478.
2021-11-28 21:49:22 +00:00
toggle = {C_("Word spacing", "small"), C_("Word spacing", "medium"), C_("Word spacing", "large")},
Adds Word Expansion: use of letter spacing for justification Bump crengine: - Text: fix occasional BiDi bad word splitting - Font: fix HB fallback measurement/drawing mismatches - Font: do not add letter spacing on diacritics - Text: tunable use of letter spacing for justification - Text: dont adjust space after initial quotation mark/dash (rework) - Text: fix possible bad widths after collapsed spaces xtext.cpp: pick crengine fix with HB fallback measurement/drawing mismatches Adds "Word Expansion" to bottom Font size menu, and moved "Word Spacing" there too, to balance the panels' heights to 4 items.
2020-05-03 16:06:58 +00:00
values = {
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
G_defaults:readSetting("DCREREADER_CONFIG_WORD_SPACING_SMALL"),
G_defaults:readSetting("DCREREADER_CONFIG_WORD_SPACING_MEDIUM"),
G_defaults:readSetting("DCREREADER_CONFIG_WORD_SPACING_LARGE"),
Adds Word Expansion: use of letter spacing for justification Bump crengine: - Text: fix occasional BiDi bad word splitting - Font: fix HB fallback measurement/drawing mismatches - Font: do not add letter spacing on diacritics - Text: tunable use of letter spacing for justification - Text: dont adjust space after initial quotation mark/dash (rework) - Text: fix possible bad widths after collapsed spaces xtext.cpp: pick crengine fix with HB fallback measurement/drawing mismatches Adds "Word Expansion" to bottom Font size menu, and moved "Word Spacing" there too, to balance the panels' heights to 4 items.
2020-05-03 16:06:58 +00:00
},
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
default_value = G_defaults:readSetting("DCREREADER_CONFIG_WORD_SPACING_MEDIUM"),
Adds Word Expansion: use of letter spacing for justification Bump crengine: - Text: fix occasional BiDi bad word splitting - Font: fix HB fallback measurement/drawing mismatches - Font: do not add letter spacing on diacritics - Text: tunable use of letter spacing for justification - Text: dont adjust space after initial quotation mark/dash (rework) - Text: fix possible bad widths after collapsed spaces xtext.cpp: pick crengine fix with HB fallback measurement/drawing mismatches Adds "Word Expansion" to bottom Font size menu, and moved "Word Spacing" there too, to balance the panels' heights to 4 items.
2020-05-03 16:06:58 +00:00
args = {
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
G_defaults:readSetting("DCREREADER_CONFIG_WORD_SPACING_SMALL"),
G_defaults:readSetting("DCREREADER_CONFIG_WORD_SPACING_MEDIUM"),
G_defaults:readSetting("DCREREADER_CONFIG_WORD_SPACING_LARGE"),
Adds Word Expansion: use of letter spacing for justification Bump crengine: - Text: fix occasional BiDi bad word splitting - Font: fix HB fallback measurement/drawing mismatches - Font: do not add letter spacing on diacritics - Text: tunable use of letter spacing for justification - Text: dont adjust space after initial quotation mark/dash (rework) - Text: fix possible bad widths after collapsed spaces xtext.cpp: pick crengine fix with HB fallback measurement/drawing mismatches Adds "Word Expansion" to bottom Font size menu, and moved "Word Spacing" there too, to balance the panels' heights to 4 items.
2020-05-03 16:06:58 +00:00
},
event = "SetWordSpacing",
[UX] Add fine tune for Word Spacing Using DoubleSpinWidget. Also keep SpinWidgets open on Apply. Added little trick: if widget has been moved, close bottom config menu on next Apply to show more of the book.
2020-05-09 11:16:12 +00:00
help_text = _([[Tells the rendering engine by how much to scale the width of each 'space' character in the text from its regular width, and by how much it can additionally reduce them to make more words fit on a line (100% means no reduction).]]),
Adds Word Expansion: use of letter spacing for justification Bump crengine: - Text: fix occasional BiDi bad word splitting - Font: fix HB fallback measurement/drawing mismatches - Font: do not add letter spacing on diacritics - Text: tunable use of letter spacing for justification - Text: dont adjust space after initial quotation mark/dash (rework) - Text: fix possible bad widths after collapsed spaces xtext.cpp: pick crengine fix with HB fallback measurement/drawing mismatches Adds "Word Expansion" to bottom Font size menu, and moved "Word Spacing" there too, to balance the panels' heights to 4 items.
2020-05-03 16:06:58 +00:00
name_text_hold_callback = optionsutil.showValues,
name_text_true_values = true,
show_true_value_func = function(val)
[chore] replace utf8 bytes with Unicode escape sequence
2023-08-01 08:09:29 +00:00
return string.format("%d\u{202F}%%, %d\u{202F}%%", val[1], val[2]) -- use Narrow Now-Break space here
Adds Word Expansion: use of letter spacing for justification Bump crengine: - Text: fix occasional BiDi bad word splitting - Font: fix HB fallback measurement/drawing mismatches - Font: do not add letter spacing on diacritics - Text: tunable use of letter spacing for justification - Text: dont adjust space after initial quotation mark/dash (rework) - Text: fix possible bad widths after collapsed spaces xtext.cpp: pick crengine fix with HB fallback measurement/drawing mismatches Adds "Word Expansion" to bottom Font size menu, and moved "Word Spacing" there too, to balance the panels' heights to 4 items.
2020-05-03 16:06:58 +00:00
end,
},
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderFont
Adds Word Expansion: use of letter spacing for justification Bump crengine: - Text: fix occasional BiDi bad word splitting - Font: fix HB fallback measurement/drawing mismatches - Font: do not add letter spacing on diacritics - Text: tunable use of letter spacing for justification - Text: dont adjust space after initial quotation mark/dash (rework) - Text: fix possible bad widths after collapsed spaces xtext.cpp: pick crengine fix with HB fallback measurement/drawing mismatches Adds "Word Expansion" to bottom Font size menu, and moved "Word Spacing" there too, to balance the panels' heights to 4 items.
2020-05-03 16:06:58 +00:00
name = "word_expansion",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("Word Expansion"),
Adds Word Expansion: use of letter spacing for justification Bump crengine: - Text: fix occasional BiDi bad word splitting - Font: fix HB fallback measurement/drawing mismatches - Font: do not add letter spacing on diacritics - Text: tunable use of letter spacing for justification - Text: dont adjust space after initial quotation mark/dash (rework) - Text: fix possible bad widths after collapsed spaces xtext.cpp: pick crengine fix with HB fallback measurement/drawing mismatches Adds "Word Expansion" to bottom Font size menu, and moved "Word Spacing" there too, to balance the panels' heights to 4 items.
2020-05-03 16:06:58 +00:00
more_options = true,
more_options_param = {
value_min = 0,
value_max = 20,
value_step = 1,
value_hold_step = 4,
SpinWidget, DoubleSpinWidget: add units to bottom menu (#9126) * Units to bottom menu * add ¹’¹ to 96dpi
2022-06-04 07:35:33 +00:00
unit = "%",
Adds Word Expansion: use of letter spacing for justification Bump crengine: - Text: fix occasional BiDi bad word splitting - Font: fix HB fallback measurement/drawing mismatches - Font: do not add letter spacing on diacritics - Text: tunable use of letter spacing for justification - Text: dont adjust space after initial quotation mark/dash (rework) - Text: fix possible bad widths after collapsed spaces xtext.cpp: pick crengine fix with HB fallback measurement/drawing mismatches Adds "Word Expansion" to bottom Font size menu, and moved "Word Spacing" there too, to balance the panels' heights to 4 items.
2020-05-03 16:06:58 +00:00
name = "word_expansion",
[UX] Add fine tune for Word Spacing Using DoubleSpinWidget. Also keep SpinWidgets open on Apply. Added little trick: if widget has been moved, close bottom config menu on next Apply to show more of the book.
2020-05-09 11:16:12 +00:00
name_text = _("Max word expansion"),
SpinWidget, DoubleSpinWidget: add units to bottom menu (#9126) * Units to bottom menu * add ¹’¹ to 96dpi
2022-06-04 07:35:33 +00:00
info_text = _([[Set max word expansion as a percentage of the font size.]]),
Adds Word Expansion: use of letter spacing for justification Bump crengine: - Text: fix occasional BiDi bad word splitting - Font: fix HB fallback measurement/drawing mismatches - Font: do not add letter spacing on diacritics - Text: tunable use of letter spacing for justification - Text: dont adjust space after initial quotation mark/dash (rework) - Text: fix possible bad widths after collapsed spaces xtext.cpp: pick crengine fix with HB fallback measurement/drawing mismatches Adds "Word Expansion" to bottom Font size menu, and moved "Word Spacing" there too, to balance the panels' heights to 4 items.
2020-05-03 16:06:58 +00:00
event = "SetWordExpansion",
CRE: add "CJK width scaling" option The setting is handled like all other bottom menu options but, as it's really not useful and its target audience is very limited, make it not shown in the bottom menu, but available via another button in the (also quite not useful) Word Expansion fine tuning widget.
2022-06-05 10:36:33 +00:00
other_button = { -- allow fine tuning the hidden cjk_width_scaling option (defined below)
text = _("CJK scaling"),
other_option = "cjk_width_scaling",
}
Adds Word Expansion: use of letter spacing for justification Bump crengine: - Text: fix occasional BiDi bad word splitting - Font: fix HB fallback measurement/drawing mismatches - Font: do not add letter spacing on diacritics - Text: tunable use of letter spacing for justification - Text: dont adjust space after initial quotation mark/dash (rework) - Text: fix possible bad widths after collapsed spaces xtext.cpp: pick crengine fix with HB fallback measurement/drawing mismatches Adds "Word Expansion" to bottom Font size menu, and moved "Word Spacing" there too, to balance the panels' heights to 4 items.
2020-05-03 16:06:58 +00:00
},
[i18n] Add context to various none/auto/small/medium/large (#8489) Needed for Greek and possibly other languages. Closes #8478.
2021-11-28 21:49:22 +00:00
toggle = {C_("Word expansion", "none"), C_("Word expansion", "some"), C_("Word expansion", "more")},
Adds Word Expansion: use of letter spacing for justification Bump crengine: - Text: fix occasional BiDi bad word splitting - Font: fix HB fallback measurement/drawing mismatches - Font: do not add letter spacing on diacritics - Text: tunable use of letter spacing for justification - Text: dont adjust space after initial quotation mark/dash (rework) - Text: fix possible bad widths after collapsed spaces xtext.cpp: pick crengine fix with HB fallback measurement/drawing mismatches Adds "Word Expansion" to bottom Font size menu, and moved "Word Spacing" there too, to balance the panels' heights to 4 items.
2020-05-03 16:06:58 +00:00
values = {
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
G_defaults:readSetting("DCREREADER_CONFIG_WORD_EXPANSION_NONE"),
G_defaults:readSetting("DCREREADER_CONFIG_WORD_EXPANSION_SOME"),
G_defaults:readSetting("DCREREADER_CONFIG_WORD_EXPANSION_MORE"),
Adds Word Expansion: use of letter spacing for justification Bump crengine: - Text: fix occasional BiDi bad word splitting - Font: fix HB fallback measurement/drawing mismatches - Font: do not add letter spacing on diacritics - Text: tunable use of letter spacing for justification - Text: dont adjust space after initial quotation mark/dash (rework) - Text: fix possible bad widths after collapsed spaces xtext.cpp: pick crengine fix with HB fallback measurement/drawing mismatches Adds "Word Expansion" to bottom Font size menu, and moved "Word Spacing" there too, to balance the panels' heights to 4 items.
2020-05-03 16:06:58 +00:00
},
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
default_value = G_defaults:readSetting("DCREREADER_CONFIG_WORD_EXPANSION_NONE"),
Adds Word Expansion: use of letter spacing for justification Bump crengine: - Text: fix occasional BiDi bad word splitting - Font: fix HB fallback measurement/drawing mismatches - Font: do not add letter spacing on diacritics - Text: tunable use of letter spacing for justification - Text: dont adjust space after initial quotation mark/dash (rework) - Text: fix possible bad widths after collapsed spaces xtext.cpp: pick crengine fix with HB fallback measurement/drawing mismatches Adds "Word Expansion" to bottom Font size menu, and moved "Word Spacing" there too, to balance the panels' heights to 4 items.
2020-05-03 16:06:58 +00:00
args = {
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
G_defaults:readSetting("DCREREADER_CONFIG_WORD_EXPANSION_NONE"),
G_defaults:readSetting("DCREREADER_CONFIG_WORD_EXPANSION_SOME"),
G_defaults:readSetting("DCREREADER_CONFIG_WORD_EXPANSION_MORE"),
Adds Word Expansion: use of letter spacing for justification Bump crengine: - Text: fix occasional BiDi bad word splitting - Font: fix HB fallback measurement/drawing mismatches - Font: do not add letter spacing on diacritics - Text: tunable use of letter spacing for justification - Text: dont adjust space after initial quotation mark/dash (rework) - Text: fix possible bad widths after collapsed spaces xtext.cpp: pick crengine fix with HB fallback measurement/drawing mismatches Adds "Word Expansion" to bottom Font size menu, and moved "Word Spacing" there too, to balance the panels' heights to 4 items.
2020-05-03 16:06:58 +00:00
},
event = "SetWordExpansion",
help_text = _([[On justified lines having too wide spaces, allow distributing the excessive space into words by expanding them with letter spacing. This sets the max allowed letter spacing as a % of the font size.]]),
name_text_hold_callback = optionsutil.showValues,
name_text_true_values = true,
show_true_value_func = function(val)
[chore] replace utf8 bytes with Unicode escape sequence
2023-08-01 08:09:29 +00:00
return string.format("%d\u{202F}%%", val) -- use Narrow No-Break space here
Adds Word Expansion: use of letter spacing for justification Bump crengine: - Text: fix occasional BiDi bad word splitting - Font: fix HB fallback measurement/drawing mismatches - Font: do not add letter spacing on diacritics - Text: tunable use of letter spacing for justification - Text: dont adjust space after initial quotation mark/dash (rework) - Text: fix possible bad widths after collapsed spaces xtext.cpp: pick crengine fix with HB fallback measurement/drawing mismatches Adds "Word Expansion" to bottom Font size menu, and moved "Word Spacing" there too, to balance the panels' heights to 4 items.
2020-05-03 16:06:58 +00:00
end,
},
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderFont
CRE: add "CJK width scaling" option The setting is handled like all other bottom menu options but, as it's really not useful and its target audience is very limited, make it not shown in the bottom menu, but available via another button in the (also quite not useful) Word Expansion fine tuning widget.
2022-06-05 10:36:33 +00:00
-- This option is not shown in the bottom menu, but its fine tuning is made
-- available via the other_button in Word Expansion's fine tuning widget.
-- We still need to define it as an option here for it to be known and
-- handled as any other one - we just make it hidden.
show = false,
name = "cjk_width_scaling",
default_value = 100,
values = { 100, 105, 110 }, -- (not shown)
event = "SetCJKWidthScaling",
more_options = true,
more_options_param = {
value_min = 100,
value_max = 150,
value_step = 1,
value_hold_step = 5,
unit = "%",
name = "cjk_width_scaling",
name_text = _("CJK width scaling"),
info_text = _([[Increase the width of all CJK (Chinese, Japanese, Korean) chararacters by this percentage. This has the effect of adding space between these glyphs, and might make them easier to distinguish to some readers.]]),
event = "SetCJKWidthScaling",
other_button = {
text = _("Word expansion"),
other_option = "word_expansion",
}
},
},
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
}
},
{
Update UI layout code to use new SVG icons - Add IconWidget, use it for icons instead of ImageWidget. Specify icons by name only, look for them (with either .svg or .png suffixes) in multiple directories (including koreader/settings/icons/ to allow customizing them). Don't crash when icon name not found, shown a black background warning icon instead. - Don't trust the icons' native sizes: replace scale_for_dpi=true with width/height=DGENERIC_ICON_SIZE, so all icons get the same (tunable) size - except in a few specific use cases. - Top and bottom menu bars: normalize, and have icons properly centered in them, extend vertical line separators up to the edges. - TOC: adjust expand/collapse icons size to items size
2020-12-19 11:18:30 +00:00
icon = "appbar.contrast",
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
options = {
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderFont
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
name = "font_gamma",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("Contrast"),
cre: more constrast settings (#3737) Use ButtonProgress like it was done for kopt.
2018-03-11 13:54:17 +00:00
buttonprogress = true,
default_value = 15, -- gamma = 1.0
default_pos = 2,
values = {10, 15, 25, 30, 36, 43, 49, 56},
config line space/font gamma values directly
2014-08-17 13:45:48 +00:00
event = "SetFontGamma",
cre: more constrast settings (#3737) Use ButtonProgress like it was done for kopt.
2018-03-11 13:54:17 +00:00
args = {10, 15, 25, 30, 36, 43, 49, 56},
-- gamma values for these indexes are:
labels = {0.8, 1.0, 1.45, 1.90, 2.50, 4.0, 8.0, 15.0},
Show current and default values in config dialog (pdf) (#3973)
2018-05-26 17:45:37 +00:00
name_text_hold_callback = optionsutil.showValues,
[UX] Add fine tune in contrast (#5413)
2019-09-23 22:24:45 +00:00
more_options = true,
more_options_param = {
ConfigDialog: show button with default values in spinwidgets (#9558)
2022-09-25 12:37:22 +00:00
-- Values table taken from crengine/crengine/Tools/GammaGen/gammagen.cpp.
-- crengine counts the index of the table starting from 0.
-- Index is stored in the settings and passed to crengine as-is.
-- ConfigDialog adds value_table_shift to the index to display the value from the table.
[UX] Add fine tune in contrast (#5413)
2019-09-23 22:24:45 +00:00
value_table = { 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9,
0.95, 0.98, 1, 1.02, 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.4, 1.45,
1.5, 1.6, 1.7, 1.8, 1.9, 2, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9,
[core] Remove a bunch of superflous semicolons (#9449)
2022-09-08 19:52:06 +00:00
3, 3.5, 4, 4.5, 5, 5.5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
ConfigDialog: show button with default values in spinwidgets (#9558)
2022-09-25 12:37:22 +00:00
value_table_shift = 1,
[UX] Add fine tune in contrast (#5413)
2019-09-23 22:24:45 +00:00
},
Added Font Hinting toggle (#3182)
2017-09-08 15:38:51 +00:00
},
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderFont
bump crengine: more granular font weights (#7616) Includes: - MathML: a few minor fixes - (Upstream) lvtext: fix possible index out of range - Fonts: RegisterExternalFont() should take a documentId - Fonts: fix: letter-spacing should not be applied on diacritic - (Upstream) Fonts: more granular synthetic weights - Fonts: synthesized weights: tweak some comments - Fonts: keep hinting with synthetic weight - Fonts: fix synthesized weight inconsitencies - Fonts: fix getFontFileNameAndFaceIndex() - Fonts: adds LVFontMan::RegularizeRegisteredFontsWeights() - Fonts: handle synth_weight tweaks in glyph/glyphinfo slots - (Upstream) Fonts: fix some compiler warnings - Fix hyphenation on Armenian and Georgian text Update the bottom menu widget "Font Weight" to allow more granular weights than the previous "regular | bold". Also bump thirdparty/luasec to v1.0.1.
2021-04-28 23:37:53 +00:00
name = "font_base_weight",
name_text = _("Font Weight"),
toggle = { "-1", "-½", "0", "+½", "+1", "+1½", "+3" },
values = { -1, -0.5, 0, 0.5, 1, 1.5, 3 },
args = { -1, -0.5, 0, 0.5, 1, 1.5, 3 },
default_value = 0,
event = "SetFontBaseWeight",
more_options = true,
more_options_param = {
value_min = -3,
value_max = 5.5,
value_step = 0.25,
precision = "%+.2f",
value_hold_step = 1,
},
help_text = _([[Set the font weight delta from "regular" to apply to all fonts.
CreOptions: Display weight classes names, in addition to their raw value.
2021-04-29 18:16:30 +00:00
- 0 will use the "Regular (400)" variation of a font.
- +1 will use the "Medium (500)" variation of a font if available.
- +3 will use the "Bold (700)" variation of a font if available.
CreOptions: Minor wording tweak after #7616 c.f., https://github.com/koreader/koreader/pull/7616#discussion_r622732969
2021-04-29 17:45:12 +00:00
If a font variation is not available, as well as for fractional adjustments, it will be synthesized from the nearest available weight.]]),
bump crengine: more granular font weights (#7616) Includes: - MathML: a few minor fixes - (Upstream) lvtext: fix possible index out of range - Fonts: RegisterExternalFont() should take a documentId - Fonts: fix: letter-spacing should not be applied on diacritic - (Upstream) Fonts: more granular synthetic weights - Fonts: synthesized weights: tweak some comments - Fonts: keep hinting with synthetic weight - Fonts: fix synthesized weight inconsitencies - Fonts: fix getFontFileNameAndFaceIndex() - Fonts: adds LVFontMan::RegularizeRegisteredFontsWeights() - Fonts: handle synth_weight tweaks in glyph/glyphinfo slots - (Upstream) Fonts: fix some compiler warnings - Fix hyphenation on Armenian and Georgian text Update the bottom menu widget "Font Weight" to allow more granular weights than the previous "regular | bold". Also bump thirdparty/luasec to v1.0.1.
2021-04-28 23:37:53 +00:00
help_text_func = function(configurable, document)
Misc: Get rid of the legacy defaults.lua globals (#9546) * This removes support for the following deprecated constants: `DTAP_ZONE_FLIPPING`, `DTAP_ZONE_BOOKMARK`, `DCREREADER_CONFIG_DEFAULT_FONT_GAMMA` * The "Advanced settings" panel now highlights modified values in bold (think about:config in Firefox ;)). * LuaData: Isolate global table lookup shenanigans, and fix a few issues in unused-in-prod codepaths. * CodeStyle: Require module locals for Lua/C modules, too. * ScreenSaver: Actually garbage collect our widget on close (ScreenSaver itself is not an instantiated object). * DateTimeWidget: Code cleanups to ensure child widgets can be GC'ed.
2022-09-27 23:10:50 +00:00
local cre = require("document/credocument"):engineInit()
bump crengine: more granular font weights (#7616) Includes: - MathML: a few minor fixes - (Upstream) lvtext: fix possible index out of range - Fonts: RegisterExternalFont() should take a documentId - Fonts: fix: letter-spacing should not be applied on diacritic - (Upstream) Fonts: more granular synthetic weights - Fonts: synthesized weights: tweak some comments - Fonts: keep hinting with synthetic weight - Fonts: fix synthesized weight inconsitencies - Fonts: fix getFontFileNameAndFaceIndex() - Fonts: adds LVFontMan::RegularizeRegisteredFontsWeights() - Fonts: handle synth_weight tweaks in glyph/glyphinfo slots - (Upstream) Fonts: fix some compiler warnings - Fix hyphenation on Armenian and Georgian text Update the bottom menu widget "Font Weight" to allow more granular weights than the previous "regular | bold". Also bump thirdparty/luasec to v1.0.1.
2021-04-28 23:37:53 +00:00
local font_face = document:getFontFace()
CreOptions: Display weight classes names, in addition to their raw value.
2021-04-29 18:16:30 +00:00
local available_weights = prettifyCreWeights(cre.getFontFaceAvailableWeights(font_face))
return T(_("The default font '%1' provides the following weight classes: %2."), font_face, table.concat(available_weights, C_("List separator", ", ")))
bump crengine: more granular font weights (#7616) Includes: - MathML: a few minor fixes - (Upstream) lvtext: fix possible index out of range - Fonts: RegisterExternalFont() should take a documentId - Fonts: fix: letter-spacing should not be applied on diacritic - (Upstream) Fonts: more granular synthetic weights - Fonts: synthesized weights: tweak some comments - Fonts: keep hinting with synthetic weight - Fonts: fix synthesized weight inconsitencies - Fonts: fix getFontFileNameAndFaceIndex() - Fonts: adds LVFontMan::RegularizeRegisteredFontsWeights() - Fonts: handle synth_weight tweaks in glyph/glyphinfo slots - (Upstream) Fonts: fix some compiler warnings - Fix hyphenation on Armenian and Georgian text Update the bottom menu widget "Font Weight" to allow more granular weights than the previous "regular | bold". Also bump thirdparty/luasec to v1.0.1.
2021-04-28 23:37:53 +00:00
end,
name_text_hold_callback = optionsutil.showValues,
name_text_true_values = true,
show_true_value_func = function(val)
CreOptions: Display weight classes names, in addition to their raw value.
2021-04-29 18:16:30 +00:00
return weightClassToString(400+val*100)
bump crengine: more granular font weights (#7616) Includes: - MathML: a few minor fixes - (Upstream) lvtext: fix possible index out of range - Fonts: RegisterExternalFont() should take a documentId - Fonts: fix: letter-spacing should not be applied on diacritic - (Upstream) Fonts: more granular synthetic weights - Fonts: synthesized weights: tweak some comments - Fonts: keep hinting with synthetic weight - Fonts: fix synthesized weight inconsitencies - Fonts: fix getFontFileNameAndFaceIndex() - Fonts: adds LVFontMan::RegularizeRegisteredFontsWeights() - Fonts: handle synth_weight tweaks in glyph/glyphinfo slots - (Upstream) Fonts: fix some compiler warnings - Fix hyphenation on Armenian and Georgian text Update the bottom menu widget "Font Weight" to allow more granular weights than the previous "regular | bold". Also bump thirdparty/luasec to v1.0.1.
2021-04-28 23:37:53 +00:00
end,
},
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderFont
Added Font Hinting toggle (#3182)
2017-09-08 15:38:51 +00:00
name = "font_hinting",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("Font Hinting"),
[i18n] Add context to various none/auto/small/medium/large (#8489) Needed for Greek and possibly other languages. Closes #8478.
2021-11-28 21:49:22 +00:00
toggle = {C_("Font hinting", "off"), C_("Font hinting", "native"), C_("Font hinting", "auto")},
Added Font Hinting toggle (#3182)
2017-09-08 15:38:51 +00:00
values = {0, 1, 2},
default_value = 2,
args = {0, 1, 2},
event = "SetFontHinting",
Show current and default values in config dialog (pdf) (#3973)
2018-05-26 17:45:37 +00:00
name_text_hold_callback = optionsutil.showValues,
Add some help texts to long press popup on bottom config titles (#4048)
2018-07-04 10:08:55 +00:00
help_text = _([[Font hinting is the process by which fonts are adjusted for maximum readability on the screen's pixel grid.
- off: no hinting.
- native: use the font internal hinting instructions.
- auto: use FreeType's hinting algorithm, ignoring font instructions.]]),
cre: configurable kerning method (off/freetype/harfbuzz) (#4167) Bump base & crengine for HarfBuzz support.
2018-08-17 21:08:21 +00:00
},
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderFont
cre: configurable kerning method (off/freetype/harfbuzz) (#4167) Bump base & crengine for HarfBuzz support.
2018-08-17 21:08:21 +00:00
name = "font_kerning",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("Font Kerning"),
toggle = {_("off"), _("fast"), _("good"), _("best")},
bump crengine: Harfbuzz light, WTF-8, corrupted ZIPs Includes: - EPUB: workaround ZIP files with corrupted central directories - Supports book text encoded in WTF-8 - Harfbuzz kerning (full): fix possible wrong flags - (Upstream) Adds new kerning method: Harfbuzz light, without ligatures Adds Harfbuzz light kerning methods as the 3rd toggle.
2019-01-15 19:40:35 +00:00
values = {0, 1, 2, 3},
cre: use 'best' (Harfbuzz) as the default kerning method (#5553) It might be slower, but is needed to properly display books in arabic, indic... Also bump crengine: use FreeType "light" hinting algorithm, which hints on the y-axis only (and so avoid messing with advances and kerning on the x-axis).
2019-11-01 22:07:41 +00:00
default_value = 3,
bump crengine: Harfbuzz light, WTF-8, corrupted ZIPs Includes: - EPUB: workaround ZIP files with corrupted central directories - Supports book text encoded in WTF-8 - Harfbuzz kerning (full): fix possible wrong flags - (Upstream) Adds new kerning method: Harfbuzz light, without ligatures Adds Harfbuzz light kerning methods as the 3rd toggle.
2019-01-15 19:40:35 +00:00
args = {0, 1, 2, 3},
cre: configurable kerning method (off/freetype/harfbuzz) (#4167) Bump base & crengine for HarfBuzz support.
2018-08-17 21:08:21 +00:00
event = "SetFontKerning",
name_text_hold_callback = optionsutil.showValues,
help_text = _([[Font kerning is the process of adjusting the spacing between individual letter forms, to achieve a visually pleasing result.
- off: no kerning.
- fast: use FreeType's kerning implementation (no ligatures).
[lang] Change "full" to "best" (#8141) I guess `full` was in on of the old iterations. Might affect translations though
2021-08-28 07:10:20 +00:00
- good: use HarfBuzz's light kerning implementation (faster than best but no ligatures and limited support for non-western scripts)
cre: use 'best' (Harfbuzz) as the default kerning method (#5553) It might be slower, but is needed to properly display books in arabic, indic... Also bump crengine: use FreeType "light" hinting algorithm, which hints on the y-axis only (and so avoid messing with advances and kerning on the x-axis).
2019-11-01 22:07:41 +00:00
- best: use HarfBuzz's full kerning implementation (slower, but may support ligatures with some fonts; also needed to properly display joined arabic glyphs and some other scripts).
cre: configurable kerning method (off/freetype/harfbuzz) (#4167) Bump base & crengine for HarfBuzz support.
2018-08-17 21:08:21 +00:00
(Font Hinting may need to be adjusted for the best result with either kerning implementation.)]]),
cre: add Word Gap setting to bottom config panel (#4026) Maps to crengine's Space Condensing feature (named Word Gap as a similar feature is named for PDF)
2018-06-30 14:55:43 +00:00
},
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
}
},
{
Update UI layout code to use new SVG icons - Add IconWidget, use it for icons instead of ImageWidget. Specify icons by name only, look for them (with either .svg or .png suffixes) in multiple directories (including koreader/settings/icons/ to allow customizing them). Don't crash when icon name not found, shown a black background warning icon instead. - Don't trust the icons' native sizes: replace scale_for_dpi=true with width/height=DGENERIC_ICON_SIZE, so all icons get the same (tunable) size - except in a few specific use cases. - Top and bottom menu bars: normalize, and have icons properly centered in them, extend vertical line separators up to the edges. - TOC: adjust expand/collapse icons size to items size
2020-12-19 11:18:30 +00:00
icon = "appbar.settings",
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
options = {
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderRolling
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
name = "status_line",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("Alt Status Bar"),
toggle = {_("off"), _("on")},
Don't toggle the footer when toggling the top status bar
2021-01-29 17:39:06 +00:00
values = {1, 0}, -- Note that 0 means crengine header status line enabled, and 1 means disabled
default_value = 1,
Reorganize bottom menu config panels (#6131) Mostly for the PDF bottom menu. - Reorganize by topic, trying to limit the number of widgets per panel to 4. - Re-order some toggles from low to high ('off' then 'on'). - Show font size as number instead of a list of "Aa". - PDF: add more font size values, and increase usable contrast values. - Add help_text to most PDF toggle titles. - CRE line spacing: increase fine tuning min and max. Also avoid zoom advice messages on book load.
2020-05-07 18:24:12 +00:00
args = {1, 0},
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
event = "SetStatusLine",
Show current and default values in config dialog (pdf) (#3973)
2018-05-26 17:45:37 +00:00
name_text_hold_callback = optionsutil.showValues,
Don't toggle the footer when toggling the top status bar
2021-01-29 17:39:06 +00:00
help_text = _([[Enable or disable the rendering engine alternative status bar at the top of the screen. The items displayed can be customized via the main menu.
Reorganize bottom menu config panels (#6131) Mostly for the PDF bottom menu. - Reorganize by topic, trying to limit the number of widgets per panel to 4. - Re-order some toggles from low to high ('off' then 'on'). - Show font size as number instead of a list of "Aa". - PDF: add more font size values, and increase usable contrast values. - Add help_text to most PDF toggle titles. - CRE line spacing: increase fine tuning min and max. Also avoid zoom advice messages on book load.
2020-05-07 18:24:12 +00:00
Don't toggle the footer when toggling the top status bar
2021-01-29 17:39:06 +00:00
Whether enabled or disabled, KOReader's own status bar at the bottom of the screen can be toggled by tapping.]]),
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
},
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderTypeset
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
name = "embedded_css",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("Embedded Style"),
toggle = {_("off"), _("on")},
Reorganize bottom menu config panels (#6131) Mostly for the PDF bottom menu. - Reorganize by topic, trying to limit the number of widgets per panel to 4. - Re-order some toggles from low to high ('off' then 'on'). - Show font size as number instead of a list of "Aa". - PDF: add more font size values, and increase usable contrast values. - Add help_text to most PDF toggle titles. - CRE line spacing: increase fine tuning min and max. Also avoid zoom advice messages on book load.
2020-05-07 18:24:12 +00:00
values = {0, 1},
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
default_value = 1,
Reorganize bottom menu config panels (#6131) Mostly for the PDF bottom menu. - Reorganize by topic, trying to limit the number of widgets per panel to 4. - Re-order some toggles from low to high ('off' then 'on'). - Show font size as number instead of a list of "Aa". - PDF: add more font size values, and increase usable contrast values. - Add help_text to most PDF toggle titles. - CRE line spacing: increase fine tuning min and max. Also avoid zoom advice messages on book load.
2020-05-07 18:24:12 +00:00
args = {false, true},
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
event = "ToggleEmbeddedStyleSheet",
Show current and default values in config dialog (pdf) (#3973)
2018-05-26 17:45:37 +00:00
name_text_hold_callback = optionsutil.showValues,
Add some help texts to long press popup on bottom config titles (#4048)
2018-07-04 10:08:55 +00:00
help_text = _([[Enable or disable publisher stylesheets embedded in the book.
(Note that less radical changes can be achieved via Style Tweaks in the main menu.)]]),
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
},
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderTypeset
Added Embedded Fonts config toggle Just under the existing "Embedded Styles". Support for this was already there in crengine, and interfacing is similar to what is done with Embedded Styles.
2017-08-30 07:04:04 +00:00
name = "embedded_fonts",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("Embedded Fonts"),
toggle = {_("off"), _("on")},
Reorganize bottom menu config panels (#6131) Mostly for the PDF bottom menu. - Reorganize by topic, trying to limit the number of widgets per panel to 4. - Re-order some toggles from low to high ('off' then 'on'). - Show font size as number instead of a list of "Aa". - PDF: add more font size values, and increase usable contrast values. - Add help_text to most PDF toggle titles. - CRE line spacing: increase fine tuning min and max. Also avoid zoom advice messages on book load.
2020-05-07 18:24:12 +00:00
values = {0, 1},
Added Embedded Fonts config toggle Just under the existing "Embedded Styles". Support for this was already there in crengine, and interfacing is similar to what is done with Embedded Styles.
2017-08-30 07:04:04 +00:00
default_value = 1,
Reorganize bottom menu config panels (#6131) Mostly for the PDF bottom menu. - Reorganize by topic, trying to limit the number of widgets per panel to 4. - Re-order some toggles from low to high ('off' then 'on'). - Show font size as number instead of a list of "Aa". - PDF: add more font size values, and increase usable contrast values. - Add help_text to most PDF toggle titles. - CRE line spacing: increase fine tuning min and max. Also avoid zoom advice messages on book load.
2020-05-07 18:24:12 +00:00
args = {false, true},
Added Embedded Fonts config toggle Just under the existing "Embedded Styles". Support for this was already there in crengine, and interfacing is similar to what is done with Embedded Styles.
2017-08-30 07:04:04 +00:00
event = "ToggleEmbeddedFonts",
Embedded fonts toggle: disabled if no embedded font Have the enabled/disabled state of the toggle show the presence or not of embedded fonts in the current book. Also show the names of the embedded fonts in the help_text InfoMessage.
2022-06-11 09:08:42 +00:00
enabled_func = function(configurable, document)
Show current and default values in config dialog (pdf) (#3973)
2018-05-26 17:45:37 +00:00
return optionsutil.enableIfEquals(configurable, "embedded_css", 1)
Embedded fonts toggle: disabled if no embedded font Have the enabled/disabled state of the toggle show the presence or not of embedded fonts in the current book. Also show the names of the embedded fonts in the help_text InfoMessage.
2022-06-11 09:08:42 +00:00
and next(document:getEmbeddedFontList()) ~= nil
Added Embedded Fonts config toggle Just under the existing "Embedded Styles". Support for this was already there in crengine, and interfacing is similar to what is done with Embedded Styles.
2017-08-30 07:04:04 +00:00
end,
Show current and default values in config dialog (pdf) (#3973)
2018-05-26 17:45:37 +00:00
name_text_hold_callback = optionsutil.showValues,
Add some help texts to long press popup on bottom config titles (#4048)
2018-07-04 10:08:55 +00:00
help_text = _([[Enable or disable the use of the fonts embedded in the book.
(Disabling the fonts specified in the publisher stylesheets can also be achieved via Style Tweaks in the main menu.)]]),
Embedded fonts toggle: disabled if no embedded font Have the enabled/disabled state of the toggle show the presence or not of embedded fonts in the current book. Also show the names of the embedded fonts in the help_text InfoMessage.
2022-06-11 09:08:42 +00:00
help_text_func = function(configurable, document)
local font_list = document:getEmbeddedFontList()
if next(font_list) then
local font_details = {}
table.insert(font_details, _("Embedded fonts provided by the current book:"))
for name in ffiUtil.orderedPairs(font_list) do
table.insert(font_details, name .. (font_list[name] and "" or T(" (%1)", _("not used"))))
end
return table.concat(font_details, "\n")
end
end,
Added Embedded Fonts config toggle Just under the existing "Embedded Styles". Support for this was already there in crengine, and interfacing is similar to what is done with Embedded Styles.
2017-08-30 07:04:04 +00:00
},
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderTypeset
Allow toggling CRe's new dithering & scaling (#4922) Smooth scaling toggle is per document, in the gear tab. Dithering is in the Dev top menu ;).
2019-04-18 21:26:53 +00:00
name = "smooth_scaling",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("Image Scaling"),
toggle = {_("fast"), _("best")},
Allow toggling CRe's new dithering & scaling (#4922) Smooth scaling toggle is per document, in the gear tab. Dithering is in the Dev top menu ;).
2019-04-18 21:26:53 +00:00
values = {0, 1},
default_value = 0,
args = {false, true},
event = "ToggleImageScaling",
name_text_hold_callback = optionsutil.showValues,
help_text = _([[- 'fast' uses a fast but inaccurate scaling algorithm when scaling images.
- 'best' switches to a more costly but vastly more pleasing and accurate algorithm.]]),
},
copt deduplicate: render_dpi, margins, rotation_mode (#10880)
2023-09-08 05:41:44 +00:00
{ -- ReaderTypeset
Allow disabling automagic image inversion in Nightmode in CRe (#5095) * Allow disabling automagic image inversion in NightMode Fix #4986
2019-06-25 22:23:41 +00:00
name = "nightmode_images",
[chore] Get rid of ui/data/strings.lua (#6921) As suggested [here](https://github.com/koreader/koreader/pull/6885#issuecomment-734865881)
2020-11-29 09:18:59 +00:00
name_text = _("Invert Images"),
toggle = {_("on"), _("off")},
Allow disabling automagic image inversion in Nightmode in CRe (#5095) * Allow disabling automagic image inversion in NightMode Fix #4986
2019-06-25 22:23:41 +00:00
values = {1, 0},
default_value = 1,
args = {true, false},
event = "ToggleNightmodeImages",
Rotation icons: make 'em dynamic. (#7440) Followup to #7306. As discussed there, the only way to make everybody happy is to make 'em context-aware. At which point, trying to make the fact that it's a *device* rotation and not a *content* one come across in the icon design loses its interest, and would actually only further muddy the issue. So, these are similar is spirit to the traditional rotation icons in pretty much anything that can rotate text content, with a special inspiration from the Kindle 4 & PocketBook UI. Fix #7429
2021-03-29 03:12:22 +00:00
show_func = function() return Screen.night_mode end,
Allow disabling automagic image inversion in Nightmode in CRe (#5095) * Allow disabling automagic image inversion in NightMode Fix #4986
2019-06-25 22:23:41 +00:00
name_text_hold_callback = optionsutil.showValues,
help_text = _([[Disable the automagic inversion of images when nightmode is enabled. Useful if your book contains mainly inlined mathematical content or scene break art.]]),
},
cleanup: expand tab to 4 spaces
2014-03-13 13:52:43 +00:00
},
},
move kopt/cre options into ui/data directory & wrap strings in config options
2013-04-08 14:26:54 +00:00
}
Refactored to use strictly locals
2013-10-18 20:38:07 +00:00
return CreOptions
Reference in New Issue Copy Permalink