r1169 - trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts

caowai_song at sita.openmoko.org caowai_song at sita.openmoko.org
Thu Mar 1 08:39:18 CET 2007


Author: caowai_song
Date: 2007-03-01 08:39:08 +0100 (Thu, 01 Mar 2007)
New Revision: 1169

Added:
   trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-low.xml
   trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-number.xml
   trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-symbol.xml
Removed:
   trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-dvorak.xml
   trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-extended.xml
   trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-fi.xml
   trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-numpad.xml
   trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-ru.xml
   trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-us.xml
Modified:
   trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/Makefile.am
Log:
Add different config file of each keyboard.


Modified: trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/Makefile.am	2007-03-01 02:31:18 UTC (rev 1168)
+++ trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/Makefile.am	2007-03-01 07:39:08 UTC (rev 1169)
@@ -1,7 +1,8 @@
 keyboardsdir = $(datadir)/matchbox-keyboard
-keyboards_DATA = keyboard.xml keyboard-extended.xml keyboard-dvorak.xml \
-                 keyboard-us.xml keyboard-ru.xml keyboard-fi.xml        \
-                 keyboard-numpad.xml                                    \
+keyboards_DATA = keyboard.xml                                           \
+                 keyboard-low.xml                                       \
+                 keyboard-number.xml                                    \
+                 keyboard-symbol.xml                                    \
                  bg_input_switch.png                                    \
                  bg_keypad.png                                          \
                  key_blank.png                                          \

Deleted: trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-dvorak.xml
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-dvorak.xml	2007-03-01 02:31:18 UTC (rev 1168)
+++ trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-dvorak.xml	2007-03-01 07:39:08 UTC (rev 1169)
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<keyboard>
-
-<options>
-	<!-- not yet implemented -->
-</options>
-
-<layout id="dvorak keyboard">
-
-<!--
-matchbox-keyboard implementation of the 'common' Dvorak keyboard layout.
-Contributed by Leon Matthews http://www.lost.co.nz/
--->
-
-<!-- Top Row -->
-<row>
-	<space width="500" extended="true"/>
-	<key fill="true">
-		<default display="Esc" action="escape" />
-	</key>
-	<key>
-		<default display="`" />
-		<shifted display="~" />
-	</key>
-	<key>
-		<default display="1" />
-		<shifted display="!" />
-	</key>
-	<key>
-		<default display="2" />
-		<shifted display='@' />
-		<mod1 display="½" />
-	</key>
-	<key>
-		<default display="3" />
-		<shifted display="#" />
-		<mod1 display="¾" />
-	</key>
-	<key>
-		<default display="4" />
-		<shifted display="$" />
-	</key>
-	<key>
-		<default display="5" />
-		<shifted display="%" />
-	</key>
-	<key>
-		<default display="6" />
-		<shifted display="^" />
-	</key>
-	<key>
-		<default display="7" />
-		<shifted display="&amp;" />
-	</key>
-	<key>
-		<default display="8" />
-		<shifted display="*" />
-	</key>
-	<key>
-		<default display="9" />
-		<shifted display="(" />
-	</key>
-	<key>
-		<default display="0" />
-		<shifted display=")" />
-	</key>
-	<key>
-		<default display="{" />
-		<shifted display="[" />
-	</key>
-	<key>
-		<default display="}" />
-		<shifted display="]" />
-	</key>
-	<key fill="true">
-		<default display="Bksp" action="backspace"/>
-	</key>
-	<space width="500" extended="true"/>
-	<key width="4000"  extended="true">
-		<default display="Home" action="home"/>
-	</key>
-	<key width="4000"  extended="true">
-		<default display="PgUp" action="pageup"/>
-	</key>
-	<space width="500" extended="true"/>
-</row>
-
-<!-- Second Row -->
-<row>
-	<space width="500" extended="true"/>
-	<key fill="true">
-		<default display="Tab" action="tab"/>
-	</key>
-	<key>
-		<default display="'" />
-		<shifted display='"' />
-	</key>
-	<key>
-		<default display="," />
-		<shifted display="&lt;" />
-	</key>
-	<key>
-		<default display="." />
-		<shifted display="&gt;" />
-	</key>
-	<key obey-caps='true'>
-		<default display="p" />
-		<shifted display="P" />
-	</key>
-	<key obey-caps='true'>
-		<default display="y" />
-		<shifted display="Y" />
-	</key>
-	<key obey-caps='true'>
-		<default display="f" />
-		<shifted display="F" />
-	</key>
-	<key obey-caps='true'>
-		<default display="g" />
-		<shifted display="G" />
-	</key>
-	<key obey-caps='true'>
-		<default display="c" />
-		<shifted display="C" />
-	</key>
-	<key obey-caps='true'>
-		<default display="r" />
-		<shifted display="R" />
-	</key>
-	<key obey-caps='true'>
-		<default display="l" />
-		<shifted display="L" />
-	</key>
-	<key>
-		<default display="?" />
-		<shifted display="/" />
-	</key>
-	<key>
-		<default display="=" />
-		<shifted display="+" />
-	</key>
-	<key fill="true">
-		<default display="\" />
-		<shifted display="|" />
-	</key>
-	<space width="500" extended="true"/>
-	<key width="4000"  extended="true">
-		<default display="End" action="end"/>
-	</key>
-	<key width="4000"  extended="true">
-		<default display="PgDn" action="pagedown"/>
-	</key>
-	<space width="500" extended="true"/>
-</row>
-
-<!-- Third row -->
-<row>
-	<space width="500" extended="true"/>
-	<key fill="true">
-		<default display="Caps" action="modifier:caps"/>
-	</key>
-	<key obey-caps='true'>
-		<default display="a" />
-		<shifted display="A" />
-	</key>
-	<key obey-caps='true'>
-		<default display="o" />
-		<shifted display="O" />
-	</key>
-	<key obey-caps='true'>
-		<mod1 display="ë" />
-		<default    display="e" />
-		<shifted display="E" />
-	</key>
-	<key obey-caps='true'>
-		<default display="u" />
-		<shifted display="U" />
-	</key>
-	<key obey-caps='true'>
-		<default display="i" />
-		<shifted display="I" />
-	</key>
-	<key obey-caps='true'>
-		<default display="d" />
-		<shifted display="D" />
-	</key>
-	<key obey-caps='true'>
-		<default display="h" />
-		<shifted display="H" />
-	</key>
-	<key obey-caps='true'>
-		<default display="t" />
-		<shifted display="T" />
-	</key>
-	<key obey-caps='true'>
-		<default display="n" />
-		<shifted display="N" />
-	</key>
-	<key obey-caps='true'>
-		<default display="s" />
-		<shifted display="S" />
-	</key>
-	<key>
-		<default display="-" />
-		<shifted display="_" />
-	</key>
-	<key fill="true">
-		<default display="Ret" action="return"/>
-	</key>
-	<space width="500" extended="true"/>
-	<space width="4000" extended="true" />
-	<space width="4000" extended="true" />
-	<space width="500" extended="true"/>
-</row>
-
-<!-- Fourth Row -->
-<row>
-	<space width="500" extended="true"/>
-	<key fill="true">
-		<default display="Shift" action="modifier:shift"/>
-	</key>
-	<key>
-		<default display=";" />
-		<shifted display=":" />
-	</key>
-	<key obey-caps='true'>
-		<default display="q" />
-		<shifted display="Q" />
-	</key>
-	<key obey-caps='true'>
-		<default display="j" />
-		<shifted display="J" />
-	</key>
-	<key obey-caps='true'>
-		<default display="k" />
-		<shifted display="K" />
-	</key>
-	<key obey-caps='true'>
-		<default display="x" />
-		<shifted display="X" />
-	</key>
-	<key obey-caps='true'>
-		<default display="b" />
-		<shifted display="B" />
-	</key>
-	<key obey-caps='true'>
-		<default display="m" />
-		<shifted display="M" />
-	</key>
-	<key obey-caps='true'>
-		<default display="w" />
-		<shifted display="W" />
-	</key>
-	<key obey-caps='true'>
-		<default display="v" />
-		<shifted display="V" />
-	</key>
-	<key obey-caps='true'>
-		<default display="z" />
-		<shifted display="Z" />
-	</key>
-	<key fill="true">
-		<default display="Shift" action="modifier:shift"/>
-	</key>
-	<space width="500" extended="true"/>
-	<space width="4000"  extended="true" />
-	<space width="4000"  extended="true" />
-	<space width="500" extended="true"/>
-</row>
-
-<!-- Bottom Row -->
-<row>
-	<space width="500" extended="true"/>
-	<key>
-		<default display="äëö" action="modifier:mod1"/>
-	</key>
-	<key fill="true">
-		<default display="Ctrl" action="modifier:ctrl"/>
-	</key>
-	<key>
-		<default display="Alt" action="modifier:alt"/>
-	</key>
-	<key width="12000">
-		<default display=" " action="space" />
-	</key>
-	<key>
-		<default display="^" action="up" />
-	</key>
-	<key>
-		<default display="V" action="down" />
-	</key>
-	<key>
-		<default display="&lt;" action="left" />
-	</key>
-	<key>
-		<default display="&gt;" action="right" />
-	</key>
-	<space width="500" extended="true"/>
-	<space width="4000"  extended="true" />
-	<space width="4000"  extended="true" />
-	<space width="500" extended="true"/>
-</row>
-
-</layout>
-
-</keyboard>

Deleted: trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-extended.xml
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-extended.xml	2007-03-01 02:31:18 UTC (rev 1168)
+++ trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-extended.xml	2007-03-01 07:39:08 UTC (rev 1169)
@@ -1,348 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<keyboard>
-
-<options>
-<!--
-   <font prefered-size=''>
-   <size fixed='100x100'>
-   <padding>
--->
-</options>
-
-<layout id="name">
-
-<!--
-  <row>
-     <key>
-	  <default display="ヂ" />                
-    </key>
-    <key>
-	  <default display="Ӫ" />                
-    </key>
-    <key width="1500">
-	  <default display="Ω" />                
-    </key>
-    <space width="1500" />
-    <key fill="true">
-	  <default display="⠿" />                
-    </key>
-  </row>
--->
-
-  <row>
-    <key fill="true">
-	  <default display="Esc" action="escape" />
-    </key>
-    <key>
-	  <default display="`" />
-    </key>
-    <key>
-	  <default display="1" />                
-	  <shifted display="!" />
-    </key>
-    <key>
-	  <default display="2" />                
-	  <shifted display='"' />
-    </key>
-    <key>
-	  <default display="3" />
-	  <shifted display="" />                
-    </key>
-    <key>
-	  <default display="4" />
-	  <shifted display="$" />                
-    </key>
-    <key>
-	  <default display="5" />
-	  <shifted display="%" />                
-    </key>
-    <key>
-	  <default display="6" />
-	  <shifted display="^" />                
-    </key>
-    <key>
-	  <default display="7" />
-	  <shifted display="&amp;" />                
-    </key>
-    <key>
-	  <default display="8" />
-	  <shifted display="*" />                
-    </key>
-    <key>
-	  <default display="9" />
-	  <shifted display="(" />                
-    </key>
-    <key>
-	  <default display="0" />
-	  <shifted display=")" />                
-    </key>
-    <key>
-	  <default display="-" />
-	  <shifted display="_" />                
-    </key>
-    <key>
-	  <default display="=" />
-	  <shifted display="+" />                
-    </key>
-
-    <key fill="true">
-	  <default display="Bksp" action="backspace"/>
-    </key>
-
-    <space width="500" />
-
-    <key width="4000">
-	  <default display="Home" />
-    </key>
-    <key width="4000">
-	  <default display="PgUp" />
-    </key>
-
-
-  </row>
-
-  <row>
-    <key fill="true">
-	  <default display="Tab" action="tab"/>                
-    </key>
-    <key obey-caps='true'>
-	  <default display="q" />                
-	  <shifted display="Q" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="w" />                
-	  <shifted display="W" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="e" />                
-	  <shifted display="E" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="r" />                
-	  <shifted display="R" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="t" />                
-	  <shifted display="T" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="y" />                
-	  <shifted display="Y" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="u" />                
-	  <shifted display="U" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="i" />                
-	  <shifted display="I" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="o" />                
-	  <shifted display="O" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="p" />                
-	  <shifted display="P" />
-    </key>
-    <key>
-	  <default display="{" />                
-	  <shifted display="[" />
-    </key>
-    <key>
-	  <default display="}" />                
-	  <shifted display="]" />
-    </key>
-    <key fill="true">
-	  <default display="\" />                
-	  <shifted display="|" />
-    </key>
-
-    <space width="500" />
-
-    <key width="4000">
-	  <default display="End" />
-    </key>
-    <key width="4000">
-	  <default display="PgDn" />
-    </key>
-
-
-  </row>
-  <row>
-    <key fill="true">
-	  <default display="Caps" action="modifier:caps"/>                
-    </key>
-    <key obey-caps='true'>
-	  <default display="a" />                
-	  <shifted display="A" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="s" />                
-	  <shifted display="S" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="d" />                
-	  <shifted display="D" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="f" />                
-	  <shifted display="F" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="g" />                
-	  <shifted display="G" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="h" />                
-	  <shifted display="H" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="j" />                
-	  <shifted display="J" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="k" />                
-	  <shifted display="K" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="l" />                
-	  <shifted display="L" />
-    </key>
-    <key>
-	  <default display=":" />                
-	  <shifted display=";" />
-    </key>
-    <key>
-	  <default display="#" />                
-	  <shifted display="~" />
-    </key>
-    <key fill="true">
-	  <default display="Ret" action="return"/>
-    </key>
-
-    <space width="500" />
-
-    <key width="4000">
-	  <default display="Del" />
-    </key>
-    <key width="4000">
-	  <default display="XXX" />
-    </key>
-
-
-  </row>
-  <row>
-
-    <key fill="true">
-	  <default display="Shift" action="modifier:shift"/>                
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="z" />                
-	  <shifted display="Z" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="x" />                
-	  <shifted display="X" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="c" />                
-	  <shifted display="C" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="v" />                
-	  <shifted display="V" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="b" />                
-	  <shifted display="B" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="n" />                
-	  <shifted display="N" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="m" />                
-	  <shifted display="M" />
-    </key>
-
-    <key>
-	  <default display="." />                
-	  <shifted display="&lt;" />
-    </key>
-    <key>
-	  <default display="." />                
-	  <shifted display="&gt;" />
-    </key>
-    <key>
-	  <default display="?" />                
-	  <shifted display="/" />
-    </key>
-
-
-    <key fill="true">
-	  <default display="Shift" action="modifier:shift"/>                
-    </key>
-
-    <space width="500" />
-
-    <key width="4000">
-	  <default display="Inst" />
-    </key>
-    <key width="4000">
-	  <default display="Pase" />
-    </key>
-
-
- </row>
-  <row>
-    <key>
-	  <default display="aeo" action="modifier:mod1"/>                
-    </key>
-
-    <key>
-	  <default display="Ctrl" action="modifier:ctrl"/>                
-    </key>
-
-    <key>
-	  <default display="Alt" action="modifier:alt"/>                
-    </key>
-
-
-    <key width="14000">
-	  <default display=" " action="space" />                
-    </key>
-
-    <key>
-	  <default display="@" />                
-	  <shifted display="'" />
-    </key>
-
-    <key>
-	  <default display="^" action="up" />                
-    </key>
-    <key>
-	  <default display="^" action="down" />                
-    </key>
-    <key>
-	  <default display="&lt;" action="left" />                
-    </key>
-    <key>
-	  <default display="&gt;" action="right" />                
-    </key>
-
-    <space width="8500" />
-
-</row>
-
-</layout>
-
-
-</keyboard>

Deleted: trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-fi.xml
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-fi.xml	2007-03-01 02:31:18 UTC (rev 1168)
+++ trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-fi.xml	2007-03-01 07:39:08 UTC (rev 1169)
@@ -1,376 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<keyboard>
-
-<options>
-<!-- not yet implemented -->
-</options>
-
-<layout id="defualt keyboard">
-
-<!--
-  <row>
-     <key>
-	  <default display="ヂ" />
-    </key>
-    <key>
-	  <default display="Óª" />
-    </key>
-    <key width="1500">
-	  <default display="Ω" />
-    </key>
-    <space width="1500" />
-    <key fill="true">
-	  <default display="â ¿" />
-    </key>
-  </row>
--->
-
-  <row>
-
-    <space width="500" extended="true"/>
-
-    <key fill="true">
-	  <default display="Esc" action="escape" />
-    </key>
-    <key>
-	  <default display="§" />
-	  <shifted display="½" />
-    </key>
-    <key>
-	  <default display="1" />
-	  <shifted display="!" />
-    </key>
-    <key>
-	  <default display="2" />
-	  <shifted display='"' />
-	  <mod1 display='@' />
-    </key>
-    <key>
-	  <default display="3" />
-	  <shifted display="#" />
-	  <mod1 display="£" />
-    </key>
-    <key>
-	  <default display="4" />
-	  <default display="¤" />
-	  <mod1 display="$" />
-    </key>
-    <key>
-	  <default display="5" />
-	  <shifted display="%" />
-    </key>
-    <key>
-	  <default display="6" />
-	  <shifted display="&amp;" />
-    </key>
-    <key>
-	  <default display="7" />
-	  <shifted display="/" />
-	  <mod1 display='{' />
-    </key>
-    <key>
-	  <default display="8" />
-	  <shifted display="(" />
-	  <mod1 display='[' />
-    </key>
-    <key>
-	  <default display="9" />
-	  <shifted display=")" />
-	  <mod1 display=']' />
-    </key>
-    <key>
-	  <default display="0" />
-	  <shifted display="=" />
-	  <mod1 display='}' />
-    </key>
-    <key>
-	  <default display="+" />
-	  <shifted display="?" />
-	  <mod1 display="\" />
-    </key>
-    <key>
-	  <default display="'" />
-	  <shifted display="*" />
-    </key>
-
-    <key fill="true">
-	  <default display="Bksp" action="backspace"/>
-    </key>
-
-    <space width="500" extended="true"/>
-
-    <key width="4000"  extended="true">
-	  <default display="Home" action="home"/>
-    </key>
-    <key width="4000"  extended="true">
-	  <default display="PgUp" action="pageup"/>
-    </key>
-
-    <space width="500" extended="true"/>
-
-
-  </row>
-
-  <row>
-
-    <space width="500" extended="true"/>
-
-    <key fill="true">
-	  <default display="Tab" action="tab"/>
-    </key>
-    <key obey-caps='true'>
-	  <default display="q" />
-	  <shifted display="Q" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="w" />
-	  <shifted display="W" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="e" />
-	  <shifted display="E" />
-	  <mod1 display="€" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="r" />
-	  <shifted display="R" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="t" />
-	  <shifted display="T" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="y" />
-	  <shifted display="Y" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="u" />
-	  <shifted display="U" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="i" />
-	  <shifted display="I" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="o" />
-	  <shifted display="O" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="p" />
-	  <shifted display="P" />
-    </key>
-    <key>
-	  <default display="å" />
-	  <shifted display="Å" />
-    </key>
-    <key>
-	  <default display="~" />
-	  <shifted display="^" />
-    </key>
-
-    <space width="500" extended="true"/>
-
-    <key width="4000"  extended="true">
-	  <default display="End" action="end"/>
-    </key>
-    <key width="4000"  extended="true">
-	  <default display="PgDn" action="pagedown"/>
-    </key>
-
-    <space width="500" extended="true"/>
-
-  </row>
-  <row>
-
-    <space width="500" extended="true"/>
-
-    <key fill="true">
-	  <default display="Caps" action="modifier:caps"/>
-    </key>
-    <key obey-caps='true'>
-	  <default display="a" />
-	  <shifted display="A" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="s" />
-	  <shifted display="S" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="d" />
-	  <shifted display="D" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="f" />
-	  <shifted display="F" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="g" />
-	  <shifted display="G" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="h" />
-	  <shifted display="H" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="j" />
-	  <shifted display="J" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="k" />
-	  <shifted display="K" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="l" />
-	  <shifted display="L" />
-    </key>
-    <key>
-	  <default display="Ö" />
-	  <shifted display="ö" />
-    </key>
-    <key>
-	  <default display="ä" />
-	  <shifted display="Ä" />
-    </key>
-    <key fill="true">
-	  <default display="Ret" action="return"/>
-    </key>
-
-    <space width="500" extended="true"/>
-
-    <space width="4000"  extended="true" />
-
-    <space width="4000"  extended="true" />
-
-    <space width="500" extended="true"/>
-
-
-  </row>
-  <row>
-
-    <space width="500" extended="true"/>
-
-    <key fill="true">
-	  <default display="Shift" action="modifier:shift"/>
-    </key>
-
-    <key>
-	  <default display="&lt;" />
-	  <shifted display="&gt;" />
-	  <mod1 display="|" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="z" />
-	  <shifted display="Z" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="x" />
-	  <shifted display="X" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="c" />
-	  <shifted display="C" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="v" />
-	  <shifted display="V" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="b" />
-	  <shifted display="B" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="n" />
-	  <shifted display="N" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="m" />
-	  <shifted display="M" />
-	  <mod1 display="µ" />
-    </key>
-
-    <key>
-	  <default display="," />
-	  <shifted display=":" />
-    </key>
-    <key>
-	  <default display="." />
-	  <shifted display=":" />
-    </key>
-    <key>
-	  <default display="-" />
-	  <shifted display="_" />
-    </key>
-
-
-    <key fill="true">
-	  <default display="Shift" action="modifier:shift"/>
-    </key>
-
-    <space width="500" extended="true"/>
-
-    <space width="4000"  extended="true" />
-
-    <space width="4000"  extended="true" />
-
-    <space width="500" extended="true"/>
-
-
-
- </row>
-  <row>
-
-    <space width="500" extended="true"/>
-
-
-    <key fill="true">
-	  <default display="Ctrl" action="modifier:ctrl"/>
-    </key>
-
-    <key>
-	  <default display="Alt" action="modifier:alt"/>
-    </key>
-
-
-    <key width="12000">
-	  <default display=" " action="space" />
-    </key>
-
-    <key>
-	  <default display="ALT GR" action="modifier:mod1"/>
-    </key>
-
-
-    <key>
-	  <default display="UP" action="up" />
-    </key>
-    <key>
-	  <default display="DOWN" action="down" />
-    </key>
-    <key>
-	  <default display="LEFT" action="left" />
-    </key>
-    <key>
-	  <default display="RIGHT" action="right" />
-    </key>
-
-    <space width="500" extended="true"/>
-
-    <space width="4000"  extended="true" />
-
-    <space width="4000"  extended="true" />
-
-    <space width="500" extended="true"/>
-
-</row>
-
-</layout>
-
-
-</keyboard>
\ No newline at end of file

Added: trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-low.xml
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-low.xml	2007-03-01 02:31:18 UTC (rev 1168)
+++ trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-low.xml	2007-03-01 07:39:08 UTC (rev 1169)
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<keyboard>
+
+<options>
+<!-- not yet implemented -->
+</options>
+
+<layout id="defualt keyboard">
+  <background image="bg_keypad.png" />
+
+  <row>
+
+    <key>
+      <default display="q" />
+      <normalimage image="key_low_q.png"/>
+      <pushimage image="key_low_q_p.png"/>
+    </key>
+    <key>
+      <default display="w" />
+      <normalimage image="key_low_w.png"/>
+      <pushimage image="key_low_w_p.png"/>
+    </key>
+    <key>
+      <default display="e" />
+      <normalimage image="key_low_e.png"/>
+      <pushimage image="key_low_e_p.png"/>
+    </key>
+    <key>
+      <default display="r" />
+      <normalimage image="key_low_r.png"/>
+      <pushimage image="key_low_r_p.png"/>
+    </key>
+    <key>
+      <default display="t" />
+      <normalimage image="key_low_t.png"/>
+      <pushimage image="key_low_t_p.png"/>
+    </key>
+    <key>
+      <default display="y" />
+      <normalimage image="key_low_y.png"/>
+      <pushimage image="key_low_y_p.png"/>
+    </key>
+    <key>
+      <default display="u" />
+      <normalimage image="key_low_u.png"/>
+      <pushimage image="key_low_u_p.png"/>
+    </key>
+    <key>
+      <default display="i" />
+      <normalimage image="key_low_i.png"/>
+      <pushimage image="key_low_i_p.png"/>
+    </key>
+    <key>
+      <default display="o" />
+      <normalimage image="key_low_o.png"/>
+      <pushimage image="key_low_o_p.png"/>
+    </key>
+    <key>
+      <default display="p" />
+      <normalimage image="key_low_p.png"/>
+      <pushimage image="key_low_p_p.png"/>
+    </key>
+
+  </row>
+
+  <row>
+
+    <key>
+      <default display="a" />
+      <normalimage image="key_low_a.png"/>
+      <pushimage image="key_low_a_p.png"/>
+    </key>
+    <key>
+      <default display="s" />
+      <normalimage image="key_low_s.png"/>
+      <pushimage image="key_low_s_p.png"/>
+    </key>
+    <key>
+      <default display="d" />
+      <normalimage image="key_low_d.png"/>
+      <pushimage image="key_low_d_p.png"/>
+    </key>
+    <key>
+      <default display="f" />
+      <normalimage image="key_low_f.png"/>
+      <pushimage image="key_low_f_p.png"/>
+    </key>
+    <key>
+      <default display="g" />
+      <normalimage image="key_low_g.png"/>
+      <pushimage image="key_low_g_p.png"/>
+    </key>
+    <key>
+      <default display="h" />
+      <normalimage image="key_low_h.png"/>
+      <pushimage image="key_low_h_p.png"/>
+    </key>
+    <key>
+      <default display="j" />
+      <normalimage image="key_low_j.png"/>
+      <pushimage image="key_low_j_p.png"/>
+    </key>
+    <key>
+      <default display="k" />
+      <normalimage image="key_low_k.png"/>
+      <pushimage image="key_low_k_p.png"/>
+    </key>
+    <key>
+      <default display="l" />
+      <normalimage image="key_low_l.png"/>
+      <pushimage image="key_low_l_p.png"/>
+    </key>
+
+  </row>
+  <row>
+
+    <key>
+      <default display="z" />
+      <normalimage image="key_low_z.png"/>
+      <pushimage image="key_low_z_p.png"/>
+    </key>
+    <key>
+      <default display="x" />
+      <normalimage image="key_low_x.png"/>
+      <pushimage image="key_low_x_p.png"/>
+    </key>
+    <key>
+      <default display="c" />
+      <normalimage image="key_low_c.png"/>
+      <pushimage image="key_low_c_p.png"/>
+    </key>
+    <key>
+      <default display="v" />
+      <normalimage image="key_low_v.png"/>
+      <pushimage image="key_low_v_p.png"/>
+    </key>
+    <key>
+      <default display="b" />
+      <normalimage image="key_low_b.png"/>
+      <pushimage image="key_low_b_p.png"/>
+    </key>
+    <key>
+      <default display="n" />
+      <normalimage image="key_low_n.png"/>
+      <pushimage image="key_low_n_p.png"/>
+    </key>
+    <key>
+      <default display="m" />
+      <normalimage image="key_low_m.png"/>
+      <pushimage image="key_low_m_p.png"/>
+    </key>
+
+  </row>
+
+  <row>
+
+
+    <key>
+      <default display=" " action="space" />
+      <normalimage image="key_comm_space.png"/>
+      <pushimage image="key_comm_space_p.png"/>
+    </key>
+    <key>
+      <default display=" " action="backspace" />
+      <normalimage image="key_comm_backspace.png"/>
+      <pushimage image="key_comm_backspace_p.png"/>
+    </key>
+    <key>
+      <default display=" " action="return" />
+      <normalimage image="key_comm_enter.png"/>
+      <pushimage image="key_comm_enter_p.png"/>
+    </key>
+  </row>
+
+</layout>
+
+
+</keyboard>

Added: trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-number.xml
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-number.xml	2007-03-01 02:31:18 UTC (rev 1168)
+++ trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-number.xml	2007-03-01 07:39:08 UTC (rev 1169)
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<keyboard>
+
+<options>
+<!-- not yet implemented -->
+</options>
+
+<layout id="defualt keyboard">
+  <background image="bg_keypad.png" />
+
+  <row>
+
+    <key>
+      <default display="1" />
+      <normalimage image="key_num_1.png"/>
+      <pushimage image="key_num_1_p.png"/>
+    </key>
+    <key>
+      <default display="2" />
+      <normalimage image="key_num_2.png"/>
+      <pushimage image="key_num_2_p.png"/>
+    </key>
+    <key>
+      <default display="3" />
+      <normalimage image="key_num_3.png"/>
+      <pushimage image="key_num_3_p.png"/>
+    </key>
+    <key>
+      <default display="4" />
+      <normalimage image="key_num_4.png"/>
+      <pushimage image="key_num_4_p.png"/>
+    </key>
+    <key>
+      <default display="5" />
+      <normalimage image="key_num_5.png"/>
+      <pushimage image="key_num_5_p.png"/>
+    </key>
+    <key>
+      <default display="6" />
+      <normalimage image="key_num_6.png"/>
+      <pushimage image="key_num_6_p.png"/>
+    </key>
+    <key>
+      <default display="7" />
+      <normalimage image="key_num_7.png"/>
+      <pushimage image="key_num_7_p.png"/>
+    </key>
+    <key>
+      <default display="8" />
+      <normalimage image="key_num_8.png"/>
+      <pushimage image="key_num_8_p.png"/>
+    </key>
+    <key>
+      <default display="9" />
+      <normalimage image="key_num_9.png"/>
+      <pushimage image="key_num_9_p.png"/>
+    </key>
+    <key>
+      <default display="0" />
+      <normalimage image="key_num_0.png"/>
+      <pushimage image="key_num_0_p.png"/>
+    </key>
+
+  </row>
+
+  <row>
+
+    <key>
+      <default display="^" />
+      <normalimage image="key_sym_caret.png"/>
+      <pushimage image="key_sym_caret_p.png"/>
+    </key>
+    <key>
+      <default display="(" />
+      <normalimage image="key_sym_open_paren.png"/>
+      <pushimage image="key_sym_open_paren_p.png"/>
+    </key>
+    <key>
+      <default display=")" />
+      <normalimage image="key_sym_close_paren.png"/>
+      <pushimage image="key_sym_close_paren_p.png"/>
+    </key>
+    <key>
+      <default display="-" />
+      <normalimage image="key_sym_minus.png"/>
+      <pushimage image="key_sym_minus_p.png"/>
+    </key>
+    <key>
+      <default display="+" />
+      <normalimage image="key_sym_plus.png"/>
+      <pushimage image="key_sym_plus_p.png"/>
+    </key>
+    <key>
+      <default display="=" />
+      <normalimage image="key_sym_equal.png"/>
+      <pushimage image="key_sym_equal_p.png"/>
+    </key>
+
+  </row>
+  <row>
+
+    <key>
+      <default display="%" />
+      <normalimage image="key_sym_percent.png"/>
+      <pushimage image="key_sym_percent_p.png"/>
+    </key>
+    <key>
+      <default display="*" />
+      <normalimage image="key_sym_star.png"/>
+      <pushimage image="key_sym_star_p.png"/>
+    </key>
+    <key>
+      <default display="&lt;" />
+      <normalimage image="key_sym_smaller.png"/>
+      <pushimage image="key_sym_smaller_p.png"/>
+    </key>
+    <key>
+      <default display="&gt;" />
+      <normalimage image="key_sym_greater.png"/>
+      <pushimage image="key_sym_greater_p.png"/>
+    </key>
+    <key>
+      <default display="." />
+      <normalimage image="key_sym_period.png"/>
+      <pushimage image="key_sym_period_p.png"/>
+    </key>
+    <key>
+      <default display="/" />
+      <normalimage image="key_sym_slash.png"/>
+      <pushimage image="key_sym_slash_p.png"/>
+    </key>
+
+  </row>
+
+  <row>
+
+
+    <key>
+      <default display=" " action="space" />
+      <normalimage image="key_comm_space.png"/>
+      <pushimage image="key_comm_space_p.png"/>
+    </key>
+    <key>
+      <default display=" " action="backspace" />
+      <normalimage image="key_comm_backspace.png"/>
+      <pushimage image="key_comm_backspace_p.png"/>
+    </key>
+    <key>
+      <default display=" " action="return" />
+      <normalimage image="key_comm_enter.png"/>
+      <pushimage image="key_comm_enter_p.png"/>
+    </key>
+  </row>
+
+</layout>
+
+
+</keyboard>

Deleted: trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-numpad.xml
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-numpad.xml	2007-03-01 02:31:18 UTC (rev 1168)
+++ trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-numpad.xml	2007-03-01 07:39:08 UTC (rev 1169)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<keyboard>
-
-<options>
-<!-- not yet implemented -->
-</options>
-
-<layout id="defualt keyboard">
-
-  <row>
-
-    <space width="500" extended="true"/>
-
-    <key>
-	  <default display="9" />                
-    </key>
-    <key>
-	  <default display="8" />                
-    </key>
-    <key>
-	  <default display="7" />
-    </key>
-
-  </row>
-  <row>
-    <space width="500" extended="true"/>
-    <key>
-	  <default display="6" />
-    </key>
-    <key>
-	  <default display="5" />
-    </key>
-    <key>
-	  <default display="4" />
-    </key>
-  </row>
-  <row>
-    <space width="500" extended="true"/>
-    <key>
-	  <default display="3" />
-    </key>
-
-    <key>
-	  <default display="2" />
-    </key>
-    <key>
-	  <default display="1" />
-    </key>
-  </row>
-  <row>
-    <space width="500" extended="true"/>
-    <key>
-	  <default display="0" />
-    </key>
-  </row>
-
-</layout>
-
-
-</keyboard>
\ No newline at end of file

Deleted: trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-ru.xml
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-ru.xml	2007-03-01 02:31:18 UTC (rev 1168)
+++ trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-ru.xml	2007-03-01 07:39:08 UTC (rev 1169)
@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<keyboard>
-
-<options>
-  
-</options>
-
-<layout id="RUS">
-
-  <row>
-
-    <space width="500" extended="true"/>
-
-    <key fill="true">
-	  <default display="Esc" action="escape" />
-    </key>
-    <key>
-	  <default display="`" />
-    </key>
-    <key>
-	  <default display="1" />                
-	  <shifted display="!" />
-    </key>
-    <key>
-	  <default display="2" />                
-	  <shifted display='"' />
-<!-- " -->
-
-          <mod1    display="½" />
-    </key>
-    <key>
-	  <default display="3" />
-	  <shifted display="£" />
-          <mod1    display="¾" />               
-    </key>
-    <key>
-	  <default display="4" />
-	  <shifted display="$" />                
-    </key>
-    <key>
-	  <default display="5" />
-	  <shifted display="%" />                
-    </key>
-    <key>
-	  <default display="6" />
-	  <shifted display="^" />                
-    </key>
-    <key>
-	  <default display="7" />
-	  <shifted display="&amp;" />                
-    </key>
-    <key>
-	  <default display="8" />
-	  <shifted display="*" />                
-    </key>
-    <key>
-	  <default display="9" />
-	  <shifted display="(" />                
-    </key>
-    <key>
-	  <default display="0" />
-	  <shifted display=")" />                
-    </key>
-    <key>
-	  <default display="-" />
-	  <shifted display="_" />                
-    </key>
-    <key>
-	  <default display="=" />
-	  <shifted display="+" />                
-    </key>
-
-    <key fill="true">
-	  <default display="Bksp" action="backspace"/>
-    </key>
-
-    <space width="500" extended="true"/>
-
-    <key width="4000"  extended="true">
-	  <default display="Home" action="home"/>
-    </key>
-    <key width="4000"  extended="true">
-	  <default display="PgUp" action="pageup"/>
-    </key>
-
-    <space width="500" extended="true"/>
-
-
-  </row>
-
-  <row>
-
-    <space width="500" extended="true"/>
-
-    <key fill="true">
-	  <default display="Tab" action="tab"/>                
-    </key>
-    <key obey-caps='true'>
-	  <default display="й" />                
-	  <shifted display="Й" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="ц" />                
-	  <shifted display="Ц" />
-    </key>
-    <key obey-caps='true'>
-	  <default    display="у" />                
-	  <shifted display="У" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="к" />                
-	  <shifted display="К" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="е" />                
-	  <shifted display="Е" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="н" />                
-	  <shifted display="Н" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="г" />                
-	  <shifted display="Г" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="ш" />                
-	  <shifted display="Ш" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="щ" />                
-	  <shifted display="Щ" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="з" />                
-	  <shifted display="З" />
-    </key>
-    <key>
-	  <default display="х" />                
-	  <shifted display="Х" />
-    </key>
-    <key>
-	  <default display="ъ" />                
-	  <shifted display="Ъ" />
-    </key>
-    <key fill="true">
-	  <default display="\" />                
-	  <shifted display="|" />
-    </key>
-
-    <space width="500" extended="true"/>
-
-    <key width="4000"  extended="true">
-	  <default display="End" action="end"/>
-    </key>
-    <key width="4000"  extended="true">
-	  <default display="PgDn" action="pagedown"/>
-    </key>
-
-    <space width="500" extended="true"/>
-
-  </row>
-  <row>
-
-    <space width="500" extended="true"/>
-
-    <key fill="true">
-	  <default display="Caps" action="modifier:caps"/>                
-    </key>
-    <key obey-caps='true'>
-	  <default display="ф" />                
-	  <shifted display="Ф" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="ы" />                
-	  <shifted display="Ы" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="в" />                
-	  <shifted display="В" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="а" />                
-	  <shifted display="А" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="п" />                
-	  <shifted display="П" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="р" />                
-	  <shifted display="Р" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="о" />                
-	  <shifted display="О" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="л" />                
-	  <shifted display="Л" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="д" />                
-	  <shifted display="Д" />
-    </key>
-    <key>
-	  <default display="ж" />                
-	  <shifted display="Ж" />
-    </key>
-    <key>
-	  <default display="э" />                
-	  <shifted display="Э" />
-    </key>
-    <key fill="true">
-	  <default display="Ret" action="return"/>
-    </key>
-
-    <space width="500" extended="true"/>
-
-    <space width="4000"  extended="true" />
-
-    <space width="4000"  extended="true" />
-
-    <space width="500" extended="true"/>
-
-
-  </row>
-  <row>
-
-    <space width="500" extended="true"/>
-
-    <key fill="true">
-	  <default display="Shift" action="modifier:shift"/>                
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="я" />                
-	  <shifted display="Я" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="ч" />                
-	  <shifted display="Ч" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="с" />                
-	  <shifted display="С" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="м" />                
-	  <shifted display="М" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="и" />                
-	  <shifted display="И" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="т" />                
-	  <shifted display="Т" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="ь" />                
-	  <shifted display="Ь" />
-    </key>
-
-    <key>
-	  <default display="б" />                
-	  <shifted display="Б" />
-    </key>
-    <key>
-	  <default display="ю" />                
-	  <shifted display="Ю" />
-    </key>
-    <key>
-	  <default display="?" />                
-	  <shifted display="/" />
-    </key>
-
-
-    <key fill="true">
-	  <default display="Shift" action="modifier:shift"/>                
-    </key>
-
-    <space width="500" extended="true"/>
-
-    <space width="4000"  extended="true" />
-
-    <space width="4000"  extended="true" />
-
-    <space width="500" extended="true"/>
-
-
-
- </row>
-  <row>
-
-    <space width="500" extended="true"/>
-
-    <key>
-	  <default display="äëö" action="modifier:mod1"/>                
-    </key>
-    <key>
-	  <default display="EN" action="modifier:mod2"/>                
-    </key>
-
-    <key fill="true">
-	  <default display="Ctrl" action="modifier:ctrl"/>                
-    </key>
-
-    <key>
-	  <default display="Alt" action="modifier:alt"/>                
-    </key>
-
-
-    <key width="12000">
-	  <default display=" " action="space" />                
-    </key>
-
-    <key>
-	  <default display="@" />                
-	  <shifted display="'" />
-    </key>
-
-    <key>
-	  <default display="^" action="up" />                
-    </key>
-    <key>
-	  <default display="V" action="down" />                
-    </key>
-    <key>
-	  <default display="&lt;" action="left" />                
-    </key>
-    <key>
-	  <default display="&gt;" action="right" />                
-    </key>
-
-    <space width="500" extended="true"/>
-
-    <space width="4000"  extended="true" />
-
-    <space width="4000"  extended="true" />
-
-    <space width="500" extended="true"/>
-
-</row>
-
-</layout>
-
-</keyboard>
-

Added: trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-symbol.xml
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-symbol.xml	2007-03-01 02:31:18 UTC (rev 1168)
+++ trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-symbol.xml	2007-03-01 07:39:08 UTC (rev 1169)
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<keyboard>
+
+<options>
+<!-- not yet implemented -->
+</options>
+
+<layout id="defualt keyboard">
+  <background image="bg_keypad.png" />
+
+  <row>
+
+    <key>
+      <default display="`" />
+      <normalimage image="key_sym_grave_accent.png"/>
+      <pushimage image="key_sym_grave_accent_p.png"/>
+    </key>
+    <key>
+      <default display="~" />
+      <normalimage image="key_sym_tilde.png"/>
+      <pushimage image="key_sym_tilde_p.png"/>
+    </key>
+    <key>
+      <default display="!" />
+      <normalimage image="key_sym_exclamation.png"/>
+      <pushimage image="key_sym_exclamation_p.png"/>
+    </key>
+    <key>
+      <default display="@" />
+      <normalimage image="key_sym_at.png"/>
+      <pushimage image="key_sym_at_p.png"/>
+    </key>
+    <key>
+      <default display="#" />
+      <normalimage image="key_sym_sharp.png"/>
+      <pushimage image="key_sym_sharp_p.png"/>
+    </key>
+    <key>
+      <default display="$" />
+      <normalimage image="key_sym_dollar.png"/>
+      <pushimage image="key_sym_dollar_p.png"/>
+    </key>
+    <key>
+      <default display="%" />
+      <normalimage image="key_sym_percent.png"/>
+      <pushimage image="key_sym_percent_p.png"/>
+    </key>
+    <key>
+      <default display="^" />
+      <normalimage image="key_sym_caret.png"/>
+      <pushimage image="key_sym_caret_p.png"/>
+    </key>
+    <key>
+      <default display="&amp;" />
+      <normalimage image="key_sym_ampersand.png"/>
+      <pushimage image="key_sym_ampersand_p.png"/>
+    </key>
+    <key>
+      <default display="*" />
+      <normalimage image="key_sym_star.png"/>
+      <pushimage image="key_sym_star_p.png"/>
+    </key>
+
+  </row>
+
+  <row>
+
+    <key>
+      <default display="(" />
+      <normalimage image="key_sym_open_paren.png"/>
+      <pushimage image="key_sym_open_paren_p.png"/>
+    </key>
+    <key>
+      <default display=")" />
+      <normalimage image="key_sym_close_paren.png"/>
+      <pushimage image="key_sym_close_paren_p.png"/>
+    </key>
+    <key>
+      <default display="{" />
+      <normalimage image="key_sym_open_curly.png"/>
+      <pushimage image="key_sym_open_curly_p.png"/>
+    </key>
+    <key>
+      <default display="}" />
+      <normalimage image="key_sym_close_curly.png"/>
+      <pushimage image="key_sym_close_curly_p.png"/>
+    </key>
+    <key>
+      <default display="[" />
+      <normalimage image="key_sym_open_bracket.png"/>
+      <pushimage image="key_sym_open_bracket_p.png"/>
+    </key>
+    <key>
+      <default display="]" />
+      <normalimage image="key_sym_close_bracket.png"/>
+      <pushimage image="key_sym_close_bracket_p.png"/>
+    </key>
+    <key>
+      <default display="_" />
+      <normalimage image="key_sym_underscore.png"/>
+      <pushimage image="key_sym_underscore_p.png"/>
+    </key>
+    <key>
+      <default display="-" />
+      <normalimage image="key_sym_minus.png"/>
+      <pushimage image="key_sym_minus_p.png"/>
+    </key>
+    <key>
+      <default display="+" />
+      <normalimage image="key_sym_plus.png"/>
+      <pushimage image="key_sym_plus_p.png"/>
+    </key>
+    <key>
+      <default display="=" />
+      <normalimage image="key_sym_equal.png"/>
+      <pushimage image="key_sym_equal_p.png"/>
+    </key>
+
+  </row>
+  <row>
+
+    <key>
+      <default display="&lt;" />
+      <normalimage image="key_sym_smaller.png"/>
+      <pushimage image="key_sym_smaller_p.png"/>
+    </key>
+    <key>
+      <default display="&gt;" />
+      <normalimage image="key_sym_greater.png"/>
+      <pushimage image="key_sym_greater_p.png"/>
+    </key>
+    <key>
+      <default display="|" />
+      <normalimage image="key_sym_line.png"/>
+      <pushimage image="key_sym_line_p.png"/>
+    </key>
+    <key>
+      <default display="?" />
+      <normalimage image="key_sym_question.png"/>
+      <pushimage image="key_sym_question_p.png"/>
+    </key>
+    <key>
+      <default display=";" />
+      <normalimage image="key_sym_semicolon.png"/>
+      <pushimage image="key_sym_semicolon_p.png"/>
+    </key>
+    <key>
+      <default display=":" />
+      <normalimage image="key_sym_colon.png"/>
+      <pushimage image="key_sym_colon_p.png"/>
+    </key>
+    <key>
+      <default display="," />
+      <normalimage image="key_sym_comma.png"/>
+      <pushimage image="key_sym_comma_p.png"/>
+    </key>
+    <key>
+      <default display="." />
+      <normalimage image="key_sym_period.png"/>
+      <pushimage image="key_sym_period_p.png"/>
+    </key>
+    <key>
+      <default display="'" />
+      <normalimage image="key_sym_quote.png"/>
+      <pushimage image="key_sym_quote_p.png"/>
+    </key>
+    <key>
+      <default display='"' />
+      <normalimage image="key_sym_quotes.png"/>
+      <pushimage image="key_sym_quotes_p.png"/>
+    </key>
+
+  </row>
+
+  <row>
+
+
+    <key>
+      <default display="/" />
+      <normalimage image="key_sym_slash.png"/>
+      <pushimage image="key_sym_slash_p.png"/>
+    </key>
+    <key>
+      <default display=" " action="space" />
+      <normalimage image="key_comm_space.png"/>
+      <pushimage image="key_comm_space_p.png"/>
+    </key>
+    <key>
+      <default display=" " action="backspace" />
+      <normalimage image="key_comm_backspace.png"/>
+      <pushimage image="key_comm_backspace_p.png"/>
+    </key>
+    <key>
+      <default display=" " action="return" />
+      <normalimage image="key_comm_enter.png"/>
+      <pushimage image="key_comm_enter_p.png"/>
+    </key>
+    <key>
+      <default display="\" />
+      <normalimage image="key_sym_slash2.png"/>
+      <pushimage image="key_sym_slash2_p.png"/>
+    </key>
+
+  </row>
+
+</layout>
+
+
+</keyboard>

Deleted: trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-us.xml
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-us.xml	2007-03-01 02:31:18 UTC (rev 1168)
+++ trunk/src/target/OM-2007/applications/openmoko-keyboard/layouts/keyboard-us.xml	2007-03-01 07:39:08 UTC (rev 1169)
@@ -1,371 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<keyboard>
-
-<!--
-
- US keyboard layout by Matt Reimer <mreimer at vpop.net>
-
--->
-
-<options>
-<!-- not yet implemented -->
-</options>
-
-<layout id="default keyboard">
-
-<!--
-  <row>
-     <key>
-	  <default display="ヂ" />                
-    </key>
-    <key>
-	  <default display="Ӫ" />                
-    </key>
-    <key width="1500">
-	  <default display="Ω" />                
-    </key>
-    <space width="1500" />
-    <key fill="true">
-	  <default display="⠿" />                
-    </key>
-  </row>
--->
-
-  <row>
-
-    <space width="500" extended="true"/>
-
-    <key fill="true">
-	  <default display="Esc" action="escape" />
-    </key>
-    <key>
-	  <default display="`" />
-	  <shifted display="~" />
-    </key>
-    <key>
-	  <default display="1" />                
-	  <shifted display="!" />
-    </key>
-    <key>
-	  <default display="2" />                
-	  <shifted display='@' />
-          <mod1    display="½" />
-    </key>
-    <key>
-	  <default display="3" />
-	  <shifted display="#" />
-          <mod1    display="¾" />               
-    </key>
-    <key>
-	  <default display="4" />
-	  <shifted display="$" />                
-    </key>
-    <key>
-	  <default display="5" />
-	  <shifted display="%" />                
-    </key>
-    <key>
-	  <default display="6" />
-	  <shifted display="^" />                
-    </key>
-    <key>
-	  <default display="7" />
-	  <shifted display="&amp;" />                
-    </key>
-    <key>
-	  <default display="8" />
-	  <shifted display="*" />                
-    </key>
-    <key>
-	  <default display="9" />
-	  <shifted display="(" />                
-    </key>
-    <key>
-	  <default display="0" />
-	  <shifted display=")" />                
-    </key>
-    <key>
-	  <default display="-" />
-	  <shifted display="_" />                
-    </key>
-    <key>
-	  <default display="=" />
-	  <shifted display="+" />                
-    </key>
-
-    <key fill="true">
-	  <default display="Bksp" action="backspace"/>
-    </key>
-
-    <space width="500" extended="true"/>
-
-    <key width="4000"  extended="true">
-	  <default display="Home" action="home"/>
-    </key>
-    <key width="4000"  extended="true">
-	  <default display="PgUp" action="pageup"/>
-    </key>
-
-    <space width="500" extended="true"/>
-
-
-  </row>
-
-  <row>
-
-    <space width="500" extended="true"/>
-
-    <key fill="true">
-	  <default display="Tab" action="tab"/>                
-    </key>
-    <key obey-caps='true'>
-	  <default display="q" />                
-	  <shifted display="Q" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="w" />                
-	  <shifted display="W" />
-    </key>
-    <key obey-caps='true'>
-	  <mod1 display="ë" />
-	  <default    display="e" />                
-	  <shifted display="E" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="r" />                
-	  <shifted display="R" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="t" />                
-	  <shifted display="T" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="y" />                
-	  <shifted display="Y" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="u" />                
-	  <shifted display="U" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="i" />                
-	  <shifted display="I" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="o" />                
-	  <shifted display="O" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="p" />                
-	  <shifted display="P" />
-    </key>
-    <key>
-	  <default display="[" />                
-	  <shifted display="{" />
-    </key>
-    <key>
-	  <default display="]" />                
-	  <shifted display="}" />
-    </key>
-    <key fill="true">
-	  <default display="\" />                
-	  <shifted display="|" />
-    </key>
-
-    <space width="500" extended="true"/>
-
-    <key width="4000"  extended="true">
-	  <default display="End" action="end"/>
-    </key>
-    <key width="4000"  extended="true">
-	  <default display="PgDn" action="pagedown"/>
-    </key>
-
-    <space width="500" extended="true"/>
-
-  </row>
-  <row>
-
-    <space width="500" extended="true"/>
-
-    <key fill="true">
-	  <default display="Caps" action="modifier:caps"/>                
-    </key>
-    <key obey-caps='true'>
-	  <default display="a" />                
-	  <shifted display="A" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="s" />                
-	  <shifted display="S" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="d" />                
-	  <shifted display="D" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="f" />                
-	  <shifted display="F" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="g" />                
-	  <shifted display="G" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="h" />                
-	  <shifted display="H" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="j" />                
-	  <shifted display="J" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="k" />                
-	  <shifted display="K" />
-    </key>
-    <key obey-caps='true'>
-	  <default display="l" />                
-	  <shifted display="L" />
-    </key>
-    <key>
-	  <default display=";" />                
-	  <shifted display=":" />
-    </key>
-    <key>
-	  <default display="'" />                
-	  <shifted display='"' />
-    </key>
-    <key fill="true">
-	  <default display="Ret" action="return"/>
-    </key>
-
-    <space width="500" extended="true"/>
-
-    <space width="4000"  extended="true" />
-
-    <space width="4000"  extended="true" />
-
-    <space width="500" extended="true"/>
-
-
-  </row>
-  <row>
-
-    <space width="500" extended="true"/>
-
-    <key fill="true">
-	  <default display="Shift" action="modifier:shift"/>                
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="z" />                
-	  <shifted display="Z" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="x" />                
-	  <shifted display="X" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="c" />                
-	  <shifted display="C" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="v" />                
-	  <shifted display="V" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="b" />                
-	  <shifted display="B" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="n" />                
-	  <shifted display="N" />
-    </key>
-
-    <key obey-caps='true'>
-	  <default display="m" />                
-	  <shifted display="M" />
-    </key>
-
-    <key>
-	  <default display="," />                
-	  <shifted display="&lt;" />
-    </key>
-    <key>
-	  <default display="." />                
-	  <shifted display="&gt;" />
-    </key>
-    <key>
-	  <default display="/" />                
-	  <shifted display="?" />
-    </key>
-
-
-    <key fill="true">
-	  <default display="Shift" action="modifier:shift"/>                
-    </key>
-
-    <space width="500" extended="true"/>
-
-    <space width="4000"  extended="true" />
-
-    <space width="4000"  extended="true" />
-
-    <space width="500" extended="true"/>
-
-
-
- </row>
-  <row>
-
-    <space width="500" extended="true"/>
-
-    <key>
-	  <default display="äëö" action="modifier:mod1"/>                
-    </key>
-
-    <key fill="true">
-	  <default display="Ctrl" action="modifier:ctrl"/>                
-    </key>
-
-    <key>
-	  <default display="Alt" action="modifier:alt"/>                
-    </key>
-
-
-    <key width="12000">
-	  <default display=" " action="space" />                
-    </key>
-
-    <key>
-	  <default display="^" action="up" />                
-    </key>
-    <key>
-	  <default display="V" action="down" />                
-    </key>
-    <key>
-	  <default display="&lt;" action="left" />                
-    </key>
-    <key>
-	  <default display="&gt;" action="right" />                
-    </key>
-
-    <space width="500" extended="true"/>
-
-    <space width="4000"  extended="true" />
-
-    <space width="4000"  extended="true" />
-
-    <space width="500" extended="true"/>
-
-</row>
-
-</layout>
-
-
-</keyboard>





More information about the commitlog mailing list