You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/10/12 11:25:25 UTC

svn commit: r824272 - in /ofbiz/trunk/specialpurpose/pos: config/buttonevents.xml screens/800x600/dialog/keyboard.xml screens/default/dialog/keyboard.xml src/org/ofbiz/pos/event/CharacterEvents.java src/org/ofbiz/pos/screen/Keyboard.java

Author: jleroux
Date: Mon Oct 12 09:25:23 2009
New Revision: 824272

URL: http://svn.apache.org/viewvc?rev=824272&view=rev
Log:
Add the @ sign on the POS alphanum virtual keyboard

Modified:
    ofbiz/trunk/specialpurpose/pos/config/buttonevents.xml
    ofbiz/trunk/specialpurpose/pos/screens/800x600/dialog/keyboard.xml
    ofbiz/trunk/specialpurpose/pos/screens/default/dialog/keyboard.xml
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/CharacterEvents.java
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java

Modified: ofbiz/trunk/specialpurpose/pos/config/buttonevents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/config/buttonevents.xml?rev=824272&r1=824271&r2=824272&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/config/buttonevents.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/config/buttonevents.xml Mon Oct 12 09:25:23 2009
@@ -64,7 +64,8 @@
     <event button-name="charY" class-name="org.ofbiz.pos.event.CharacterEvents" method-name="triggerY" disable-lock="false"/>
     <event button-name="charZ" class-name="org.ofbiz.pos.event.CharacterEvents" method-name="triggerZ" disable-lock="false"/>
     <event button-name="charDel" class-name="org.ofbiz.pos.event.CharacterEvents" method-name="triggerDel" disable-lock="false"/>
-
+    <event button-name="char@" class-name="org.ofbiz.pos.event.CharacterEvents" method-name="triggerAt" disable-lock="false"/>
+    
     <!-- base menu events -->
     <event button-name="menuClear" class-name="org.ofbiz.pos.event.MenuEvents" method-name="triggerClear" disable-lock="true"/>
     <event button-name="menuQty" class-name="org.ofbiz.pos.event.MenuEvents" method-name="triggerQty" disable-lock="false"/>

Modified: ofbiz/trunk/specialpurpose/pos/screens/800x600/dialog/keyboard.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/screens/800x600/dialog/keyboard.xml?rev=824272&r1=824271&r2=824272&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/screens/800x600/dialog/keyboard.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/screens/800x600/dialog/keyboard.xml Mon Oct 12 09:25:23 2009
@@ -59,7 +59,8 @@
                 <Button name="charJ" x="456" y="138" w="75" h="68" style="numButton" content="j" alignment="Center"/>
                 <Button name="charK" x="532" y="138" w="75" h="68" style="numButton" content="k" alignment="Center"/>
                 <Button name="charL" x="608" y="138" w="75" h="68" style="numButton" content="l" alignment="Center"/>
-
+                <Button name="charAt" x="684" y="138" w="75" h="68" style="numButton" content="@" alignment="Center"/><!-- @ -->
+                
                 <Button name="charZ" x="00" y="207" w="75" h="68" style="numButton" content="z" alignment="Center"/>
                 <Button name="charX" x="76" y="207" w="75" h="68" style="numButton" content="x" alignment="Center"/>
                 <Button name="charC" x="152" y="207" w="75" h="68" style="numButton" content="c" alignment="Center"/>

Modified: ofbiz/trunk/specialpurpose/pos/screens/default/dialog/keyboard.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/screens/default/dialog/keyboard.xml?rev=824272&r1=824271&r2=824272&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/screens/default/dialog/keyboard.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/screens/default/dialog/keyboard.xml Mon Oct 12 09:25:23 2009
@@ -59,7 +59,8 @@
                 <Button name="charJ" x="456" y="138" w="75" h="68" style="numButton" content="j" alignment="Center"/>
                 <Button name="charK" x="532" y="138" w="75" h="68" style="numButton" content="k" alignment="Center"/>
                 <Button name="charL" x="608" y="138" w="75" h="68" style="numButton" content="l" alignment="Center"/>
-
+                <Button name="charAt" x="684" y="138" w="75" h="68" style="numButton" content="@" alignment="Center"/>
+                
                 <Button name="charZ" x="00" y="207" w="75" h="68" style="numButton" content="z" alignment="Center"/>
                 <Button name="charX" x="76" y="207" w="75" h="68" style="numButton" content="x" alignment="Center"/>
                 <Button name="charC" x="152" y="207" w="75" h="68" style="numButton" content="c" alignment="Center"/>

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/CharacterEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/CharacterEvents.java?rev=824272&r1=824271&r2=824272&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/CharacterEvents.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/CharacterEvents.java Mon Oct 12 09:25:23 2009
@@ -272,4 +272,8 @@
             input.appendChar('z');
         }
     }
+    public static void triggerAt(PosScreen pos) {
+        Input input = pos.getInput();
+            input.appendChar('@');
+    }
 }

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java?rev=824272&r1=824271&r2=824272&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java Mon Oct 12 09:25:23 2009
@@ -85,7 +85,7 @@
 
     private void setupEvents() {
         String[] keys = {"A" ,"B" ,"C" ,"D" ,"E" ,"F" ,"G" ,"H" ,"I" ,"J" ,"K" ,"L" ,"M" ,"N" ,"O" ,"P" ,"Q" ,"R" ,"S" ,"T" ,"U" ,"V" ,"W" ,"X" ,"Y" ,"Z",
-                "1" ,"2" ,"3" ,"4" ,"5" ,"6" ,"7" ,"8" ,"9" ,"0" ,
+                "1" ,"2" ,"3" ,"4" ,"5" ,"6" ,"7" ,"8" ,"9" ,"0" , "At",
                 "Dot", "Dash", "Del", "Space", "Clear", "Enter", "Cancel", "Shift", "ShiftLock"};
         XButton button = null;
         for(String key : keys) {
@@ -270,6 +270,10 @@
         triggerAndAppend(" ");
     }
 
+    public void triggerAt() {
+        triggerAndAppend("@");
+    }
+
     public void triggerClear() {
         clear();
     }