move screen DPI and refresh rate entries into Screen menu

pull/766/head
chrox 10 years ago
parent d2b55f7177
commit 3c8e6975fb

@ -72,7 +72,6 @@ function FileManagerMenu:setUpdateItemTable()
self.ui:toggleHiddenFiles() self.ui:toggleHiddenFiles()
end end
}) })
table.insert(self.tab_item_table.setting, { table.insert(self.tab_item_table.setting, {
text = _("Start with last opened file"), text = _("Start with last opened file"),
checked_func = function() return G_reader_settings:readSetting("open_last") end, checked_func = function() return G_reader_settings:readSetting("open_last") end,
@ -82,12 +81,9 @@ function FileManagerMenu:setUpdateItemTable()
G_reader_settings:saveSetting("open_last", not open_last) G_reader_settings:saveSetting("open_last", not open_last)
end end
}) })
if Device:hasFrontlight() then if Device:hasFrontlight() then
ReaderFrontLight:addToMainMenu(self.tab_item_table) ReaderFrontLight:addToMainMenu(self.tab_item_table)
end end
table.insert(self.tab_item_table.setting, UIManager:getRefreshMenuTable())
table.insert(self.tab_item_table.setting, { table.insert(self.tab_item_table.setting, {
text = _("Night mode"), text = _("Night mode"),
checked_func = function() return G_reader_settings:readSetting("night_mode") end, checked_func = function() return G_reader_settings:readSetting("night_mode") end,
@ -97,8 +93,13 @@ function FileManagerMenu:setUpdateItemTable()
G_reader_settings:saveSetting("night_mode", not night_mode) G_reader_settings:saveSetting("night_mode", not night_mode)
end end
}) })
table.insert(self.tab_item_table.setting, {
table.insert(self.tab_item_table.setting, Screen:getDPIMenuTable()) text = _("Screen"),
sub_item_table = {
Screen:getDPIMenuTable(),
UIManager:getRefreshMenuTable(),
},
})
table.insert(self.tab_item_table.setting, Language:getLangMenuTable()) table.insert(self.tab_item_table.setting, Language:getLangMenuTable())
-- info tab -- info tab

@ -88,7 +88,6 @@ function ReaderMenu:setUpdateItemTable()
G_reader_settings:saveSetting("show_advanced", not show_advanced) G_reader_settings:saveSetting("show_advanced", not show_advanced)
end end
}) })
table.insert(self.tab_item_table.setting, UIManager:getRefreshMenuTable())
table.insert(self.tab_item_table.setting, { table.insert(self.tab_item_table.setting, {
text = _("Night mode"), text = _("Night mode"),
checked_func = function() return G_reader_settings:readSetting("night_mode") end, checked_func = function() return G_reader_settings:readSetting("night_mode") end,
@ -98,7 +97,15 @@ function ReaderMenu:setUpdateItemTable()
G_reader_settings:saveSetting("night_mode", not night_mode) G_reader_settings:saveSetting("night_mode", not night_mode)
end end
}) })
table.insert(self.tab_item_table.setting, Screen:getDPIMenuTable()) -- FIXME: it's curious that if this 'Screen' menu is placed after the Language
-- menu submenu in Advanced won't be shown. Probably a bug in the touchmenu module.
table.insert(self.tab_item_table.setting, {
text = _("Screen"),
sub_item_table = {
Screen:getDPIMenuTable(),
UIManager:getRefreshMenuTable(),
},
})
table.insert(self.tab_item_table.setting, Language:getLangMenuTable()) table.insert(self.tab_item_table.setting, Language:getLangMenuTable())
-- info tab -- info tab

Loading…
Cancel
Save