Add new options to screensaver (#3535)

* Prevent open screensaver more than one in the same time

* Add option to enable/disable background in message screensaver

* fallback to random images if this book cover is excluded feature + fix Disabled (leave screen/page as it is)

* Autostretch disable by default, more fallback options, leave screen as it is
This commit is contained in:
Robert
2017-12-17 18:27:24 +01:00
committed by Frans de Jonge
parent 70f2aa09ea
commit efa0d06df9
14 changed files with 633 additions and 202 deletions

View File

@@ -127,36 +127,21 @@ function ReaderMenu:setUpdateItemTable()
end
if Device:supportsScreensaver() then
local excluded = function()
return self.ui.doc_settings:readSetting("exclude_screensaver") or false
end
local proportional = function()
return self.ui.doc_settings:readSetting("proportional_screensaver") or false
end
self.menu_items.screensaver = {
text = _("Screensaver"),
local ss_book_settings = {
text = _("Current book cover settings"),
enabled_func = function()
return not (self.ui == nil or self.ui.document == nil)
and G_reader_settings:readSetting('screensaver_type') == "cover"
end,
sub_item_table = {
{
text = _("Use last book's cover as screensaver"),
checked_func = Screensaver.isUsingBookCover,
callback = function()
if Screensaver:isUsingBookCover() then
G_reader_settings:saveSetting(
"use_lastfile_as_screensaver", false)
else
G_reader_settings:delSetting(
"use_lastfile_as_screensaver")
end
G_reader_settings:flush()
end
},
{
text = _("Exclude this book's cover from screensaver"),
checked_func = excluded,
enabled_func = Screensaver.isUsingBookCover,
checked_func = function()
return self.ui.doc_settings:readSetting("exclude_screensaver") == true
end,
callback = function()
if excluded() then
self.ui.doc_settings:delSetting("exclude_screensaver")
if Screensaver:excluded() then
self.ui.doc_settings:saveSetting("exclude_screensaver", false)
else
self.ui.doc_settings:saveSetting("exclude_screensaver", true)
end
@@ -164,21 +149,45 @@ function ReaderMenu:setUpdateItemTable()
end
},
{
text = _("Auto stretch this book's cover image in screensaver"),
checked_func = proportional,
enabled_func = Screensaver.isUsingBookCover,
callback = function()
if proportional() then
self.ui.doc_settings:delSetting("proportional_screensaver")
text = _("Stretch book cover to fit screen"),
checked_func = function()
local settings_stretch_cover = self.ui.doc_settings:readSetting("stretch_cover")
if settings_stretch_cover == nil and G_reader_settings:readSetting("stretch_cover_default") then
return true
else
self.ui.doc_settings:saveSetting(
"proportional_screensaver", not proportional())
return self.ui.doc_settings:readSetting("stretch_cover") == true
end
end,
callback = function()
self.ui.doc_settings:saveSetting("stretch_cover", not Screensaver:stretchCover())
self.ui:saveSettings()
end
}
end,
hold_callback = function()
local ConfirmBox = require("ui/widget/confirmbox")
UIManager:show(ConfirmBox:new {
text = _("Stretch all book covers to fit screen?"),
cancel_text = _("Don't stretch"),
cancel_callback = function()
G_reader_settings:delSetting("stretch_cover_default")
return
end,
ok_text = _("Stretch"),
ok_callback = function()
G_reader_settings:saveSetting("stretch_cover_default", true)
return
end,
})
end,
},
}
}
self.menu_items.screensaver = {
text = _("Screensaver"),
sub_item_table = require("ui/elements/screensaver_menu"),
}
table.remove(self.menu_items.screensaver.sub_item_table, 8)
table.insert(self.menu_items.screensaver.sub_item_table, ss_book_settings)
end
-- main menu tab
-- insert common info