diff --git a/frontend/ui/widget/multiinputdialog.lua b/frontend/ui/widget/multiinputdialog.lua index f7f7bbf4b..5069b5035 100644 --- a/frontend/ui/widget/multiinputdialog.lua +++ b/frontend/ui/widget/multiinputdialog.lua @@ -1,20 +1,25 @@ -local FrameContainer = require("ui/widget/container/framecontainer") +local Blitbuffer = require("ffi/blitbuffer") local CenterContainer = require("ui/widget/container/centercontainer") -local VerticalGroup = require("ui/widget/verticalgroup") +local Device = require("device") +local Font = require("ui/font") +local FrameContainer = require("ui/widget/container/framecontainer") +local Geom = require("ui/geometry") local InputDialog = require("ui/widget/inputdialog") local InputText = require("ui/widget/inputtext") +local TextBoxWidget = require("ui/widget/textboxwidget") local UIManager = require("ui/uimanager") -local Geom = require("ui/geometry") -local Screen = require("device").screen +local VerticalGroup = require("ui/widget/verticalgroup") local _ = require("gettext") -local Blitbuffer = require("ffi/blitbuffer") +local Screen = Device.screen -local input_field +local input_field, input_description local MultiInputDialog = InputDialog:extend{ field = {}, field_hint = {}, fields = {}, + description_padding = Screen:scaleBySize(5), + description_margin = Screen:scaleBySize(2), } function MultiInputDialog:init() @@ -27,6 +32,7 @@ function MultiInputDialog:init() } input_field = {} + input_description = {} local k = 0 for i, field in ipairs(self.fields) do k = k + 1 @@ -40,6 +46,25 @@ function MultiInputDialog:init() scroll = false, parent = self, } + if field.description then + input_description[k] = FrameContainer:new{ + padding = self.description_padding, + margin = self.description_margin, + bordersize = 0, + TextBoxWidget:new{ + text = field.description, + face = Font:getFace("x_smallinfofont"), + width = self.width * 0.9, + } + } + table.insert(VerticalGroupData, CenterContainer:new{ + dimen = Geom:new{ + w = self.title_bar:getSize().w, + h = input_description[k]:getSize().h , + }, + input_description[k], + }) + end table.insert(VerticalGroupData, CenterContainer:new{ dimen = Geom:new{ w = self.title_bar:getSize().w, diff --git a/plugins/statistics.koplugin/main.lua b/plugins/statistics.koplugin/main.lua index db68c3423..dd75ea7b0 100755 --- a/plugins/statistics.koplugin/main.lua +++ b/plugins/statistics.koplugin/main.lua @@ -605,16 +605,14 @@ function ReaderStatistics:updateSettings() title = _("Statistics settings"), fields = { { - text = "", + text = self.page_min_read_sec, + description = T(_("Min seconds, default is %1"), DEFAULT_MIN_READ_SEC), input_type = "number", - hint = T(_("Min seconds, default is %1. Current value: %2"), - DEFAULT_MIN_READ_SEC, self.page_min_read_sec), }, { - text = "", + text = self.page_max_read_sec, + description = T(_("Max seconds, default is %1"), DEFAULT_MAX_READ_SEC), input_type = "number", - hint = T(_("Max seconds, default is %1. Current value: %2"), - DEFAULT_MAX_READ_SEC, self.page_max_read_sec), }, }, buttons = {