common_info_menu_table: reorder code

frontend/ui/elements/common_info_menu_table.lua

@@ -1,6 +1,7 @@
 local BD = require("ui/bidi")
 local ConfirmBox = require("ui/widget/confirmbox")
 local Device = require("device")
+local Event = require("ui/event")
 local InfoMessage = require("ui/widget/infomessage")
 local Notification = require("ui/widget/notification")
 local UIManager = require("ui/uimanager")
@@ -12,29 +13,20 @@ local T = require("ffi/util").template
 
 local common_info = {}
 
+-- tools tab
+common_info.more_tools = {
+    text = _("More tools"),
+}
+
+-- main tab
 if Device:hasOTAUpdates() then
     local OTAManager = require("ui/otamanager")
     common_info.ota_update = OTAManager:getOTAMenuTable()
 end
-common_info.version = {
+
-    text = T(_("Version: %1"), Version:getShortVersion()),
-    keep_menu_open = true,
-    callback = function()
-        UIManager:show(InfoMessage:new{
-            text = Version:getCurrentRevision(),
-        })
-    end
-}
 common_info.help = {
     text = _("Help"),
 }
-common_info.more_tools = {
-    text = _("More tools"),
-}
-
-common_info.device = {
-    text = _("Device"),
-}
 common_info.quickstart_guide = {
     text = _("Quickstart guide"),
     callback = function()
@@ -43,15 +35,12 @@ common_info.quickstart_guide = {
         ReaderUI:showReader(QuickStart:getQuickStart())
     end
 }
-common_info.about = {
+common_info.search_menu = {
-    text = _("About"),
+    text = _("Menu search"),
-    keep_menu_open = true,
     callback = function()
-        UIManager:show(InfoMessage:new{
+        UIManager:sendEvent(Event:new("ShowMenuSearch"))
-            text = T(_("KOReader %1\n\nA document viewer for E Ink devices.\n\nLicensed under Affero GPL v3. All dependencies are free software.\n\nhttp://koreader.rocks"), BD.ltr(Version:getCurrentRevision())),
+    end,
-            icon = "koreader",
+    keep_menu_open = true,
-        })
-    end
 }
 common_info.report_bug = {
     text_func = function()
@@ -114,5 +103,24 @@ common_info.report_bug = {
         })
     end
 }
+common_info.version = {
+    text = T(_("Version: %1"), Version:getShortVersion()),
+    keep_menu_open = true,
+    callback = function()
+        UIManager:show(InfoMessage:new{
+            text = Version:getCurrentRevision(),
+        })
+    end
+}
+common_info.about = {
+    text = _("About"),
+    keep_menu_open = true,
+    callback = function()
+        UIManager:show(InfoMessage:new{
+            text = T(_("KOReader %1\n\nA document viewer for E Ink devices.\n\nLicensed under Affero GPL v3. All dependencies are free software.\n\nhttp://koreader.rocks"), BD.ltr(Version:getCurrentRevision())),
+            icon = "koreader",
+        })
+    end
+}
 
 return common_info