Revert "TouchMenu: menu search (koreader#9884, koreader#9876)"

This reverts commit e026598. This reverts commit e58a12b.
Frenzie · Dec 7, 2022 · 675f1f1 · 675f1f1
1 parent e026598
commit 675f1f1
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 401 deletions.
diff --git a/frontend/apps/filemanager/filemanager.lua b/frontend/apps/filemanager/filemanager.lua
@@ -1385,11 +1385,4 @@ function FileManager:onRefreshContent()
     self:onRefresh()
 end
 
-function FileManager:onMenuSearch()
-    if not self.ui then
-        self.menu:onShowMenu()
-    end
-    self.menu.menu_container[1]:onShowMenuSearch()
-end
-
 return FileManager
diff --git a/frontend/apps/reader/readerui.lua b/frontend/apps/reader/readerui.lua
@@ -871,11 +871,4 @@ function ReaderUI:getCurrentPage()
     end
 end
 
-function ReaderUI:onMenuSearch()
-    if not self.ui then
-        self.menu:onShowMenu()
-    end
-    self.menu.menu_container[1]:onShowMenuSearch()
-end
-
 return ReaderUI
diff --git a/frontend/dispatcher.lua b/frontend/dispatcher.lua
@@ -97,7 +97,6 @@ local settingsList = {
     fulltext_search = {category="none", event="ShowFulltextSearchInput", title=_("Fulltext search"), general=true},
     file_search = {category="none", event="ShowFileSearch", title=_("File search"), general=true, separator=true},
     show_menu = {category="none", event="ShowMenu", title=_("Show menu"), general=true},
-    menu_search = {category="none", event="MenuSearch", title=_("Menu search"), general=true},
     favorites = {category="none", event="ShowColl", arg="favorites", title=_("Favorites"), general=true},
     screenshot = {category="none", event="Screenshot", title=_("Screenshot"), general=true, separator=true},
 
@@ -228,7 +227,6 @@ local dispatcher_menu_order = {
     "file_search",
 
     "show_menu",
-    "menu_search",
     "screenshot",
 
     "exit_screensaver",

diff --git a/frontend/ui/elements/common_settings_menu_table.lua b/frontend/ui/elements/common_settings_menu_table.lua
@@ -609,12 +609,4 @@ common_settings.units = {
     },
 }
 
-common_settings.search_menu = {
-    text = _("Menu search"),
-    callback = function()
-        UIManager:sendEvent(Event:new("ShowMenuSearch"))
-    end,
-    keep_menu_open = true,
-}
-
 return common_settings
diff --git a/frontend/ui/elements/filemanager_menu_order.lua b/frontend/ui/elements/filemanager_menu_order.lua
@@ -169,8 +169,6 @@ local order = {
     help = {
         "quickstart_guide",
         "----------------------------",
-        "search_menu",
-        "----------------------------",
         "report_bug",
         "----------------------------",
         "system_statistics", -- if enabled (Plugin)

diff --git a/frontend/ui/elements/reader_menu_order.lua b/frontend/ui/elements/reader_menu_order.lua
@@ -222,8 +222,6 @@ local order = {
     help = {
         "quickstart_guide",
         "----------------------------",
-        "search_menu",
-        "----------------------------",
         "report_bug",
         "----------------------------",
         "system_statistics",  -- if enabled (Plugin)