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

MenuSorter: pass config prefix for proper user override

Browse Source
This commit is contained in:
Frans de Jonge
2017-03-02 08:41:44 +01:00
parent 5b20106db7
commit aa0bf60ccb
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/apps/filemanager/filemanagermenu.lua
View File

@@ -340,7 +340,7 @@ function FileManagerMenu:setUpdateItemTable()
}
local MenuSorter = require("frontend/ui/menusorter")
self.tab_item_table = MenuSorter:sort(self.menu_items, order)
self.tab_item_table = MenuSorter:sort(self.menu_items, order, "filemanager")
end
function FileManagerMenu:onShowMenu()

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

@@ -238,7 +238,7 @@ function ReaderMenu:setUpdateItemTable()
}
local MenuSorter = require("frontend/ui/menusorter")
self.tab_item_table = MenuSorter:sort(self.menu_items, order)
self.tab_item_table = MenuSorter:sort(self.menu_items, order, "reader")
end
function ReaderMenu:onShowReaderMenu()

9
frontend/ui/menusorter.lua
View File

@@ -17,8 +17,9 @@ local function file_exists(name)
if f~=nil then io.close(f) return true else return false end
end
function MenuSorter:readMSSettings(table)
local menu_order = DataStorage:getSettingsDir().."/menu_order"
function MenuSorter:readMSSettings(table, config_prefix)
local config_prefix = config_prefix.."_" or ""
local menu_order = DataStorage:getSettingsDir().."/"..config_prefix.."menu_order"
if file_exists(menu_order..".lua") then
return require(menu_order) or {}
@@ -27,7 +28,7 @@ function MenuSorter:readMSSettings(table)
end
end
function MenuSorter:sort(item_table, order)
function MenuSorter:sort(item_table, order, config_prefix)
DEBUG(item_table, order)
--local menu_table = {}
--local separator = {
@@ -35,7 +36,7 @@ DEBUG(item_table, order)
--}
DEBUG("menu before user order", order)
-- take care of user customizations
local user_order = self:readMSSettings(item_table_name)
local user_order = self:readMSSettings(item_table_name, config_prefix)
if user_order then
for user_order_id,user_order_item in pairs(user_order) do
for order_id, order_item in pairs (order) do