Merge pull request #810 from chrox/master

revert rebasing with sourceforge upstream crengine

.gitignore

@@ -18,6 +18,7 @@ emu
 
 koreader-*.zip
 koreader-*.apk
+koreader-*.tar.gz
 
 /.cproject
 /.project

Makefile

@@ -63,7 +63,7 @@ endif
 ifndef EMULATE_READER
 	# clean up, remove unused files for releases
 	rm -rf $(INSTALL_DIR)/koreader/data/{cr3.ini,cr3skin-format.txt,desktop,devices,manual}
-	rm $(INSTALL_DIR)/koreader/fonts/droid/DroidSansFallbackFull.ttf
+	rm $(INSTALL_DIR)/koreader/fonts/droid/DroidSansFallbackFull.ttc
 endif
 
 $(KOR_BASE)/$(OUTPUT_DIR)/luajit:

defaults.lua

@@ -96,8 +96,8 @@ DKOPTREADER_CONFIG_MAX_COLUMNS = 2        -- range from 1 to 4
 DKOPTREADER_CONFIG_CONTRAST = 1.0        -- range from 0.2 to 2.0
 
 -- word spacing for reflow
-DKOPTREADER_CONFIG_WORD_SAPCINGS = {0.05, -1, 0.375}    -- range from 0.05 to 0.5
-DKOPTREADER_CONFIG_DEFAULT_WORD_SAPCING = -1            -- range from 0.05 to 0.5
+DKOPTREADER_CONFIG_WORD_SPACINGS = {0.05, -0.2, 0.375}    -- range from (+/-)0.05 to (+/-)0.5
+DKOPTREADER_CONFIG_DEFAULT_WORD_SPACING = -0.2            -- range from (+/-)0.05 to (+/-)0.5
 -- document languages for OCR
 DKOPTREADER_CONFIG_DOC_LANGS_TEXT = {"English", "Chinese"}
 DKOPTREADER_CONFIG_DOC_LANGS_CODE = {"eng", "chi_sim"}    -- language code, make sure you have corresponding training data
@@ -114,6 +114,16 @@ DCREREADER_CONFIG_MARGIN_SIZES_SMALL = {5, 10, 5, 10}
 DCREREADER_CONFIG_MARGIN_SIZES_MEDIUM = {10, 15, 10, 15}
 DCREREADER_CONFIG_MARGIN_SIZES_LARGE = {20, 20, 20, 20}
 
+-- crereader font gamma
+DCREREADER_CONFIG_LIGHTER_FONT_GAMMA = 10
+DCREREADER_CONFIG_DEFAULT_FONT_GAMMA = 15
+DCREREADER_CONFIG_DARKER_FONT_GAMMA = 25
+
+-- crereader line space percentage
+DCREREADER_CONFIG_LINE_SPACE_PERCENT_SMALL = 90
+DCREREADER_CONFIG_LINE_SPACE_PERCENT_MEDIUM = 100
+DCREREADER_CONFIG_LINE_SPACE_PERCENT_LARGE = 120
+
 -- crereader progress bar
 -- 0 for top "full" progress bar
 -- 1 for bottom "mini" progress bar

frontend/apps/reader/modules/readerfont.lua

@@ -68,24 +68,30 @@ function ReaderFont:onSetDimensions(dimen)
 end
 
 function ReaderFont:onReadSettings(config)
-    self.font_face = config:readSetting("font_face") or self.ui.document.default_font
+    self.font_face = config:readSetting("font_face")
+            or self.ui.document.default_font
     self.ui.document:setFontFace(self.font_face)
 
-    self.header_font_face = config:readSetting("header_font_face") or self.ui.document.header_font
+    self.header_font_face = config:readSetting("header_font_face")
+            or self.ui.document.header_font
     self.ui.document:setHeaderFont(self.header_font_face)
 
-    --@TODO change this!  12.01 2013 (houqp)
-    self.font_size = config:readSetting("font_size") or DCREREADER_CONFIG_DEFAULT_FONT_SIZE or 22
+    self.font_size = config:readSetting("font_size")
+            or DCREREADER_CONFIG_DEFAULT_FONT_SIZE or 22
     self.ui.document:setFontSize(Screen:scaleByDPI(self.font_size))
 
-    self.font_embolden = config:readSetting("font_embolden") or G_reader_settings:readSetting("copt_font_weight") or 0
+    self.font_embolden = config:readSetting("font_embolden")
+            or G_reader_settings:readSetting("copt_font_weight") or 0
     self.ui.document:toggleFontBolder(self.font_embolden)
 
-    --@TODO still missing: line_spacing from settings.reader.lua (so far just decrease/increase in there) 18.07.2014 (WS64)
-    self.line_space_percent = config:readSetting("line_space_percent") or (DKOPTREADER_CONFIG_LINE_SPACING or 1.2)*100
+    self.line_space_percent = config:readSetting("line_space_percent")
+            or G_reader_settings:readSetting("copt_line_spacing")
+            or DCREREADER_CONFIG_LINE_SPACE_PERCENT_MEDIUM
     self.ui.document:setInterlineSpacePercent(self.line_space_percent)
 
-    self.gamma_index = config:readSetting("gamma_index") or 15
+    self.gamma_index = config:readSetting("gamma_index")
+            or G_reader_settings:readSetting("copt_font_gamma")
+            or DCREREADER_CONFIG_DEFAULT_FONT_GAMMA
     self.ui.document:setGammaIndex(self.gamma_index)
 
     -- Dirty hack: we have to add folloing call in order to set
@@ -146,25 +152,14 @@ function ReaderFont:onSetFontSize(new_size)
     return true
 end
 
-function ReaderFont:onChangeLineSpace(direction)
-    local msg = ""
-    if direction == "decrease" then
-        self.line_space_percent = self.line_space_percent - 10
-        -- NuPogodi, 15.05.12: reduce lowest space_percent to 80
-        self.line_space_percent = math.max(self.line_space_percent, 80)
-        msg = _("Decrease line space to ")
-    else
-        self.line_space_percent = self.line_space_percent + 10
-        self.line_space_percent = math.min(self.line_space_percent, 200)
-        msg = _("Increase line space to ")
-    end
+function ReaderFont:onSetLineSpace(space)
+    self.line_space_percent = math.min(200, math.max(80, space))
     UIManager:show(Notification:new{
-        text = msg..self.line_space_percent.."%",
+        text = _("Set line space to ")..self.line_space_percent.."%",
         timeout = 1,
     })
     self.ui.document:setInterlineSpacePercent(self.line_space_percent)
     self.ui:handleEvent(Event:new("UpdatePos"))
-
     return true
 end
 
@@ -175,20 +170,13 @@ function ReaderFont:onToggleFontBolder(toggle)
     return true
 end
 
-function ReaderFont:onChangeFontGamma(direction)
-    local msg = ""
-    if direction == "increase" then
-        cre.setGammaIndex(self.gamma_index+2)
-        msg = _("Increase gamma to ")
-    elseif direction == "decrease" then
-        cre.setGammaIndex(self.gamma_index-2)
-        msg = _("Decrease gamma to ")
-    end
-    self.gamma_index = cre.getGammaIndex()
+function ReaderFont:onSetFontGamma(gamma)
+    self.gamma_index = gamma
     UIManager:show(Notification:new{
-        text = msg..self.gamma_index,
+        text = _("Set font gamma to ")..self.gamma_index,
         timeout = 1
     })
+    self.ui.document:setGammaIndex(self.gamma_index)
     self.ui:handleEvent(Event:new("RedrawCurrentView"))
     return true
 end

frontend/apps/reader/modules/readerkoptlistener.lua

@@ -20,6 +20,11 @@ function ReaderKoptListener:onReadSettings(config)
     self.document.configurable.contrast = config:readSetting("kopt_contrast") or
                     G_reader_settings:readSetting("kopt_contrast") or 1.0
     self.ui:handleEvent(Event:new("GammaUpdate", 1/self.document.configurable.contrast))
+    -- since K2pdfopt v2.21 negative value of word spacing is also used, for config
+    -- compatability we should manually change previous -1 to a more reasonable -0.2
+    if self.document.configurable.word_spacing == -1 then
+        self.document.configurable.word_spacing = -0.2
+    end
 end
 
 function ReaderKoptListener:onSaveSettings()

frontend/apps/reader/modules/readerlink.lua

@@ -7,6 +7,7 @@ local Screen = require("ui/screen")
 local Device = require("ui/device")
 local Event = require("ui/event")
 local DEBUG = require("dbg")
+local _ = require("gettext")
 
 local ReaderLink = InputContainer:new{
     link_states = {}
@@ -16,6 +17,7 @@ function ReaderLink:init()
     if Device:isTouchDevice() then
         self:initGesListener()
     end
+    self.ui.menu:registerToMainMenu(self)
 end
 
 function ReaderLink:onReadSettings(config)
@@ -50,6 +52,21 @@ function ReaderLink:initGesListener()
     end
 end
 
+function ReaderLink:addToMainMenu(tab_item_table)
+    -- insert table to main reader menu
+    table.insert(tab_item_table.navi, {
+        text = _("Follow links"),
+        checked_func = function()
+            return G_reader_settings:readSetting("follow_links") ~= false
+        end,
+        callback = function()
+            local follow_links = G_reader_settings:readSetting("follow_links")
+            if follow_links == nil then follow_links = true end
+            G_reader_settings:saveSetting("follow_links", not follow_links)
+        end
+    })
+end
+
 function ReaderLink:onSetDimensions(dimen)
     -- update listening according to new screen dimen
     if Device:isTouchDevice() then
@@ -58,6 +75,7 @@ function ReaderLink:onSetDimensions(dimen)
 end
 
 function ReaderLink:onTap(arg, ges)
+    if G_reader_settings:readSetting("follow_links") == false then return end
     if self.ui.document.info.has_pages then
         local pos = self.view:screenToPageTransform(ges.pos)
         if pos then

frontend/apps/reader/modules/readertoc.lua

@@ -99,7 +99,7 @@ function ReaderToc:getTocTitleOfCurrentPage()
 end
 
 function ReaderToc:_getChapterPagesLeft(pageno,pages)
-    local i 
+    local i
     local j = 0
 
     if not self.toc then
@@ -288,7 +288,7 @@ end
 
 function ReaderToc:addToMainMenu(tab_item_table)
     -- insert table to main reader menu
-    table.insert(tab_item_table.navi, {
+    table.insert(tab_item_table.navi, 1, {
         text = self.toc_menu_title,
         callback = function()
             self:onShowToc()

frontend/document/credocument.lua

@@ -396,7 +396,6 @@ function CreDocument:register(registry)
     registry:addProvider("pdb", "application/pdb", self)
     registry:addProvider("doc", "application/doc", self)
     registry:addProvider("tcr", "application/tcr", self)
-    registry:addProvider("zip", "application/zip", self)
 end
 
 return CreDocument

frontend/document/pdfdocument.lua

@@ -224,6 +224,7 @@ end
 function PdfDocument:register(registry)
     registry:addProvider("pdf", "application/pdf", self)
     registry:addProvider("cbz", "application/cbz", self)
+    registry:addProvider("zip", "application/zip", self)
     registry:addProvider("xps", "application/xps", self)
 end
 

frontend/ui/data/creoptions.lua

@@ -37,11 +37,19 @@ local CreOptions = {
             {
                 name = "line_spacing",
                 name_text = S.LINE_SPACING,
-                toggle = {S.DECREASE, S.INCREASE},
-                alternate = false,
-                args = {"decrease", "increase"},
-                default_arg = "decrease",
-                event = "ChangeLineSpace",
+                toggle = {S.SMALL, S.MEDIUM, S.LARGE},
+                values = {
+                    DCREREADER_CONFIG_LINE_SPACE_PERCENT_SMALL,
+                    DCREREADER_CONFIG_LINE_SPACE_PERCENT_MEDIUM,
+                    DCREREADER_CONFIG_LINE_SPACE_PERCENT_LARGE,
+                },
+                default_value = DCREREADER_CONFIG_LINE_SPACE_PERCENT_MEDIUM,
+                event = "SetLineSpace",
+                args = {
+                    DCREREADER_CONFIG_LINE_SPACE_PERCENT_SMALL,
+                    DCREREADER_CONFIG_LINE_SPACE_PERCENT_MEDIUM,
+                    DCREREADER_CONFIG_LINE_SPACE_PERCENT_LARGE,
+                },
             },
             {
                 name = "page_margins",
@@ -53,12 +61,12 @@ local CreOptions = {
                     DCREREADER_CONFIG_MARGIN_SIZES_LARGE,
                 },
                 default_value = DCREREADER_CONFIG_MARGIN_SIZES_MEDIUM,
+                event = "SetPageMargins",
                 args = {
                     DCREREADER_CONFIG_MARGIN_SIZES_SMALL,
                     DCREREADER_CONFIG_MARGIN_SIZES_MEDIUM,
                     DCREREADER_CONFIG_MARGIN_SIZES_LARGE,
                 },
-                event = "SetPageMargins",
             },
         }
     },
@@ -102,11 +110,19 @@ local CreOptions = {
             {
                 name = "font_gamma",
                 name_text = S.CONTRAST,
-                toggle = {S.DECREASE, S.INCREASE},
-                alternate = false,
-                args = {"decrease", "increase"},
-                default_arg = "increase",
-                event = "ChangeFontGamma",
+                item_text = {S.LIGHTER, S.DEFAULT, S.DARKER},
+                default_value = DCREREADER_CONFIG_DEFAULT_FONT_GAMMA,
+                values = {
+                    DCREREADER_CONFIG_LIGHTER_FONT_GAMMA,
+                    DCREREADER_CONFIG_DEFAULT_FONT_GAMMA,
+                    DCREREADER_CONFIG_DARKER_FONT_GAMMA,
+                },
+                event = "SetFontGamma",
+                args = {
+                    DCREREADER_CONFIG_LIGHTER_FONT_GAMMA,
+                    DCREREADER_CONFIG_DEFAULT_FONT_GAMMA,
+                    DCREREADER_CONFIG_DARKER_FONT_GAMMA,
+                },
             }
         }
     },

frontend/ui/data/koptoptions.lua

@@ -186,8 +186,8 @@ local KoptOptions = {
                 name = "word_spacing",
                 name_text = S.WORD_GAP,
                 toggle = {S.SMALL, S.AUTO, S.LARGE},
-                values = DKOPTREADER_CONFIG_WORD_SAPCINGS,
-                default_value = DKOPTREADER_CONFIG_DEFAULT_WORD_SAPCING,
+                values = DKOPTREADER_CONFIG_WORD_SPACINGS,
+                default_value = DKOPTREADER_CONFIG_DEFAULT_WORD_SPACING,
             },
             {
                 name = "writing_direction",

frontend/ui/device/screen.lua

@@ -239,6 +239,11 @@ function Screen:restoreFromBB(bb)
     end
 end
 
+function Screen:close()
+    DEBUG("close screen framebuffer")
+    self.fb:close()
+end
+
 function Screen:getDPIMenuTable()
     local function dpi() return G_reader_settings:readSetting("screen_dpi") end
     local function custom() return G_reader_settings:readSetting("custom_screen_dpi") end

frontend/ui/font.lua

@@ -35,7 +35,7 @@ local Font = {
         infofont = "noto/NotoSans-Regular.ttf",
     },
     fallbacks = {
-        [1] = "droid/DroidSansFallback.ttf",
+        [1] = "droid/DroidSansFallback.ttc",
         [2] = "noto/NotoSans-Regular.ttf",
         [3] = "droid/DroidSans.ttf",
         [4] = "freefont/FreeSans.ttf",

frontend/ui/uimanager.lua

@@ -358,7 +358,7 @@ function UIManager:run()
 
         -- stop when we have no window to show
         if #self._window_stack == 0 then
-            DEBUG("no dialog left to show, would loop endlessly")
+            DEBUG("no dialog left to show")
             self:quit()
             return nil
         end

frontend/ui/widget/configdialog.lua

@@ -234,7 +234,7 @@ function ConfigOption:init()
             local current_item = nil
             local function value_diff(val1, val2, name)
                 if type(val1) ~= type(val2) then
-                    error("different data types in option", name)
+                    DEBUG("different data types in option")
                 end
                 if type(val1) == "number" then
                     return math.abs(val1 - val2)

frontend/ui/widget/imagewidget.lua

@@ -18,10 +18,11 @@ local ImageWidget = Widget:new{
 
 function ImageWidget:_render()
     local itype = string.lower(string.match(self.file, ".+%.([^.]+)") or "")
-    if itype == "jpeg" or itype == "jpg" then
-        self._bb = Image:fromJPEG(self.file)
-    elseif itype == "png" then
-        self._bb = Image:fromPNG(self.file)
+    if itype == "png" or itype == "jpg" or itype == "jpeg"
+            or itype == "tiff" then
+        self._bb = Image:fromFile(self.file, self.width, self.height)
+    else
+        error("Image file type not supported.")
     end
     local w, h = self._bb:getWidth(), self._bb:getHeight()
     if (self.width and self.width ~= w) or (self.height and self.height ~= h) then

koreader-base

@@ -1 +1 @@
-Subproject commit e55751cc548d3ec5b95f36fd12c4ec50160086a7
+Subproject commit ee036fa663fa4ee9d2b963aa73585fdb06bc970f

l10n/templates/koreader.pot

@@ -6,20 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n"
-"POT-Creation-Date: 2014-08-06 12:31+0000\n"
+"POT-Creation-Date: 2014-08-17 13:46+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: reader.lua:76
+msgid ""
+" does not exist"
+msgstr ""
+
 #: plugins/evernote.koplugin/main.lua:334
 msgid ""
 " others."
 msgstr ""
 
-#: frontend/ui/uimanager.lua:473
-#: frontend/ui/uimanager.lua:479
-#: frontend/ui/uimanager.lua:485
+#: frontend/ui/uimanager.lua:516
+#: frontend/ui/uimanager.lua:522
+#: frontend/ui/uimanager.lua:528
 msgid ""
 " pages"
 msgstr ""
@@ -45,7 +50,7 @@ msgid ""
 msgstr ""
 
 #: frontend/apps/reader/modules/readerhighlight.lua:302
-#: frontend/ui/widget/dictquicklookup.lua:152
+#: frontend/ui/widget/dictquicklookup.lua:158
 msgid ""
 "Add Note"
 msgstr ""
@@ -55,8 +60,18 @@ msgid ""
 "Apply"
 msgstr ""
 
+#: frontend/apps/filemanager/filemanagersetdefaults.lua:249
+msgid ""
+"Are you sure to save the settings to \"defaults.persistent.lua\"?"
+msgstr ""
+
+#: frontend/apps/filemanager/filemanagersearch.lua:329
+msgid ""
+"Author(s): "
+msgstr ""
+
 #: frontend/apps/reader/modules/readertypeset.lua:66
-#: frontend/ui/device/screen.lua:256
+#: frontend/ui/device/screen.lua:262
 msgid ""
 "Auto"
 msgstr ""
@@ -72,12 +87,13 @@ msgid ""
 "Bookmarks"
 msgstr ""
 
+#: frontend/apps/filemanager/filemanagersetdefaults.lua:164
+#: frontend/apps/filemanager/filemanagersetdefaults.lua:207
 #: frontend/apps/reader/modules/readergoto.lua:36
-#: frontend/apps/filemanager/filemanagersetdefaults.lua:142
 #: frontend/ui/widget/confirmbox.lua:29
 #: frontend/ui/widget/touchmenu.lua:547
 #: plugins/evernote.koplugin/main.lua:124
-#: plugins/zsync.koplugin/main.lua:279
+#: plugins/zsync.koplugin/main.lua:274
 msgid ""
 "Cancel"
 msgstr ""
@@ -98,7 +114,7 @@ msgid ""
 msgstr ""
 
 #: plugins/zsync.koplugin/main.lua:226
-#: plugins/zsync.koplugin/main.lua:236
+#: plugins/zsync.koplugin/main.lua:245
 msgid ""
 "Choose inbox"
 msgstr ""
@@ -108,7 +124,7 @@ msgid ""
 "Columns"
 msgstr ""
 
-#: plugins/zsync.koplugin/main.lua:271
+#: plugins/zsync.koplugin/main.lua:266
 msgid ""
 "Confirm"
 msgstr ""
@@ -118,36 +134,31 @@ msgid ""
 "Contrast"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanager.lua:86
+#: frontend/apps/filemanager/filemanager.lua:87
 msgid ""
 "Copy"
 msgstr ""
 
-#: frontend/ui/uimanager.lua:473
-#: frontend/ui/uimanager.lua:479
-#: frontend/ui/uimanager.lua:485
+#: frontend/ui/uimanager.lua:516
+#: frontend/ui/uimanager.lua:522
+#: frontend/ui/uimanager.lua:528
 msgid ""
 "Custom "
 msgstr ""
 
-#: frontend/ui/device/screen.lua:287
+#: frontend/ui/device/screen.lua:293
 msgid ""
 "Custom DPI"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanager.lua:104
+#: frontend/apps/filemanager/filemanager.lua:105
 msgid ""
 "Cut"
 msgstr ""
 
-#: frontend/apps/reader/modules/readerfont.lua:185
-msgid ""
-"Decrease gamma to "
-msgstr ""
-
-#: frontend/apps/reader/modules/readerfont.lua:155
+#: frontend/apps/filemanager/filemanagersetdefaults.lua:331
 msgid ""
-"Decrease line space to "
+"Default settings successfully saved!"
 msgstr ""
 
 #: frontend/ui/data/strings.lua:20
@@ -155,8 +166,8 @@ msgid ""
 "Defect Size"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanager.lua:111
-#: frontend/apps/filemanager/filemanagerhistory.lua:30
+#: frontend/apps/filemanager/filemanager.lua:112
+#: frontend/apps/filemanager/filemanagerhistory.lua:31
 #: frontend/apps/reader/modules/readerhighlight.lua:187
 msgid ""
 "Delete"
@@ -197,7 +208,7 @@ msgid ""
 "Downloading may take several minutes..."
 msgstr ""
 
-#: frontend/ui/uimanager.lua:460
+#: frontend/ui/uimanager.lua:503
 msgid ""
 "E-ink full refresh rate"
 msgstr ""
@@ -233,16 +244,21 @@ msgid ""
 "Evernote"
 msgstr ""
 
-#: frontend/ui/uimanager.lua:468
+#: frontend/ui/uimanager.lua:511
 msgid ""
 "Every 6 pages"
 msgstr ""
 
-#: frontend/ui/uimanager.lua:463
+#: frontend/ui/uimanager.lua:506
 msgid ""
 "Every page"
 msgstr ""
 
+#: frontend/apps/filemanager/filemanagermenu.lua:158
+msgid ""
+"Exit"
+msgstr ""
+
 #: plugins/evernote.koplugin/main.lua:82
 msgid ""
 "Export all notes in this book"
@@ -269,92 +285,26 @@ msgid ""
 "Exporting may take several seconds..."
 msgstr ""
 
-#: reader.lua:80
+#: reader.lua:76
 msgid ""
-"File does not exist"
+"File "
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:150
+#: frontend/apps/filemanager/filemanagermenu.lua:190
 msgid ""
 "File manager menu"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:126
-msgid ""
-"Please report bugs to \nhttps://github.com/koreader/koreader/issues"
-msgstr ""
-
-#: frontend/apps/filemanager/filemanager.lua:21
+#: frontend/apps/filemanager/filemanager.lua:22
 msgid ""
 "FileManager"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:141
-#: frontend/apps/filemanager/filemanagersearch.lua:112
-msgid ""
-"Search Books"
-msgstr ""
-
-#: frontend/apps/filemanager/filemanagersearch.lua:80
-msgid ""
-"Found calibre metadata at "
-msgstr ""
-
-#: frontend/apps/filemanager/filemanagersearch.lua:98
-msgid ""
-"You must specify at least one field to search at (SEARCH_XXX = true in defaults.lua)"
-msgstr ""
-
-#: frontend/apps/filemanager/filemanagersearch.lua:116
+#: frontend/apps/filemanager/filemanagersearch.lua:128
 msgid ""
 "Find"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagersearch.lua:242
-msgid ""
-"No match for "
-msgstr ""
-
-#: frontend/apps/filemanager/filemanagersearch.lua:276
-msgid ""
-"Title: "
-msgstr ""
-
-#: frontend/apps/filemanager/filemanagersearch.lua:277
-msgid ""
-"Author(s): "
-msgstr ""
-
-#: frontend/apps/filemanager/filemanagersearch.lua:278
-msgid ""
-"Tags: "
-msgstr ""
-
-#: frontend/apps/filemanager/filemanagersearch.lua:279
-msgid ""
-"Series: "
-msgstr ""
-
-#: frontend/apps/filemanager/filemanagersearch.lua:283
-msgid ""
-"Path: "
-msgstr ""
-
-#: frontend/apps/filemanager/filemanagersetdefaults.lua:76
-msgid ""
-"Wrong settings might crash Koreader! Continue?"
-msgstr ""
-
-#: frontend/apps/filemanager/filemanagersetdefaults.lua:182
-msgid ""
-"Are you sure to save the settings to \"defaults.persistent.lua\"?"
-msgstr ""
-
-#: frontend/apps/filemanager/filemanagersetdefaults.lua:265
-msgid ""
-"Default settings successfully saved!"
-msgstr ""
-
 #: frontend/ui/data/strings.lua:13
 msgid ""
 "Fine Tuning"
@@ -365,6 +315,11 @@ msgid ""
 "Floating punctuation"
 msgstr ""
 
+#: frontend/apps/reader/modules/readerlink.lua:58
+msgid ""
+"Follow links"
+msgstr ""
+
 #: frontend/ui/data/strings.lua:24
 msgid ""
 "Font Weight"
@@ -410,19 +365,19 @@ msgid ""
 "Go to Page or Location"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:118
+#: frontend/apps/filemanager/filemanagermenu.lua:133
 #: frontend/apps/reader/modules/readermenu.lua:124
 msgid ""
 "Help"
 msgstr ""
 
 #: frontend/apps/reader/modules/readerhighlight.lua:294
-#: frontend/ui/widget/dictquicklookup.lua:145
+#: frontend/ui/widget/dictquicklookup.lua:136
 msgid ""
 "Highlight"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagerhistory.lua:14
+#: frontend/apps/filemanager/filemanagerhistory.lua:15
 msgid ""
 "History"
 msgstr ""
@@ -432,27 +387,17 @@ msgid ""
 "Hyphenation"
 msgstr ""
 
-#: frontend/apps/reader/modules/readerfont.lua:182
-msgid ""
-"Increase gamma to "
-msgstr ""
-
-#: frontend/apps/reader/modules/readerfont.lua:159
-msgid ""
-"Increase line space to "
-msgstr ""
-
 #: frontend/ui/data/strings.lua:23
 msgid ""
 "Indentation"
 msgstr ""
 
-#: frontend/ui/uimanager.lua:449
+#: frontend/ui/uimanager.lua:492
 msgid ""
 "Input page number for a full refresh"
 msgstr ""
 
-#: frontend/ui/device/screen.lua:294
+#: frontend/ui/device/screen.lua:300
 msgid ""
 "Input screen DPI"
 msgstr ""
@@ -482,7 +427,7 @@ msgid ""
 "Language"
 msgstr ""
 
-#: frontend/ui/device/screen.lua:279
+#: frontend/ui/device/screen.lua:285
 msgid ""
 "Large"
 msgstr ""
@@ -528,17 +473,18 @@ msgid ""
 "Logout"
 msgstr ""
 
-#: frontend/ui/device/screen.lua:271
+#: frontend/ui/device/screen.lua:277
 msgid ""
 "Medium"
 msgstr ""
 
 #: frontend/apps/reader/modules/readerhighlight.lua:333
+#: frontend/ui/widget/dictquicklookup.lua:165
 msgid ""
 "More"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:95
+#: frontend/apps/filemanager/filemanagermenu.lua:111
 #: frontend/apps/reader/modules/readermenu.lua:93
 msgid ""
 "Night mode"
@@ -549,7 +495,25 @@ msgid ""
 "No definition found."
 msgstr ""
 
-#: reader.lua:95
+#: frontend/apps/filemanager/filemanagersearch.lua:290
+msgid ""
+"No match for \" .. self.search_value)})\n"
+"    end\n"
+"end\n"
+"\n"
+"function Search:onMenuHold(item)\n"
+"    if item.notchecked then\n"
+"        item.info = item.info .. item.path\n"
+"        local f = io.open(item.path)\n"
+"        if f == nil then\n"
+"            item.info = item.info .. \"\n"
+"File not found!\"\n"
+"        else\n"
+"            item.info = item.info .. \"\n"
+"\" .. string.format(\"%4.1fM\",lfs.attributes(item.path, \"size"
+msgstr ""
+
+#: reader.lua:91
 msgid ""
 "No reader engine for this file"
 msgstr ""
@@ -559,8 +523,8 @@ msgid ""
 "Note: "
 msgstr ""
 
+#: frontend/apps/filemanager/filemanagersetdefaults.lua:192
 #: frontend/apps/reader/modules/readerfrontlight.lua:115
-#: frontend/apps/filemanager/filemanagersetdefaults.lua:130
 #: frontend/ui/widget/confirmbox.lua:28
 #: frontend/ui/widget/touchmenu.lua:553
 msgid ""
@@ -597,9 +561,9 @@ msgid ""
 "On"
 msgstr ""
 
-#: reader.lua:85
+#: reader.lua:81
 msgid ""
-"Opening file"
+"Opening file "
 msgstr ""
 
 #: frontend/apps/reader/modules/readergoto.lua:43
@@ -622,12 +586,17 @@ msgid ""
 "Page Margin"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanager.lua:93
+#: frontend/apps/filemanager/filemanager.lua:94
 msgid ""
 "Paste"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:121
+#: frontend/apps/filemanager/filemanagersearch.lua:335
+msgid ""
+"Path: "
+msgstr ""
+
+#: frontend/apps/filemanager/filemanagermenu.lua:136
 #: frontend/apps/reader/modules/readermenu.lua:127
 msgid ""
 "Please report bugs to \n"
@@ -654,12 +623,12 @@ msgid ""
 "RTL"
 msgstr ""
 
-#: plugins/zsync.koplugin/main.lua:362
+#: plugins/zsync.koplugin/main.lua:354
 msgid ""
 "Received file:"
 msgstr ""
 
-#: frontend/apps/reader/modules/readerfont.lua:209
+#: frontend/apps/reader/modules/readerfont.lua:197
 msgid ""
 "Redrawing with font "
 msgstr ""
@@ -674,12 +643,7 @@ msgid ""
 "Render Quality"
 msgstr ""
 
-#: plugins/evernote.koplugin/main.lua:49
-msgid ""
-"Sandbox"
-msgstr ""
-
-#: frontend/ui/device/screen.lua:253
+#: frontend/ui/device/screen.lua:259
 msgid ""
 "Screen DPI"
 msgstr ""
@@ -689,7 +653,7 @@ msgid ""
 "Screen Mode"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:88
+#: frontend/apps/filemanager/filemanagermenu.lua:104
 #: frontend/apps/reader/modules/readermenu.lua:86
 msgid ""
 "Screen settings"
@@ -700,6 +664,21 @@ msgid ""
 "Scroll Mode"
 msgstr ""
 
+#: frontend/apps/filemanager/filemanagersearch.lua:124
+msgid ""
+"Search Books"
+msgstr ""
+
+#: frontend/apps/filemanager/filemanagermenu.lua:151
+msgid ""
+"Search books"
+msgstr ""
+
+#: frontend/apps/filemanager/filemanagersearch.lua:331
+msgid ""
+"Series: "
+msgstr ""
+
 #: frontend/ui/widget/configdialog.lua:582
 msgid ""
 "Set default "
@@ -710,7 +689,7 @@ msgid ""
 "Set default floating punctuation to "
 msgstr ""
 
-#: frontend/apps/reader/modules/readerfont.lua:224
+#: frontend/apps/reader/modules/readerfont.lua:212
 msgid ""
 "Set default font to "
 msgstr ""
@@ -720,7 +699,17 @@ msgid ""
 "Set default zoom mode to "
 msgstr ""
 
-#: frontend/apps/reader/modules/readerfont.lua:140
+#: frontend/apps/filemanager/filemanagermenu.lua:142
+msgid ""
+"Set defaults"
+msgstr ""
+
+#: frontend/apps/reader/modules/readerfont.lua:176
+msgid ""
+"Set font gamma to "
+msgstr ""
+
+#: frontend/apps/reader/modules/readerfont.lua:146
 msgid ""
 "Set font size to "
 msgstr ""
@@ -730,6 +719,11 @@ msgid ""
 "Set highlight drawer "
 msgstr ""
 
+#: frontend/apps/reader/modules/readerfont.lua:158
+msgid ""
+"Set line space to "
+msgstr ""
+
 #: frontend/apps/reader/modules/readertypeset.lua:11
 msgid ""
 "Set render style"
@@ -750,7 +744,7 @@ msgid ""
 "Show advanced options"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:69
+#: frontend/apps/filemanager/filemanagermenu.lua:84
 msgid ""
 "Show hidden files"
 msgstr ""
@@ -760,12 +754,12 @@ msgid ""
 "Show page overlap"
 msgstr ""
 
-#: frontend/ui/device/screen.lua:263
+#: frontend/ui/device/screen.lua:269
 msgid ""
 "Small"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:76
+#: frontend/apps/filemanager/filemanagermenu.lua:92
 msgid ""
 "Start with last opened file"
 msgstr ""
@@ -785,7 +779,7 @@ msgid ""
 "Subscribe documents"
 msgstr ""
 
-#: frontend/ui/uimanager.lua:81
+#: frontend/ui/uimanager.lua:114
 msgid ""
 "Suspended"
 msgstr ""
@@ -815,16 +809,26 @@ msgid ""
 "Table of contents"
 msgstr ""
 
+#: frontend/apps/filemanager/filemanagersearch.lua:330
+msgid ""
+"Tags: "
+msgstr ""
+
 #: frontend/ui/data/strings.lua:12
 msgid ""
 "Text Align"
 msgstr ""
 
-#: frontend/ui/device/screen.lua:248
+#: frontend/ui/device/screen.lua:254
 msgid ""
 "This will take effect on next restart."
 msgstr ""
 
+#: frontend/apps/filemanager/filemanagersearch.lua:328
+msgid ""
+"Title: "
+msgstr ""
+
 #: frontend/apps/reader/modules/readerfrontlight.lua:100
 msgid ""
 "Toggle"
@@ -840,7 +844,7 @@ msgid ""
 "Underscore"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:110
+#: frontend/apps/filemanager/filemanagermenu.lua:125
 #: frontend/apps/reader/modules/readermenu.lua:116
 msgid ""
 "Version"
@@ -856,6 +860,11 @@ msgid ""
 "View Mode"
 msgstr ""
 
+#: frontend/ui/widget/dictquicklookup.lua:151
+msgid ""
+"Wikipedia"
+msgstr ""
+
 #: frontend/ui/data/strings.lua:19
 msgid ""
 "Word Gap"
@@ -871,11 +880,31 @@ msgid ""
 "Writing screen to "
 msgstr ""
 
+#: frontend/apps/filemanager/filemanagersetdefaults.lua:77
+msgid ""
+"Wrong settings might crash Koreader! Continue?"
+msgstr ""
+
+#: frontend/apps/filemanager/filemanagermenu.lua:40
+msgid ""
+"You have unsaved default settings. Save them now?"
+msgstr ""
+
+#: frontend/apps/filemanager/filemanagersearch.lua:107
+msgid ""
+"You must specify at least one field to search at! (SEARCH_XXX = true in defaults.lua)"
+msgstr ""
+
 #: frontend/ui/otamanager.lua:143
 msgid ""
 "Your koreader is updated."
 msgstr ""
 
+#: plugins/zsync.koplugin/main.lua:42
+msgid ""
+"ZSync"
+msgstr ""
+
 #: frontend/apps/reader/modules/readerzooming.lua:320
 msgid ""
 "Zoom to fit content"
@@ -1002,7 +1031,7 @@ msgid ""
 "mini"
 msgstr ""
 
-#: frontend/ui/widget/menu.lua:565
+#: frontend/ui/widget/menu.lua:575
 msgid ""
 "no choices available"
 msgstr ""
@@ -1027,7 +1056,7 @@ msgid ""
 "page"
 msgstr ""
 
-#: frontend/ui/widget/menu.lua:554
+#: frontend/ui/widget/menu.lua:563
 msgid ""
 "page "
 msgstr ""

reader.lua

@@ -38,8 +38,6 @@ function exitReader()
 
     G_reader_settings:close()
 
-    input.closeAll()
-
     -- Close lipc handles
     KindlePowerD:coda()
     ReaderActivityIndicator:coda()
@@ -64,6 +62,9 @@ function exitReader()
         end
     end
 
+    input.closeAll()
+    Screen:close()
+
     if Profiler then Profiler.stop() end
     os.exit(0)
 end