OFBiz › OFBiz - Commits

svn commit: r828865 - in /ofbiz/trunk/specialpurpose/pos: config/ screens/800x600/dialog/ screens/800x600/menu/ screens/default/dialog/ screens/default/menu/ src/org/ofbiz/pos/event/ src/org/ofbiz/pos/screen/

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r828865 - in /ofbiz/trunk/specialpurpose/pos: config/ screens/800x600/dialog/ screens/800x600/menu/ screens/default/dialog/ screens/default/menu/ src/org/ofbiz/pos/event/ src/org/ofbiz/pos/screen/

jleroux@apache.org
Author: jleroux
Date: Thu Oct 22 21:41:39 2009
New Revision: 828865

URL: http://svn.apache.org/viewvc?rev=828865&view=rev
Log:
With this change it's now possible to dynamically swap the virtual keyboad and numpad on/off
Also reorganisation of the Admin Panel by grouping related buttons as much as possible

Removed:
    ofbiz/trunk/specialpurpose/pos/screens/800x600/dialog/numeric.xml
    ofbiz/trunk/specialpurpose/pos/screens/default/dialog/numeric.xml
Modified:
    ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml
    ofbiz/trunk/specialpurpose/pos/config/XuiLabels.properties
    ofbiz/trunk/specialpurpose/pos/config/XuiLabels_fr.properties
    ofbiz/trunk/specialpurpose/pos/config/buttonevents.xml
    ofbiz/trunk/specialpurpose/pos/screens/800x600/menu/mgrmain.xml
    ofbiz/trunk/specialpurpose/pos/screens/default/menu/mgrmain.xml
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java

Modified: ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml?rev=828865&r1=828864&r2=828865&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml Thu Oct 22 21:41:39 2009
@@ -529,10 +529,18 @@
         <value xml:lang="ro">Validare...</value>
         <value xml:lang="zh">确认...</value>
     </property>
+    <property key="PosVirtualKeyboardTitle">
+        <value xml:lang="en">To inactivate the virtual keyboard: 1. Permanently, parameters.properties file. 2. Temporarily, button VIRTUAL on Admin Panel.</value>
+        <value xml:lang="fr">Pour désactiver le clavier virtuel : 1. En permanence, fichier parameters.properties. 2. Temporairement, bouton Clavier virtuel du panneau Gestion.</value>
+    </property>        
+    <property key="PosVirtualNumPadTitle">
+        <value xml:lang="en">To inactivate: see virtual keyboard.</value>
+        <value xml:lang="fr">Pour désactiver voir le clavier virtuel.</value>
+    </property>        
     <property key="PosVoid">
         <value xml:lang="en">Enter Order Number To Void:</value>
         <value xml:lang="es">Ingrese número de orden a anular</value>
-        <value xml:lang="fr">Entrez le n° d'ordre à annuler :</value>
+        <value xml:lang="fr">Entrez le n° de commande à annuler :</value>
         <value xml:lang="it">Inserire Numero Ordine Da Svuotare:</value>
         <value xml:lang="ro">Introduceti Numarul Comenzii de Descarcat:</value>
         <value xml:lang="zh">输入要作废的订单号:</value>

Modified: ofbiz/trunk/specialpurpose/pos/config/XuiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/config/XuiLabels.properties?rev=828865&r1=828864&r2=828865&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/config/XuiLabels.properties (original)
+++ ofbiz/trunk/specialpurpose/pos/config/XuiLabels.properties Thu Oct 22 21:41:39 2009
@@ -80,6 +80,7 @@
 SET_REF\#=SET REF#
 SIGN_OUT=SIGN OUT
 SKU=SKU
+SWAP_KEYBOARD=VIRTUAL
 Save=Save
 SaveAndClear=<html><center>Save and<br>clear current sale
 Search=Search

Modified: ofbiz/trunk/specialpurpose/pos/config/XuiLabels_fr.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/config/XuiLabels_fr.properties?rev=828865&r1=828864&r2=828865&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/config/XuiLabels_fr.properties (original)
+++ ofbiz/trunk/specialpurpose/pos/config/XuiLabels_fr.properties Thu Oct 22 21:41:39 2009
@@ -25,7 +25,7 @@
 CHANGE_PRICE=Changer le prix
 CHECK=Ch\u00e8que
 CLEAR_ALL=Tout annuler
-CLEAR_CACHE=Annuler l'encours
+CLEAR_CACHE=Vider les caches
 CLEAR_ONE=Annuler le paiement
 CLIENT_PROFILE=Donn\u00e9es client
 CLOSE=Fermer
@@ -70,7 +70,7 @@
 QTY=Quantit\u00e9
 RECEIPT_PRINTER_COMMUNICATION_ERROR=Erreur lors de la communication avec l'imprimante de caisse
 RECEIPT_SERIALISE_ERROR=Erreur lors de la tentative de s\u00e9rialisation du ticket
-REPRINT=R\u00e9afficher
+REPRINT=R\u00e9imprimer
 RESET_XUI=R\u00e9initialiser
 ReasonInOut=Raison
 Replace=Remplacer
@@ -80,6 +80,7 @@
 SET_REF\#=n\u00b0 ?
 SIGN_OUT=Sortir
 SKU=Code
+SWAP_KEYBOARD=Clavier virtuel
 Save=Sauver
 SaveAndClear=<html><center>Sauver et<br>r\u00e9intialiser la vente
 Search=Rechercher

Modified: ofbiz/trunk/specialpurpose/pos/config/buttonevents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/config/buttonevents.xml?rev=828865&r1=828864&r2=828865&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/config/buttonevents.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/config/buttonevents.xml Thu Oct 22 21:41:39 2009
@@ -115,6 +115,7 @@
     <event button-name="mgrReprintTx" class-name="org.ofbiz.pos.event.ManagerEvents" method-name="reprintLastTx" disable-lock="false"/>
     <event button-name="mgrTotals" class-name="org.ofbiz.pos.event.ManagerEvents" method-name="totalsReport" disable-lock="false"/>
     <event button-name="mgrCacheClear" class-name="org.ofbiz.pos.event.ManagerEvents" method-name="clearCache" disable-lock="false"/>
+    <event button-name="mgrSwapKeyboard" class-name="org.ofbiz.pos.event.ManagerEvents" method-name="SwapKeyboard" disable-lock="false"/>    
     <event button-name="mgrResetXui" class-name="org.ofbiz.pos.event.ManagerEvents" method-name="resetXui" disable-lock="false"/>
     <event button-name="mgrPaidOut" class-name="org.ofbiz.pos.event.ManagerEvents" method-name="paidOut" disable-lock="false"/>
     <event button-name="mgrPaidIn" class-name="org.ofbiz.pos.event.ManagerEvents" method-name="paidIn" disable-lock="false"/>

Modified: ofbiz/trunk/specialpurpose/pos/screens/800x600/menu/mgrmain.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/screens/800x600/menu/mgrmain.xml?rev=828865&r1=828864&r2=828865&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/screens/800x600/menu/mgrmain.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/screens/800x600/menu/mgrmain.xml Thu Oct 22 21:41:39 2009
@@ -29,14 +29,14 @@
 
         <!-- line 2 -->
         <Button name="mgrPriceChg" x="0" y="49" w="78" h="47" style="posButton" content="CHANGE_PRICE" alignment="Center"/>
-        <Button name="mgrReprintTx" x="80" y="49" w="78" h="47" style="posButton" content="REPRINT" alignment="Center"/>
+        <Button name="" x="80" y="49" w="78" h="47" style="posButton" content="" alignment="Center"/>
         <Button name="" x="160" y="49" w="78" h="47" style="posButton" content="" alignment="Center"/>
         <Button name="" x="240" y="49" w="78" h="47" style="posButton" content="" alignment="Center"/>
         <Button name="" x="320" y="49" w="78" h="47" style="posButton" content="" alignment="Center"/>
         <Button name="mgrOpenTerm" x="400" y="49" w="78" h="47" style="posButton" content="OPEN" alignment="Center"/>
 
         <!-- line 3 -->
-        <Button name="" x="0" y="98" w="78" h="47" style="posButton" content="" alignment="Center"/>
+        <Button name="mgrVoidSale" x="0" y="98" w="78" h="47" style="posButton" content="VOID_SALE" alignment="Center"/>
         <Button name="" x="80" y="98" w="78" h="47" style="posButton" content="" alignment="Center"/>
         <Button name="mgrPaidOut" x="160" y="98" w="78" h="47" style="posButton" content="PAID_OUT" alignment="Center"/>
         <Button name="mgrPaidIn" x="240" y="98" w="78" h="47" style="posButton" content="PAID_IN" alignment="Center"/>
@@ -49,13 +49,13 @@
         <Button name="" x="160" y="147" w="78" h="47" style="posButton" content="" alignment="Center"/>
         <Button name="" x="240" y="147" w="78" h="47" style="posButton" content="" alignment="Center"/>
         <Button name="" x="320" y="147" w="78" h="47" style="posButton" content="" alignment="Center"/>
-        <Button name="mgrVoidSale" x="400" y="147" w="78" h="47" style="posButton" content="VOID_SALE" alignment="Center"/>
+        <Button name="" x="400" y="147" w="78" h="47" style="posButton" content="" alignment="Center"/>
 
         <!-- line 5 -->
-        <Button name="mgrCacheClear" x="0" y="196" w="78" h="47" style="posButton" content="CLEAR_CACHE" alignment="Center"/>
-        <Button name="mgrResetXui" x="80" y="196" w="78" h="47" style="posButton" content="RESET_XUI" alignment="Center"/>
+        <Button name="mgrSwapKeyboard" x="0" y="196" w="78" h="47" style="posButton" content="SWAP_KEYBOARD" alignment="Center"/>
+        <Button name="mgrReprintTx" x="80" y="196" w="78" h="47" style="posButton" content="REPRINT" alignment="Center"/>
         <Button name="" x="160" y="196" w="78" h="47" style="posButton" content="" alignment="Center"/>
-        <Button name="" x="240" y="196" w="78" h="47" style="posButton" content="" alignment="Center"/>
+        <Button name="mgrCacheClear" x="240" y="196" w="78" h="47" style="posButton" content="CLEAR_CACHE" alignment="Center"/>
         <Button name="" x="320" y="196" w="78" h="47" style="posButton" content="" alignment="Center"/>
         <Button name="" x="400" y="196" w="78" h="47" style="posButton" content="" alignment="Center"/>
 
@@ -63,7 +63,7 @@
         <Button name="mgrPopDrwr" x="0" y="245" w="78" h="47" style="posButton" content="OPEN_DRAWER" alignment="Center"/>
         <Button name="mgrTotals" x="80" y="245" w="78" h="47" style="posButton" content="TOTALS" alignment="Center"/>
         <Button name="" x="160" y="245" w="78" h="47" style="posButton" content="" alignment="Center"/>
-        <Button name="" x="240" y="245" w="78" h="47" style="posButton" content="" alignment="Center"/>
+        <Button name="mgrResetXui" x="240" y="245" w="78" h="47" style="posButton" content="RESET_XUI" alignment="Center"/>
         <Button name="" x="320" y="245" w="78" h="47" style="posButton" content="" alignment="Center"/>
         <Button name="mgrShutDown" x="400" y="245" w="78" h="47" style="posButton" content="EXIT" alignment="Center"/>
     </Components>

Modified: ofbiz/trunk/specialpurpose/pos/screens/default/menu/mgrmain.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/screens/default/menu/mgrmain.xml?rev=828865&r1=828864&r2=828865&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/screens/default/menu/mgrmain.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/screens/default/menu/mgrmain.xml Thu Oct 22 21:41:39 2009
@@ -29,14 +29,14 @@
 
         <!-- line 2 -->
         <Button name="mgrPriceChg" x="0" y="62" w="100" h="60" style="posButton" content="CHANGE_PRICE" alignment="Center"/>
-        <Button name="mgrReprintTx" x="102" y="62" w="100" h="60" style="posButton" content="REPRINT" alignment="Center"/>
+        <Button name="" x="102" y="62" w="100" h="60" style="posButton" content="" alignment="Center"/>
         <Button name="" x="204" y="62" w="100" h="60" style="posButton" content="" alignment="Center"/>
         <Button name="" x="306" y="62" w="100" h="60" style="posButton" content="" alignment="Center"/>
         <Button name="" x="408" y="62" w="100" h="60" style="posButton" content="" alignment="Center"/>
         <Button name="mgrOpenTerm" x="510" y="62" w="100" h="60" style="posButton" content="OPEN" alignment="Center"/>
 
         <!-- line 3 -->
-        <Button name="" x="0" y="124" w="100" h="60" style="posButton" content="" alignment="Center"/>
+        <Button name="mgrVoidSale" x="0" y="124" w="100" h="60" style="posButton" content="VOID_SALE" alignment="Center"/>
         <Button name="" x="102" y="124" w="100" h="60" style="posButton" content="" alignment="Center"/>
         <Button name="mgrPaidOut" x="204" y="124" w="100" h="60" style="posButton" content="PAID_OUT" alignment="Center"/>
         <Button name="mgrPaidIn" x="306" y="124" w="100" h="60" style="posButton" content="PAID_IN" alignment="Center"/>
@@ -49,13 +49,13 @@
         <Button name="" x="204" y="186" w="100" h="60" style="posButton" content="" alignment="Center"/>
         <Button name="" x="306" y="186" w="100" h="60" style="posButton" content="" alignment="Center"/>
         <Button name="" x="408" y="186" w="100" h="60" style="posButton" content="" alignment="Center"/>
-        <Button name="mgrVoidSale" x="510" y="186" w="100" h="60" style="posButton" content="VOID_SALE" alignment="Center"/>
+        <Button name="" x="510" y="186" w="100" h="60" style="posButton" content="" alignment="Center"/>
 
         <!-- line 5 -->
-        <Button name="mgrCacheClear" x="0" y="248" w="100" h="60" style="posButton" content="CLEAR_CACHE" alignment="Center"/>
-        <Button name="mgrResetXui" x="102" y="248" w="100" h="60" style="posButton" content="RESET_XUI" alignment="Center"/>
+        <Button name="mgrSwapKeyboard" x="0" y="248" w="100" h="60" style="posButton" content="SWAP_KEYBOARD" alignment="Center"/>
+        <Button name="mgrReprintTx" x="102" y="248" w="100" h="60" style="posButton" content="REPRINT" alignment="Center"/>
         <Button name="" x="204" y="248" w="100" h="60" style="posButton" content="" alignment="Center"/>
-        <Button name="" x="306" y="248" w="100" h="60" style="posButton" content="" alignment="Center"/>
+        <Button name="mgrCacheClear" x="306" y="248" w="100" h="60" style="posButton" content="CLEAR_CACHE" alignment="Center"/>
         <Button name="" x="408" y="248" w="100" h="60" style="posButton" content="" alignment="Center"/>
         <Button name="" x="510" y="248" w="100" h="60" style="posButton" content="" alignment="Center"/>
 
@@ -63,7 +63,7 @@
         <Button name="mgrPopDrwr" x="0" y="310" w="100" h="60" style="posButton" content="OPEN_DRAWER" alignment="Center"/>
         <Button name="mgrTotals" x="102" y="310" w="100" h="60" style="posButton" content="TOTALS" alignment="Center"/>
         <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="mgrResetXui" x="306" y="310" w="100" h="60" style="posButton" content="RESET_XUI" alignment="Center"/>
         <Button name="" x="408" y="310" w="100" h="60" style="posButton" content="" alignment="Center"/>
         <Button name="mgrShutDown" x="510" y="310" w="100" h="60" style="posButton" content="EXIT" alignment="Center"/>
     </Components>

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java?rev=828865&r1=828864&r2=828865&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java Thu Oct 22 21:41:39 2009
@@ -376,6 +376,22 @@
             pos.refresh();
         }
     }
+    
+    public static synchronized void SwapKeyboard(PosScreen pos) {
+        if (!mgrLoggedIn) {
+            pos.showDialog("dialog/error/mgrnotloggedin");
+        } else {
+            String showKeyboardInSaveSale = null;
+            showKeyboardInSaveSale = UtilProperties.getPropertyValue("parameters.properties", "ShowKeyboardInSaveSale");
+            if ("N".equalsIgnoreCase(showKeyboardInSaveSale)) {
+                UtilProperties.setPropertyValueInMemory("parameters.properties", "ShowKeyboardInSaveSale", "Y");
+            } else {
+                UtilProperties.setPropertyValueInMemory("parameters.properties", "ShowKeyboardInSaveSale", "N");                
+            }
+        }
+    }
+    
+    
 
     public static synchronized void shutdown(PosScreen pos) {
         if (!mgrLoggedIn) {

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java?rev=828865&r1=828864&r2=828865&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java Thu Oct 22 21:41:39 2009
@@ -78,12 +78,10 @@
     protected static PosTransaction m_trans = null;
     protected String m_type = null;
     protected boolean cancelled = false;
-    private static boolean SHOW_KEYBOARD_IN_SAVE_SALE= UtilProperties.propertyValueEqualsIgnoreCase("parameters", "ShowKeyboardInSaveSale", "Y");
     private static boolean SWIP_WITH_CARD = UtilProperties.propertyValueEqualsIgnoreCase("parameters", "SwipWithCard", "N");    
     private static Locale locale = Locale.getDefault();
     private String m_partyId = null;
 
-
     //TODO : make getter and setter for members (ie m_*) if needed (extern calls). For that in Eclipse use Source/Generate Getters and setters
 
     public ClientProfile(PosTransaction trans, PosScreen page) {
@@ -135,7 +133,6 @@
         m_clientListCombo.setToolTipText(UtilProperties.getMessage(PosTransaction.resource, "PosSelectClientToEdit", locale));
         m_clientListCombo.addActionListener(this);
 
-
         m_dialog.pack();
         m_nameEdit.requestFocusInWindow();
         m_dialog.showDialog(this);
@@ -167,7 +164,7 @@
     }
 
     public synchronized void editName() {
-        if (wasMouseClicked() && SHOW_KEYBOARD_IN_SAVE_SALE) {
+        if (wasMouseClicked() && UtilProperties.propertyValueEqualsIgnoreCase("parameters", "ShowKeyboardInSaveSale", "Y")) {
             try {
                 Keyboard keyboard = new Keyboard(m_pos);
                 keyboard.setText(m_nameEdit.getText());
@@ -181,7 +178,7 @@
     }
 
     public synchronized void editEmail() {
-        if (wasMouseClicked() && SHOW_KEYBOARD_IN_SAVE_SALE) {
+        if (wasMouseClicked() && UtilProperties.propertyValueEqualsIgnoreCase("parameters", "ShowKeyboardInSaveSale", "Y")) {
             try {
                 Keyboard keyboard = new Keyboard(m_pos);
                 keyboard.setText(m_emailEdit.getText());
@@ -195,7 +192,7 @@
     }
 
     public synchronized void editPhone() {
-        if (wasMouseClicked() && SHOW_KEYBOARD_IN_SAVE_SALE) {
+        if (wasMouseClicked() && UtilProperties.propertyValueEqualsIgnoreCase("parameters", "ShowKeyboardInSaveSale", "Y")) {
             try {
                 NumericKeypad numericKeypad = new NumericKeypad(m_pos);
                 numericKeypad.setMinus(true);
@@ -210,7 +207,7 @@
     }
 
     public synchronized void editCard() {
-        if (wasMouseClicked() && SHOW_KEYBOARD_IN_SAVE_SALE && !SWIP_WITH_CARD) {
+        if (wasMouseClicked() && UtilProperties.propertyValueEqualsIgnoreCase("parameters", "ShowKeyboardInSaveSale", "Y") && !SWIP_WITH_CARD) {
             try {
                 NumericKeypad numericKeypad = new NumericKeypad(m_pos);
                 numericKeypad.setMinus(true);

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=828865&r1=828864&r2=828865&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 Thu Oct 22 21:41:39 2009
@@ -21,6 +21,8 @@
 import java.awt.Color;
 
 import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilProperties;
+import org.ofbiz.pos.PosTransaction;
 
 import net.xoetrope.swing.XButton;
 import net.xoetrope.swing.XDialog;
@@ -29,6 +31,7 @@
 import net.xoetrope.xui.XPage;
 import net.xoetrope.xui.events.XEventHelper;
 import java.awt.Panel;
+import java.util.Locale;
 
 public class Keyboard extends XPage {
     public static final String module = Keyboard.class.getName();
@@ -48,6 +51,7 @@
         m_dialog = (XDialog) m_pageSupport;
         m_edit = (XEdit) m_pageSupport.findComponent("keyboard_input");
         m_edit.setText("");
+        m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PosVirtualKeyboardTitle", Locale.getDefault()));
     }
 
     public String openDlg() {

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java?rev=828865&r1=828864&r2=828865&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java Thu Oct 22 21:41:39 2009
@@ -18,6 +18,11 @@
  *******************************************************************************/
 package org.ofbiz.pos.screen;
 
+import java.util.Locale;
+
+import org.ofbiz.base.util.UtilProperties;
+import org.ofbiz.pos.PosTransaction;
+
 import net.xoetrope.swing.XButton;
 import net.xoetrope.swing.XDialog;
 import net.xoetrope.swing.XEdit;
@@ -39,13 +44,12 @@
 
     public NumericKeypad(PosScreen pos) {
         m_pos = pos;
-        return;
     }
 
     public String openDlg() {
-
-        m_pageSupport = pageMgr.loadPage(m_pos.getScreenLocation() + "/dialog/numeric");
+        m_pageSupport = pageMgr.loadPage(m_pos.getScreenLocation() + "/dialog/numerickeypad");
         m_dialog = (XDialog)m_pageSupport;
+        m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PosVirtualNumPadTitle", Locale.getDefault()));
 
         m_edit = (XEdit) m_pageSupport.findComponent("numeric_input");
         m_edit.setText("");

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=828865&r1=828864&r2=828865&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 Thu Oct 22 21:41:39 2009
@@ -65,7 +65,6 @@
     protected static PosTransaction m_trans = null;
     protected String m_type = null;
     protected boolean cancelled = false;
-    private static boolean SHOW_KEYBOARD_IN_SAVE_SALE = UtilProperties.propertyValueEqualsIgnoreCase("parameters", "ShowKeyboardInSaveSale", "Y");
 
     //TODO : make getter and setter for members (ie m_*) if needed (extern calls). For that in Eclipse use Source/Generate Getters and setters
 
@@ -146,7 +145,7 @@
     }
 
     public synchronized void editAmount() {
-        if (wasMouseClicked() && SHOW_KEYBOARD_IN_SAVE_SALE) {
+        if (wasMouseClicked() && UtilProperties.propertyValueEqualsIgnoreCase("parameters", "ShowKeyboardInSaveSale", "Y")) {
             try {
                 NumericKeypad numericKeypad = new NumericKeypad(m_pos);
                 numericKeypad.setMinus(true);

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java?rev=828865&r1=828864&r2=828865&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java Thu Oct 22 21:41:39 2009
@@ -53,7 +53,6 @@
     //protected XButton m_saveAndPrint = null; //FIXME : button does not exist yet
     protected static PosTransaction m_trans = null;
     public static SimpleDateFormat sdf = new SimpleDateFormat(UtilProperties.getMessage(PosTransaction.resource,"PosDateTimeFormat",Locale.getDefault()));
-    private static boolean SHOW_KEYBOARD_IN_SAVE_SALE = UtilProperties.propertyValueEqualsIgnoreCase("parameters", "ShowKeyboardInSaveSale", "Y");
 
     //TODO : make getter and setter for members (ie m_*) if needed (extern calls).  For that in Eclipse use Source/Generate Getters and setters
 
@@ -128,7 +127,7 @@
     }
 
     public synchronized void editSaleName() {
-        if (wasMouseClicked() && SHOW_KEYBOARD_IN_SAVE_SALE) {
+        if (wasMouseClicked() && UtilProperties.propertyValueEqualsIgnoreCase("parameters", "ShowKeyboardInSaveSale", "Y")) {
             try {
                 Keyboard keyboard = new Keyboard(m_pos);
                 keyboard.setText(m_saleName.getText());


Free forum by Nabble Edit this page