renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ButtonDialogTitle: remove (#12394)

Browse Source
This commit is contained in:
hius07
2024-09-07 20:11:35 +03:00
committed by GitHub
parent 7572a812cc
commit 5476301034
4 changed files with 15 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
frontend/apps/filemanager/filemanagerconverter.lua
View File

@@ -2,7 +2,7 @@
This module is responsible for converting files.
]]
local ButtonDialogTitle = require("ui/widget/buttondialogtitle")
local ButtonDialog = require("ui/widget/buttondialog")
local ConfirmBox = require("ui/widget/confirmbox")
local UIManager = require("ui/uimanager")
local lfs = require("libs/libkoreader-lfs")
@@ -64,31 +64,22 @@ function FileConverter:_mdFileToHtml(file, title)
return html
end
function FileConverter:writeStringToFile(content, file)
local f = io.open(file, "w")
if f == nil then
return
end
f:write(content)
f:close()
end
function FileConverter:isSupported(file)
return FileConverter.formats_from[util.getFileNameSuffix(file)] and true or false
return self.formats_from[util.getFileNameSuffix(file)] and true or false
end
function FileConverter:showConvertButtons(file, ui)
local __, filename_pure = util.splitFilePathName(file)
local filename_suffix = util.getFileNameSuffix(file)
local filetype_name = self.formats_from[filename_suffix].name
self.convert_dialog = ButtonDialogTitle:new{
self.convert_dialog = ButtonDialog:new{
title = T(_("Convert %1 to:"), filetype_name),
buttons = {
{
{
text = _("HTML"),
callback = function()
local html = FileConverter:_mdFileToHtml(file, filename_pure)
local html = self:_mdFileToHtml(file, filename_pure)
if not html then return end
local filename_html = file..".html"
if lfs.attributes(filename_html, "mode") == "file" then
@@ -96,12 +87,12 @@ function FileConverter:showConvertButtons(file, ui)
text = _("Overwrite existing HTML file?"),
ok_text = _("Overwrite"),
ok_callback = function()
FileConverter:writeStringToFile(html, filename_html)
util.writeToFile(html, filename_html)
UIManager:close(self.convert_dialog)
end,
})
else
FileConverter:writeStringToFile(html, filename_html)
util.writeToFile(html, filename_html)
ui:refreshPath()
UIManager:close(self.convert_dialog)
end

3
frontend/ui/quickstart.lua
View File

@@ -8,6 +8,7 @@ local Version = require("version")
local FFIUtil = require("ffi/util")
local T = FFIUtil.template
local lfs = require("libs/libkoreader-lfs")
local util = require("util")
local _ = require("gettext")
local QuickStart = {
@@ -262,7 +263,7 @@ function QuickStart:getQuickStart()
quickstart_html = quickstart_html:gsub('<html>', '<html dir="rtl">')
end
-- Write the fixed HTML content
FileConverter:writeStringToFile(quickstart_html, quickstart_filename)
util.writeToFile(quickstart_html, quickstart_filename)
end
end
-- remember filename for file manager

2
frontend/ui/uimanager.lua
View File

@@ -686,7 +686,7 @@ Clear the full repaint & refresh queues.
NOTE: Beware! This doesn't take any prisonners!
You shouldn't have to resort to this unless in very specific circumstances!
plugins/coverbrowser.koplugin/covermenu.lua building a franken-menu out of buttondialogtitle & buttondialog
plugins/coverbrowser.koplugin/covermenu.lua building a franken-menu out of buttondialog
and wanting to avoid inheriting their original paint/refresh cycle being a prime example.
--]]
function UIManager:clearRenderStack()

152
frontend/ui/widget/buttondialogtitle.lua
View File

@@ -1,146 +1,6 @@
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 InputContainer = require("ui/widget/container/inputcontainer")
local MovableContainer = require("ui/widget/container/movablecontainer")
local Size = require("ui/size")
local TextBoxWidget = require("ui/widget/textboxwidget")
local VerticalGroup = require("ui/widget/verticalgroup")
local UIManager = require("ui/uimanager")
local VerticalSpan = require("ui/widget/verticalspan")
local _ = require("gettext")
local Screen = Device.screen
local ButtonDialogTitle = InputContainer:extend{
title = nil,
title_align = nil,
title_face = Font:getFace("x_smalltfont"),
title_padding = Size.padding.large,
title_margin = Size.margin.title,
width = nil,
width_factor = nil, -- number between 0 and 1, factor to the smallest of screen width and height
use_info_style = true, -- set to false to have bold font style of the title
info_face = Font:getFace("infofont"),
info_padding = Size.padding.default,
info_margin = Size.margin.default,
buttons = nil,
tap_close_callback = nil,
dismissable = true, -- set to false if any button callback is required
}
function ButtonDialogTitle:init()
self.screen_width = Screen:getWidth()
self.screen_height = Screen:getHeight()
if not self.width then
if not self.width_factor then
self.width_factor = 0.9 -- default if no width specified
end
self.width = math.floor(math.min(self.screen_width, self.screen_height) * self.width_factor)
end
if self.dismissable then
if Device:hasKeys() then
local close_keys = Device:hasFewKeys() and { "Back", "Left" } or Device.input.group.Back
self.key_events.Close = { { close_keys } }
end
if Device:isTouchDevice() then
self.ges_events.TapClose = {
GestureRange:new {
ges = "tap",
range = Geom:new {
x = 0,
y = 0,
w = self.screen_width,
h = self.screen_height,
}
}
}
end
end
self.button_table = ButtonTable:new{
width = self.width - 2*Size.border.window - 2*Size.padding.button,
buttons = self.buttons,
zero_sep = true,
show_parent = self,
}
local title_padding = self.use_info_style and self.info_padding or self.title_padding
local title_margin = self.use_info_style and self.info_margin or self.title_margin
local title_width = self.width - 2 * (Size.border.window + Size.padding.button + title_padding + title_margin)
local title_widget = FrameContainer:new{
padding = title_padding,
margin = title_margin,
bordersize = 0,
TextBoxWidget:new{
text = self.title,
width = title_width,
face = self.use_info_style and self.info_face or self.title_face,
alignment = self.title_align or "left",
},
}
self[1] = CenterContainer:new{
dimen = Screen:getSize(),
ignore_if_over = "height",
MovableContainer:new{
anchor = self.anchor,
FrameContainer:new{
VerticalGroup:new{
align = "center",
title_widget,
VerticalSpan:new{ width = Size.span.vertical_default },
self.button_table,
},
background = Blitbuffer.COLOR_WHITE,
bordersize = Size.border.window,
radius = Size.radius.window,
padding = Size.padding.button,
padding_bottom = 0, -- no padding below buttontable
}
}
}
end
function ButtonDialogTitle:setTitle(title)
self.title = title
self:free()
self:init()
UIManager:setDirty("all", "ui")
end
function ButtonDialogTitle:onShow()
UIManager:setDirty(self, function()
return "ui", self[1][1].dimen -- i.e., MovableContainer
end)
end
function ButtonDialogTitle:onCloseWidget()
UIManager:setDirty(nil, function()
return "ui", self[1][1].dimen
end)
end
function ButtonDialogTitle:onTapClose()
UIManager:close(self)
if self.tap_close_callback then
self.tap_close_callback()
end
return true
end
function ButtonDialogTitle:onClose()
self:onTapClose()
return true
end
function ButtonDialogTitle:paintTo(...)
InputContainer.paintTo(self, ...)
self.dimen = self[1][1].dimen
end
return ButtonDialogTitle
-- ButtonDialogTitle widget is deprecated.
-- Use ButtonDialog instead.
local logger = require("logger")
logger.warn("Calling deprecated ButtonDialogTitle widget")
return require("ui/widget/buttondialog")