From cfa4f03c182635e1200ae60feac1266cdf3d3636 Mon Sep 17 00:00:00 2001 From: chrox Date: Thu, 13 Nov 2014 12:54:42 +0800 Subject: [PATCH 1/2] fix #1149 by adding 'Network setting' in filemanager --- frontend/apps/filemanager/filemanagermenu.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/frontend/apps/filemanager/filemanagermenu.lua b/frontend/apps/filemanager/filemanagermenu.lua index 808c8c17c..7db2eaf72 100644 --- a/frontend/apps/filemanager/filemanagermenu.lua +++ b/frontend/apps/filemanager/filemanagermenu.lua @@ -2,6 +2,7 @@ local CenterContainer = require("ui/widget/container/centercontainer") local InputContainer = require("ui/widget/container/inputcontainer") local ConfirmBox = require("ui/widget/confirmbox") local InfoMessage = require("ui/widget/infomessage") +local NetworkMgr = require("ui/networkmgr") local OTAManager = require("ui/otamanager") local UIManager = require("ui/uimanager") local Device = require("device") @@ -124,6 +125,13 @@ function FileManagerMenu:setUpdateItemTable() UIManager:getRefreshMenuTable(), }, }) + table.insert(self.tab_item_table.setting, { + text = _("Network settings"), + sub_item_table = { + NetworkMgr:getWifiMenuTable(), + NetworkMgr:getProxyMenuTable(), + } + }) table.insert(self.tab_item_table.setting, { text = _("Night mode"), checked_func = function() return G_reader_settings:readSetting("night_mode") end, From edb124471de01cb0c008f0e42bc541ad5fa495ac Mon Sep 17 00:00:00 2001 From: chrox Date: Thu, 13 Nov 2014 12:59:02 +0800 Subject: [PATCH 2/2] screensaver options only apply to Kobo devices --- frontend/apps/reader/modules/readermenu.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/apps/reader/modules/readermenu.lua b/frontend/apps/reader/modules/readermenu.lua index f7dca8735..3f14ad43f 100644 --- a/frontend/apps/reader/modules/readermenu.lua +++ b/frontend/apps/reader/modules/readermenu.lua @@ -152,7 +152,7 @@ function ReaderMenu:setUpdateItemTable() end }) - if KOBO_SCREEN_SAVER_LAST_BOOK then + if Device:isKobo() and KOBO_SCREEN_SAVER_LAST_BOOK then local excluded = function() return self.ui.doc_settings:readSetting("exclude_screensaver") or false end