From 34e0238b6fde9bce4ec0d0c0b238ba6db4c5d7e4 Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Sun, 6 Mar 2016 21:52:53 -0800
Subject: [PATCH] readermenu: move book status to info tab & minor cleanup

---
 frontend/apps/reader/modules/readerstatus.lua | 20 +++++++++----------
 frontend/apps/reader/readerui.lua             | 14 ++++++-------
 frontend/ui/widget/bookstatuswidget.lua       |  1 -
 frontend/ui/widget/inputtext.lua              |  2 +-
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/frontend/apps/reader/modules/readerstatus.lua b/frontend/apps/reader/modules/readerstatus.lua
index 31fd0c94a..42e865230 100644
--- a/frontend/apps/reader/modules/readerstatus.lua
+++ b/frontend/apps/reader/modules/readerstatus.lua
@@ -20,23 +20,21 @@ function ReaderStatus:init()
     if self.ui.document.is_djvu or self.ui.document.is_pic then
         self.enabled = false
         return
-    end
-    -- register event listener if enabled
-    self.onEndOfBook = function()
-        self:showStatus()
-    end
-    self.total_pages = self.document:getPageCount()
-    self.ui:registerPostInitCallback(function()
+    else
+        self.total_pages = self.document:getPageCount()
         self.ui.menu:registerToMainMenu(self)
-    end)
+        -- register event listener if enabled
+        self.onEndOfBook = function()
+            self:showStatus()
+        end
+    end
 end
 
 function ReaderStatus:addToMainMenu(tab_item_table)
-    table.insert(tab_item_table.typeset, {
-        text = _("Status"),
+    table.insert(tab_item_table.info, {
+        text = _("Book status"),
         callback = function()
             self:showStatus()
-            UIManager:setDirty("all")
         end,
     })
 end
diff --git a/frontend/apps/reader/readerui.lua b/frontend/apps/reader/readerui.lua
index dc3f82dcb..04991b387 100644
--- a/frontend/apps/reader/readerui.lua
+++ b/frontend/apps/reader/readerui.lua
@@ -171,12 +171,6 @@ function ReaderUI:init()
         view = self.view,
         ui = self
     }, true)
-    -- history view
-    self:registerModule("history", FileManagerHistory:new{
-        dialog = self.dialog,
-        menu = self.menu,
-        ui = self,
-    })
     -- frontlight controller
     if Device:hasFrontlight() then
         self:registerModule("frontlight", ReaderFrontLight:new{
@@ -297,13 +291,17 @@ function ReaderUI:init()
         view = self.view,
         ui = self
     })
-
+    -- book status
     self:registerModule("status", ReaderStatus:new{
         ui = self,
         document = self.document,
         view = self.view,
     })
-
+    -- history view
+    self:registerModule("history", FileManagerHistory:new{
+        dialog = self.dialog,
+        ui = self,
+    })
     -- koreader plugins
     for _,plugin_module in ipairs(PluginLoader:loadPlugins()) do
         DEBUG("Loaded plugin", plugin_module.name, "at", plugin_module.path)
diff --git a/frontend/ui/widget/bookstatuswidget.lua b/frontend/ui/widget/bookstatuswidget.lua
index 8a8263448..076c2517b 100644
--- a/frontend/ui/widget/bookstatuswidget.lua
+++ b/frontend/ui/widget/bookstatuswidget.lua
@@ -516,7 +516,6 @@ function BookStatusWidget:getStatisticsSettings()
     end
 end
 
-
 function BookStatusWidget:onSwitchFocus(inputbox)
     self.note_dialog = InputDialog:new{
         title = "Note",
diff --git a/frontend/ui/widget/inputtext.lua b/frontend/ui/widget/inputtext.lua
index 7008c25ca..0707adfef 100644
--- a/frontend/ui/widget/inputtext.lua
+++ b/frontend/ui/widget/inputtext.lua
@@ -100,7 +100,7 @@ function InputText:initTextBox(text)
         text_widget,
     }
     self.dimen = self[1]:getSize()
-
+    -- FIXME: self.parent is not always in the widget statck (BookStatusWidget)
     UIManager:setDirty(self.parent, function()
         return "ui", self[1].dimen
     end)