From 5c39c19a73d82a9687424bb202188c22e92e0219 Mon Sep 17 00:00:00 2001 From: hius07 <62179190+hius07@users.noreply.github.com> Date: Wed, 12 Jan 2022 14:32:03 +0200 Subject: [PATCH] [chore] Remove leftover: cface (#8659) Ancient menu widget had it. Not used anymore. --- frontend/apps/filemanager/filemanagerfilesearcher.lua | 2 -- frontend/apps/filemanager/filemanagersetdefaults.lua | 2 -- frontend/apps/reader/modules/readerpagemap.lua | 1 - frontend/apps/reader/modules/readertoc.lua | 1 - frontend/ui/widget/filechooser.lua | 2 -- plugins/calibre.koplugin/search.lua | 3 --- 6 files changed, 11 deletions(-) diff --git a/frontend/apps/filemanager/filemanagerfilesearcher.lua b/frontend/apps/filemanager/filemanagerfilesearcher.lua index f0ae66766..f75959c33 100644 --- a/frontend/apps/filemanager/filemanagerfilesearcher.lua +++ b/frontend/apps/filemanager/filemanagerfilesearcher.lua @@ -3,7 +3,6 @@ local CheckButton = require("ui/widget/checkbutton") local CenterContainer = require("ui/widget/container/centercontainer") local DocumentRegistry = require("document/documentregistry") local FileChooser = require("ui/widget/filechooser") -local Font = require("ui/font") local InfoMessage = require("ui/widget/infomessage") local InputContainer = require("ui/widget/container/inputcontainer") local InputDialog = require("ui/widget/inputdialog") @@ -177,7 +176,6 @@ function FileSearcher:showSearchResults() height = Screen:getHeight() - (Size.margin.fullscreen_popout * 2), show_parent = menu_container, onMenuHold = self.onMenuHold, - cface = Font:getFace("smallinfofont"), _manager = self, } table.insert(menu_container, self.search_menu) diff --git a/frontend/apps/filemanager/filemanagersetdefaults.lua b/frontend/apps/filemanager/filemanagersetdefaults.lua index 4618c1cb2..69a69b35d 100644 --- a/frontend/apps/filemanager/filemanagersetdefaults.lua +++ b/frontend/apps/filemanager/filemanagersetdefaults.lua @@ -2,7 +2,6 @@ local CenterContainer = require("ui/widget/container/centercontainer") local ConfirmBox = require("ui/widget/confirmbox") local DataStorage = require("datastorage") local Device = require("device") -local Font = require("ui/font") local InfoMessage = require("ui/widget/infomessage") local InputContainer = require("ui/widget/container/inputcontainer") local InputDialog = require("ui/widget/inputdialog") @@ -96,7 +95,6 @@ function SetDefaults:init() self.defaults_menu = Menu:new{ width = self.screen_width - (Size.margin.fullscreen_popout * 2), height = self.screen_height - (Size.margin.fullscreen_popout * 2), - cface = Font:getFace("smallinfofont"), show_parent = menu_container, _manager = self, } diff --git a/frontend/apps/reader/modules/readerpagemap.lua b/frontend/apps/reader/modules/readerpagemap.lua index 60dc70b99..351459703 100644 --- a/frontend/apps/reader/modules/readerpagemap.lua +++ b/frontend/apps/reader/modules/readerpagemap.lua @@ -221,7 +221,6 @@ function ReaderPageMap:onShowPageList() is_popout = false, width = Screen:getWidth(), height = Screen:getHeight(), - cface = Font:getFace("x_smallinfofont"), items_per_page = items_per_page, items_font_size = items_font_size, line_color = require("ffi/blitbuffer").COLOR_WHITE, diff --git a/frontend/apps/reader/modules/readertoc.lua b/frontend/apps/reader/modules/readertoc.lua index 1b58fa597..e9318dd36 100644 --- a/frontend/apps/reader/modules/readertoc.lua +++ b/frontend/apps/reader/modules/readertoc.lua @@ -746,7 +746,6 @@ function ReaderToc:onShowToc() is_popout = false, width = Screen:getWidth(), height = Screen:getHeight(), - cface = Font:getFace("x_smallinfofont"), single_line = true, align_baselines = true, with_dots = items_with_dots, diff --git a/frontend/ui/widget/filechooser.lua b/frontend/ui/widget/filechooser.lua index bffb47fe1..5831ee448 100644 --- a/frontend/ui/widget/filechooser.lua +++ b/frontend/ui/widget/filechooser.lua @@ -4,7 +4,6 @@ local DocSettings = require("docsettings") local DocumentRegistry = require("document/documentregistry") local OpenWithDialog = require("ui/widget/openwithdialog") local ConfirmBox = require("ui/widget/confirmbox") -local Font = require("ui/font") local Menu = require("ui/widget/menu") local UIManager = require("ui/uimanager") local ffi = require("ffi") @@ -18,7 +17,6 @@ local getFileNameSuffix = util.getFileNameSuffix local getFriendlySize = util.getFriendlySize local FileChooser = Menu:extend{ - cface = Font:getFace("smallinfofont"), no_title = true, path = lfs.currentdir(), show_path = true, diff --git a/plugins/calibre.koplugin/search.lua b/plugins/calibre.koplugin/search.lua index 3904627c1..62ca723c1 100644 --- a/plugins/calibre.koplugin/search.lua +++ b/plugins/calibre.koplugin/search.lua @@ -8,7 +8,6 @@ local ConfirmBox = require("ui/widget/confirmbox") local DataStorage = require("datastorage") local Device = require("device") local DocumentRegistry = require("document/documentregistry") -local Font = require("ui/font") local InputDialog = require("ui/widget/inputdialog") local InfoMessage = require("ui/widget/infomessage") local InputContainer = require("ui/widget/container/inputcontainer") @@ -392,7 +391,6 @@ function CalibreSearch:browse(option, run, chosen) height = Screen:getHeight() - (Size.margin.fullscreen_popout * 2), show_parent = menu_container, onMenuHold = self.onMenuHold, - cface = Font:getFace("smallinfofont"), _manager = self, } table.insert(menu_container, self.search_menu) @@ -452,7 +450,6 @@ function CalibreSearch:showresults(t, title) height = Screen:getHeight() - (Size.margin.fullscreen_popout * 2), show_parent = menu_container, onMenuHold = self.onMenuHold, - cface = Font:getFace("smallinfofont"), _manager = self, } table.insert(menu_container, self.search_menu)