Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add QWERTY GB layout #557

Merged
merged 3 commits into from
Feb 16, 2024
Merged

Add QWERTY GB layout #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a2a642
Add QWERTY GB
RyanGibb Feb 16, 2024
31ec358
Update generated files
Julow Feb 16, 2024
ca74062
Make it the default layout for en-GB
Julow Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion check_layout.output
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ Layout doesn't define some important keys, missing: f11_placeholder, f12_placeho
1 warnings
# latn_qwerty_es
0 warnings
# latn_qwerty_gb
0 warnings
# latn_qwerty_hu
0 warnings
# latn_qwerty_lv
Expand All @@ -96,7 +98,7 @@ Layout doesn't define some important keys, missing: f11_placeholder, f12_placeho
Duplicate keys: !, ', ,, -, ., ?
1 warnings
# latn_qwerty_tly
Duplicate keys: a, c, g, j, q
Duplicate keys: a, c, j, q
Layout doesn't define some important keys, missing: esc, f11_placeholder, f12_placeholder, tab
2 warnings
# latn_qwerty_tr
Expand Down
3 changes: 3 additions & 0 deletions res/values/layouts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<item>latn_qwerty_br</item>
<item>latn_qwerty_cz</item>
<item>latn_qwerty_es</item>
<item>latn_qwerty_gb</item>
<item>latn_qwerty_hu</item>
<item>latn_qwerty_lv</item>
<item>latn_qwerty_no</item>
Expand Down Expand Up @@ -82,6 +83,7 @@
<item>QWERTY (Brasileiro)</item>
<item>QWERTY (Czech)</item>
<item>QWERTY (Español)</item>
<item>QWERTY (UK)</item>
<item>QWERTY (Magyar)</item>
<item>QWERTY (Latvian)</item>
<item>QWERTY (Norwegian)</item>
Expand Down Expand Up @@ -132,6 +134,7 @@
<item>@xml/latn_qwerty_br</item>
<item>@xml/latn_qwerty_cz</item>
<item>@xml/latn_qwerty_es</item>
<item>@xml/latn_qwerty_gb</item>
<item>@xml/latn_qwerty_hu</item>
<item>@xml/latn_qwerty_lv</item>
<item>@xml/latn_qwerty_no</item>
Expand Down
2 changes: 1 addition & 1 deletion res/xml/method.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<subtype android:label="%s" android:languageTag="cs" android:imeSubtypeLocale="cs_CZ" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_cz,extra_keys=accent_aigu:á:é:í:ó:ú:ý|accent_ring:ů|accent_caron:č:ě:ň:ř:š:ž:ď:ť"/>
<subtype android:label="%s" android:languageTag="de" android:imeSubtypeLocale="de_DE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_de,extra_keys=accent_trema:ä:ö:ü|ß|€"/>
<subtype android:label="%s" android:languageTag="el" android:imeSubtypeLocale="el" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=grek_qwerty,extra_keys=£|€"/>
<subtype android:label="%s" android:languageTag="en-GB" android:imeSubtypeLocale="en_GB" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=£|€"/>
<subtype android:label="%s" android:languageTag="en-GB" android:imeSubtypeLocale="en_GB" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_gb,extra_keys=£|€"/>
<subtype android:label="%s" android:languageTag="en-US" android:imeSubtypeLocale="en_US" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us"/>
<subtype android:label="%s" android:languageTag="es" android:imeSubtypeLocale="es_ES" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_es,extra_keys=accent_aigu:á:é:í:ó:ú|accent_tilde:ñ|accent_grave|accent_trema|€"/>
<subtype android:label="%s" android:languageTag="fa" android:imeSubtypeLocale="fa_IR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=arab_pc_ir"/>
Expand Down
37 changes: 37 additions & 0 deletions srcs/layouts/latn_qwerty_gb.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<keyboard name="QWERTY (UK)" script="latin">
<row>
<key key0="q" key2="1" key4="esc"/>
<key key0="w" key2="2" key3="&quot;"/>
<key key0="e" key1="!" key2="3" key3="loc £" key4="loc €"/>
<key key0="r" key2="4" key3="$" key1="loc ₪"/>
<key key0="t" key2="5" key3="%"/>
<key key0="y" key2="6" key3="^"/>
<key key0="u" key2="7" key3="&amp;"/>
<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"/>
</row>
<row>
<key shift="0.5" key0="a" key1="tab" key2="`"/>
<key key0="s" key1="loc accent_ring" key2="loc §" key3="loc ß" key4="loc accent_ogonek"/>
<key key0="d" key1="loc accent_grave" key3="loc accent_aigu"/>
<key key0="f" key1="loc accent_dot_above"/>
<key key0="g" key1="loc accent_caron" key2="-" key3="_"/>
<key key0="h" key2="=" key3="+"/>
<key key0="j" key1="loc accent_trema" key2="loc accent_circonflexe" key4="}" key3="{"/>
<key key0="k" key1="loc accent_double_aigu" key3="[" key4="]"/>
<key key0="l" key1="\#" key2="~" key3="'" key4="\@"/>
</row>
<row>
<key width="1.5" key0="shift" key2="loc capslock"/>
<key key0="z" key2="|" key3="\\"/>
<key key0="x" key2="loc †"/>
<key key0="c" key1="loc accent_cedille" key2="&lt;" key3="."/>
<key key0="v" key2="&gt;" key3=","/>
<key key0="b" key2="\?" key3="/"/>
<key key0="n" key1="loc accent_tilde" key2=":" key3=";"/>
<key key0="m"/>
<key width="1.5" key0="backspace" key2="delete"/>
</row>
</keyboard>