From 45428dda49aefdab68cc232e0798ce030c33d531 Mon Sep 17 00:00:00 2001 From: hius07 <62179190+hius07@users.noreply.github.com> Date: Wed, 21 Jun 2023 07:33:09 +0300 Subject: [PATCH] History: shorten date/time field (#10594) --- frontend/apps/filemanager/filemanagerhistory.lua | 10 +++++----- frontend/apps/filemanager/filemanagermenu.lua | 11 +++++++++++ frontend/readhistory.lua | 3 ++- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/frontend/apps/filemanager/filemanagerhistory.lua b/frontend/apps/filemanager/filemanagerhistory.lua index 409f00650..00f6817e4 100644 --- a/frontend/apps/filemanager/filemanagerhistory.lua +++ b/frontend/apps/filemanager/filemanagerhistory.lua @@ -221,16 +221,16 @@ function FileManagerHistory:showHistDialog() end, } end - table.insert(buttons, { - genFilterButton("reading"), - genFilterButton("abandoned"), - genFilterButton("complete"), - }) table.insert(buttons, { genFilterButton("all"), genFilterButton("new"), genFilterButton("deleted"), }) + table.insert(buttons, { + genFilterButton("reading"), + genFilterButton("abandoned"), + genFilterButton("complete"), + }) if self.count.deleted > 0 then table.insert(buttons, {}) -- separator table.insert(buttons, { diff --git a/frontend/apps/filemanager/filemanagermenu.lua b/frontend/apps/filemanager/filemanagermenu.lua index 7ea8577e7..507ac7a29 100644 --- a/frontend/apps/filemanager/filemanagermenu.lua +++ b/frontend/apps/filemanager/filemanagermenu.lua @@ -263,6 +263,17 @@ function FileManagerMenu:setUpdateItemTable() { text = _("History settings"), sub_item_table = { + { + text = _("Shorten date/time"), + checked_func = function() + return G_reader_settings:isTrue("history_datetime_short") + end, + callback = function() + G_reader_settings:flipNilOrFalse("history_datetime_short") + require("readhistory"):reload(true) + end, + separator = true, + }, { text = _("Clear history of deleted files"), callback = function() diff --git a/frontend/readhistory.lua b/frontend/readhistory.lua index 7d9e65fbe..f589c9cf6 100644 --- a/frontend/readhistory.lua +++ b/frontend/readhistory.lua @@ -24,7 +24,8 @@ local function buildEntry(input_time, input_file) file = file_path, text = input_file:gsub(".*/", ""), dim = not file_exists, - mandatory = datetime.secondsToDateTime(input_time), + mandatory = G_reader_settings:isTrue("history_datetime_short") + and datetime.secondsToDate(input_time):sub(3) or datetime.secondsToDateTime(input_time), select_enabled = file_exists, } end