s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-nb-keyboard' into 'master'

Browse Source 
Fix the nb symbols file and extended layout

See merge request Librem5/squeekboard!137
This commit is contained in:
Dorota Czaplejewicz
2019-08-27 14:58:12 +00:00
parent 1cf242a9df d38c030ee6
commit 4b5bb2a507
2 changed files with 165 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
data/keyboards/geometry/extended.xml
View File

@ -1,58 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<geometry version="0.90"> <geometry version="0.90">
<bounds x="0" y="10.000000" width="426.0000" height="296.5853"/> <bounds x="0" y="10.000000" width="426.0000" height="296.5853"/>
<section angle="0">
<row orientation="1">
<key name="AD01" oref="outline2" />
<key name="AD02" oref="outline2" />
<key name="AD03" oref="outline2" />
<key name="AD04" oref="outline2" />
<key name="AD05" oref="outline2" />
<key name="AD06" oref="outline2" />
<key name="AD07" oref="outline2" />
<key name="AD08" oref="outline2" />
<key name="AD09" oref="outline2" />
<key name="AD10" oref="outline2" />
<key name="AD11" oref="outline2" />
</row>
</section>
<section angle="0">
<row orientation="1">
<key name="AC01" oref="outline2" />
<key name="AC02" oref="outline2" />
<key name="AC03" oref="outline2" />
<key name="AC04" oref="outline2" />
<key name="AC05" oref="outline2" />
<key name="AC06" oref="outline2" />
<key name="AC07" oref="outline2" />
<key name="AC08" oref="outline2" />
<key name="AC09" oref="outline2" />
<key name="AC10" oref="outline2" />
<key name="AC11" oref="outline2" />
</row>
</section>
<section angle="0">
<row orientation="1">
<key name="LFSH" oref="altline" />
<key name="AB01" oref="outline2" />
<key name="AB02" oref="outline2" />
<key name="AB03" oref="outline2" />
<key name="AB04" oref="outline2" />
<key name="AB05" oref="outline2" />
<key name="AB06" oref="outline2" />
<key name="AB07" oref="outline2" />
<key name="BKSP" oref="altline" />
</row>
</section>
<section angle="0">
<row orientation="1">
<key keycode="0" name="ABC123" oref="altline" />
<key name="I149" oref="altline" />
<key name="SPCE" oref="spaceline" />
<key name="AB08" oref="outline2" />
<key name="RTRN" oref="outline7" />
</row>
</section>
<outline id="outline2" corner-radius="1.000000"> <outline id="outline2" corner-radius="1.000000">
<point x="0.000000" y="0.000000"/> <point x="0.000000" y="0.000000"/>
<point x="32" y="0.000000"/> <point x="32" y="0.000000"/>
@ -119,4 +68,38 @@
<point x="150.5853" y="52"/> <point x="150.5853" y="52"/>
<point x="0.000000" y="52"/> <point x="0.000000" y="52"/>
</outline> </outline>
<button name="Shift_L" oref="altline" />
<button name="BackSpace" oref="altline" />
<button name="preferences" oref="altline" />
<button name="show_numbers" oref="altline" keycode="0" />
<button name="show_letters" oref="altline" keycode="0" />
<button name="show_symbols" oref="altline" keycode="0" />
<button name="space" oref="spaceline" />
<button name="return" oref="outline7" />
<view>
<section angle="0">q w e r t y u i o p aring</section>
<section angle="0">a s d f g h j k l oslash ae</section>
<section angle="0"> Shift_L z x c v b n m BackSpace </section>
<section angle="0"> show_numbers preferences space period Return </section>
</view>
<view>
<section angle="0">Q W E R T Y U I O P Aring</section>
<section angle="0">A S D F G H J K L Oslash AE</section>
<section angle="0"> Shift_L Z X C V B N M BackSpace </section>
<section angle="0"> show_numbers preferences space period Return </section>
</view>
<view>
<section angle="0">1 2 3 4 5 6 7 8 9 0</section>
<section angle="0">at numbersign dollar percent ampersand minus underscore plus parenleft parenright</section>
<section angle="0"> show_symbols comma quotedbl quoteright colon semicolon exclam question BackSpace </section>
<section angle="0"> show_letters preferences space period Return </section>
</view>
<view>
<section angle="0">asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph</section>
<section angle="0">copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright</section>
<section angle="0"> show_numbers backslash slash less greater equal bracketleft bracketright BackSpace </section>
<section angle="0"> show_letters preferences space period Return </section>
</view>
</geometry> </geometry>

334
data/keyboards/symbols/nb.xml
View File

@ -1,206 +1,132 @@
<?xml version='1.0' encoding='ASCII' standalone='yes'?> <?xml version='1.0' encoding='UTF-8' standalone='yes'?>
<symbols version="0.90"> <symbols version="0.90">
<key name="AD01"> <symbol label="*">asterisk</symbol>
<symbol label="q">q</symbol> <symbol label="+/=">show_symbols</symbol>
<symbol label="Q">Q</symbol> <symbol label="&#964;">Greek_tau</symbol>
<symbol label="1">1</symbol> <symbol label="å">aring</symbol>
<symbol label="~">asciitilde</symbol> <symbol label="ø">oslash</symbol>
</key> <symbol label="æ">ae</symbol>
<key name="AD02"> <symbol label="Å">Aring</symbol>
<symbol label="w">w</symbol> <symbol label="Ø">Oslash</symbol>
<symbol label="W">W</symbol> <symbol label="Æ">AE</symbol>
<symbol label="2">2</symbol> <symbol label="q">q</symbol>
<symbol label="`">quoteleft</symbol> <symbol label="Q">Q</symbol>
</key> <symbol label="1">1</symbol>
<key name="AD03"> <symbol label="~">asciitilde</symbol>
<symbol label="e">e</symbol> <symbol label="w">w</symbol>
<symbol label="E">E</symbol> <symbol label="W">W</symbol>
<symbol label="3">3</symbol> <symbol label="2">2</symbol>
<symbol label="|">bar</symbol> <symbol label="`">quoteleft</symbol>
</key> <symbol label="e">e</symbol>
<key name="AD04"> <symbol label="E">E</symbol>
<symbol label="r">r</symbol> <symbol label="3">3</symbol>
<symbol label="R">R</symbol> <symbol label="|">bar</symbol>
<symbol label="4">4</symbol> <symbol label="r">r</symbol>
<symbol label="&#183;">U00B7</symbol> <symbol label="R">R</symbol>
</key> <symbol label="4">4</symbol>
<key name="AD05"> <symbol label="&#183;">U00B7</symbol>
<symbol label="t">t</symbol> <symbol label="t">t</symbol>
<symbol label="T">T</symbol> <symbol label="T">T</symbol>
<symbol label="5">5</symbol> <symbol label="5">5</symbol>
<symbol label="&#8730;">squareroot</symbol> <symbol label="&#8730;">squareroot</symbol>
</key> <symbol label="y">y</symbol>
<key name="AD06"> <symbol label="Y">Y</symbol>
<symbol label="y">y</symbol> <symbol label="6">6</symbol>
<symbol label="Y">Y</symbol> <symbol label="&#960;">Greek_pi</symbol>
<symbol label="6">6</symbol> <symbol label="u">u</symbol>
<symbol label="&#960;">Greek_pi</symbol> <symbol label="U">U</symbol>
</key> <symbol label="7">7</symbol>
<key name="AD07"> <symbol label="&#247;">division</symbol>
<symbol label="u">u</symbol> <symbol label="i">i</symbol>
<symbol label="U">U</symbol> <symbol label="I">I</symbol>
<symbol label="7">7</symbol> <symbol label="8">8</symbol>
<symbol label="&#247;">division</symbol> <symbol label="&#215;">multiply</symbol>
</key> <symbol label="o">o</symbol>
<key name="AD08"> <symbol label="O">O</symbol>
<symbol label="i">i</symbol> <symbol label="9">9</symbol>
<symbol label="I">I</symbol> <symbol label="&#182;">paragraph</symbol>
<symbol label="8">8</symbol> <symbol label="p">p</symbol>
<symbol label="&#215;">multiply</symbol> <symbol label="P">P</symbol>
</key> <symbol label="0">0</symbol>
<key name="AD09"> <symbol label="&#9651;">U25B3</symbol>
<symbol label="o">o</symbol> <symbol keyval="229" label="&#229;">aring</symbol>
<symbol label="O">O</symbol> <symbol keyval="197" label="&#197;">Aring</symbol>
<symbol label="9">9</symbol> <symbol label="a">a</symbol>
<symbol label="&#182;">paragraph</symbol> <symbol label="A">A</symbol>
</key> <symbol label="@">at</symbol>
<key name="AD10"> <symbol label="&#169;">copyright</symbol>
<symbol label="p">p</symbol> <symbol label="s">s</symbol>
<symbol label="P">P</symbol> <symbol label="S">S</symbol>
<symbol label="0">0</symbol> <symbol label="#">numbersign</symbol>
<symbol label="&#9651;">U25B3</symbol> <symbol label="&#174;">U00AE</symbol>
</key> <symbol label="d">d</symbol>
<key name="AD11"> <symbol label="D">D</symbol>
<symbol keyval="229" label="&#229;">aring</symbol> <symbol label="$">dollar</symbol>
<symbol keyval="197" label="&#197;">Aring</symbol> <symbol label="&#163;">U00A3</symbol>
<symbol label=""></symbol> <symbol label="f">f</symbol>
<symbol label=""></symbol> <symbol label="F">F</symbol>
<!-- Empty labels cause keys to be hidden when the level they are defined <symbol label="%">percent</symbol>
for is shown. --> <symbol label="&#8364;">EuroSign</symbol>
</key> <symbol label="g">g</symbol>
<key name="AC01"> <symbol label="G">G</symbol>
<symbol label="a">a</symbol> <symbol label="&amp;">ampersand</symbol>
<symbol label="A">A</symbol> <symbol label="&#165;">U00A5</symbol>
<symbol label="@">at</symbol> <symbol label="h">h</symbol>
<symbol label="&#169;">copyright</symbol> <symbol label="H">H</symbol>
</key> <symbol label="-">minus</symbol>
<key name="AC02"> <symbol label="^">asciicircum</symbol>
<symbol label="s">s</symbol> <symbol label="j">j</symbol>
<symbol label="S">S</symbol> <symbol label="J">J</symbol>
<symbol label="#">numbersign</symbol> <symbol label="_">underscore</symbol>
<symbol label="&#174;">U00AE</symbol> <symbol label="&#176;">degree</symbol>
</key> <symbol label="k">k</symbol>
<key name="AC03"> <symbol label="K">K</symbol>
<symbol label="d">d</symbol> <symbol label="+">plus</symbol>
<symbol label="D">D</symbol> <symbol label="=">equal</symbol>
<symbol label="$">dollar</symbol> <symbol label="l">l</symbol>
<symbol label="&#163;">U00A3</symbol> <symbol label="L">L</symbol>
</key> <symbol label="(">parenleft</symbol>
<key name="AC04"> <symbol label="{">braceleft</symbol>
<symbol label="f">f</symbol> <symbol keyval="248" label="&#248;">oslash</symbol>
<symbol label="F">F</symbol> <symbol keyval="216" label="&#216;">Oslash</symbol>
<symbol label="%">percent</symbol> <symbol label=")">parenright</symbol>
<symbol label="&#8364;">EuroSign</symbol> <symbol label="}">braceright</symbol>
</key> <symbol keyval="230" label="&#230;">ae</symbol>
<key name="AC05"> <symbol keyval="198" label="&#198;">AE</symbol>
<symbol label="g">g</symbol> <symbol keyval="65293" icon="key-enter">Return</symbol>
<symbol label="G">G</symbol> <symbol keyval="65505" icon="key-shift">Shift_L</symbol>
<symbol label="&amp;">ampersand</symbol> <symbol label="z">z</symbol>
<symbol label="&#165;">U00A5</symbol> <symbol label="Z">Z</symbol>
</key> <symbol label=",">comma</symbol>
<key name="AC06"> <symbol label="\">backslash</symbol>
<symbol label="h">h</symbol> <symbol label="x">x</symbol>
<symbol label="H">H</symbol> <symbol label="X">X</symbol>
<symbol label="-">minus</symbol> <symbol label="&quot;">quotedbl</symbol>
<symbol label="^">asciicircum</symbol> <symbol label="/">slash</symbol>
</key> <symbol label="c">c</symbol>
<key name="AC07"> <symbol label="C">C</symbol>
<symbol label="j">j</symbol> <symbol label="'">quoteright</symbol>
<symbol label="J">J</symbol> <symbol label="&lt;">less</symbol>
<symbol label="_">underscore</symbol> <symbol label="v">v</symbol>
<symbol label="&#176;">degree</symbol> <symbol label="V">V</symbol>
</key> <symbol label=":">colon</symbol>
<key name="AC08"> <symbol label="&gt;">greater</symbol>
<symbol label="k">k</symbol> <symbol label="b">b</symbol>
<symbol label="K">K</symbol> <symbol label="B">B</symbol>
<symbol label="+">plus</symbol> <symbol label=";">semicolon</symbol>
<symbol label="=">equal</symbol> <symbol label="=">equal</symbol>
</key> <symbol label="n">n</symbol>
<key name="AC09"> <symbol label="N">N</symbol>
<symbol label="l">l</symbol> <symbol label="!">exclam</symbol>
<symbol label="L">L</symbol> <symbol label="[">bracketleft</symbol>
<symbol label="(">parenleft</symbol> <symbol label="m">m</symbol>
<symbol label="{">braceleft</symbol> <symbol label="M">M</symbol>
</key> <symbol label="?">question</symbol>
<key name="AC10"> <symbol label="]">bracketright</symbol>
<symbol keyval="248" label="&#248;">oslash</symbol> <symbol label=".">period</symbol>
<symbol keyval="216" label="&#216;">Oslash</symbol> <symbol label="123">show_numbers</symbol>
<symbol label=")">parenright</symbol> <symbol label="ABC">show_letters</symbol>
<symbol label="}">braceright</symbol> <symbol label="&#9786;" icon="keyboard-mode-symbolic" tooltip="Setup">preferences</symbol>
</key> <symbol label=" ">space</symbol>
<key name="AC11"> <symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
<symbol keyval="230" label="&#230;">ae</symbol>
<symbol keyval="198" label="&#198;">AE</symbol>
<symbol label=""></symbol>
<symbol label=""></symbol>
</key>
<key name="RTRN">
<symbol keyval="65293" icon="key-enter">Return</symbol>
</key>
<key name="LFSH">
<keysym keyval="65505" icon="key-shift">Shift_L</keysym>
<keysym keyval="65505" icon="key-shift">Shift_L</keysym>
<keysym keyval="65505" label="=/+">Shift_L</keysym>
<keysym keyval="65505" label="123">Shift_L</keysym>
</key>
<key name="AB01">
<symbol label="z">z</symbol>
<symbol label="Z">Z</symbol>
<symbol label=",">comma</symbol>
<symbol label="\">backslash</symbol>
</key>
<key name="AB02">
<symbol label="x">x</symbol>
<symbol label="X">X</symbol>
<symbol label="&quot;">quotedbl</symbol>
<symbol label="/">slash</symbol>
</key>
<key name="AB03">
<symbol label="c">c</symbol>
<symbol label="C">C</symbol>
<symbol label="'">quoteright</symbol>
<symbol label="&lt;">less</symbol>
</key>
<key name="AB04">
<symbol label="v">v</symbol>
<symbol label="V">V</symbol>
<symbol label=":">colon</symbol>
<symbol label="&gt;">greater</symbol>
</key>
<key name="AB05">
<symbol label="b">b</symbol>
<symbol label="B">B</symbol>
<symbol label=";">semicolon</symbol>
<symbol label="=">equal</symbol>
</key>
<key name="AB06">
<symbol label="n">n</symbol>
<symbol label="N">N</symbol>
<symbol label="!">exclam</symbol>
<symbol label="[">bracketleft</symbol>
</key>
<key name="AB07">
<symbol label="m">m</symbol>
<symbol label="M">M</symbol>
<symbol label="?">question</symbol>
<symbol label="]">bracketright</symbol>
</key>
<key name="AB08">
<symbol label=".">period</symbol>
</key>
<key name="ABC123">
<symbol label="123">show-numbers</symbol>
<symbol label="123">show-numbers</symbol>
<symbol label="ABC">show-letters</symbol>
<symbol label="ABC">show-letters</symbol>
</key>
<key name="I149">
<symbol icon="keyboard-mode-symbolic" tooltip="Setup">preferences</symbol>
</key>
<key name="SPCE">
<symbol label=" ">space</symbol>
</key>
<key name="BKSP">
<symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
</key>
</symbols> </symbols>