svn commit: r674761 - in /ofbiz/trunk/specialpurpose/pos: config/parameters.properties screens/default/menu/posmain.xml src/org/ofbiz/pos/screen/PaidInOut.java

Author: jleroux
Date: Tue Jul  8 03:55:20 2008
New Revision: 674761

URL: http://svn.apache.org/viewvc?rev=674761&view=rev
Log:
Actually the num keybd makes more sense in Paid In and Out

Modified:
    ofbiz/trunk/specialpurpose/pos/config/parameters.properties
    ofbiz/trunk/specialpurpose/pos/screens/default/menu/posmain.xml
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java

Modified: ofbiz/trunk/specialpurpose/pos/config/parameters.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/config/parameters.properties?rev=674761&r1=674760&r2=674761&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/config/parameters.properties (original)
+++ ofbiz/trunk/specialpurpose/pos/config/parameters.properties Tue Jul  8 03:55:20 2008
@@ -17,4 +17,7 @@
 ###############################################################################
 #                                                                              
 ### Miscellaneous parameters
+
+# Used with a touch screen to allow showing vituals keyboards (alpha and keypad).
+# For now this properties is used with both. Maybe at some point we will need both in the same screen.
 ShowKeyboardInSaveSale=Y
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/pos/screens/default/menu/posmain.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/screens/default/menu/posmain.xml?rev=674761&r1=674760&r2=674761&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/screens/default/menu/posmain.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/screens/default/menu/posmain.xml Tue Jul  8 03:55:20 2008
@@ -67,9 +67,8 @@
         <Button name="" x="204" y="310" w="100" h="60" style="posButton" content="" alignment="Center"/>
         <Button name="" x="306" y="310" w="100" h="60" style="posButton" content="" alignment="Center"/>
         <Button name="" x="408" y="310" w="100" h="60" style="posButton" content="" alignment="Center"/>
-        <!--Button name="" x="510" y="310" w="100" h="60" style="posButton" content="" alignment="Center"/-->
+        <Button name="" x="510" y="310" w="100" h="60" style="posButton" content="" alignment="Center"/>
         <!--Button name="testMsr" x="510" y="310" w="100" h="60" style="posButton" content="TEST MSR" alignment="Center"/-->
-        <Button name="testNumeric" x="510" y="310" w="100" h="60" style="posButton" content="Num Keypad" alignment="Center"/>
         
     </Components>    
 </XPage>

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java?rev=674761&r1=674760&r2=674761&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java Tue Jul  8 03:55:20 2008
@@ -137,9 +137,10 @@
     public synchronized void editAmount(){
         if (wasMouseClicked() && ShowKeyboardInSaveSale) {
             try {
-                Keyboard keyboard = new Keyboard(m_pos);
-                keyboard.setText(m_amountEdit.getText());
-                m_amountEdit.setText(keyboard.openDlg());
+                NumericKeypad numericKeypad = new NumericKeypad(m_pos);
+                numericKeypad.setMinus(true);
+                numericKeypad.setPercent(false);              
+                m_amountEdit.setText(numericKeypad.openDlg());
             }catch(Exception e){
                 Debug.logError(e, module);
             }