diff options
Diffstat (limited to 'srcs')
34 files changed, 97 insertions, 56 deletions
diff --git a/srcs/juloo.keyboard2/KeyboardData.java b/srcs/juloo.keyboard2/KeyboardData.java index a106e03..225d8cc 100644 --- a/srcs/juloo.keyboard2/KeyboardData.java +++ b/srcs/juloo.keyboard2/KeyboardData.java @@ -608,6 +608,7 @@ public final class KeyboardData /** See [addExtraKeys()]. */ public final static class PreferredPos { + /** Default position for extra keys. */ public static final PreferredPos DEFAULT; public static final PreferredPos ANYWHERE; @@ -622,6 +623,9 @@ public final class KeyboardData public KeyPos[] positions = ANYWHERE_POSITIONS; public PreferredPos() {} + public PreferredPos(KeyValue next_to_) { next_to = next_to_; } + public PreferredPos(KeyPos[] pos) { positions = pos; } + public PreferredPos(KeyValue next_to_, KeyPos[] pos) { next_to = next_to_; positions = pos; } public PreferredPos(PreferredPos src) { @@ -634,13 +638,12 @@ public final class KeyboardData static { - DEFAULT = new PreferredPos(); - DEFAULT.positions = new KeyPos[]{ - new KeyPos(1, -1, 4), - new KeyPos(1, -1, 3), - new KeyPos(2, -1, 2), - new KeyPos(2, -1, 1) - }; + DEFAULT = new PreferredPos(new KeyPos[]{ + new KeyPos(1, -1, 4), + new KeyPos(1, -1, 3), + new KeyPos(2, -1, 2), + new KeyPos(2, -1, 1) + }); ANYWHERE = new PreferredPos(); } } diff --git a/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java b/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java index 5e56369..adf66ec 100644 --- a/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java +++ b/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java @@ -68,6 +68,8 @@ public class ExtraKeysPreference extends PreferenceCategory "redo", "superscript", "subscript", + "f11_placeholder", + "f12_placeholder", }; /** Whether an extra key is enabled by default. */ @@ -80,6 +82,8 @@ public class ExtraKeysPreference extends PreferenceCategory case "compose": case "tab": case "esc": + case "f11_placeholder": + case "f12_placeholder": return true; default: return false; @@ -119,6 +123,40 @@ public class ExtraKeysPreference extends PreferenceCategory return res.getString(id); } + static String key_title(String key_name, KeyValue kv) + { + switch (key_name) + { + case "f11_placeholder": return "F11"; + case "f12_placeholder": return "F12"; + } + return kv.getString(); + } + + static KeyboardData.PreferredPos key_preferred_pos(String key_name) + { + switch (key_name) + { + case "f11_placeholder": + return new KeyboardData.PreferredPos(KeyValue.getKeyByName("9"), + new KeyboardData.KeyPos[]{ + new KeyboardData.KeyPos(0, 8, 3), + new KeyboardData.KeyPos(0, 8, 4), + new KeyboardData.KeyPos(0, -1, 3), + new KeyboardData.KeyPos(0, -1, 4), + }); + case "f12_placeholder": + return new KeyboardData.PreferredPos(KeyValue.getKeyByName("0"), + new KeyboardData.KeyPos[]{ + new KeyboardData.KeyPos(0, 9, 3), + new KeyboardData.KeyPos(0, 9, 4), + new KeyboardData.KeyPos(0, -1, 3), + new KeyboardData.KeyPos(0, -1, 4), + }); + } + return KeyboardData.PreferredPos.DEFAULT; + } + /** Get the set of enabled extra keys. */ public static Map<KeyValue, KeyboardData.PreferredPos> get_extra_keys(SharedPreferences prefs) { @@ -128,7 +166,7 @@ public class ExtraKeysPreference extends PreferenceCategory { if (prefs.getBoolean(pref_key_of_key_name(key_name), default_checked(key_name))) - ks.put(KeyValue.getKeyByName(key_name), KeyboardData.PreferredPos.DEFAULT); + ks.put(KeyValue.getKeyByName(key_name), key_preferred_pos(key_name)); } return ks; } @@ -166,7 +204,7 @@ public class ExtraKeysPreference extends PreferenceCategory { super(ctx); KeyValue kv = KeyValue.getKeyByName(key_name); - String title = kv.getString(); + String title = key_title(key_name, kv); String descr = key_description(ctx.getResources(), key_name); if (descr != null) title += " (" + descr + ")"; diff --git a/srcs/layouts/arab_pc.xml b/srcs/layouts/arab_pc.xml index dc0f453..3298875 100644 --- a/srcs/layouts/arab_pc.xml +++ b/srcs/layouts/arab_pc.xml @@ -11,8 +11,8 @@ <key key0="ه" key1="÷" key2="8" key3="*"/> <key key0="خ" key1="×" key2="9" key3="("/> <key key0="ح" key1="؛" key2="0" key3=")"/> - <key key0="ج" key1=">" key2="-" key3="_" key4="f11_placeholder"/> - <key key0="د" key1="<" key2="=" key3="ذ" key4="f12_placeholder"/> + <key key0="ج" key1=">" key2="-" key3="_"/> + <key key0="د" key1="<" key2="=" key3="ذ"/> <!-- <key key0="ذ" key1="ّ" key3="\\" key4="|"/> --> </row> <row> diff --git a/srcs/layouts/arab_pc_ckb.xml b/srcs/layouts/arab_pc_ckb.xml index 4b63ad4..ac2e2a6 100644 --- a/srcs/layouts/arab_pc_ckb.xml +++ b/srcs/layouts/arab_pc_ckb.xml @@ -34,6 +34,6 @@ <key key0="ب"/> <key key0="ن" key2="،" key3="؛"/> <key key0="م"/> - <key key0="backspace" key2="delete" key3="f11_placeholder" key4="f12_placeholder"/> + <key key0="backspace" key2="delete"/> </row> </keyboard> diff --git a/srcs/layouts/arab_pc_hindu.xml b/srcs/layouts/arab_pc_hindu.xml index 9808ff4..9852364 100644 --- a/srcs/layouts/arab_pc_hindu.xml +++ b/srcs/layouts/arab_pc_hindu.xml @@ -11,8 +11,8 @@ <key key0="ه" key1="÷" key2="٨" key3="*"/> <key key0="خ" key1="×" key2="٩" key3="("/> <key key0="ح" key1="؛" key2="٠" key3=")"/> - <key key0="ج" key1=">" key2="-" key3="_" key4="f11_placeholder"/> - <key key0="د" key1="<" key2="=" key3="ذ" key4="f12_placeholder"/> + <key key0="ج" key1=">" key2="-" key3="_"/> + <key key0="د" key1="<" key2="=" key3="ذ"/> <!-- <key key0="ذ" key1="ّ" key3="\\" key4="|"/> --> </row> <row> diff --git a/srcs/layouts/arab_pc_ir.xml b/srcs/layouts/arab_pc_ir.xml index f5823bb..f5b7f88 100644 --- a/srcs/layouts/arab_pc_ir.xml +++ b/srcs/layouts/arab_pc_ir.xml @@ -11,7 +11,7 @@ <key key0="ه" key2="۸" key3="*"/> <key key0="خ" key2="۹" key3="(" key4=")"/> <key key0="ح" key2="۰"/> - <key key0="ج" key1="f11_placeholder" key3="f12_placeholder"/> + <key key0="ج"/> </row> <row> <key key0="ش" key2="loc tab"/> diff --git a/srcs/layouts/cyrl_jcuken_ru.xml b/srcs/layouts/cyrl_jcuken_ru.xml index a9d7f1a..5b32dc5 100644 --- a/srcs/layouts/cyrl_jcuken_ru.xml +++ b/srcs/layouts/cyrl_jcuken_ru.xml @@ -11,7 +11,7 @@ <key key0="ш" key2="8" key3="*"/> <key key0="щ" key2="9" key3="(" key4=")"/> <key key0="з" key2="0" key3="{" key4="}"/> - <key key0="х" key3="[" key4="]" key1="f11_placeholder" key2="f12_placeholder"/> + <key key0="х" key3="[" key4="]"/> </row> <row> <key key0="ф" key1="loc tab" key2="`"/> diff --git a/srcs/layouts/cyrl_jcuken_uk.xml b/srcs/layouts/cyrl_jcuken_uk.xml index 45f9966..e38bbfa 100644 --- a/srcs/layouts/cyrl_jcuken_uk.xml +++ b/srcs/layouts/cyrl_jcuken_uk.xml @@ -10,7 +10,7 @@ <key key0="г" key1="ґ" key2="7" key3="&"/> <key key0="ш" key2="8" key3="*"/> <key key0="щ" key2="9" key3="(" key4=")"/> - <key key0="з" key2="0" key3="f11_placeholder" key4="f12_placeholder"/> + <key key0="з" key2="0"/> <key key0="х"/> </row> <row> diff --git a/srcs/layouts/cyrl_ueishsht.xml b/srcs/layouts/cyrl_ueishsht.xml index 296b908..7ed2d12 100644 --- a/srcs/layouts/cyrl_ueishsht.xml +++ b/srcs/layouts/cyrl_ueishsht.xml @@ -10,7 +10,7 @@ <key key0="с" key2="7" key3="&" key4="§"/> <key key0="д" key2="8" key3="*" key4="№"/> <key key0="з" key2="9" key3="(" key4=")"/> - <key key0="ц" key2="0" key3="f11_placeholder" key4="f12_placeholder"/> + <key key0="ц" key2="0"/> <key key0="б" key2="€"/> </row> <row> diff --git a/srcs/layouts/cyrl_yaverti.xml b/srcs/layouts/cyrl_yaverti.xml index ef32644..caf3058 100644 --- a/srcs/layouts/cyrl_yaverti.xml +++ b/srcs/layouts/cyrl_yaverti.xml @@ -10,7 +10,7 @@ <key key0="у" key2="7" key3="&" key4="§"/> <key key0="и" key2="8" key3="*"/> <key key0="о" key2="9" key3="(" key4=")"/> - <key key0="п" key2="0" key3="f11_placeholder" key4="f12_placeholder"/> + <key key0="п" key2="0"/> </row> <row> <key shift="0.5" key0="а" key1="loc tab" key2="`"/> diff --git a/srcs/layouts/grek_qwerty.xml b/srcs/layouts/grek_qwerty.xml index 00143de..9648f05 100644 --- a/srcs/layouts/grek_qwerty.xml +++ b/srcs/layouts/grek_qwerty.xml @@ -10,7 +10,7 @@ <key key0="θ" key2="7" key3="&"/> <key key0="ι" key1="accent_trema" key2="8" key3="*"/> <key key0="ο" key2="9" key3="(" key4=")"/> - <key key0="π" key2="0" key3="f11_placeholder" key4="f12_placeholder"/> + <key key0="π" key2="0"/> </row> <row> <key shift="0.5" key0="α" key1="loc tab" key2="`"/> diff --git a/srcs/layouts/hebr_1_il.xml b/srcs/layouts/hebr_1_il.xml index 5fe219c..dca827f 100644 --- a/srcs/layouts/hebr_1_il.xml +++ b/srcs/layouts/hebr_1_il.xml @@ -12,7 +12,7 @@ <key key0="ן" key2="8" key3="*"/> <key key0="ם" key2="9" key3="b(" key4="lrm"/> <key key0="פ" key2="0" key3="b)" key4="rlm"/> - <key key0="backspace" key2="delete" key3="f11_placeholder" key4="f12_placeholder"/> + <key key0="backspace" key2="delete"/> </row> <row> <key key0="ש" key2="`" key1="loc tab" key3="sindot_placeholder" key4="shindot_placeholder" width="1.333"/> diff --git a/srcs/layouts/hebr_2_il.xml b/srcs/layouts/hebr_2_il.xml index 42bd805..95a9416 100644 --- a/srcs/layouts/hebr_2_il.xml +++ b/srcs/layouts/hebr_2_il.xml @@ -35,6 +35,6 @@ <key key0="מ" key1="blt" key2=","/> <key key0="צ" key1="bgt" key2="."/> <key key0="/" key1="\?"/> - <key key0="backspace" key2="delete" key3="f11_placeholder" key4="f12_placeholder" width="1.333"/> + <key key0="backspace" key2="delete" width="1.333"/> </row> </keyboard> diff --git a/srcs/layouts/latn_azerty_fr.xml b/srcs/layouts/latn_azerty_fr.xml index db39718..70e3a81 100644 --- a/srcs/layouts/latn_azerty_fr.xml +++ b/srcs/layouts/latn_azerty_fr.xml @@ -11,8 +11,8 @@ <key key0="y" key2="6" key3="-" key4="|"/> <key key0="u" key2="7" key3="à" key4="`"/> <key key0="i" key2="8" key3="_" key4="\\"/> - <key key0="o" key2="9" key3="\@" key4="f11_placeholder"/> - <key key0="p" key2="0" key3="f12_placeholder"/> + <key key0="o" key2="9" key3="\@"/> + <key key0="p" key2="0"/> </row> <row> <key key0="q" key2="loc tab"/> diff --git a/srcs/layouts/latn_bone.xml b/srcs/layouts/latn_bone.xml index 1452dca..b547a56 100644 --- a/srcs/layouts/latn_bone.xml +++ b/srcs/layouts/latn_bone.xml @@ -10,8 +10,8 @@ <key key0="p" key3="!" key4="7"/> <key key0="h" key3="<" key4="8"/> <key key0="l" key1="ℓ" key3=">" key4="9"/> - <key key0="m" key1="≠" key3="=" key4="f11_placeholder"/> - <key key0="w" key3="&" key4="f12_placeholder"/> + <key key0="m" key1="≠" key3="="/> + <key key0="w" key3="&"/> </row> <row> <key key0="c" key2="loc tab" key4="\\"/> diff --git a/srcs/layouts/latn_colemak.xml b/srcs/layouts/latn_colemak.xml index d79f7a3..cf82f10 100644 --- a/srcs/layouts/latn_colemak.xml +++ b/srcs/layouts/latn_colemak.xml @@ -8,7 +8,7 @@ <key key0="p" key2="=" key3="%"/> <key key0="g" key1="!" key2="/" key3="\\"/> <key key0="j" key1="loc accent_caron" key2="loc accent_trema" /> - <key key0="l" key1="f11_placeholder" key2="f12_placeholder"/> + <key key0="l"/> <key key0="u" key1="loc accent_double_aigu" key2="loc accent_ring" /> <key key0="y" key1=""" key2="'"/> diff --git a/srcs/layouts/latn_dvorak.xml b/srcs/layouts/latn_dvorak.xml index c826b1b..6563200 100644 --- a/srcs/layouts/latn_dvorak.xml +++ b/srcs/layouts/latn_dvorak.xml @@ -2,8 +2,8 @@ <keyboard name="Dvorak" script="latin"> <row> <key key0="shift" width="1.5" key2="loc esc" key4="loc tab"/> - <key key0="p" key1="loc accent_ring" key2="." key3="<" key4="f11_placeholder"/> - <key key0="y" key1="loc accent_grave" key2="," key3=">" key4="f12_placeholder"/> + <key key0="p" key1="loc accent_ring" key2="." key3="<"/> + <key key0="y" key1="loc accent_grave" key2="," key3=">"/> <key key0="f" key4="loc €"/> <key key0="g" key2="\\" key3="|"/> <key key0="c" key1="loc accent_trema" key2="loc accent_circonflexe" key3="{" key4="}"/> diff --git a/srcs/layouts/latn_neo2.xml b/srcs/layouts/latn_neo2.xml index baeee12..4a7d33a 100644 --- a/srcs/layouts/latn_neo2.xml +++ b/srcs/layouts/latn_neo2.xml @@ -11,8 +11,8 @@ <key key0="k" key2="6" key4="!"/> <key key0="h" key2="7" key4="<"/> <key key0="g" key2="8" key4=">"/> - <key key0="f" key2="9" key3="f11_placeholder" key4="="/> - <key key0="q" key2="0" key3="f12_placeholder" key4="&"/> + <key key0="f" key2="9" key4="="/> + <key key0="q" key2="0" key4="&"/> <key key0="ß" key1="—"/> </row> <row> diff --git a/srcs/layouts/latn_qwerty_br.xml b/srcs/layouts/latn_qwerty_br.xml index 2b40301..77de7b6 100644 --- a/srcs/layouts/latn_qwerty_br.xml +++ b/srcs/layouts/latn_qwerty_br.xml @@ -5,8 +5,8 @@ <key key0="q" key2="1" key4="loc esc"/> <key key0="w" key1="~" key2="2" key3="\@" key4="!"/> <key key0="e" key2="3" key3="\#" key4="€"/> - <key key0="r" key2="4" key3="$" key4="f11_placeholder"/> - <key key0="t" key2="5" key3="%" key4="f12_placeholder"/> + <key key0="r" key2="4" key3="$"/> + <key key0="t" key2="5" key3="%"/> <key key0="y" key2="6" key3="^" key4="loc accent_trema"/> <key key0="u" key2="7" key3="&"/> <key key0="i" key2="8" key3="*"/> diff --git a/srcs/layouts/latn_qwerty_da.xml b/srcs/layouts/latn_qwerty_da.xml index d2b90c6..651f668 100644 --- a/srcs/layouts/latn_qwerty_da.xml +++ b/srcs/layouts/latn_qwerty_da.xml @@ -10,8 +10,8 @@ <key key0="u" key2="7" key4="\\"/> <key key0="i" key2="8" key3="*" key4="/"/> <key key0="o" key2="9" key3="+"/> - <key key0="p" key2="0" key3="=" key4="f11_placeholder"/> - <key key0="å" key1="\?" key3="!" key4="f12_placeholder"/> + <key key0="p" key2="0" key3="="/> + <key key0="å" key1="\?" key3="!"/> </row> <row> <key key0="a" key2="loc tab"/> diff --git a/srcs/layouts/latn_qwerty_es.xml b/srcs/layouts/latn_qwerty_es.xml index e7e7ce7..2fa0e0b 100644 --- a/srcs/layouts/latn_qwerty_es.xml +++ b/srcs/layouts/latn_qwerty_es.xml @@ -10,7 +10,7 @@ <key key0="u" key2="7" key3="&"/> <key key0="i" key2="8" key3="*"/> <key key0="o" key2="9" key3="(" key4=")"/> - <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/> + <key key0="p" key2="0"/> </row> <row> <key key0="a" key2="loc tab" key4="`"/> diff --git a/srcs/layouts/latn_qwerty_gb.xml b/srcs/layouts/latn_qwerty_gb.xml index 4bf2f36..0d6ea4e 100644 --- a/srcs/layouts/latn_qwerty_gb.xml +++ b/srcs/layouts/latn_qwerty_gb.xml @@ -10,7 +10,7 @@ <key key0="u" key2="7" key3="&"/> <key key0="i" key2="8" key3="*"/> <key key0="o" key1="loc accent_macron" key2="9" key3="(" key4=")"/> - <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/> + <key key0="p" key2="0"/> </row> <row> <key shift="0.5" key0="a" key1="loc tab" key2="`"/> diff --git a/srcs/layouts/latn_qwerty_hu.xml b/srcs/layouts/latn_qwerty_hu.xml index d511dfb..160fb3f 100644 --- a/srcs/layouts/latn_qwerty_hu.xml +++ b/srcs/layouts/latn_qwerty_hu.xml @@ -5,8 +5,8 @@ <key key0="w" key1="'" key2="1" key3="~" key4="|"/> <key key0="e" key1=""" key2="2" key4="é"/> <key key0="r" key2="3" key4="^"/> - <key key0="t" key1="!" key2="4" key4="f11_placeholder"/> - <key key0="y" key1="%" key2="5" key3="°" key4="f12_placeholder"/> + <key key0="t" key1="!" key2="4"/> + <key key0="y" key1="%" key2="5" key3="°"/> <key key0="u" key1="ű" key2="6" key3="ü" key4="ú"/> <key key0="i" key1="=" key2="7" key3="`" key4="í"/> <key key0="o" key1="ő" key2="8" key3="ö" key4="ó"/> diff --git a/srcs/layouts/latn_qwerty_lv.xml b/srcs/layouts/latn_qwerty_lv.xml index 06f27a9..6b940a9 100644 --- a/srcs/layouts/latn_qwerty_lv.xml +++ b/srcs/layouts/latn_qwerty_lv.xml @@ -4,8 +4,8 @@ <key key0="q" key2="1" key4="loc esc"/> <key key0="w" key1="~" key2="2" key3="\@" key4="!"/> <key key0="e" key1="ē" key2="3" key3="\#" key4="€"/> - <key key0="r" key1="ŗ" key2="4" key3="$" key4="f11_placeholder"/> - <key key0="t" key2="5" key3="%" key4="f12_placeholder"/> + <key key0="r" key1="ŗ" key2="4" key3="$"/> + <key key0="t" key2="5" key3="%"/> <key key0="y" key2="6" key3="^"/> <key key0="u" key1="ū" key2="7" key3="&" key4="*"/> <key key0="i" key1="ī" key2="8" key3="(" key4=")"/> diff --git a/srcs/layouts/latn_qwerty_no.xml b/srcs/layouts/latn_qwerty_no.xml index 60d1582..abb0a2e 100644 --- a/srcs/layouts/latn_qwerty_no.xml +++ b/srcs/layouts/latn_qwerty_no.xml @@ -10,7 +10,7 @@ <key key0="u" key2="7" key3="&"/> <key key0="i" key2="8" key3="*"/> <key key0="o" key1="ø" key2="9" key3="(" key4=")"/> - <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/> + <key key0="p" key2="0"/> </row> <row> <key shift="0.5" key0="a" key1="loc tab" key2="`" key3="æ" key4="å"/> diff --git a/srcs/layouts/latn_qwerty_ro.xml b/srcs/layouts/latn_qwerty_ro.xml index 63cf6d2..a0a8c15 100644 --- a/srcs/layouts/latn_qwerty_ro.xml +++ b/srcs/layouts/latn_qwerty_ro.xml @@ -10,7 +10,7 @@ <key key0="u" key2="7" key3="&"/> <key key0="i" key1="î" key2="8" key3="*"/> <key key0="o" key1="loc accent_macron" key2="9" key3="(" key4=")"/> - <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/> + <key key0="p" key2="0"/> </row> <row> <key shift="0.5" key0="a" key1="â" key2="ă" key3="`" key4="loc tab"/> diff --git a/srcs/layouts/latn_qwerty_se.xml b/srcs/layouts/latn_qwerty_se.xml index fdea993..5e8fb7d 100644 --- a/srcs/layouts/latn_qwerty_se.xml +++ b/srcs/layouts/latn_qwerty_se.xml @@ -10,8 +10,8 @@ <key key0="u" key2="7" key3="~" key4="\\"/> <key key0="i" key2="8" key3="*" key4="/"/> <key key0="o" key2="9" key3="+" key4="-"/> - <key key0="p" key2="0" key3="=" key4="f11_placeholder"/> - <key key0="å" key1="\?" key3="!" key4="f12_placeholder"/> + <key key0="p" key2="0" key3="="/> + <key key0="å" key1="\?" key3="!"/> </row> <row> <key key0="a" key2="loc tab"/> diff --git a/srcs/layouts/latn_qwerty_us.xml b/srcs/layouts/latn_qwerty_us.xml index 6397ff8..f801c3c 100644 --- a/srcs/layouts/latn_qwerty_us.xml +++ b/srcs/layouts/latn_qwerty_us.xml @@ -31,7 +31,7 @@ See srcs/juloo.keyboard2/KeyValue.java for the keys that have a special meaning. <key key0="u" key2="7" key3="&"/> <key key0="i" key2="8" key3="*"/> <key key0="o" key1="loc accent_macron" key2="9" key3="(" key4=")"/> - <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/> + <key key0="p" key2="0"/> </row> <row> <key shift="0.5" key0="a" key1="loc tab" key2="`"/> diff --git a/srcs/layouts/latn_qwerty_vi.xml b/srcs/layouts/latn_qwerty_vi.xml index ea76a83..634eee9 100644 --- a/srcs/layouts/latn_qwerty_vi.xml +++ b/srcs/layouts/latn_qwerty_vi.xml @@ -11,7 +11,7 @@ <key key0="u" key2="7" key3="&"/> <key key0="i" key2="8" key3="*"/> <key key0="o" key1="ô" key2="9" key3="(" key4=")"/> - <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/> + <key key0="p" key2="0"/> </row> <row> <key shift="0.5" key0="a" key1="loc tab" key2="ă" key3="â"/> diff --git a/srcs/layouts/latn_qwertz.xml b/srcs/layouts/latn_qwertz.xml index 4a07445..37f5cc7 100644 --- a/srcs/layouts/latn_qwertz.xml +++ b/srcs/layouts/latn_qwertz.xml @@ -5,8 +5,8 @@ <key key0="q" key2="1" key4="loc esc"/> <key key0="w" key1="^" key2="2" key3=""" key4="\@"/> <key key0="e" key1="§" key2="3" key3="!" key4="€"/> - <key key0="r" key2="4" key3="$" key4="f11_placeholder"/> - <key key0="t" key2="5" key3="%" key4="f12_placeholder"/> + <key key0="r" key2="4" key3="$"/> + <key key0="t" key2="5" key3="%"/> <key key0="z" key2="6" key3="&" key4="{"/> <key key0="u" key2="7" key3="ü" key4="}"/> <key key0="i" key1="(" key2="8" key3="[" key4="]"/> diff --git a/srcs/layouts/latn_qwertz_de.xml b/srcs/layouts/latn_qwertz_de.xml index 087c8f3..c420682 100644 --- a/srcs/layouts/latn_qwertz_de.xml +++ b/srcs/layouts/latn_qwertz_de.xml @@ -5,8 +5,8 @@ <key key0="q" key2="1" key4="loc esc"/> <key key0="w" key1="^" key2="2" key3=""" key4="\@"/> <key key0="e" key1="§" key2="3" key3="!" key4="€"/> - <key key0="r" key2="4" key3="$" key4="f11_placeholder"/> - <key key0="t" key2="5" key3="%" key4="f12_placeholder"/> + <key key0="r" key2="4" key3="$"/> + <key key0="t" key2="5" key3="%"/> <key key0="z" key2="6" key3="&"/> <key key0="u" key2="7" key3="{" key4="}"/> <key key0="i" key2="8" key3="[" key4="]"/> diff --git a/srcs/layouts/latn_qwertz_fr_ch.xml b/srcs/layouts/latn_qwertz_fr_ch.xml index 9f41448..c131c67 100644 --- a/srcs/layouts/latn_qwertz_fr_ch.xml +++ b/srcs/layouts/latn_qwertz_fr_ch.xml @@ -5,8 +5,8 @@ <key key0="q" key1="§" key2="1" key4="loc esc"/> <key key0="w" key1="^" key2="2" key3=""" key4="\@"/> <key key0="e" key2="3" key3="\#" key4="€"/> - <key key0="r" key2="4" key3="$" key4="f11_placeholder"/> - <key key0="t" key2="5" key3="%" key4="f12_placeholder"/> + <key key0="r" key2="4" key3="$"/> + <key key0="t" key2="5" key3="%"/> <key key0="z" key2="6" key3="&"/> <key key0="u" key1="ù" key2="7" key3="{" key4="}"/> <key key0="i" key2="8" key3="[" key4="]"/> diff --git a/srcs/layouts/latn_qwertz_hu.xml b/srcs/layouts/latn_qwertz_hu.xml index 65f53d0..42f0f1e 100644 --- a/srcs/layouts/latn_qwertz_hu.xml +++ b/srcs/layouts/latn_qwertz_hu.xml @@ -5,8 +5,8 @@ <key key0="w" key1="'" key2="1" key3="~" key4="|"/> <key key0="e" key1=""" key2="2" key4="é"/> <key key0="r" key2="3" key4="^"/> - <key key0="t" key1="!" key2="4" key4="f11_placeholder"/> - <key key0="z" key1="%" key2="5" key3="°" key4="f12_placeholder"/> + <key key0="t" key1="!" key2="4"/> + <key key0="z" key1="%" key2="5" key3="°"/> <key key0="u" key1="ű" key2="6" key3="ü" key4="ú"/> <key key0="i" key1="=" key2="7" key3="`" key4="í"/> <key key0="o" key1="ő" key2="8" key3="ö" key4="ó"/> diff --git a/srcs/layouts/shaw_imperial_en.xml b/srcs/layouts/shaw_imperial_en.xml index 4900baf..a686a21 100644 --- a/srcs/layouts/shaw_imperial_en.xml +++ b/srcs/layouts/shaw_imperial_en.xml @@ -11,7 +11,7 @@ <key key0="𐑙" key2="7" key3="&"/> <key key0="𐑘" key2="8" key3="*"/> <key key0="𐑡" key2="9" key3="(" key4=")"/> - <key key0="𐑔" key2="0" key3="f11_placeholder" key4="f12_placeholder"/> + <key key0="𐑔" key2="0"/> </row> <row> <key key0="𐑭" key1="loc tab" key2="𐑸" key3="`"/> |