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

Annotations export/import: merge (keep existing annotations) (#13751)

Browse Source
This commit is contained in:
hius07
2025-05-13 18:09:51 +03:00
committed by GitHub
parent f1b345e1d3
commit 082e818e67
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/apps/reader/modules/readerannotation.lua
View File

@@ -282,7 +282,7 @@ function ReaderAnnotation:importAnnotations()
if anno:readSetting("device_id") == G_reader_settings:readSetting("device_id") then return end -- same device
local new_annotations = anno:readSetting("annotations")
if (self.ui.paging and true) ~= anno:readSetting("paging") then return end -- incompatible annotations type
local new_datetime = anno:readSetting("datetime")
local new_datetime = G_reader_settings:isTrue("annotations_export_keep_all_on_import") and "" or anno:readSetting("datetime")
os.remove(file)
if #self.annotations == 0 then
self.annotations = new_annotations

9
frontend/apps/reader/modules/readerbookmark.lua
View File

@@ -252,6 +252,15 @@ function ReaderBookmark:addToMainMenu(menu_items)
G_reader_settings:flipNilOrFalse("annotations_export_on_closing")
end,
},
{
text = _("Keep all annotations on import"),
checked_func = function()
return G_reader_settings:isTrue("annotations_export_keep_all_on_import")
end,
callback = function()
G_reader_settings:flipNilOrFalse("annotations_export_keep_all_on_import")
end,
},
{
text_func = function()
return T(_("Export / import folder: %1"),