From 141095b0c8e882e7ffd1b7800f8f135c4ed1c6f1 Mon Sep 17 00:00:00 2001
From: Frans de Jonge <fransdejonge@gmail.com>
Date: Wed, 26 Nov 2014 18:16:54 +0100
Subject: [PATCH] Alterations to the menu

References #1219 and #1258.
---
 .../filemanager/filemanagerfilesearcher.lua   |  1 -
 frontend/apps/filemanager/filemanagermenu.lua | 43 +++++++++++--------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/frontend/apps/filemanager/filemanagerfilesearcher.lua b/frontend/apps/filemanager/filemanagerfilesearcher.lua
index ed006babd..ba0c2b964 100644
--- a/frontend/apps/filemanager/filemanagerfilesearcher.lua
+++ b/frontend/apps/filemanager/filemanagerfilesearcher.lua
@@ -78,7 +78,6 @@ end
 
 function FileSearcher:init(search_path)
     self.path = search_path or lfs.currentdir()
-    --self.path = ('/home/frans/Dropbox')
     self:showSearch()
 end
 
diff --git a/frontend/apps/filemanager/filemanagermenu.lua b/frontend/apps/filemanager/filemanagermenu.lua
index 7cad27ee7..4a839544f 100644
--- a/frontend/apps/filemanager/filemanagermenu.lua
+++ b/frontend/apps/filemanager/filemanagermenu.lua
@@ -29,17 +29,8 @@ function FileManagerMenu:init()
         tools = {
             icon = "resources/icons/appbar.tools.png",
         },
-        opdscatalog = {
+        search = {
             icon = "resources/icons/appbar.magnify.browse.png",
-            callback = function()
-                self:onCloseFileManagerMenu()
-                local OPDSCatalog = require("apps/opdscatalog/opdscatalog")
-                function OPDSCatalog:onExit()
-                    DEBUG("refresh filemanager")
-                    filemanager:onRefresh()
-                end
-                OPDSCatalog:showCatalog()
-             end,
         },
         home = {
             icon = "resources/icons/appbar.home.png",
@@ -124,7 +115,7 @@ function FileManagerMenu:setUpdateItemTable()
 
     -- tools tab
     table.insert(self.tab_item_table.tools, {
-        text = _("Change defaults file"),
+        text = _("Advanced settings"),
         callback = function()
             SetDefaults:ConfirmEdit()
         end,
@@ -133,16 +124,32 @@ function FileManagerMenu:setUpdateItemTable()
         end,
     })
     table.insert(self.tab_item_table.tools, {
-        text = _("Search books"),
+        text = _("OPDS catalog"),
         callback = function()
-            Search:getCalibre()
-            if Search.metafile_1 ~= nil then
-                Search:ShowSearch()
-            else -- fallback to filename search if no calibre metadata file
-                FileSearcher:init()
+            local OPDSCatalog = require("apps/opdscatalog/opdscatalog")
+            function OPDSCatalog:onExit()
+                DEBUG("refresh filemanager")
+                filemanager:onRefresh()
             end
+            OPDSCatalog:showCatalog()
+        end,
+    })
+
+    -- search tab
+    table.insert(self.tab_item_table.search, {
+        text = _("Find a book in calibre catalog"),
+        callback = function()
+            Search:getCalibre()
+            Search:ShowSearch()
+        end
+    })
+    table.insert(self.tab_item_table.search, {
+        text = _("Find a file"),
+        callback = function()
+            FileSearcher:init(self.ui.file_chooser.path)
         end
     })
+
     -- home tab
     table.insert(self.tab_item_table.home, {
         text = _("Exit"),
@@ -172,7 +179,7 @@ function FileManagerMenu:onShowMenu()
                 self.tab_item_table.setting,
                 self.tab_item_table.info,
                 self.tab_item_table.tools,
-                self.tab_item_table.opdscatalog,
+                self.tab_item_table.search,
                 self.tab_item_table.home,
             },
             show_parent = menu_container,