Merge pull request #906 from WS64/master

Exclude book's cover from screensaver (hopefully the final try!)

frontend/apps/reader/modules/readermenu.lua

@@ -139,6 +139,20 @@ function ReaderMenu:setUpdateItemTable()
             })
         end
     })
+    
+    --typeset tab
+    if KOBO_SCREEN_SAVER_LAST_BOOK then
+        local exclude = self.ui.doc_settings:readSetting("exclude_screensaver") or false
+        table.insert(self.tab_item_table.typeset, {
+            text = _("Use this book's cover as screensaver"),
+            checked_func = function() return not (self.ui.doc_settings:readSetting("exclude_screensaver") or false) end,
+            callback = function()
+                local exclude = self.ui.doc_settings:readSetting("exclude_screensaver") or false
+                self.ui.doc_settings:saveSetting("exclude_screensaver", not exclude)
+                self.ui:saveSettings()
+            end
+        })
+    end
 end
 
 function ReaderMenu:onShowReaderMenu()

frontend/ui/screensaver.lua

@@ -1,6 +1,7 @@
 local DocumentRegistry = require("document/documentregistry")
 local UIManager = require("ui/uimanager")
 local Screen = require("ui/screen")
+local DocSettings = require("docsettings")
 local DEBUG = require("dbg")
 local _ = require("gettext")
 
@@ -56,7 +57,12 @@ function Screensaver:show()
     -- first check book cover image
     if KOBO_SCREEN_SAVER_LAST_BOOK then
         local lastfile = G_reader_settings:readSetting("lastfile")
-        self.suspend_msg = self:getCoverImage(lastfile)
+        local data = DocSettings:open(lastfile)
+        local exclude = data:readSetting("exclude_screensaver")
+        if not exclude then
+            self.suspend_msg = self:getCoverImage(lastfile)
+        end
+
     end
     -- then screensaver directory or file image
     if not self.suspend_msg then