Merge pull request #544 from houqp/houqp-master

move reader code into apps directory

frontend/apps/filemanager/filemanagermenu.lua

@@ -1,6 +1,5 @@
 local CenterContainer = require("ui/widget/container/centercontainer")
 local TouchMenu = require("ui/widget/touchmenu")
-local ReaderFrontLight = require("ui/reader/readerfrontlight")
 local InputContainer = require("ui/widget/container/inputcontainer")
 local InfoMessage = require("ui/widget/infomessage")
 local UIManager = require("ui/uimanager")
@@ -10,6 +9,7 @@ local Geom = require("ui/geometry")
 local Screen = require("ui/screen")
 local Language = require("ui/language")
 local _ = require("gettext")
+local ReaderFrontLight = require("apps/reader/modules/readerfrontlight")
 
 local FileManagerMenu = InputContainer:extend{
     tab_item_table = nil,

frontend/apps/reader/modules/readerrolling.lua

@@ -5,10 +5,10 @@ local Geom = require("ui/geometry")
 local Input = require("ui/input")
 local Event = require("ui/event")
 local GestureRange = require("ui/gesturerange")
-local ReaderPanning = require("ui/reader/readerpanning")
 local UIManager = require("ui/uimanager")
 local DEBUG = require("dbg")
 local _ = require("gettext")
+local ReaderPanning = require("apps/reader/modules/readerpanning")
 
 local ReaderRolling = InputContainer:new{
     old_doc_height = nil,

frontend/apps/reader/modules/readerview.lua

@@ -1,12 +1,12 @@
 local OverlapGroup = require("ui/widget/overlapgroup")
-local ReaderFlipping = require("ui/reader/readerflipping")
-local ReaderFooter = require("ui/reader/readerfooter")
-local ReaderDogear = require("ui/reader/readerdogear")
 local UIManager = require("ui/uimanager")
 local Screen = require("ui/screen")
 local Geom = require("ui/geometry")
 local Event = require("ui/event")
 local DEBUG = require("dbg")
+local ReaderFlipping = require("apps/reader/modules/readerflipping")
+local ReaderFooter = require("apps/reader/modules/readerfooter")
+local ReaderDogear = require("apps/reader/modules/readerdogear")
 
 local ReaderView = OverlapGroup:new{
     document = nil,
@@ -59,9 +59,9 @@ local ReaderView = OverlapGroup:new{
     dogear_visible = false,
     -- in flipping state
     flipping_visible = false,
-    
+
     -- auto save settings after turning pages
-    auto_save_paging_count = 0,    
+    auto_save_paging_count = 0,
 }
 
 function ReaderView:init()
@@ -395,7 +395,7 @@ end
 
 function ReaderView:drawHighlightRect(bb, x, y, rect, drawer)
     local x, y, w, h = rect.x, rect.y, rect.w, rect.h
-    
+
     if drawer == "underscore" then
         self.highlight.line_width = self.highlight.line_width or 2
         self.highlight.line_color = self.highlight.line_color or 5
@@ -623,7 +623,7 @@ function ReaderView:onSaveSettings()
     self.ui.doc_settings:saveSetting("screen_mode", self.screen_mode)
     self.ui.doc_settings:saveSetting("rotation_mode", self.cur_rotation_mode)
     self.ui.doc_settings:saveSetting("gamma", self.state.gamma)
-    self.ui.doc_settings:saveSetting("highlight", self.highlight.saved)    
+    self.ui.doc_settings:saveSetting("highlight", self.highlight.saved)
 end
 
 function ReaderView:autoSaveSettings()

frontend/apps/reader/readerui.lua

@@ -7,30 +7,30 @@ local UIManager = require("ui/uimanager")
 local DEBUG = require("dbg")
 local _ = require("gettext")
 
-local ReaderView = require("ui/reader/readerview")
-local ReaderZooming = require("ui/reader/readerzooming")
-local ReaderPanning = require("ui/reader/readerpanning")
-local ReaderRotation = require("ui/reader/readerrotation")
-local ReaderPaging = require("ui/reader/readerpaging")
-local ReaderRolling = require("ui/reader/readerrolling")
-local ReaderToc = require("ui/reader/readertoc")
-local ReaderBookmark = require("ui/reader/readerbookmark")
-local ReaderFont = require("ui/reader/readerfont")
-local ReaderTypeset = require("ui/reader/readertypeset")
-local ReaderMenu = require("ui/reader/readermenu")
-local ReaderGoto = require("ui/reader/readergoto")
-local ReaderConfig = require("ui/reader/readerconfig")
-local ReaderCropping = require("ui/reader/readercropping")
-local ReaderKoptListener = require("ui/reader/readerkoptlistener")
-local ReaderCoptListener = require("ui/reader/readercoptlistener")
-local ReaderHinting = require("ui/reader/readerhinting")
-local ReaderHighlight = require("ui/reader/readerhighlight")
-local ReaderScreenshot = require("ui/reader/readerscreenshot")
-local ReaderFrontLight = require("ui/reader/readerfrontlight")
-local ReaderDictionary = require("ui/reader/readerdictionary")
-local ReaderHyphenation = require("ui/reader/readerhyphenation")
-local ReaderActivityIndicator = require("ui/reader/readeractivityindicator")
-local ReaderLink = require("ui/reader/readerlink")
+local ReaderView = require("apps/reader/modules/readerview")
+local ReaderZooming = require("apps/reader/modules/readerzooming")
+local ReaderPanning = require("apps/reader/modules/readerpanning")
+local ReaderRotation = require("apps/reader/modules/readerrotation")
+local ReaderPaging = require("apps/reader/modules/readerpaging")
+local ReaderRolling = require("apps/reader/modules/readerrolling")
+local ReaderToc = require("apps/reader/modules/readertoc")
+local ReaderBookmark = require("apps/reader/modules/readerbookmark")
+local ReaderFont = require("apps/reader/modules/readerfont")
+local ReaderTypeset = require("apps/reader/modules/readertypeset")
+local ReaderMenu = require("apps/reader/modules/readermenu")
+local ReaderGoto = require("apps/reader/modules/readergoto")
+local ReaderConfig = require("apps/reader/modules/readerconfig")
+local ReaderCropping = require("apps/reader/modules/readercropping")
+local ReaderKoptListener = require("apps/reader/modules/readerkoptlistener")
+local ReaderCoptListener = require("apps/reader/modules/readercoptlistener")
+local ReaderHinting = require("apps/reader/modules/readerhinting")
+local ReaderHighlight = require("apps/reader/modules/readerhighlight")
+local ReaderScreenshot = require("apps/reader/modules/readerscreenshot")
+local ReaderFrontLight = require("apps/reader/modules/readerfrontlight")
+local ReaderDictionary = require("apps/reader/modules/readerdictionary")
+local ReaderHyphenation = require("apps/reader/modules/readerhyphenation")
+local ReaderActivityIndicator = require("apps/reader/modules/readeractivityindicator")
+local ReaderLink = require("apps/reader/modules/readerlink")
 
 --[[
 This is an abstraction for a reader interface

frontend/document/credocument.lua

@@ -1,12 +1,12 @@
 local Geom = require("ui/geometry")
 local CreOptions = require("ui/data/creoptions")
 local Document = require("document/document")
-local Configurable = require("ui/reader/configurable")
 local Geom = require("ui/geometry")
 local Font = require("ui/font")
 local Device = require("ui/device")
 local Screen = require("ui/screen")
 local DEBUG = require("dbg")
+local Configurable = require("configurable")
 -- TBD: DrawContext
 
 local CreDocument = Document:new{
@@ -91,13 +91,13 @@ function CreDocument:init()
         self.error_message = self.doc -- will contain error message
         return
     end
-    
+
     -- adjust font sizes according to screen dpi
     self._document:adjustFontSizes(Screen:getDPI())
-    
+
     -- set fallback font face
     self._document:setStringProperty("crengine.font.fallback.face", self.fallback_font)
-    
+
     self.is_open = true
     self.info.has_pages = false
     self:_readMetadata()

frontend/document/djvudocument.lua

@@ -3,8 +3,8 @@ local Cache = require("cache")
 local CacheItem = require("cacheitem")
 local KoptOptions = require("ui/data/koptoptions")
 local Document = require("document/document")
-local Configurable = require("ui/reader/configurable")
 local DrawContext = require("ffi/drawcontext")
+local Configurable = require("configurable")
 
 local DjvuDocument = Document:new{
     _document = false,

frontend/document/document.lua

@@ -3,7 +3,7 @@ local Cache = require("cache")
 local CacheItem = require("cacheitem")
 local TileCacheItem = require("document/tilecacheitem")
 local Geom = require("ui/geometry")
-local Configurable = require("ui/reader/configurable")
+local Configurable = require("configurable")
 local Math = require("optmath")
 local DEBUG = require("dbg")
 
@@ -36,7 +36,7 @@ local Document = {
         author = "",
         date = ""
     },
-    
+
     links = {},
 
     GAMMA_NO_GAMMA = 1.0,

frontend/document/pdfdocument.lua

@@ -2,7 +2,7 @@ local Cache = require("cache")
 local CacheItem = require("cacheitem")
 local KoptOptions = require("ui/data/koptoptions")
 local Document = require("document/document")
-local Configurable = require("ui/reader/configurable")
+local Configurable = require("configurable")
 local DrawContext = require("ffi/drawcontext")
 local ffi = require("ffi")
 ffi.cdef[[
@@ -125,7 +125,7 @@ function PdfDocument:getUsedBBox(pageno)
     if used.y0 < 0 then used.y0 = 0 end
     if used.y1 > pheight then used.y1 = pheight end
     --@TODO give size for cacheitem?  02.12 2012 (houqp)
-    Cache:insert(hash, CacheItem:new{ 
+    Cache:insert(hash, CacheItem:new{
         ubbox = used,
     })
     page:close()
@@ -140,7 +140,7 @@ function PdfDocument:getPageLinks(pageno)
     end
     local page = self._document:openPage(pageno)
     local links = page:getPageLinks()
-    Cache:insert(hash, CacheItem:new{ 
+    Cache:insert(hash, CacheItem:new{
         links = links,
     })
     page:close()

reader.lua

@@ -19,13 +19,13 @@ end
 local UIManager = require("ui/uimanager")
 local Menu = require("ui/widget/menu")
 local InfoMessage = require("ui/widget/infomessage")
-local ReaderUI = require("ui/readerui")
 local DocumentRegistry = require("document/documentregistry")
 local DEBUG = require("dbg")
-local FileManager = require("apps/filemanager/filemanager")
 local Device = require("ui/device")
 local Screen = require("ui/screen")
 
+local ReaderUI = require("apps/reader/readerui")
+
 Profiler = nil
 
 function exitReader()
@@ -94,6 +94,7 @@ function doShowReaderUI(file, pass)
 end
 
 function showHomePage(path)
+    local FileManager = require("apps/filemanager/filemanager")
     UIManager:show(FileManager:new{
         dimen = Screen:getSize(),
         root_path = path,