From 4778d3db3b830bda2d96b08a4a1601016c9630b8 Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Mon, 25 Nov 2019 23:34:31 +0100 Subject: [PATCH] [RFC] Switch remaining keyboard icons to glyphs (#5639) * Switch the last few remaining icons to true glyphs (Del/Backspace & Enter). Also, allow a glyph to be rendered in (fake) bold, and use it for Enter. * Update fonts Pickup the tweaked nerdfonts for the backspace symbol --- frontend/ui/data/keyboardlayouts/el_keyboard.lua | 10 +++++----- frontend/ui/data/keyboardlayouts/en_keyboard.lua | 10 +++++----- frontend/ui/data/keyboardlayouts/he_keyboard.lua | 10 +++++----- frontend/ui/data/keyboardlayouts/ja_keyboard.lua | 10 +++++----- frontend/ui/data/keyboardlayouts/ko_KR_keyboard.lua | 10 +++++----- frontend/ui/data/keyboardlayouts/pt_keyboard.lua | 10 +++++----- frontend/ui/data/keyboardlayouts/ru_keyboard.lua | 10 +++++----- frontend/ui/widget/virtualkeyboard.lua | 7 ++++++- resources/fonts | 2 +- 9 files changed, 42 insertions(+), 37 deletions(-) diff --git a/frontend/ui/data/keyboardlayouts/el_keyboard.lua b/frontend/ui/data/keyboardlayouts/el_keyboard.lua index b6119809b..e832bbfa4 100644 --- a/frontend/ui/data/keyboardlayouts/el_keyboard.lua +++ b/frontend/ui/data/keyboardlayouts/el_keyboard.lua @@ -103,9 +103,9 @@ return { { _B_el, _b_el, ">", prd, "Ó", "ó", "†", "‡", }, { _N_el, _n_el, "‘", "↑", "Ú", "ú", "–", "—", }, { _M_el, _m_el, "’", "↓", "Ç", "ç", "…", "¨", }, - { label = "Backspace", - icon = "resources/icons/appbar.clear.reflect.horizontal.png", - width = 1.5 + { label = "", + width = 1.5, + bold = false }, }, -- fourth row @@ -119,10 +119,10 @@ return { width = 3.0}, { com, com, "“", "←", "Ũ", "ũ", com, com, }, { prd, prd, "”", "→", "Ĩ", "ĩ", prd, prd, }, - { label = "Enter", + { label = "⮠", "\n", "\n", "\n", "\n", "\n", "\n", "\n", "\n", - icon = "resources/icons/appbar.arrow.enter.png", width = 1.5, + bold = true }, }, }, diff --git a/frontend/ui/data/keyboardlayouts/en_keyboard.lua b/frontend/ui/data/keyboardlayouts/en_keyboard.lua index a6ea4884c..7aceb0950 100644 --- a/frontend/ui/data/keyboardlayouts/en_keyboard.lua +++ b/frontend/ui/data/keyboardlayouts/en_keyboard.lua @@ -101,9 +101,9 @@ return { { _B_, _b_, ">", prd, "Ó", "ó", "†", "‡", }, { _N_, _n_, "‘", "↑", "Ú", "ú", "–", "—", }, { _M_, _m_, "’", "↓", "Ç", "ç", "…", "¨", }, - { label = "Backspace", - icon = "resources/icons/appbar.clear.reflect.horizontal.png", - width = 1.5 + { label = "", + width = 1.5, + bold = false }, }, -- fourth row @@ -117,10 +117,10 @@ return { width = 3.0}, { com, com, "“", "←", "Ũ", "ũ", com, com, }, { prd, prd, "”", "→", "Ĩ", "ĩ", prd, prd, }, - { label = "Enter", + { label = "⮠", "\n", "\n", "\n", "\n", "\n", "\n", "\n", "\n", - icon = "resources/icons/appbar.arrow.enter.png", width = 1.5, + bold = true }, }, }, diff --git a/frontend/ui/data/keyboardlayouts/he_keyboard.lua b/frontend/ui/data/keyboardlayouts/he_keyboard.lua index 8ff4ca35c..b41b27c6d 100644 --- a/frontend/ui/data/keyboardlayouts/he_keyboard.lua +++ b/frontend/ui/data/keyboardlayouts/he_keyboard.lua @@ -72,9 +72,9 @@ return { { "־", nun, ">", prd, }, { "ֿ ", mem, "‘", "↑", }, { "ֽ ", tzadik, "’", "↓", }, - { label = "Backspace", - icon = "resources/icons/appbar.clear.reflect.horizontal.png", - width = 1.5 + { label = "", + width = 1.5, + bold = false }, }, -- fourth row @@ -86,10 +86,10 @@ return { width = 3.0}, { com, taf, "“", "←", }, { prd, "ץ", "”", "→", }, - { label = "Enter", + { label = "⮠", "\n", "\n", "\n", "\n", - icon = "resources/icons/appbar.arrow.enter.png", width = 1.5, + bold = true }, }, }, diff --git a/frontend/ui/data/keyboardlayouts/ja_keyboard.lua b/frontend/ui/data/keyboardlayouts/ja_keyboard.lua index c764e8d1b..851727643 100644 --- a/frontend/ui/data/keyboardlayouts/ja_keyboard.lua +++ b/frontend/ui/data/keyboardlayouts/ja_keyboard.lua @@ -99,14 +99,14 @@ return { { label = "空白", " ", " ", " ", " ", width = 5.5}, - { label = "Enter", + { label = "⮠", "\n", "\n", "\n", "\n", - icon = "resources/icons/appbar.arrow.enter.png", width = 1.5, + bold = true }, - { label = "Backspace", - icon = "resources/icons/appbar.clear.reflect.horizontal.png", - width = 1.5 + { label = "", + width = 1.5, + bold = false }, }, }, diff --git a/frontend/ui/data/keyboardlayouts/ko_KR_keyboard.lua b/frontend/ui/data/keyboardlayouts/ko_KR_keyboard.lua index 756acde92..dc4458c0b 100644 --- a/frontend/ui/data/keyboardlayouts/ko_KR_keyboard.lua +++ b/frontend/ui/data/keyboardlayouts/ko_KR_keyboard.lua @@ -138,9 +138,9 @@ return { { "ㅠ", "ㅠ", "&", prd, }, { "ㅜ", "ㅜ", "『", "↑", }, { "ㅡ", "ㅡ", "』", "↓", }, - { label = "Backspace", - icon = "resources/icons/appbar.clear.reflect.horizontal.png", - width = 1.5 + { label = "", + width = 1.5, + bold = false }, }, -- fourth row @@ -156,10 +156,10 @@ return { width = 3.0}, { com, com, "“", "←", }, { prd, prd, "”", "→", }, - { label = "Enter", + { label = "⮠", "\n", "\n", "\n", "\n", - icon = "resources/icons/appbar.arrow.enter.png", width = 1.5, + bold = true }, }, }, diff --git a/frontend/ui/data/keyboardlayouts/pt_keyboard.lua b/frontend/ui/data/keyboardlayouts/pt_keyboard.lua index 4780116ce..a4b6bab32 100644 --- a/frontend/ui/data/keyboardlayouts/pt_keyboard.lua +++ b/frontend/ui/data/keyboardlayouts/pt_keyboard.lua @@ -43,9 +43,9 @@ return { { "B", "b", ">", ".", "B", "b", ">", ".", "Ó", "ó", "†", "‡", }, { "N", "n", "‘", "↑", "N", "n", "‘", "“", "Ú", "ú", "–", "—", }, { "M", "m", "’", "↓", "M", "m", "’", "”", "Ç", "ç", "…", "¨", }, - { label = "Backspace", - icon = "resources/icons/appbar.clear.reflect.horizontal.png", - width = 1.5 + { label = "", + width = 1.5, + bold = false }, }, -- fourth row @@ -59,10 +59,10 @@ return { width = 3.0}, { ",", ",", "“", "←", ",", ",", "Ё", "Ё", ",", ",", ",", ",", }, { ",", ".", "”", "→", ",", ".", "ё", "ё", ",", ".", ",", ".", }, - { label = "Enter", + { label = "⮠", "\n", "\n", "\n", "\n", "\n", "\n", "\n", "\n", "\n", "\n", "\n", "\n", - icon = "resources/icons/appbar.arrow.enter.png", width = 1.5, + bold = true }, }, }, diff --git a/frontend/ui/data/keyboardlayouts/ru_keyboard.lua b/frontend/ui/data/keyboardlayouts/ru_keyboard.lua index 5b1dd515f..9f8685225 100644 --- a/frontend/ui/data/keyboardlayouts/ru_keyboard.lua +++ b/frontend/ui/data/keyboardlayouts/ru_keyboard.lua @@ -49,9 +49,9 @@ return { { "И", "и", ">", prd, "Һ", "һ", "†", "‡", }, { "Т", "т", "‘", "↑", "Б", "б", "–", "—", }, { "Ь", "ь", "’", "↓", "Ю", "ю", "…", "¨", }, - { label = "Backspace", - icon = "resources/icons/appbar.clear.reflect.horizontal.png", - width = 1.5 + { label = "", + width = 1.5, + bold = false }, }, -- fourth row @@ -65,10 +65,10 @@ return { width = 3.0}, { com, com, "“", "←", "Ё", "ё", "Ũ", "ũ", com, com, }, { prd, prd, "”", "→", prd, prd, "Ĩ", "ĩ", prd, prd, }, - { label = "Enter", + { label = "⮠", "\n", "\n", "\n", "\n", "\n", "\n", "\n", "\n", "\n", "\n", - icon = "resources/icons/appbar.arrow.enter.png", width = 1.5, + bold = true }, }, }, diff --git a/frontend/ui/widget/virtualkeyboard.lua b/frontend/ui/widget/virtualkeyboard.lua index a8f6ca996..6dbbe3216 100644 --- a/frontend/ui/widget/virtualkeyboard.lua +++ b/frontend/ui/widget/virtualkeyboard.lua @@ -30,6 +30,7 @@ local VirtualKey = InputContainer:new{ key = nil, icon = nil, label = nil, + bold = nil, keyboard = nil, callback = nil, @@ -102,7 +103,7 @@ function VirtualKey:init() elseif self.keyboard.umlautmode_keys[self.label] ~= nil then self.callback = function () self.keyboard:setLayer("Äéß") end self.skiptap = true - elseif self.label == "Backspace" then + elseif self.label == "" then self.callback = function () self.keyboard:delChar() end self.hold_callback = function () self.ignore_key_release = true -- don't have delChar called on release @@ -153,6 +154,7 @@ function VirtualKey:init() label_widget = TextWidget:new{ text = self.label, face = self.face, + bold = self.bold or false, } end self[1] = FrameContainer:new{ @@ -485,10 +487,12 @@ function VirtualKeyPopup:init() local key = type(v) == "table" and v.key or v local label = type(v) == "table" and v.label or key local icon = type(v) == "table" and v.icon + local bold = type(v) == "table" and v.bold local virtual_key = VirtualKey:new{ key = key, label = label, icon = icon, + bold = bold, keyboard = parent_key.keyboard, key_chars = key_chars, width = parent_key.width, @@ -777,6 +781,7 @@ function VirtualKeyboard:addKeys() key_chars = key_chars, icon = self.KEYS[i][j].icon, label = label, + bold = self.KEYS[i][j].bold, keyboard = self, width = key_width, height = key_height, diff --git a/resources/fonts b/resources/fonts index 63e7df0af..016220d96 160000 --- a/resources/fonts +++ b/resources/fonts @@ -1 +1 @@ -Subproject commit 63e7df0afe4df9804eb43a70def122814495cb7e +Subproject commit 016220d96629d4bea763a7df9ff4cc4b1b92185b