From 1dc595e87fb4825a745e507e36a07e3478cfa9a8 Mon Sep 17 00:00:00 2001 From: Alexander Straube Date: Fri, 25 Oct 2024 18:51:25 +0000 Subject: [PATCH] Start from scratch --- .../de@terminal/qml/Keyboard_de@terminal.qml | 4 +- qml/keys/TabKey.qml | 23 ----- qml/keys/languages.js | 83 ++++++++++--------- qml/keys/qmldir | 1 - src/view/abstracttexteditor.cpp | 4 - 5 files changed, 44 insertions(+), 71 deletions(-) delete mode 100644 qml/keys/TabKey.qml diff --git a/plugins/de@terminal/qml/Keyboard_de@terminal.qml b/plugins/de@terminal/qml/Keyboard_de@terminal.qml index 41228ac6..c186cec0 100644 --- a/plugins/de@terminal/qml/Keyboard_de@terminal.qml +++ b/plugins/de@terminal/qml/Keyboard_de@terminal.qml @@ -51,7 +51,6 @@ KeyPad { anchors.horizontalCenter: parent.horizontalCenter; spacing: 0 - TabKey { padding: 0 } CharKey { label: "a"; shifted: "A"; extended: ["ä","à","á","ã","â","å","æ"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å","Æ"]; leftSide: true; } CharKey { label: "s"; shifted: "S"; extended: ["ß","ş","$"]; extendedShifted: ["ẞ","Ş","$"] } CharKey { label: "d"; shifted: "D"; } @@ -60,7 +59,8 @@ KeyPad { CharKey { label: "h"; shifted: "H"; } CharKey { label: "j"; shifted: "J"; } CharKey { label: "k"; shifted: "K"; } - CharKey { label: "l"; shifted: "L"; extended: ["ł","£"]; extendedShifted: ["Ł","£"]; rightSide: true; } + CharKey { label: "l"; shifted: "L"; extended: ["ł","£"]; extendedShifted: ["Ł","£"] } + CharKey { label: "ü"; shifted: "Ü"; rightSide: true; } } Row { diff --git a/qml/keys/TabKey.qml b/qml/keys/TabKey.qml deleted file mode 100644 index f8fb3674..00000000 --- a/qml/keys/TabKey.qml +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2024 Vojtěch Pluskal - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.4 - -ActionKey { - label: "↹" - shifted: "↹" - action: "tab"; -} diff --git a/qml/keys/languages.js b/qml/keys/languages.js index 89fcc0cd..d45a09d7 100644 --- a/qml/keys/languages.js +++ b/qml/keys/languages.js @@ -16,47 +16,48 @@ function languageIdToName(languageId) { - if (languageId == "ar") return Gettext.qsTr("Arabic"); - if (languageId == "az") return Gettext.qsTr("Azerbaijani"); - if (languageId == "be") return Gettext.qsTr("Belarusian"); - if (languageId == "bg") return Gettext.qsTr("Bulgarian"); - if (languageId == "bs") return Gettext.qsTr("Bosnian"); - if (languageId == "ca") return Gettext.qsTr("Catalan"); - if (languageId == "cs") return Gettext.qsTr("Czech"); - if (languageId == "da") return Gettext.qsTr("Danish"); - if (languageId == "de") return Gettext.qsTr("German"); - if (languageId == "el") return Gettext.qsTr("Greek"); - if (languageId == "en") return Gettext.qsTr("English"); - if (languageId == "en@dv") return Gettext.qsTr("English\n(Dvorak)"); - if (languageId == "eo") return Gettext.qsTr("Esperanto"); - if (languageId == "es") return Gettext.qsTr("Spanish"); - if (languageId == "fa") return Gettext.qsTr("Persian"); - if (languageId == "fi") return Gettext.qsTr("Finnish"); - if (languageId == "fr") return Gettext.qsTr("French"); - if (languageId == "fr-ch") return Gettext.qsTr("French\n(Swiss)"); - if (languageId == "gd") return Gettext.qsTr("Scottish Gaelic"); - if (languageId == "he") return Gettext.qsTr("Hebrew"); - if (languageId == "hr") return Gettext.qsTr("Croatian"); - if (languageId == "hu") return Gettext.qsTr("Hungarian"); - if (languageId == "is") return Gettext.qsTr("Icelandic"); - if (languageId == "it") return Gettext.qsTr("Italian"); - if (languageId == "ja") return Gettext.qsTr("Japanese"); - if (languageId == "lt") return Gettext.qsTr("Lithuanian"); - if (languageId == "lv") return Gettext.qsTr("Latvian"); - if (languageId == "mk") return Gettext.qsTr("Macedonian"); - if (languageId == "ko") return Gettext.qsTr("Korean"); - if (languageId == "nl") return Gettext.qsTr("Dutch"); - if (languageId == "nb") return Gettext.qsTr("Norwegian"); - if (languageId == "pl") return Gettext.qsTr("Polish"); - if (languageId == "pt") return Gettext.qsTr("Portuguese"); - if (languageId == "ro") return Gettext.qsTr("Romanian"); - if (languageId == "ru") return Gettext.qsTr("Russian"); - if (languageId == "sl") return Gettext.qsTr("Slovenian"); - if (languageId == "sr") return Gettext.qsTr("Serbian"); - if (languageId == "sv") return Gettext.qsTr("Swedish"); - if (languageId == "th") return Gettext.qsTr("Thai"); - if (languageId == "tr") return Gettext.qsTr("Turkish"); - if (languageId == "uk") return Gettext.qsTr("Ukrainian"); + if (languageId == "ar") return Gettext.qsTr("Arabic"); + if (languageId == "az") return Gettext.qsTr("Azerbaijani"); + if (languageId == "be") return Gettext.qsTr("Belarusian"); + if (languageId == "bg") return Gettext.qsTr("Bulgarian"); + if (languageId == "bs") return Gettext.qsTr("Bosnian"); + if (languageId == "ca") return Gettext.qsTr("Catalan"); + if (languageId == "cs") return Gettext.qsTr("Czech"); + if (languageId == "da") return Gettext.qsTr("Danish"); + if (languageId == "de") return Gettext.qsTr("German"); + if (languageId == "de@terminal") return Gettext.qsTr("German\n(Terminal)"); + if (languageId == "el") return Gettext.qsTr("Greek"); + if (languageId == "en") return Gettext.qsTr("English"); + if (languageId == "en@dv") return Gettext.qsTr("English\n(Dvorak)"); + if (languageId == "eo") return Gettext.qsTr("Esperanto"); + if (languageId == "es") return Gettext.qsTr("Spanish"); + if (languageId == "fa") return Gettext.qsTr("Persian"); + if (languageId == "fi") return Gettext.qsTr("Finnish"); + if (languageId == "fr") return Gettext.qsTr("French"); + if (languageId == "fr-ch") return Gettext.qsTr("French\n(Swiss)"); + if (languageId == "gd") return Gettext.qsTr("Scottish Gaelic"); + if (languageId == "he") return Gettext.qsTr("Hebrew"); + if (languageId == "hr") return Gettext.qsTr("Croatian"); + if (languageId == "hu") return Gettext.qsTr("Hungarian"); + if (languageId == "is") return Gettext.qsTr("Icelandic"); + if (languageId == "it") return Gettext.qsTr("Italian"); + if (languageId == "ja") return Gettext.qsTr("Japanese"); + if (languageId == "lt") return Gettext.qsTr("Lithuanian"); + if (languageId == "lv") return Gettext.qsTr("Latvian"); + if (languageId == "mk") return Gettext.qsTr("Macedonian"); + if (languageId == "ko") return Gettext.qsTr("Korean"); + if (languageId == "nl") return Gettext.qsTr("Dutch"); + if (languageId == "nb") return Gettext.qsTr("Norwegian"); + if (languageId == "pl") return Gettext.qsTr("Polish"); + if (languageId == "pt") return Gettext.qsTr("Portuguese"); + if (languageId == "ro") return Gettext.qsTr("Romanian"); + if (languageId == "ru") return Gettext.qsTr("Russian"); + if (languageId == "sl") return Gettext.qsTr("Slovenian"); + if (languageId == "sr") return Gettext.qsTr("Serbian"); + if (languageId == "sv") return Gettext.qsTr("Swedish"); + if (languageId == "th") return Gettext.qsTr("Thai"); + if (languageId == "tr") return Gettext.qsTr("Turkish"); + if (languageId == "uk") return Gettext.qsTr("Ukrainian"); if (languageId == "zh-hans") return Gettext.qsTr("Chinese\n(Pinyin)"); if (languageId == "zh-hant") return Gettext.qsTr("Chinese\n(Chewing)"); diff --git a/qml/keys/qmldir b/qml/keys/qmldir index 196365e0..97a3beaf 100644 --- a/qml/keys/qmldir +++ b/qml/keys/qmldir @@ -18,4 +18,3 @@ PressArea 1.0 PressArea.qml SpaceKey 1.0 SpaceKey.qml UrlKey 1.0 UrlKey.qml CategoryKey 1.0 CategoryKey.qml -TabKey 1.0 TabKey.qml diff --git a/src/view/abstracttexteditor.cpp b/src/view/abstracttexteditor.cpp index 903246de..1f56deeb 100644 --- a/src/view/abstracttexteditor.cpp +++ b/src/view/abstracttexteditor.cpp @@ -642,10 +642,6 @@ void AbstractTextEditor::onKeyReleased(const Key &key) event_key = Qt::Key_End; break; - case Key::ActionTab: - event_key = Qt::Key_Tab; - break; - default: break; }