diff --git a/frontend/ui/elements/common_settings_menu_table.lua b/frontend/ui/elements/common_settings_menu_table.lua index 7188d44e6..9ca6dcc83 100644 --- a/frontend/ui/elements/common_settings_menu_table.lua +++ b/frontend/ui/elements/common_settings_menu_table.lua @@ -285,10 +285,6 @@ if Device:isTouchDevice() then } common_settings.screen_disable_double_tab = require("ui/elements/screen_disable_double_tap_table") common_settings.menu_activate = require("ui/elements/menu_activate") - common_settings.keyboard_layout = { - text = _("Keyboard"), - sub_item_table = require("ui/elements/menu_keyboard_layout"), - } end -- NOTE: Allow disabling color if it's mistakenly enabled on a Grayscale screen (after a settings import?) @@ -715,6 +711,11 @@ common_settings.device = { text = _("Device"), } +common_settings.keyboard_layout = { + text = _("Keyboard"), + sub_item_table = require("ui/elements/menu_keyboard_layout"), +} + common_settings.font_ui_fallbacks = require("ui/elements/font_ui_fallbacks") common_settings.units = { diff --git a/frontend/ui/widget/dictquicklookup.lua b/frontend/ui/widget/dictquicklookup.lua index 11fe96370..edd6f233c 100644 --- a/frontend/ui/widget/dictquicklookup.lua +++ b/frontend/ui/widget/dictquicklookup.lua @@ -105,6 +105,7 @@ function DictQuickLookup:init() ReadPrevResult = { { Input.group.PgBack } }, ReadNextResult = { { Input.group.PgFwd } }, Close = { { Input.group.Back } }, + ShowResultsMenu = { { "Menu" } }, } end if Device:isTouchDevice() then @@ -1328,6 +1329,10 @@ function DictQuickLookup:lookupWikipedia(get_fullpage, word, is_sane, lang) self.ui:handleEvent(Event:new("LookupWikipedia", word, is_sane, self.word_boxes, get_fullpage, lang)) end +function DictQuickLookup:onShowResultsMenu() + return self:showResultsMenu() +end + function DictQuickLookup:showResultsMenu() -- Show one row: "| word | dict |" for each result local width = math.floor(self.width * 0.75) diff --git a/frontend/ui/widget/sortwidget.lua b/frontend/ui/widget/sortwidget.lua index 5ef050ea8..506891894 100644 --- a/frontend/ui/widget/sortwidget.lua +++ b/frontend/ui/widget/sortwidget.lua @@ -153,6 +153,7 @@ function SortWidget:init() self.key_events.Close = { { Device.input.group.Back } } self.key_events.NextPage = { { Device.input.group.PgFwd } } self.key_events.PrevPage = { { Device.input.group.PgBack } } + self.key_events.ShowWidgetMenu = { { "Menu" } } end if Device:isTouchDevice() then self.ges_events.Swipe = { @@ -273,6 +274,11 @@ function SortWidget:init() } table.insert(self.layout, { self.footer_cancel, + self.footer_first_up, + self.footer_left, + self.footer_page, + self.footer_right, + self.footer_last_down, self.footer_ok, }) local bottom_line = LineWidget:new{ @@ -475,6 +481,10 @@ function SortWidget:onSwipe(arg, ges_ev) end end +function SortWidget:onShowWidgetMenu() + self:showMenu() +end + function SortWidget:showMenu() local dialog local buttons = {