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

Text editor: show current line number (#12632)

Browse Source
This commit is contained in:
hius07
2024-10-16 20:03:31 +03:00
committed by GitHub
parent 1493a092db
commit 71a89e45c0
2 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
frontend/ui/widget/inputdialog.lua
View File

@@ -130,7 +130,7 @@ local InputDialog = FocusManager:extend{
input_type = nil,
deny_keyboard_hiding = false, -- don't hide keyboard on tap outside
enter_callback = nil,
strike_callback = nil, -- call this on every keystroke (used by Terminal plugin's TermInputText)
strike_callback = nil, -- call this on every keystroke
inputtext_class = InputText, -- (Terminal plugin provides TermInputText)
readonly = false, -- don't allow editing, will not show keyboard
allow_newline = false, -- allow entering new lines (this disables any enter_callback)
@@ -401,6 +401,11 @@ function InputDialog:init()
save_button:setText(_("Not editable"), save_button.width)
end
end
if self.add_nav_bar then
self.curr_line_num = self._input_widget:getLineNums()
self.go_button = self.button_table:getButtonById("go")
self.go_button:setText("\u{250B}\u{202F}" .. self.curr_line_num, self.go_button.width)
end
-- Combine all
self.vgroup = VerticalGroup:new{
@@ -768,12 +773,12 @@ function InputDialog:_addSaveCloseButtons()
if self._text_modified and not edited then
self._text_modified = false
button("save"):disable()
if button("reset") then button("reset"):disable() end
if self.reset_callback then button("reset"):disable() end
self:refreshButtons()
elseif edited and not self._text_modified then
self._text_modified = true
button("save"):enable()
if button("reset") then button("reset"):enable() end
if self.reset_callback then button("reset"):enable() end
self:refreshButtons()
end
if self.edited_callback then
@@ -782,7 +787,7 @@ function InputDialog:_addSaveCloseButtons()
end
if self.reset_callback then
-- if reset_callback provided, add button to restore
-- test to some previous state
-- text to some previous state
table.insert(row, {
text = self.reset_button_text or _("Reset"),
id = "reset",
@@ -961,15 +966,17 @@ function InputDialog:_addScrollButtons(nav_bar)
})
-- Add a button to go to the line by its number in the file
table.insert(row, {
text = _("Go"),
text = "", -- current line number
font_bold = false,
id = "go",
callback = function()
self:toggleKeyboard(false) -- hide text editor keyboard
local cur_line_num, last_line_num = self._input_widget:getLineNums()
local curr_line_num, last_line_num = self._input_widget:getLineNums()
local input_dialog
input_dialog = InputDialog:new{
title = _("Enter line number"),
-- @translators %1 is the current line number, %2 is the last line number
input_hint = T(_("%1 (1 - %2)"), cur_line_num, last_line_num),
input_hint = T(_("%1 (1 - %2)"), curr_line_num, last_line_num),
input_type = "number",
stop_events_propagation = true, -- avoid interactions with upper InputDialog
buttons = {
@@ -986,7 +993,7 @@ function InputDialog:_addScrollButtons(nav_bar)
text = _("Go to line"),
is_enter_default = true,
callback = function()
local new_line_num = tonumber(input_dialog:getInputText())
local new_line_num = input_dialog:getInputValue()
if new_line_num and new_line_num >= 1 and new_line_num <= last_line_num then
UIManager:close(input_dialog)
self:toggleKeyboard()
@@ -1018,6 +1025,16 @@ function InputDialog:_addScrollButtons(nav_bar)
self._input_widget:scrollToBottom()
end,
})
self.strike_callback = function()
if self._input_widget then
local curr_line_num = self._input_widget:getLineNums()
if self.curr_line_num ~= curr_line_num then
self.curr_line_num = curr_line_num
self.go_button:setText("\u{250B}\u{202F}" .. curr_line_num, self.go_button.width)
self.go_button:refresh()
end
end
end
end
-- Add the Up & Down buttons
table.insert(row, {
@@ -1044,23 +1061,23 @@ function InputDialog:_addScrollButtons(nav_bar)
local changed = false
if prev_at_top and low > 0 then
button("up"):enable()
if button("top") then button("top"):enable() end
if nav_bar then button("top"):enable() end
prev_at_top = false
changed = true
elseif not prev_at_top and low <= 0 then
button("up"):disable()
if button("top") then button("top"):disable() end
if nav_bar then button("top"):disable() end
prev_at_top = true
changed = true
end
if prev_at_bottom and high < 1 then
button("down"):enable()
if button("bottom") then button("bottom"):enable() end
if nav_bar then button("bottom"):enable() end
prev_at_bottom = false
changed = true
elseif not prev_at_bottom and high >= 1 then
button("down"):disable()
if button("bottom") then button("bottom"):disable() end
if nav_bar then button("bottom"):disable() end
prev_at_bottom = true
changed = true
end
@@ -1080,7 +1097,7 @@ function InputDialog:findCallback(input_dialog, find_first)
local msg
if char_pos > 0 then
self._input_widget:moveCursorToCharPos(char_pos)
msg = T(_("Found in line %1."), self._input_widget:getLineNums())
msg = T(_("Found in line %1."), self.curr_line_num)
else
msg = _("Not found.")
end

9
frontend/ui/widget/inputtext.lua
View File

@@ -77,6 +77,9 @@ function InputText:onUnfocus() end
-- Resync our position state with our text widget's actual state
function InputText:resyncPos()
self.charpos, self.top_line_num = self.text_widget:getCharPos()
if self.strike_callback then
self.strike_callback()
end
end
local function initTouchEvents()
@@ -803,16 +806,16 @@ end
-- calculate current and last (original) line numbers
function InputText:getLineNums()
local cur_line_num, last_line_num = 1, 1
local curr_line_num, last_line_num = 1, 1
for i = 1, #self.charlist do
if self.text_widget.charlist[i] == "\n" then
if i < self.charpos then
cur_line_num = cur_line_num + 1
curr_line_num = curr_line_num + 1
end
last_line_num = last_line_num + 1
end
end
return cur_line_num, last_line_num
return curr_line_num, last_line_num
end
-- calculate charpos for the beginning of (original) line