Author: jleroux
Date: Mon Aug 7 14:05:00 2006
New Revision: 429478
URL: http://svn.apache.org/viewvc?rev=429478&view=rev
Log:
Minor changes, mostly formating and other cosmectics...
Modified:
incubator/ofbiz/trunk/applications/pos/screens/default/menu/posmain.xml
incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/LoadSale.java
incubator/ofbiz/trunk/applications/pos/styles/posstyles.xml
Modified:
incubator/ofbiz/trunk/applications/pos/screens/default/menu/posmain.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/screens/default/menu/posmain.xml?rev=429478&r1=429477&r2=429478&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/pos/screens/default/menu/posmain.xml
(original)
+++ incubator/ofbiz/trunk/applications/pos/screens/default/menu/posmain.xml Mon
Aug 7 14:05:00 2006
@@ -26,34 +26,34 @@
<!-- col 2 -->
<Button name="SKU.GZ-1001" x="0" y="62" w="100" h="60"
style="skuButtonGizmo" content="GIZMO 1" alignment="Center"/>
- <Button name="SKU.GZ-5005" x="102" y="62" w="100" h="60"
style="skuButtonGizmoPurple" content="GIZMO 2" alignment="Center"/>
- <Button name="SKU.GZ-2644" x="204" y="62" w="100" h="60"
style="skuButtonGizmo" content="GIZMO 3" alignment="Center"/>
- <Button name="SKU.GZ-2002" x="306" y="62" w="100" h="60"
style="skuButtonGizmo" content="GIZMO 4" alignment="Center"/>
- <Button name="SKU.GZ-7000" x="408" y="62" w="100" h="60"
style="skuButtonGizmo" content="GIZMO 5" alignment="Center"/>
+ <Button name="SKU.GZ-5005" x="102" y="62" w="100" h="60"
style="skuButtonGizmoPurple" content="GZ PURPLE" alignment="Center"/>
+ <Button name="SKU.GZ-2644" x="204" y="62" w="100" h="60"
style="skuButtonGizmo" content="GZ-2644" alignment="Center"/>
+ <Button name="SKU.GZ-2002" x="306" y="62" w="100" h="60"
style="skuButtonGizmo" content="GZ-2002" alignment="Center"/>
+ <Button name="SKU.GZ-7000" x="408" y="62" w="100" h="60"
style="skuButtonGizmo" content="GZ-7000" alignment="Center"/>
<Button name="SKU.WG-5569" x="510" y="62" w="100" h="60"
style="skuButtonWidget" content="WIDGET 1" alignment="Center"/>
<!-- col 3 -->
- <Button name="SKU.GC-001-C10" x="0" y="124" w="100" h="60"
style="skuButtonGiftCard" content="GCC10" alignment="Center"/>
- <Button name="SKU.GC-001-C100" x="102" y="124" w="100" h="60"
style="skuButtonGiftCard" content="GCC100" alignment="Center"/>
- <Button name="SKU.GC-001-C25" x="204" y="124" w="100" h="60"
style="skuButtonGiftCard" content="GCC25" alignment="Center"/>
- <Button name="SKU.GC-001-C50" x="306" y="124" w="100" h="60"
style="skuButtonGiftCard" content="GCC50" alignment="Center"/>
- <Button name="SKU.GC-001-CO" x="408" y="124" w="100" h="60"
style="skuButtonGiftCard" content="GCCO" alignment="Center"/>
- <Button name="SKU.GZ-1000" x="510" y="124" w="100" h="60"
style="skuButtonGiftCard" content="GZ1000" alignment="Center"/>
+ <Button name="SKU.GC-001-C10" x="0" y="124" w="100" h="60"
style="skuButtonGiftCard" content="GIFT CARD 1" alignment="Center"/>
+ <Button name="SKU.GC-001-C100" x="102" y="124" w="100" h="60"
style="skuButtonGiftCard" content="GC-C100" alignment="Center"/>
+ <Button name="SKU.GC-001-C25" x="204" y="124" w="100" h="60"
style="skuButtonGiftCard" content="GC-C25" alignment="Center"/>
+ <Button name="SKU.GC-001-C50" x="306" y="124" w="100" h="60"
style="skuButtonGiftCard" content="GC-C50" alignment="Center"/>
+ <Button name="SKU.GC-001-CO" x="408" y="124" w="100" h="60"
style="skuButtonGiftCard" content="GC-CO" alignment="Center"/>
+ <Button name="SKU.GZ-1000" x="510" y="124" w="100" h="60"
style="skuButtonGizmo" content="GZ-1000" alignment="Center"/>
<!-- col 4 -->
- <Button name="SKU.GC-001-H10" x="0" y="186" w="100" h="60"
style="skuButtonGiftCard" content="GCH10" alignment="Center"/>
- <Button name="SKU.GC-001-H100" x="102" y="186" w="100" h="60"
style="skuButtonGiftCard" content="GCH100" alignment="Center"/>
- <Button name="SKU.GC-001-H25" x="204" y="186" w="100" h="60"
style="skuButtonGiftCard" content="GCH125" alignment="Center"/>
- <Button name="SKU.GC-001-H50" x="306" y="186" w="100" h="60"
style="skuButtonGiftCard" content="GCH50" alignment="Center"/>
- <Button name="SKU.GC-001-HO" x="408" y="186" w="100" h="60"
style="skuButtonGiftCard" content="GCHO" alignment="Center"/>
- <Button name="SKU.GZ-DIG" x="510" y="186" w="100" h="60"
style="skuButtonGizmo" content="GZDIG" alignment="Center"/>
+ <Button name="SKU.GC-001-H10" x="0" y="186" w="100" h="60"
style="skuButtonGiftCard" content="GC-H10" alignment="Center"/>
+ <Button name="SKU.GC-001-H100" x="102" y="186" w="100" h="60"
style="skuButtonGiftCard" content="GC-H100" alignment="Center"/>
+ <Button name="SKU.GC-001-H25" x="204" y="186" w="100" h="60"
style="skuButtonGiftCard" content="GC-H125" alignment="Center"/>
+ <Button name="SKU.GC-001-H50" x="306" y="186" w="100" h="60"
style="skuButtonGiftCard" content="GC-H50" alignment="Center"/>
+ <Button name="SKU.GC-001-HO" x="408" y="186" w="100" h="60"
style="skuButtonGiftCard" content="GC-HO" alignment="Center"/>
+ <Button name="SKU.GZ-DIG" x="510" y="186" w="100" h="60"
style="skuButtonGizmo" content="GZ-DIG" alignment="Center"/>
<!-- col 5 -->
- <Button name="SKU.GZ-1004" x="0" y="248" w="100" h="60"
style="skuButtonGizmo" content="GZ1004" alignment="Center"/>
- <Button name="SKU.GZ-1005" x="102" y="248" w="100" h="60"
style="skuButtonGizmo" content="GZ1005" alignment="Center"/>
- <Button name="SKU.GZ-8544" x="204" y="248" w="100" h="60"
style="skuButtonGizmo" content="GZ8544" alignment="Center"/>
- <Button name="SKU.GZ-9290" x="306" y="248" w="100" h="60"
style="skuButtonGizmo" content="GZ9290" alignment="Center"/>
- <Button name="" x="408" y="248" w="100" h="60" style="posButton"
content="" alignment="Center"/>
+ <Button name="SKU.GZ-1004" x="0" y="248" w="100" h="60"
style="skuButtonGizmo" content="GZ-1004" alignment="Center"/>
+ <Button name="SKU.GZ-1005" x="102" y="248" w="100" h="60"
style="skuButtonGizmo" content="GZ-1005" alignment="Center"/>
+ <Button name="SKU.GZ-8544" x="204" y="248" w="100" h="60"
style="skuButtonGizmo" content="GZ-8544" alignment="Center"/>
+ <Button name="SKU.GZ-9290" x="306" y="248" w="100" h="60"
style="skuButtonGizmo" content="GZ-9290" alignment="Center"/>
+ <Button name="SKU.WG-1111" x="408" y="248" w="100" h="60"
style="skuButtonWidget" content="WG-1111" alignment="Center"/>
<Button name="" x="510" y="248" w="100" h="60" style="posButton"
content="" alignment="Center"/>
<!-- col 6 -->
Modified:
incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/LoadSale.java
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/LoadSale.java?rev=429478&r1=429477&r2=429478&view=diff
==============================================================================
---
incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/LoadSale.java
(original)
+++
incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/LoadSale.java
Mon Aug 7 14:05:00 2006
@@ -128,8 +128,7 @@
addListToCart(sale, true);
}
}
-
-
+
public synchronized void replaceSale() {
if (wasMouseClicked()) {
replaceSale_();
@@ -182,8 +181,7 @@
}
}
}
-
-
+
public synchronized void replaceSaleAndDeleteShoppingList() {
if (wasMouseClicked()) {
replaceSaleAndDeleteShoppingList_();
@@ -247,4 +245,5 @@
private void closeDlg() {
m_dialog.closeDlg();
- }}
\ No newline at end of file
+ }
+}
\ No newline at end of file
Modified: incubator/ofbiz/trunk/applications/pos/styles/posstyles.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/styles/posstyles.xml?rev=429478&r1=429477&r2=429478&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/pos/styles/posstyles.xml (original)
+++ incubator/ofbiz/trunk/applications/pos/styles/posstyles.xml Mon Aug 7
14:05:00 2006
@@ -108,7 +108,7 @@
<font_italic value="0"/>
</style>
<style name="skuButtonGizmoPurple">
- <color_back value="993399"/>
+ <color_back value="CC66CC"/>
<color_fore value="000000"/>
<font_face value="verdana"/>
<font_size value="14"/>
@@ -116,7 +116,7 @@
<font_italic value="0"/>
</style>
<style name="skuButtonWidget">
- <color_back value="CC0000"/>
+ <color_back value="FF4E36"/>
<color_fore value="000000"/>
<font_face value="verdana"/>
<font_size value="14"/>
