From 4e281f00edaae361dc4a2325cd8e9a0e5622b9f7 Mon Sep 17 00:00:00 2001 From: smartscripts-nl Date: Thu, 3 Sep 2020 01:14:06 +0200 Subject: [PATCH] Dispatcher: adds Show terminal (#6626) --- frontend/dispatcher.lua | 2 ++ plugins/terminal.koplugin/main.lua | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/dispatcher.lua b/frontend/dispatcher.lua index cf2b5c9ba..6b98c5df4 100644 --- a/frontend/dispatcher.lua +++ b/frontend/dispatcher.lua @@ -77,6 +77,7 @@ local settingsList = { calibre_search = { category="none", event="CalibreSearch", title=_("Search in calibre metadata"), device=true,}, calibre_browse_tags = { category="none", event="CalibreBrowseTags", title=_("Browse all calibre tags"), device=true,}, calibre_browse_series = { category="none", event="CalibreBrowseSeries", title=_("Browse all calibre series"), device=true, separator=true,}, + show_terminal = { category = "none", event = "TerminalStart", title = _("Show terminal"), device = true, }, edit_last_edited_file = { category = "none", event = "OpenLastEditedFile", title = _("Texteditor: open last file"), device = true, separator = true, }, favorites = { category="none", event="ShowColl", arg="favorites", title=_("Favorites"), device=true,}, @@ -208,6 +209,7 @@ local dispatcher_menu_order = { "calibre_browse_tags", "calibre_browse_series", + "show_terminal", "edit_last_edited_file", "rotation_mode", diff --git a/plugins/terminal.koplugin/main.lua b/plugins/terminal.koplugin/main.lua index 0a6ddd6a3..144d70dc4 100644 --- a/plugins/terminal.koplugin/main.lua +++ b/plugins/terminal.koplugin/main.lua @@ -6,7 +6,6 @@ local InfoMessage = require("ui/widget/infomessage") local InputDialog = require("ui/widget/inputdialog") local LuaSettings = require("luasettings") local Menu = require("ui/widget/menu") -local T = require("ffi/util").template local TextViewer = require("ui/widget/textviewer") local Trapper = require("ui/trapper") local UIManager = require("ui/uimanager") @@ -14,7 +13,9 @@ local WidgetContainer = require("ui/widget/container/widgetcontainer") local logger = require("logger") local util = require("ffi/util") local _ = require("gettext") +local N_ = _.ngettext local Screen = require("device").screen +local T = require("ffi/util").template local Terminal = WidgetContainer:new{ name = "terminal", @@ -114,7 +115,7 @@ function Terminal:updateItemTable() else self:insertPageActions(item_table) end - local title = #self.shortcuts == 1 and _("Terminal shortcut") or _("Terminal shortcuts") + local title = N_("Terminal shortcut", "Terminal shortcuts", #self.shortcuts) self.shortcuts_menu:switchItemTable(tostring(#self.shortcuts) .. " " .. title, item_table) UIManager:show(self.shortcuts_dialog) end