From 474e9d07c5351d5e4e1ed81030e9ad2642b478d8 Mon Sep 17 00:00:00 2001 From: spff Date: Thu, 17 Aug 2017 00:16:16 +0800 Subject: [PATCH 1/2] add programmer dvorak layout --- .../values-en-rPD/donottranslate-altchars.xml | 47 ++++ .../values-en-rPD/donottranslate-keymap.xml | 225 ++++++++++++++++++ .../pckeyboard/InputLanguageSelection.java | 20 +- 3 files changed, 283 insertions(+), 9 deletions(-) create mode 100644 java/res/values-en-rPD/donottranslate-altchars.xml create mode 100644 java/res/values-en-rPD/donottranslate-keymap.xml diff --git a/java/res/values-en-rPD/donottranslate-altchars.xml b/java/res/values-en-rPD/donottranslate-altchars.xml new file mode 100644 index 000000000..f6baa5c18 --- /dev/null +++ b/java/res/values-en-rPD/donottranslate-altchars.xml @@ -0,0 +1,47 @@ + + + + áàâãäåāæ + + 8çčć¢ + đ + éèêëē€ + 6₣ + 7 + + íìîïī + + + 0£₤λ + μ + ñ + óòôõöōø + 4π₱ + + 9 + §ßš + + úùûüū + + + + 5ýÿ¥ + ž + diff --git a/java/res/values-en-rPD/donottranslate-keymap.xml b/java/res/values-en-rPD/donottranslate-keymap.xml new file mode 100644 index 000000000..d1e8d5695 --- /dev/null +++ b/java/res/values-en-rPD/donottranslate-keymap.xml @@ -0,0 +1,225 @@ + + + + $ + ~ + $~¢£€¥ + + & + % + &%‰ + + [ + 7 + [7⅞♪ + + { + 5 + {5⅝ + + } + 3 + }3³¾⅜♥♠♦♣ + + ( + 1 + 1¹½⅓¼⅛ + + = + 9 + =9≈≠√ + + * + 0 + *0•★†‡ⁿ° + + ) + 2 + )2²⅔ + + + + 4 + +4+±×÷⁴ + + ] + 6 + ]6 + + ! + 8 + !8¡•★∞†‡ + + # + ` + #` + + + + ; + : + ;: + + , + < + ,<≤«‹ + + . + > + >≥»›… + + p + P + @string/alternates_for_p + + y + Y + @string/alternates_for_y + + f + F + @string/alternates_for_f + + g + G + @string/alternates_for_g + + c + C + @string/alternates_for_c + + r + R + @string/alternates_for_r + + l + L + @string/alternates_for_l + + / + \? + /\?¿ + + \@ + ^ + \@^↑↓←→ + + \\ + | + \\| + + + a + A + @string/alternates_for_a + + o + O + @string/alternates_for_o + + e + E + @string/alternates_for_e + + u + U + @string/alternates_for_u + + i + I + @string/alternates_for_i + + d + D + @string/alternates_for_d + + h + H + @string/alternates_for_h + + t + T + @string/alternates_for_t + + n + N + @string/alternates_for_n + + s + S + @string/alternates_for_s + + - + _ + -_—– + + + + + + + \' + \" + \'\"‘’“” + + q + Q + @string/alternates_for_q + + j + J + @string/alternates_for_j + + k + K + @string/alternates_for_k + + x + X + @string/alternates_for_x + + b + B + @string/alternates_for_b + + m + M + @string/alternates_for_m + + w + W + @string/alternates_for_w + + v + V + @string/alternates_for_v + + z + Z + @string/alternates_for_z + + diff --git a/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java b/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java index dfa361090..8923af1e6 100644 --- a/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java +++ b/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not @@ -68,20 +68,20 @@ public class InputLanguageSelection extends PreferenceActivity { // Run the GetLanguages.sh script to update the following lists based on // the available keyboard resources and dictionaries. private static final String[] KBD_LOCALIZATIONS = { - "ar", "bg", "bg_ST", "ca", "cs", "cs_QY", "da", "de", "de_NE", - "el", "en", "en_CX", "en_DV", "en_GB", "es", "es_LA", "es_US", + "ar", "bg", "bg_ST", "ca", "cs", "cs_QY", "da", "de", "de_NE", "el", + "en", "en_CX", "en_DV", "en_GB", "en_PD", "es", "es_LA", "es_US", "fa", "fi", "fr", "fr_CA", "he", "hr", "hu", "hu_QY", "hy", "in", - "it", "iw", "ja", "ka", "ko", "lo", "lt", "lv", "nb", "nl", "pl", - "pt", "pt_PT", "rm", "ro", "ru", "ru_PH", "si", "sk", "sk_QY", "sl", + "it", "iw", "ja", "ko", "lo", "lt", "lv", "nb", "nl", "pl", "pt", + "pt_PT", "rm", "ro", "ru", "ru_PH", "si", "sk", "sk_QY", "sl", "sr", "sv", "ta", "th", "tl", "tr", "uk", "vi", "zh_CN", "zh_TW" }; private static final String[] KBD_5_ROW = { "ar", "bg", "bg_ST", "cs", "cs_QY", "da", "de", "de_NE", "el", - "en", "en_CX", "en_DV", "en_GB", "es", "es_LA", "fa", "fi", "fr", - "fr_CA", "he", "hr", "hu", "hu_QY", "hy", "it", "iw", "lo", "lt", - "nb", "pt_PT", "ro", "ru", "ru_PH", "si", "sk", "sk_QY", "sl", - "sr", "sv", "ta", "th", "tr", "uk" + "en", "en_CX", "en_DV", "en_GB", "en_PD", "es", "es_LA", "fa", + "fi", "fr", "fr_CA", "he", "hr", "hu", "hu_QY", "hy", "it", "iw", + "lo", "lt", "nb", "pt_PT", "ro", "ru", "ru_PH", "si", "sk", "sk_QY", + "sl", "sr", "sv", "ta", "th", "tr", "uk" }; private static final String[] KBD_4_ROW = { @@ -96,6 +96,8 @@ private static String getLocaleName(Locale l) { String country = l.getCountry(); if (lang.equals("en") && country.equals("DV")) { return "English (Dvorak)"; + } else if (lang.equals("en") && country.equals("PD")) {//Since programmer dvorak usually called DVP but some code might have to get edited with the length of "DVP" + return "English (Programmer Dvorak)"; } else if (lang.equals("en") && country.equals("EX")) { return "English (4x11)"; } else if (lang.equals("en") && country.equals("CX")) { From 7a0f672caecac07099161596ee5c23c4cdaa7faf Mon Sep 17 00:00:00 2001 From: Chin-Wei Chang Date: Thu, 17 Aug 2017 00:18:53 +0800 Subject: [PATCH 2/2] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ae2b46d48..d3c6e7808 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,9 @@ This keyboard is especially useful if you use ConnectBot for SSH access. It prov The supported keyboard layouts include Armenian (Հայերեն), Arabic (العربية), British (en\_GB), Bulgarian (български език), Czech (Čeština), Danish (dansk), -Carpalx English (language "en-CX"), Dvorak English (language "en-DV"), English -(QWERTY), Finnish (Suomi), French (Français, AZERTY), German (Deutsch, QWERTZ), +Carpalx English (language "en-CX"), Dvorak English (language "en-DV"), +Programmer Dvorak English (language "en-PD"), English (QWERTY), Finnish (Suomi), +French (Français, AZERTY), German (Deutsch, QWERTZ), German Neo2 (Deutsch, language "de-NE"), Greek (ελληνικά), Hebrew (עברית), Hungarian (Magyar), Italian (Italiano), Lao (ພາສາລາວ), Norwegian (Norsk bokmål), Persian (فارسی), Portuguese (Português),