Archives
/
koreader
mirror of https://github.com/koreader/koreader
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Font: unify font styling

Browse Source
pull/2825/head
Frans de Jonge 7 years ago committed by Qingping Hou
parent 19928f2b1b
commit e1aa57f27e
30 changed files with 337 additions and 306 deletions
Show Stats Download Patch File Download Diff File

4
frontend/apps/filemanager/filemanager.lua
Unescape Escape View File

@ -78,7 +78,7 @@ function FileManager:init()
self.show_parent = self.show_parent or self
self.path_text = TextWidget:new{
face = Font:getFace("infofont", 18),
face = Font:getFace("xx_smallinfofont"),
text = abbreviate(self.root_path),
}
@ -87,7 +87,7 @@ function FileManager:init()
bordersize = 0,
VerticalGroup:new{
TextWidget:new{
face = Font:getFace("tfont", 24),
face = Font:getFace("smalltfont"),
text = self.title,
},
CenterContainer:new{

17
frontend/apps/filemanager/filemanagerfilesearcher.lua
Unescape Escape View File

@ -1,16 +1,15 @@
local CenterContainer = require("ui/widget/container/centercontainer")
local InputContainer = require("ui/widget/container/inputcontainer")
local DocumentRegistry = require("document/documentregistry")
local Font = require("ui/font")
local InputDialog = require("ui/widget/inputdialog")
local InfoMessage = require("ui/widget/infomessage")
local lfs = require("libs/libkoreader-lfs")
local UIManager = require("ui/uimanager")
local InputContainer = require("ui/widget/container/inputcontainer")
local Menu = require("ui/widget/menu")
local Screen = require("device").screen
local UIManager = require("ui/uimanager")
local lfs = require("libs/libkoreader-lfs")
local util = require("ffi/util")
local Font = require("ui/font")
local DEBUG = require("dbg")
local _ = require("gettext")
local Screen = require("device").screen
local FileSearcher = InputContainer:new{
search_dialog = nil,
@ -30,7 +29,6 @@ local FileSearcher = InputContainer:new{
function FileSearcher:readDir()
self.dirs = {self.path}
DEBUG("self.path", self.path)
self.files = {}
while #self.dirs ~= 0 do
local new_dirs = {}
@ -56,13 +54,11 @@ function FileSearcher:setSearchResults()
local FileManager = require("apps/filemanager/filemanager")
local ReaderUI = require("apps/reader/readerui")
local keywords = self.search_value
--DEBUG("self.files", self.files)
self.results = {}
if keywords == " " then -- one space to show all files
self.results = self.files
else
for __,f in pairs(self.files) do
--DEBUG("f", f)
if string.find(string.lower(f.name), string.lower(keywords)) and string.sub(f.name,-4) ~= ".sdr" then
if f.attr.mode == "directory" then
f.text = f.name.."/"
@ -82,7 +78,6 @@ function FileSearcher:setSearchResults()
end
end
end
--DEBUG("self.results", self.results)
self.keywords = keywords
self.items = #self.results
end
@ -155,7 +150,7 @@ function FileSearcher:showSearchResults()
height = Screen:getHeight()-15,
show_parent = menu_container,
onMenuHold = self.onMenuHold,
cface = Font:getFace("cfont", 22),
cface = Font:getFace("smallinfofont"),
_manager = self,
}
table.insert(menu_container, self.search_menu)

18
frontend/apps/filemanager/filemanagersearch.lua
Unescape Escape View File

@ -1,18 +1,18 @@
local CenterContainer = require("ui/widget/container/centercontainer")
local InputContainer = require("ui/widget/container/inputcontainer")
local DocumentRegistry = require("document/documentregistry")
local Font = require("ui/font")
local InputDialog = require("ui/widget/inputdialog")
local InfoMessage = require("ui/widget/infomessage")
local lfs = require("libs/libkoreader-lfs")
local UIManager = require("ui/uimanager")
local InputContainer = require("ui/widget/container/inputcontainer")
local Menu = require("ui/widget/menu")
local Screen = require("device").screen
local util = require("ffi/util")
local Font = require("ui/font")
local SetDefaults = require("apps/filemanager/filemanagersetdefaults")
local UIManager = require("ui/uimanager")
local lfs = require("libs/libkoreader-lfs")
local logger = require("logger")
local T = require("ffi/util").template
local util = require("ffi/util")
local _ = require("gettext")
local SetDefaults = require("apps/filemanager/filemanagersetdefaults")
local T = require("ffi/util").template
local calibre = "metadata.calibre"
local koreaderfile = "temp/metadata.koreader"
@ -516,7 +516,7 @@ function Search:showresults()
height = Screen:getHeight()-15,
show_parent = menu_container,
onMenuHold = self.onMenuHold,
cface = Font:getFace("cfont", 22),
cface = Font:getFace("smallinfofont"),
_manager = self,
}
table.insert(menu_container, self.search_menu)
@ -564,7 +564,7 @@ function Search:browse(option, run, chosen)
height = Screen:getHeight()-15,
show_parent = menu_container,
onMenuHold = self.onMenuHold,
cface = Font:getFace("cfont", 22),
cface = Font:getFace("smallinfofont"),
_manager = self,
}
table.insert(menu_container, self.search_menu)

17
frontend/apps/filemanager/filemanagersetdefaults.lua
Unescape Escape View File

@ -1,18 +1,17 @@
local CenterContainer = require("ui/widget/container/centercontainer")
local ConfirmBox = require("ui/widget/confirmbox")
local DataStorage = require("datastorage")
local Font = require("ui/font")
local InfoMessage = require("ui/widget/infomessage")
local InputContainer = require("ui/widget/container/inputcontainer")
local InputDialog = require("ui/widget/inputdialog")
local Menu = require("ui/widget/menu")
local MultiInputDialog = require("ui/widget/multiinputdialog")
local ConfirmBox = require("ui/widget/confirmbox")
local CenterContainer = require("ui/widget/container/centercontainer")
local DataStorage = require("datastorage")
local UIManager = require("ui/uimanager")
local Screen = require("device").screen
local Menu = require("ui/widget/menu")
local Font = require("ui/font")
local dump = require("dump")
local util = require("ffi/util")
local _ = require("gettext")
local dump = require("dump")
local Screen = require("device").screen
local defaults_path = DataStorage:getDataDir() .. "/defaults.lua"
local persistent_defaults_path = DataStorage:getDataDir() .. "/defaults.persistent.lua"
@ -83,7 +82,7 @@ function SetDefaults:init()
self.defaults_menu = Menu:new{
width = Screen:getWidth()-15,
height = Screen:getHeight()-15,
cface = Font:getFace("cfont", 22),
cface = Font:getFace("smallinfofont"),
show_parent = menu_container,
_manager = self,
}

16
frontend/apps/reader/modules/readerbookmark.lua
Unescape Escape View File

@ -1,16 +1,16 @@
local InputContainer = require("ui/widget/container/inputcontainer")
local CenterContainer = require("ui/widget/container/centercontainer")
local ButtonDialog = require("ui/widget/buttondialog")
local Menu = require("ui/widget/menu")
local CenterContainer = require("ui/widget/container/centercontainer")
local Device = require("device")
local GestureRange = require("ui/gesturerange")
local Geom = require("ui/geometry")
local Screen = require("device").screen
local UIManager = require("ui/uimanager")
local Event = require("ui/event")
local Font = require("ui/font")
local Geom = require("ui/geometry")
local GestureRange = require("ui/gesturerange")
local InputContainer = require("ui/widget/container/inputcontainer")
local Menu = require("ui/widget/menu")
local UIManager = require("ui/uimanager")
local logger = require("logger")
local _ = require("gettext")
local Screen = require("device").screen
local ReaderBookmark = InputContainer:new{
bm_menu_title = _("Bookmarks"),
@ -181,7 +181,7 @@ function ReaderBookmark:onShowBookmark()
is_popout = false,
width = Screen:getWidth(),
height = Screen:getHeight(),
cface = Font:getFace("cfont", 20),
cface = Font:getFace("x_smallinfofont"),
on_close_ges = {
GestureRange:new{
ges = "two_finger_swipe",

16
frontend/apps/reader/modules/readertoc.lua
Unescape Escape View File

@ -1,15 +1,15 @@
local InputContainer = require("ui/widget/container/inputcontainer")
local CenterContainer = require("ui/widget/container/centercontainer")
local GestureRange = require("ui/gesturerange")
local Button = require("ui/widget/button")
local UIManager = require("ui/uimanager")
local Menu = require("ui/widget/menu")
local Geom = require("ui/geometry")
local Screen = require("device").screen
local CenterContainer = require("ui/widget/container/centercontainer")
local Device = require("device")
local Event = require("ui/event")
local Font = require("ui/font")
local GestureRange = require("ui/gesturerange")
local Geom = require("ui/geometry")
local InputContainer = require("ui/widget/container/inputcontainer")
local Menu = require("ui/widget/menu")
local UIManager = require("ui/uimanager")
local _ = require("gettext")
local Screen = Device.screen
local ReaderToc = InputContainer:new{
toc = nil,
@ -312,7 +312,7 @@ function ReaderToc:onShowToc()
is_popout = false,
width = Screen:getWidth(),
height = Screen:getHeight(),
cface = Font:getFace("cfont", 20),
cface = Font:getFace("x_smallinfofont"),
on_close_ges = {
GestureRange:new{
ges = "two_finger_swipe",

34
frontend/apps/reader/skimtowidget.lua
Unescape Escape View File

@ -1,34 +1,34 @@
local InputContainer = require("ui/widget/container/inputcontainer")
local WidgetContainer = require("ui/widget/container/widgetcontainer")
local FrameContainer = require("ui/widget/container/framecontainer")
local Blitbuffer = require("ffi/blitbuffer")
local Button = require("ui/widget/button")
local CenterContainer = require("ui/widget/container/centercontainer")
local VerticalGroup = require("ui/widget/verticalgroup")
local OverlapGroup = require("ui/widget/overlapgroup")
local CloseButton = require("ui/widget/closebutton")
local TextWidget = require("ui/widget/textwidget")
local LineWidget = require("ui/widget/linewidget")
local GestureRange = require("ui/gesturerange")
local Button = require("ui/widget/button")
local UIManager = require("ui/uimanager")
local Screen = require("device").screen
local Device = require("device")
local Geom = require("ui/geometry")
local Event = require("ui/event")
local Font = require("ui/font")
local _ = require("gettext")
local Blitbuffer = require("ffi/blitbuffer")
local FrameContainer = require("ui/widget/container/framecontainer")
local Geom = require("ui/geometry")
local GestureRange = require("ui/gesturerange")
local HorizontalGroup = require("ui/widget/horizontalgroup")
local InputContainer = require("ui/widget/container/inputcontainer")
local LineWidget = require("ui/widget/linewidget")
local OverlapGroup = require("ui/widget/overlapgroup")
local ProgressWidget = require("ui/widget/progresswidget")
local TextWidget = require("ui/widget/textwidget")
local UIManager = require("ui/uimanager")
local VerticalGroup = require("ui/widget/verticalgroup")
local VerticalSpan = require("ui/widget/verticalspan")
local Event = require("ui/event")
local WidgetContainer = require("ui/widget/container/widgetcontainer")
local _ = require("gettext")
local Screen = Device.screen
local SkimToWidget = InputContainer:new{
title_face = Font:getFace("tfont", 22),
title_face = Font:getFace("x_smalltfont"),
width = nil,
height = nil,
}
function SkimToWidget:init()
self.medium_font_face = Font:getFace("ffont", 20)
self.medium_font_face = Font:getFace("ffont")
self.screen_width = Screen:getSize().w
self.screen_height = Screen:getSize().h
self.span = math.ceil(self.screen_height * 0.01)

31
frontend/ui/font.lua
Unescape Escape View File

@ -2,11 +2,11 @@
Font module.
]]
local lfs = require("libs/libkoreader-lfs")
local Freetype = require("ffi/freetype")
local Screen = require("device").screen
local Device = require("device")
local Freetype = require("ffi/freetype")
local lfs = require("libs/libkoreader-lfs")
local logger = require("logger")
local Screen = Device.screen
local Font = {
fontmap = {
@ -15,8 +15,12 @@ local Font = {
-- default font for title
--tfont = "NimbusSanL-BoldItal.cff",
tfont = "noto/NotoSans-Bold.ttf",
smalltfont = "noto/NotoSans-Bold.ttf",
x_smalltfont = "noto/NotoSans-Bold.ttf",
-- default font for footer
ffont = "noto/NotoSans-Regular.ttf",
smallffont = "noto/NotoSans-Regular.ttf",
largeffont = "noto/NotoSans-Regular.ttf",
-- default font for reading position info
rifont = "noto/NotoSans-Regular.ttf",
@ -38,11 +42,24 @@ local Font = {
-- font for info messages
infofont = "noto/NotoSans-Regular.ttf",
-- small font for info messages
smallinfofont = "noto/NotoSans-Regular.ttf",
-- small bold font for info messages
smallinfofontbold = "noto/NotoSans-Bold.ttf",
-- extra small font for info messages
x_smallinfofont = "noto/NotoSans-Regular.ttf",
-- extra extra small font for info messages
xx_smallinfofont = "noto/NotoSans-Regular.ttf",
},
sizemap = {
cfont = 24,
tfont = 26,
smalltfont = 24,
x_smalltfont = 22,
ffont = 20,
smallffont = 15,
largeffont = 25,
pgfont = 20,
scfont = 20,
rifont = 16,
@ -50,6 +67,10 @@ local Font = {
hfont = 24,
infont = 22,
infofont = 24,
smallinfofont = 22,
smallinfofontbold = 22,
x_smallinfofont = 20,
xx_smallinfofont = 18,
},
fallbacks = {
[1] = "noto/NotoSansCJK-Regular.ttf",
@ -63,6 +84,10 @@ local Font = {
faces = {},
}
--- Gets font face object.
-- @string font
-- @int size optional size
-- @treturn table @{FontFaceObj}
function Font:getFace(font, size)
-- default to content font
if not font then font = self.cfont end

43
frontend/ui/widget/bookstatuswidget.lua
Unescape Escape View File

@ -1,31 +1,28 @@
local InputContainer = require("ui/widget/container/inputcontainer")
local FrameContainer = require("ui/widget/container/framecontainer")
local Blitbuffer = require("ffi/blitbuffer")
local Button = require("ui/widget/button")
local CenterContainer = require("ui/widget/container/centercontainer")
local LeftContainer = require("ui/widget/container/leftcontainer")
local CloseButton = require("ui/widget/closebutton")
local Font = require("ui/font")
local FrameContainer = require("ui/widget/container/framecontainer")
local Geom = require("ui/geometry")
local HorizontalGroup = require("ui/widget/horizontalgroup")
local OverlapGroup = require("ui/widget/overlapgroup")
local VerticalGroup = require("ui/widget/verticalgroup")
local HorizontalSpan = require("ui/widget/horizontalspan")
local VerticalSpan = require("ui/widget/verticalspan")
local ImageWidget = require("ui/widget/imagewidget")
local InputContainer = require("ui/widget/container/inputcontainer")
local InputDialog = require("ui/widget/inputdialog")
local InputText = require("ui/widget/inputtext")
local ToggleSwitch = require("ui/widget/toggleswitch")
local Button = require("ui/widget/button")
local ProgressWidget = require("ui/widget/progresswidget")
local LeftContainer = require("ui/widget/container/leftcontainer")
local LineWidget = require("ui/widget/linewidget")
local TextWidget = require("ui/widget/textwidget")
local ImageWidget = require("ui/widget/imagewidget")
local OverlapGroup = require("ui/widget/overlapgroup")
local ProgressWidget = require("ui/widget/progresswidget")
local TextBoxWidget = require("ui/widget/textboxwidget")
local CloseButton = require("ui/widget/closebutton")
local InputDialog = require("ui/widget/inputdialog")
local TextWidget = require("ui/widget/textwidget")
local TimeVal = require("ui/timeval")
local ToggleSwitch = require("ui/widget/toggleswitch")
local UIManager = require("ui/uimanager")
local Geom = require("ui/geometry")
local Blitbuffer = require("ffi/blitbuffer")
local VerticalGroup = require("ui/widget/verticalgroup")
local VerticalSpan = require("ui/widget/verticalspan")
local Screen = require("device").screen
local Font = require("ui/font")
local TimeVal = require("ui/timeval")
local template = require("ffi/util").template
local util = require("util")
local _ = require("gettext")
@ -69,9 +66,9 @@ function BookStatusWidget:init()
}
end
self.small_font_face = Font:getFace("ffont", 15)
self.medium_font_face = Font:getFace("ffont", 20)
self.large_font_face = Font:getFace("ffont", 25)
self.small_font_face = Font:getFace("smallffont")
self.medium_font_face = Font:getFace("ffont")
self.large_font_face = Font:getFace("largeffont")
self.star = Button:new{
icon = "resources/icons/stats.star.empty.png",

22
frontend/ui/widget/buttondialogtitle.lua
Unescape Escape View File

@ -1,19 +1,19 @@
local Blitbuffer = require("ffi/blitbuffer")
local ButtonTable = require("ui/widget/buttontable")
local InputContainer = require("ui/widget/container/inputcontainer")
local FrameContainer = require("ui/widget/container/framecontainer")
local CenterContainer = require("ui/widget/container/centercontainer")
local Device = require("device")
local GestureRange = require("ui/gesturerange")
local Font = require("ui/font")
local FrameContainer = require("ui/widget/container/framecontainer")
local Geom = require("ui/geometry")
local Screen = require("device").screen
local UIManager = require("ui/uimanager")
local _ = require("gettext")
local Blitbuffer = require("ffi/blitbuffer")
local GestureRange = require("ui/gesturerange")
local InputContainer = require("ui/widget/container/inputcontainer")
local LineWidget = require("ui/widget/linewidget")
local TextBoxWidget = require("ui/widget/textboxwidget")
local Font = require("ui/font")
local VerticalGroup = require("ui/widget/verticalgroup")
local LineWidget = require("ui/widget/linewidget")
local UIManager = require("ui/uimanager")
local VerticalSpan = require("ui/widget/verticalspan")
local _ = require("gettext")
local Screen = Device.screen
local ButtonDialogTitle = InputContainer:new{
title = nil,
@ -23,8 +23,8 @@ local ButtonDialogTitle = InputContainer:new{
}
function ButtonDialogTitle:init()
self.medium_font_face = Font:getFace("ffont", 20)
self.large_font_face = Font:getFace("ffont", 25)
self.medium_font_face = Font:getFace("ffont")
self.large_font_face = Font:getFace("largeffont")
if Device:hasKeys() then
self.key_events = {
Close = { {"Back"}, doc = "close button dialog" }

6
frontend/ui/widget/closebutton.lua
Unescape Escape View File

@ -12,14 +12,14 @@ Example:
]]
local InputContainer = require("ui/widget/container/inputcontainer")
local Font = require("ui/font")
local FrameContainer = require("ui/widget/container/framecontainer")
local GestureRange = require("ui/gesturerange")
local HorizontalGroup = require("ui/widget/horizontalgroup")
local HorizontalSpan = require("ui/widget/horizontalspan")
local InputContainer = require("ui/widget/container/inputcontainer")
local TextWidget = require("ui/widget/textwidget")
local GestureRange = require("ui/gesturerange")
local Screen = require("device").screen
local Font = require("ui/font")
local CloseButton = InputContainer:new{
overlap_align = "right",

23
frontend/ui/widget/confirmbox.lua
Unescape Escape View File

@ -17,30 +17,29 @@ if the resulting phrase would be longer than three words.
]]
local InputContainer = require("ui/widget/container/inputcontainer")
local Blitbuffer = require("ffi/blitbuffer")
local ButtonTable = require("ui/widget/buttontable")
local CenterContainer = require("ui/widget/container/centercontainer")
local Device = require("device")
local Font = require("ui/font")
local FrameContainer = require("ui/widget/container/framecontainer")
local Geom = require("ui/geometry")
local GestureRange = require("ui/gesturerange")
local HorizontalGroup = require("ui/widget/horizontalgroup")
local VerticalGroup = require("ui/widget/verticalgroup")
local HorizontalSpan = require("ui/widget/horizontalspan")
local ImageWidget = require("ui/widget/imagewidget")
local InputContainer = require("ui/widget/container/inputcontainer")
local TextBoxWidget = require("ui/widget/textboxwidget")
local HorizontalSpan = require("ui/widget/horizontalspan")
local ButtonTable = require("ui/widget/buttontable")
local GestureRange = require("ui/gesturerange")
local Geom = require("ui/geometry")
local UIManager = require("ui/uimanager")
local Device = require("device")
local Screen = Device.screen
local Font = require("ui/font")
local VerticalGroup = require("ui/widget/verticalgroup")
local logger = require("logger")
local _ = require("gettext")
local Blitbuffer = require("ffi/blitbuffer")
local Screen = Device.screen
local ConfirmBox = InputContainer:new{
modal = true,
text = _("no text"),
face = Font:getFace("infofont", 25),
face = Font:getFace("infofont"),
ok_text = _("OK"),
cancel_text = _("Cancel"),
ok_callback = function() end,

36
frontend/ui/widget/dictquicklookup.lua
Unescape Escape View File

@ -1,29 +1,29 @@
local InputContainer = require("ui/widget/container/inputcontainer")
local WidgetContainer = require("ui/widget/container/widgetcontainer")
local FrameContainer = require("ui/widget/container/framecontainer")
local Blitbuffer = require("ffi/blitbuffer")
local Button = require("ui/widget/button")
local ButtonTable = require("ui/widget/buttontable")
local CenterContainer = require("ui/widget/container/centercontainer")
local LeftContainer = require("ui/widget/container/leftcontainer")
local ScrollTextWidget = require("ui/widget/scrolltextwidget")
local VerticalGroup = require("ui/widget/verticalgroup")
local OverlapGroup = require("ui/widget/overlapgroup")
local CloseButton = require("ui/widget/closebutton")
local ButtonTable = require("ui/widget/buttontable")
local InputDialog = require("ui/widget/inputdialog")
local TextWidget = require("ui/widget/textwidget")
local LineWidget = require("ui/widget/linewidget")
local GestureRange = require("ui/gesturerange")
local Button = require("ui/widget/button")
local UIManager = require("ui/uimanager")
local Screen = require("device").screen
local Device = require("device")
local Geom = require("ui/geometry")
local Event = require("ui/event")
local Font = require("ui/font")
local util = require("util")
local FrameContainer = require("ui/widget/container/framecontainer")
local GestureRange = require("ui/gesturerange")
local InputContainer = require("ui/widget/container/inputcontainer")
local InputDialog = require("ui/widget/inputdialog")
local LeftContainer = require("ui/widget/container/leftcontainer")
local LineWidget = require("ui/widget/linewidget")
local OverlapGroup = require("ui/widget/overlapgroup")
local ScrollTextWidget = require("ui/widget/scrolltextwidget")
local TextWidget = require("ui/widget/textwidget")
local UIManager = require("ui/uimanager")
local VerticalGroup = require("ui/widget/verticalgroup")
local WidgetContainer = require("ui/widget/container/widgetcontainer")
local logger = require("logger")
local util = require("util")
local _ = require("gettext")
local Screen = Device.screen
local T = require("ffi/util").template
local Blitbuffer = require("ffi/blitbuffer")
--[[
Display quick lookup word definition
@ -37,7 +37,7 @@ local DictQuickLookup = InputContainer:new{
is_wiki = false,
is_fullpage = false,
dict_index = 1,
title_face = Font:getFace("tfont", 22),
title_face = Font:getFace("x_smalltfont"),
content_face = Font:getFace("cfont", DDICT_FONT_SIZE),
width = nil,
height = nil,

13
frontend/ui/widget/filechooser.lua
Unescape Escape View File

@ -1,14 +1,15 @@
local lfs = require("libs/libkoreader-lfs")
local UIManager = require("ui/uimanager")
local Menu = require("ui/widget/menu")
local Screen = require("device").screen
local Device = require("device")
local DocSettings = require("docsettings")
local Font = require("ui/font")
local Menu = require("ui/widget/menu")
local UIManager = require("ui/uimanager")
local ffi = require("ffi")
local lfs = require("libs/libkoreader-lfs")
local util = require("ffi/util")
local _ = require("gettext")
local ffi = require("ffi")
local Screen = Device.screen
local getFileNameSuffix = require("util").getFileNameSuffix
ffi.cdef[[
int strcoll (const char *str1, const char *str2);
]]
@ -23,7 +24,7 @@ local function kobostrcoll(str1, str2)
end
local FileChooser = Menu:extend{
cface = Font:getFace("cfont", 21),
cface = Font:getFace("smallinfofont"),
no_title = true,
path = lfs.currentdir(),
parent = nil,

33
frontend/ui/widget/frontlightwidget.lua
Unescape Escape View File

@ -1,34 +1,35 @@
local InputContainer = require("ui/widget/container/inputcontainer")
local WidgetContainer = require("ui/widget/container/widgetcontainer")
local FrameContainer = require("ui/widget/container/framecontainer")
local Blitbuffer = require("ffi/blitbuffer")
local Button = require("ui/widget/button")
local CenterContainer = require("ui/widget/container/centercontainer")
local VerticalGroup = require("ui/widget/verticalgroup")
local OverlapGroup = require("ui/widget/overlapgroup")
local CloseButton = require("ui/widget/closebutton")
local TextWidget = require("ui/widget/textwidget")
local LineWidget = require("ui/widget/linewidget")
local GestureRange = require("ui/gesturerange")
local Button = require("ui/widget/button")
local UIManager = require("ui/uimanager")
local Screen = require("device").screen
local Device = require("device")
local FrameContainer = require("ui/widget/container/framecontainer")
local Geom = require("ui/geometry")
local GestureRange = require("ui/gesturerange")
local Font = require("ui/font")
local _ = require("gettext")
local Blitbuffer = require("ffi/blitbuffer")
local HorizontalGroup = require("ui/widget/horizontalgroup")
local HorizontalSpan = require("ui/widget/horizontalspan")
local InputContainer = require("ui/widget/container/inputcontainer")
local LineWidget = require("ui/widget/linewidget")
local OverlapGroup = require("ui/widget/overlapgroup")
local TextBoxWidget = require("ui/widget/textboxwidget")
local TextWidget = require("ui/widget/textwidget")
local UIManager = require("ui/uimanager")
local VerticalGroup = require("ui/widget/verticalgroup")
local VerticalSpan = require("ui/widget/verticalspan")
local HorizontalSpan = require("ui/widget/horizontalspan")
local WidgetContainer = require("ui/widget/container/widgetcontainer")
local _ = require("gettext")
local Screen = Device.screen
local FrontLightWidget = InputContainer:new{
title_face = Font:getFace("tfont", 22),
title_face = Font:getFace("x_smalltfont"),
width = nil,
height = nil,
}
function FrontLightWidget:init()
self.medium_font_face = Font:getFace("ffont", 20)
self.medium_font_face = Font:getFace("ffont")
self.light_bar = {}
self.screen_width = Screen:getSize().w
self.screen_height = Screen:getSize().h

4
frontend/ui/widget/imageviewer.lua
Unescape Escape View File

@ -19,9 +19,9 @@ local TextWidget = require("ui/widget/textwidget")
local VerticalGroup = require("ui/widget/verticalgroup")
local WidgetContainer = require("ui/widget/container/widgetcontainer")
local UIManager = require("ui/uimanager")
local Screen = Device.screen
local logger = require("logger")
local _ = require("gettext")
local Screen = Device.screen
local ImageViewer = InputContainer:new{
-- Allow for providing same different input types as ImageWidget :
@ -44,7 +44,7 @@ local ImageViewer = InputContainer:new{
-- we use this global setting for rotation angle to have the same angle as reader
rotation_angle = DLANDSCAPE_CLOCKWISE_ROTATION and 90 or 270,
title_face = Font:getFace("tfont", 22),
title_face = Font:getFace("x_smalltfont"),
title_padding = Screen:scaleBySize(5),
title_margin = Screen:scaleBySize(2),
image_padding = Screen:scaleBySize(2),

2
frontend/ui/widget/infomessage.lua
Unescape Escape View File

@ -42,7 +42,7 @@ local Screen = Device.screen
local InfoMessage = InputContainer:new{
modal = true,
face = Font:getFace("infofont", 25),
face = Font:getFace("infofont"),
text = "",
timeout = nil, -- in seconds
width = nil, -- The width of the InfoMessage. Keep it nil to use default value.

6
frontend/ui/widget/inputdialog.lua
Unescape Escape View File

@ -78,9 +78,9 @@ local InputDialog = InputContainer:new{
text_width = nil,
text_height = nil,
title_face = Font:getFace("tfont", 22),
description_face = Font:getFace("cfont", 20),
input_face = Font:getFace("cfont", 20),
title_face = Font:getFace("x_smalltfont"),
description_face = Font:getFace("x_smallinfofont"),
input_face = Font:getFace("x_smallinfofont"),
title_padding = Screen:scaleBySize(5),
title_margin = Screen:scaleBySize(2),

13
frontend/ui/widget/inputtext.lua
Unescape Escape View File

@ -1,14 +1,15 @@
local InputContainer = require("ui/widget/container/inputcontainer")
local Blitbuffer = require("ffi/blitbuffer")
local Device = require("device")
local FrameContainer = require("ui/widget/container/framecontainer")
local Font = require("ui/font")
local GestureRange = require("ui/gesturerange")
local InputContainer = require("ui/widget/container/inputcontainer")
local ScrollTextWidget = require("ui/widget/scrolltextwidget")
local TextBoxWidget = require("ui/widget/textboxwidget")
local GestureRange = require("ui/gesturerange")
local Blitbuffer = require("ffi/blitbuffer")
local UIManager = require("ui/uimanager")
local Device = require("device")
local Screen = Device.screen
local Font = require("ui/font")
local util = require("util")
local Keyboard
local InputText = InputContainer:new{
@ -22,7 +23,7 @@ local InputText = InputContainer:new{
width = nil,
height = nil,
face = Font:getFace("cfont", 22),
face = Font:getFace("smallinfofont"),
padding = 5,
margin = 5,

8
frontend/ui/widget/keyvaluepage.lua
Unescape Escape View File

@ -77,7 +77,7 @@ function KeyValueTitle:init()
TextWidget:new{
text = "", -- page count
fgcolor = Blitbuffer.COLOR_GREY,
face = Font:getFace("ffont", 16),
face = Font:getFace("smallffont"),
},
}
self.title_bottom = OverlapGroup:new{
@ -113,8 +113,8 @@ end
local KeyValueItem = InputContainer:new{
key = nil,
value = nil,
cface = Font:getFace("cfont", 22),
tface = Font:getFace("tfont", 22),
cface = Font:getFace("smallinfofont"),
tface = Font:getFace("smallinfofontbold"),
width = nil,
height = nil,
}
@ -131,7 +131,7 @@ function KeyValueItem:init()
}
end
local frame_padding = 8
local frame_padding = Screen:scaleBySize(8)
local frame_internal_width = self.width - frame_padding * 2
local key_w = frame_internal_width / 2
local value_w = frame_internal_width / 2

52
frontend/ui/widget/menu.lua
Unescape Escape View File

@ -1,32 +1,32 @@
local InputContainer = require("ui/widget/container/inputcontainer")
local WidgetContainer = require("ui/widget/container/widgetcontainer")
local LeftContainer = require("ui/widget/container/leftcontainer")
local RightContainer = require("ui/widget/container/rightcontainer")
local FrameContainer = require("ui/widget/container/framecontainer")
local CenterContainer = require("ui/widget/container/centercontainer")
local Blitbuffer = require("ffi/blitbuffer")
local BottomContainer = require("ui/widget/container/bottomcontainer")
local UnderlineContainer = require("ui/widget/container/underlinecontainer")
local FocusManager = require("ui/widget/focusmanager")
local TextWidget = require("ui/widget/textwidget")
local OverlapGroup = require("ui/widget/overlapgroup")
local VerticalSpan = require("ui/widget/verticalspan")
local HorizontalSpan = require("ui/widget/horizontalspan")
local VerticalGroup = require("ui/widget/verticalgroup")
local HorizontalGroup = require("ui/widget/horizontalgroup")
local Button = require("ui/widget/button")
local GestureRange = require("ui/gesturerange")
local CenterContainer = require("ui/widget/container/centercontainer")
local Device = require("device")
local FocusManager = require("ui/widget/focusmanager")
local Font = require("ui/font")
local FrameContainer = require("ui/widget/container/framecontainer")
local Geom = require("ui/geometry")
local Device = require("device")
local Screen = require("device").screen
local Input = require("device").input
local UIManager = require("ui/uimanager")
local RenderText = require("ui/rendertext")
local GestureRange = require("ui/gesturerange")
local HorizontalGroup = require("ui/widget/horizontalgroup")
local HorizontalSpan = require("ui/widget/horizontalspan")
local InfoMessage = require("ui/widget/infomessage")
local util = require("ffi/util")
local InputContainer = require("ui/widget/container/inputcontainer")
local LeftContainer = require("ui/widget/container/leftcontainer")
local OverlapGroup = require("ui/widget/overlapgroup")
local RenderText = require("ui/rendertext")
local RightContainer = require("ui/widget/container/rightcontainer")
local TextWidget = require("ui/widget/textwidget")
local UIManager = require("ui/uimanager")
local UnderlineContainer = require("ui/widget/container/underlinecontainer")
local VerticalGroup = require("ui/widget/verticalgroup")
local VerticalSpan = require("ui/widget/verticalspan")
local WidgetContainer = require("ui/widget/container/widgetcontainer")
local logger = require("logger")
local Blitbuffer = require("ffi/blitbuffer")
local util = require("ffi/util")
local _ = require("gettext")
local Input = Device.input
local Screen = Device.screen
local getMenuText = require("util").getMenuText
--[[
@ -322,13 +322,13 @@ Widget that displays menu
local Menu = FocusManager:new{
show_parent = nil,
-- face for displaying item contents
cface = Font:getFace("cfont", 24),
cface = Font:getFace("cfont"),
-- face for menu title
tface = Font:getFace("tfont", 26),
tface = Font:getFace("tfont"),
-- face for paging info display
fface = Font:getFace("ffont", 20),
fface = Font:getFace("ffont"),
-- font for item shortcut
sface = Font:getFace("scfont", 20),
sface = Font:getFace("scfont"),
title = "No Title",
-- default width and height

39
frontend/ui/widget/multiconfirmbox.lua
Unescape Escape View File

@ -1,28 +1,41 @@
local InputContainer = require("ui/widget/container/inputcontainer")
--[[--
Widget that shows a message and choice1/choice2/Cancel buttons
Example:
UIManager:show(MultiConfirmBox:new{
text = T( _("Set %1 as fallback font?"), face),
choice1_text = _("Default"),
choice1_callback = function()
-- set as default font
end,
choice2_text = _("Fallback"),
choice2_callback = function()
-- set as fallback font
end,
})
]]
local Blitbuffer = require("ffi/blitbuffer")
local ButtonTable = require("ui/widget/buttontable")
local CenterContainer = require("ui/widget/container/centercontainer")
local Font = require("ui/font")
local FrameContainer = require("ui/widget/container/framecontainer")
local HorizontalGroup = require("ui/widget/horizontalgroup")
local VerticalGroup = require("ui/widget/verticalgroup")
local HorizontalSpan = require("ui/widget/horizontalspan")
local ImageWidget = require("ui/widget/imagewidget")
local InputContainer = require("ui/widget/container/inputcontainer")
local TextBoxWidget = require("ui/widget/textboxwidget")
local HorizontalSpan = require("ui/widget/horizontalspan")
local ButtonTable = require("ui/widget/buttontable")
local UIManager = require("ui/uimanager")
local Screen = require("device").screen
local Font = require("ui/font")
local VerticalGroup = require("ui/widget/verticalgroup")
local logger = require("logger")
local _ = require("gettext")
local Blitbuffer = require("ffi/blitbuffer")
-- screen
local Screen = require("device").screen
--[[
Widget that shows a message and choice1/choice2/Cancel buttons
]]
local MultiConfirmBox = InputContainer:new{
modal = true,
text = _("no text"),
face = Font:getFace("infofont", 25),
face = Font:getFace("infofont"),
choice1_text = _("Choice 1"),
choice2_text = _("Choice 2"),
cancel_text = _("Cancel"),

23
frontend/ui/widget/notification.lua
Unescape Escape View File

@ -1,20 +1,21 @@
local InputContainer = require("ui/widget/container/inputcontainer")
local FrameContainer = require("ui/widget/container/framecontainer")
--[[--
Widget that displays a tiny notification at the top of the screen.
--]]
local Blitbuffer = require("ffi/blitbuffer")
local CenterContainer = require("ui/widget/container/centercontainer")
local TextWidget = require("ui/widget/textwidget")
local Device = require("device")
local Font = require("ui/font")
local FrameContainer = require("ui/widget/container/framecontainer")
local Geom = require("ui/geometry")
local Device = require("device")
local InputContainer = require("ui/widget/container/inputcontainer")
local TextWidget = require("ui/widget/textwidget")
local UIManager = require("ui/uimanager")
local Input = require("device").input
local Screen = require("device").screen
local Blitbuffer = require("ffi/blitbuffer")
local Input = Device.input
local Screen = Device.screen
--[[
Widget that displays a tiny notification on top of screen
--]]
local Notification = InputContainer:new{
face = Font:getFace("infofont", 20),
face = Font:getFace("x_smallinfofont"),
text = "Null Message",
timeout = nil,
margin = 5,

25
frontend/ui/widget/physicalkeyboard.lua
Unescape Escape View File

@ -1,21 +1,20 @@
local CenterContainer = require("ui/widget/container/centercontainer")
local Blitbuffer = require("ffi/blitbuffer")
local BottomContainer = require("ui/widget/container/bottomcontainer")
local TopContainer = require("ui/widget/container/topcontainer")
local WidgetContainer = require("ui/widget/container/widgetcontainer")
local InputContainer = require("ui/widget/container/inputcontainer")
local CenterContainer = require("ui/widget/container/centercontainer")
local Device = require("device")
local Font = require("ui/font")
local FrameContainer = require("ui/widget/container/framecontainer")
local Geom = require("ui/geometry")
local HorizontalGroup = require("ui/widget/horizontalgroup")
local HorizontalSpan = require("ui/widget/horizontalspan")
local VerticalGroup = require("ui/widget/verticalgroup")
local InputContainer = require("ui/widget/container/inputcontainer")
local TextWidget = require("ui/widget/textwidget")
local Blitbuffer = require("ffi/blitbuffer")
local Device = require("device")
local Font = require("ui/font")
local Screen = Device.screen
local Geom = require("ui/geometry")
local util = require("util")
local TopContainer = require("ui/widget/container/topcontainer")
local VerticalGroup = require("ui/widget/verticalgroup")
local WidgetContainer = require("ui/widget/container/widgetcontainer")
local logger = require("logger")
local util = require("util")
local Screen = Device.screen
local PhysicalNumericKey = WidgetContainer:new{
key = nil,
@ -29,7 +28,7 @@ local PhysicalNumericKey = WidgetContainer:new{
width = nil,
height = nil,
bordersize = 2,
face = Font:getFace("infont", 22),
face = Font:getFace("infont"),
pkey_face = Font:getFace("infont", 14),
}

36
frontend/ui/widget/touchmenu.lua
Unescape Escape View File

@ -1,26 +1,26 @@
local InputContainer = require("ui/widget/container/inputcontainer")
local FrameContainer = require("ui/widget/container/framecontainer")
local LeftContainer = require("ui/widget/container/leftcontainer")
local RightContainer = require("ui/widget/container/rightcontainer")
local Blitbuffer = require("ffi/blitbuffer")
local Button = require("ui/widget/button")
local CenterContainer = require("ui/widget/container/centercontainer")
local Device = require("device")
local Font = require("ui/font")
local FrameContainer = require("ui/widget/container/framecontainer")
local Geom = require("ui/geometry")
local GestureRange = require("ui/gesturerange")
local HorizontalGroup = require("ui/widget/horizontalgroup")
local VerticalGroup = require("ui/widget/verticalgroup")
local HorizontalSpan = require("ui/widget/horizontalspan")
local VerticalSpan = require("ui/widget/verticalspan")
local TextWidget = require("ui/widget/textwidget")
local LineWidget = require("ui/widget/linewidget")
local IconButton = require("ui/widget/iconbutton")
local GestureRange = require("ui/gesturerange")
local Button = require("ui/widget/button")
local InputContainer = require("ui/widget/container/inputcontainer")
local LeftContainer = require("ui/widget/container/leftcontainer")
local LineWidget = require("ui/widget/linewidget")
local RightContainer = require("ui/widget/container/rightcontainer")
local TextWidget = require("ui/widget/textwidget")
local UIManager = require("ui/uimanager")
local Device = require("device")
local Screen = Device.screen
local Geom = require("ui/geometry")
local Font = require("ui/font")
local Blitbuffer = require("ffi/blitbuffer")
local getMenuText = require("util").getMenuText
local VerticalGroup = require("ui/widget/verticalgroup")
local VerticalSpan = require("ui/widget/verticalspan")
local util = require("ffi/util")
local _ = require("gettext")
local Screen = Device.screen
local getMenuText = require("util").getMenuText
--[[
TouchMenuItem widget
@ -30,7 +30,7 @@ local TouchMenuItem = InputContainer:new{
vertical_align = "center",
item = nil,
dimen = nil,
face = Font:getFace("cfont", 22),
face = Font:getFace("smallinfofont"),
show_parent = nil,
}
@ -308,7 +308,7 @@ local TouchMenu = InputContainer:new{
item_height = Screen:scaleBySize(50),
bordersize = Screen:scaleBySize(2),
padding = Screen:scaleBySize(5),
fface = Font:getFace("ffont", 20),
fface = Font:getFace("ffont"),
width = nil,
height = nil,
page = 1,

26
frontend/ui/widget/virtualkeyboard.lua
Unescape Escape View File

@ -1,21 +1,21 @@
local InputContainer = require("ui/widget/container/inputcontainer")
local FrameContainer = require("ui/widget/container/framecontainer")
local CenterContainer = require("ui/widget/container/centercontainer")
local Blitbuffer = require("ffi/blitbuffer")
local BottomContainer = require("ui/widget/container/bottomcontainer")
local HorizontalSpan = require("ui/widget/horizontalspan")
local HorizontalGroup = require("ui/widget/horizontalgroup")
local VerticalSpan = require("ui/widget/verticalspan")
local VerticalGroup = require("ui/widget/verticalgroup")
local ImageWidget = require("ui/widget/imagewidget")
local TextWidget = require("ui/widget/textwidget")
local CenterContainer = require("ui/widget/container/centercontainer")
local Device = require("device")
local Font = require("ui/font")
local FrameContainer = require("ui/widget/container/framecontainer")
local Geom = require("ui/geometry")
local Device = require("device")
local Screen = Device.screen
local GestureRange = require("ui/gesturerange")
local HorizontalGroup = require("ui/widget/horizontalgroup")
local HorizontalSpan = require("ui/widget/horizontalspan")
local ImageWidget = require("ui/widget/imagewidget")
local InputContainer = require("ui/widget/container/inputcontainer")
local TextWidget = require("ui/widget/textwidget")
local UIManager = require("ui/uimanager")
local VerticalGroup = require("ui/widget/verticalgroup")
local VerticalSpan = require("ui/widget/verticalspan")
local logger = require("logger")
local Blitbuffer = require("ffi/blitbuffer")
local Screen = Device.screen
local VirtualKey = InputContainer:new{
key = nil,
@ -28,7 +28,7 @@ local VirtualKey = InputContainer:new{
width = nil,
height = math.max(Screen:getWidth(), Screen:getHeight())*0.33,
bordersize = 2,
face = Font:getFace("infont", 22),
face = Font:getFace("infont"),
}
function VirtualKey:init()

37
plugins/goodreads.koplugin/doublekeyvaluepage.lua
Unescape Escape View File

@ -1,24 +1,25 @@
local InputContainer = require("ui/widget/container/inputcontainer")
local Blitbuffer = require("ffi/blitbuffer")
local CloseButton = require("ui/widget/closebutton")
local DataStorage = require("datastorage")
local Device = require("device")
local Font = require("ui/font")
local FrameContainer = require("ui/widget/container/framecontainer")
local VerticalGroup = require("ui/widget/verticalgroup")
local VerticalSpan = require("ui/widget/verticalspan")
local Geom = require("ui/geometry")
local GestureRange = require("ui/gesturerange")
local GoodreadsApi = require("goodreadsapi")
local OverlapGroup = require("ui/widget/overlapgroup")
local LeftContainer = require("ui/widget/container/topcontainer")
local HorizontalSpan = require("ui/widget/horizontalspan")
local InputContainer = require("ui/widget/container/inputcontainer")
local LeftContainer = require("ui/widget/container/topcontainer")
local LineWidget = require("ui/widget/linewidget")
local Blitbuffer = require("ffi/blitbuffer")
local CloseButton = require("ui/widget/closebutton")
local UIManager = require("ui/uimanager")
local TextWidget = require("ui/widget/textwidget")
local GestureRange = require("ui/gesturerange")
local LuaSettings = require("luasettings")
local RenderText = require("ui/rendertext")
local Geom = require("ui/geometry")
local Font = require("ui/font")
local Device = require("device")
local TextWidget = require("ui/widget/textwidget")
local UIManager = require("ui/uimanager")
local VerticalGroup = require("ui/widget/verticalgroup")
local VerticalSpan = require("ui/widget/verticalspan")
local Screen = Device.screen
local GoodreadsApi = require("goodreadsapi")
local LuaSettings = require("luasettings")
local DataStorage = require("datastorage")
local _ = require("gettext")
local InfoMessage = require("ui/widget/infomessage")
@ -61,7 +62,7 @@ function DoubleKeyValueTitle:init()
TextWidget:new{
text = "", -- page count
fgcolor = Blitbuffer.COLOR_GREY,
face = Font:getFace("ffont", 20),
face = Font:getFace("x_smallinfofont"),
},
}
self.title_bottom = OverlapGroup:new{
@ -96,8 +97,8 @@ end
local DoubleKeyValueItem = InputContainer:new{
key = nil,
value = nil,
cface_up = Font:getFace("cfont", 22),
cface_down = Font:getFace("cfont", 18),
cface_up = Font:getFace("smallinfofont"),
cface_down = Font:getFace("xx_smallinfofont"),
width = nil,
height = nil,
align = "left",

6
plugins/goodreads.koplugin/goodreadsbook.lua
Unescape Escape View File

@ -27,9 +27,9 @@ local GoodreadsBook = InputContainer:new{
}
function GoodreadsBook:init()
self.small_font_face = Font:getFace("ffont", 16)
self.medium_font_face = Font:getFace("ffont", 18)
self.large_font_face = Font:getFace("ffont", 22)
self.small_font_face = Font:getFace("smallffont")
self.medium_font_face = Font:getFace("ffont")
self.large_font_face = Font:getFace("largeffont")
self.screen_width = Screen:getSize().w
self.screen_height = Screen:getSize().h
UIManager:setDirty(self, function()

34
plugins/statistics.koplugin/readerprogress.lua
Unescape Escape View File

@ -1,23 +1,23 @@
local InputContainer = require("ui/widget/container/inputcontainer")
local FrameContainer = require("ui/widget/container/framecontainer")
local Blitbuffer = require("ffi/blitbuffer")
local CenterContainer = require("ui/widget/container/centercontainer")
local LeftContainer = require("ui/widget/container/leftcontainer")
local CloseButton = require("ui/widget/closebutton")
local Font = require("ui/font")
local Geom = require("ui/geometry")
local FrameContainer = require("ui/widget/container/framecontainer")
local HorizontalGroup = require("ui/widget/horizontalgroup")
local OverlapGroup = require("ui/widget/overlapgroup")
local VerticalGroup = require("ui/widget/verticalgroup")
local HorizontalSpan = require("ui/widget/horizontalspan")
local VerticalSpan = require("ui/widget/verticalspan")
local ProgressWidget = require("ui/widget/progresswidget")
local InputContainer = require("ui/widget/container/inputcontainer")
local LeftContainer = require("ui/widget/container/leftcontainer")
local LineWidget = require("ui/widget/linewidget")
local OverlapGroup = require("ui/widget/overlapgroup")
local ProgressWidget = require("ui/widget/progresswidget")
local TextWidget = require("ui/widget/textwidget")
local CloseButton = require("ui/widget/closebutton")
local Geom = require("ui/geometry")
local Blitbuffer = require("ffi/blitbuffer")
local Screen = require("device").screen
local Font = require("ui/font")
local _ = require("gettext")
local UIManager = require("ui/uimanager")
local VerticalGroup = require("ui/widget/verticalgroup")
local VerticalSpan = require("ui/widget/verticalspan")
local util = require("util")
local _ = require("gettext")
local Screen = require("device").screen
local LINE_COLOR = Blitbuffer.gray(0.4)
local BG_COLOR = Blitbuffer.gray(0.2)
@ -47,9 +47,9 @@ local shortDayOfWeekTranslation = {
}
function ReaderProgress:init()
self.small_font_face = Font:getFace("ffont", 15)
self.medium_font_face = Font:getFace("ffont", 20)
self.large_font_face = Font:getFace("ffont", 25)
self.small_font_face = Font:getFace("smallffont")
self.medium_font_face = Font:getFace("ffont")
self.large_font_face = Font:getFace("largeffont")
self.screen_width = Screen:getSize().w
self.screen_height = Screen:getSize().h
UIManager:setDirty(self, function()
@ -241,7 +241,7 @@ function ReaderProgress:genWeekStats(stats_day)
TextWidget:new{
padding = 2,
text = date_format_show .. " - " .. util.secondsToClock(select_day_time, true),
face = Font:getFace("ffont", 16),
face = Font:getFace("smallffont"),
},
},
}

3
plugins/terminal.koplugin/main.lua
Unescape Escape View File

@ -1,4 +1,3 @@
local DataStorage = require("datastorage")
local Font = require("ui/font")
local InfoMessage = require("ui/widget/infomessage")
@ -67,7 +66,7 @@ function Terminal:execute()
table.insert(entries, _("Output will also be written to"))
table.insert(entries, self.dump_file)
UIManager:show(InfoMessage:new{
cface = Font:getFace("ffont", 18),
cface = Font:getFace("xx_smallinfofont"),
text = _("Command output\n") .. table.concat(entries, "\n"),
show_icon = false,
width = Screen:getWidth() * 0.8,

Write Preview
Loading…
Cancel
Save