From 906755b787d2f4e7e13a1ba005c6cd360201dba7 Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Sat, 22 Feb 2025 11:55:17 +0100 Subject: [PATCH] prefs: Add 'delete_word' and 'forward_delete_word' to extra keys The gesture combination is mentioned. Preferred position are added. --- res/values-cs/strings.xml | 3 ++ res/values-de/strings.xml | 3 ++ res/values-es/strings.xml | 3 ++ res/values-fa/strings.xml | 3 ++ res/values-fr/strings.xml | 3 ++ res/values-it/strings.xml | 3 ++ res/values-ja/strings.xml | 3 ++ res/values-ko/strings.xml | 3 ++ res/values-lv/strings.xml | 3 ++ res/values-pl/strings.xml | 3 ++ res/values-pt/strings.xml | 3 ++ res/values-ro/strings.xml | 3 ++ res/values-ru/strings.xml | 3 ++ res/values-tr/strings.xml | 3 ++ res/values-uk/strings.xml | 3 ++ res/values-vi/strings.xml | 3 ++ res/values-zh-rCN/strings.xml | 3 ++ res/values/strings.xml | 3 ++ .../prefs/ExtraKeysPreference.java | 28 +++++++++++++++++++ 19 files changed, 82 insertions(+) diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 28814b5..b6b0532 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -127,6 +127,9 @@ Tato aplikace neobsahuje žádné reklamy, nevyužívá připojení k síti a je + + + Nedávno kopírovaný text Připnout Odebrat ze schránky? diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 8837801..c130ccb 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -127,6 +127,9 @@ Diese App enthält keine Werbung, benötigt keinen Netzwerkzugriff und ist quell + + + Zuletzt kopierter Text Angeheftet Aus der Zwischenablage entfernen? diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index c6c77d5..7e58f4e 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -127,6 +127,9 @@ La misma no contiene ningún anuncio/publicidad, no realiza peticiones de red y + + + Textos recién copiados Pegado ¿Sacar este portapapeles? diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index e79ada0..5555669 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -127,6 +127,9 @@ This application contains no ads, doesn't make any network requests and is Open + + + diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 5d92511..8034389 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -127,6 +127,9 @@ Cette application ne contient pas de publicité, n'accède pas au réseau et est + + + Texte récemment copié Épinglé Supprimer ce presse-papiers ? diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index ba8f6b1..9a9b853 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -127,6 +127,9 @@ This application contains no ads, doesn't make any network requests and is Open + + + diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index c06cd05..d6d86be 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -128,6 +128,9 @@ PCキーボードでの半角入力を再現しています。日本語入力、 + + + 最近コピーしたテキスト お気に入り クリップボードから削除しますか? diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 494161c..810be1f 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -127,6 +127,9 @@ + + + 최근에 복사한 텍스트 고정 이 클립보드를 제거하시겠습니까? diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 32ae4fe..0b0a528 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -129,6 +129,9 @@ Tagad lieliski piemērota izmantošanai ikdienā. + + + Nesen starpliktuvē ievietots teksts Piesprausts Noņemt šo starpliktuves vienumu? diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 6398313..4a0e7b7 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -127,6 +127,9 @@ Aplikacja nie zawiera reklam, nie żąda dostępu do internetu, a jej kod źród + + + Ostatnio skopiowane elementy Przypięte Usunąć ten element ze schowka? diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index d4d7c68..18f634b 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -127,6 +127,9 @@ Este aplicativo não contém anúncios, não faz nenhuma solicitação de rede e + + + Textos recém copiados Fixados Remover esta cópia? diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 3ede73b..e1d8782 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -127,6 +127,9 @@ Această aplicație nu conține publicitate, nu folosește rețeaua deloc și e + + + diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 2612ad9..95baa7d 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -127,6 +127,9 @@ Разделитель нулевой ширины Неразрывный пробел Узкий неразрывный пробел + + + Недавно скопированный текст Закреплено Удалить этот буфер обмена? diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 6303258..15fa83d 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -127,6 +127,9 @@ Bu uygulama açık kaynaklıdır. Reklam içermez ve internete bağlanmaz."Zero width non-joiner --> + + + Son kopyalanan metin Sabitlendi Bu sabitlemeyi sil diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 5698b5d..f750cbd 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -127,6 +127,9 @@ Разділювач нульової ширини Нерозривний пробіл Вузький нерозривний пробіл + + + Нещодавно скопійований текст Закріплено Видалити цей буфер обміну? diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 43e1010..8293bbd 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -127,6 +127,9 @@ Bây giờ đã hoàn hảo cho việc sử dụng hàng ngày. + + + diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 1e62561..8826a21 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -127,6 +127,9 @@ + + + diff --git a/res/values/strings.xml b/res/values/strings.xml index c01dc2d..cd62b29 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -127,6 +127,9 @@ This application contains no ads, doesn't make any network requests and is Open Zero width non-joiner Non-breaking space Narrow non-breaking space + Delete a word + Delete a word on the right + Gesture Recently copied text Pinned Remove this clipboard? diff --git a/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java b/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java index 981ba48..ae0ac0c 100644 --- a/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java +++ b/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java @@ -72,6 +72,8 @@ public class ExtraKeysPreference extends PreferenceCategory "pasteAsPlainText", "undo", "redo", + "delete_word", + "forward_delete_word", "superscript", "subscript", "f11_placeholder", @@ -177,6 +179,14 @@ public class ExtraKeysPreference extends PreferenceCategory id = R.string.key_descr_redo; additional_info = format_key_combination(new String[]{"fn", "undo"}); break; + case "delete_word": + id = R.string.key_descr_delete_word; + additional_info = format_key_combination_gesture(res, "backspace"); + break; + case "forward_delete_word": + id = R.string.key_descr_forward_delete_word; + additional_info = format_key_combination_gesture(res, "forward_delete"); + break; case "selectAll": id = R.string.key_descr_selectAll; break; case "shareText": id = R.string.key_descr_shareText; break; case "subscript": id = R.string.key_descr_subscript; break; @@ -276,6 +286,7 @@ public class ExtraKeysPreference extends PreferenceCategory return kv.getString(); } + /** Format a key combination */ static String format_key_combination(String[] keys) { StringBuilder out = new StringBuilder(); @@ -287,6 +298,13 @@ public class ExtraKeysPreference extends PreferenceCategory return out.toString(); } + /** Explain a gesture on a key */ + static String format_key_combination_gesture(Resources res, String key_name) + { + return res.getString(R.string.key_descr_gesture) + " + " + + KeyValue.getKeyByName(key_name).getString(); + } + static KeyboardData.PreferredPos key_preferred_pos(String key_name) { switch (key_name) @@ -341,6 +359,16 @@ public class ExtraKeysPreference extends PreferenceCategory new KeyboardData.KeyPos(0, -1, 3), new KeyboardData.KeyPos(0, -1, 4), }); + case "delete_word": + return new KeyboardData.PreferredPos(KeyValue.getKeyByName("backspace"), + new KeyboardData.KeyPos[]{ + new KeyboardData.KeyPos(-1, -1, 3), + }); + case "forward_delete_word": + return new KeyboardData.PreferredPos(KeyValue.getKeyByName("backspace"), + new KeyboardData.KeyPos[]{ + new KeyboardData.KeyPos(-1, -1, 4), + }); } return KeyboardData.PreferredPos.DEFAULT; }