commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

r108 - gnue-invoice/forms


From: kilo
Subject: r108 - gnue-invoice/forms
Date: Thu, 11 Nov 2004 05:13:28 -0600 (CST)

Author: kilo
Date: 2004-11-11 05:13:27 -0600 (Thu, 11 Nov 2004)
New Revision: 108

Modified:
   gnue-invoice/forms/ITEM_Item.gfd
   gnue-invoice/forms/ITEM_ItemType.gfd
   gnue-invoice/forms/ITEM_UnitType.gfd
   gnue-invoice/forms/TAX_Vat.gfd
Log:
GNUe Invoice.
Converted ITEM-related forms to dialogs.

Modified: gnue-invoice/forms/ITEM_Item.gfd
===================================================================
--- gnue-invoice/forms/ITEM_Item.gfd    2004-11-10 13:25:34 UTC (rev 107)
+++ gnue-invoice/forms/ITEM_Item.gfd    2004-11-11 11:13:27 UTC (rev 108)
@@ -23,7 +23,7 @@
 
      $Id$ -->
 
-<form title="Item">
+<form xmlns:c="GNUe:Layout:Char" title="Item">
   <options/>
   <datasource name="dtsITEM_Item" connection="invoice" table="ITEM_Item"/>
   <datasource name="dts_ITEM_ItemType" connection="invoice" prequery="Y"
@@ -46,78 +46,51 @@
              fk_key="gnue_id" fk_source="dts_TAX_Vat" maxLength="32"/>
     </block>
   </logic>
-  <layout xmlns:Char="GNUe:Layout:Char" Char:height="7" Char:width="55">
+  <layout c:height="7" c:width="55">
     <page name="Page1">
-      <label name="lblItem Type:" Char:height="1" Char:width="5" Char:x="1"
-             Char:y="1" text="Type:"/>
-      <entry name="entItemType" Char:height="1" Char:width="28" Char:x="13"
-             Char:y="1" block="blkITEM_Item" field="fldItemType" label=""
-             style="dropdown"/>
-      <button name="btnEditItemType" Char:height="1" Char:width="6" Char:x="41"
-              Char:y="1" label="Edit...">
-        <trigger type="On-Action" name="btnEditItemTypeTrigger"><![CDATA[##
-          location = "ITEM_ItemType.gfd"
-          form.runForm(location)
-        ]]>
-        </trigger>
-      </button>
-      <button name="btnRefreshItemType" Char:height="1" Char:width="3"
-              Char:x="47" Char:y="1" label="@">
-        <trigger type="On-Action" name="btnRefreshItemTypeTrigger"><![CDATA[##
+      <label name="lblItem Type:" c:height="1" c:width="5" c:x="1" c:y="1"
+          text="Type:"/>
+      <entry name="entItemType" c:height="1" c:width="28" c:x="13" c:y="1"
+          block="blkITEM_Item" field="fldItemType" label="" style="dropdown"/>
+      <button name="btnEditItemType" c:height="1" c:width="6" c:x="41" c:y="1"
+          label="Edit...">
+        <trigger type="On-Action" name="btnEditItemTypeTrigger">
+          form.runForm('ITEM_ItemType.gfd')
           blkITEM_Item.fldItemType.resetForeignKey()
-        ]]>
         </trigger>
       </button>
-      <label name="lblItem Shortname:" Char:height="1" Char:width="11"
-             Char:x="1" Char:y="2" text="Short name:"/>
-      <entry name="entItemShortname" Char:height="1" Char:width="35"
-             Char:x="13" Char:y="2" block="blkITEM_Item" 
field="fldItemShortname" label=""/>
-      <label name="lblItem Longname:" Char:height="1" Char:width="10"
-             Char:x="1" Char:y="3" text="Long name:"/>
-      <entry name="entItemLongname" Char:height="1" Char:width="35"
-             Char:x="13" Char:y="3" block="blkITEM_Item" 
field="fldItemLongname" label=""/>
-      <label name="lblItem Price:" Char:height="1" Char:width="6" Char:x="1"
-             Char:y="4" text="Price:"/>
-      <entry name="entItemPrice" Char:height="1" Char:width="10" Char:x="13"
-             Char:y="4" block="blkITEM_Item" field="fldItemPrice" label=""/>
-      <label name="lblItem Unit:" Char:height="1" Char:width="5" Char:x="1"
-             Char:y="5" text="Unit:"/>
-      <entry name="entItemUnit" Char:height="1" Char:width="28" Char:x="13"
-             Char:y="5" block="blkITEM_Item" field="fldItemUnit" label=""
-             style="dropdown"/>
-      <button name="btnEditItemUnit" Char:height="1" Char:width="6" Char:x="41"
-              Char:y="5" label="Edit...">
-        <trigger type="On-Action" name="btnEditItemUnitTrigger"><![CDATA[##
-          location = "ITEM_UnitType.gfd"
-          form.runForm(location)
-        ]]>
-        </trigger>
-      </button>
-      <button name="btnRefreshItemUnit" Char:height="1" Char:width="3"
-              Char:x="47" Char:y="5" label="@">
-        <trigger type="On-Action" name="btnRefreshItemUnitTrigger"><![CDATA[##
+      <label name="lblItem Shortname:" c:height="1" c:width="11" c:x="1" 
c:y="2"
+          text="Short name:"/>
+      <entry name="entItemShortname" c:height="1" c:width="35" c:x="13" c:y="2"
+          block="blkITEM_Item" field="fldItemShortname" label=""/>
+      <label name="lblItem Longname:" c:height="1" c:width="10" c:x="1" c:y="3"
+          text="Long name:"/>
+      <entry name="entItemLongname" c:height="1" c:width="35" c:x="13" c:y="3"
+          block="blkITEM_Item" field="fldItemLongname" label=""/>
+      <label name="lblItem Price:" c:height="1" c:width="6" c:x="1" c:y="4"
+          text="Price:"/>
+      <entry name="entItemPrice" c:height="1" c:width="10" c:x="13" c:y="4"
+          block="blkITEM_Item" field="fldItemPrice" label=""/>
+      <label name="lblItem Unit:" c:height="1" c:width="5" c:x="1" c:y="5"
+          text="Unit:"/>
+      <entry name="entItemUnit" c:height="1" c:width="28" c:x="13" c:y="5"
+          block="blkITEM_Item" field="fldItemUnit" label="" style="dropdown"/>
+      <button name="btnEditItemUnit" c:height="1" c:width="6" c:x="41" c:y="5"
+          label="Edit...">
+        <trigger type="On-Action" name="btnEditItemUnitTrigger">
+          form.runForm('ITEM_UnitType.gfd')
           blkITEM_Item.fldItemUnit.resetForeignKey()
-        ]]>
         </trigger>
       </button>
-      <label name="lblItem Vat:" Char:height="1" Char:width="9" Char:x="1"
-             Char:y="6" text="Item Vat:"/>
-      <entry name="entItemVat" Char:height="1" Char:width="28" Char:x="13"
-             Char:y="6" block="blkITEM_Item" field="fldItemVat" label=""
-             style="dropdown"/>
-      <button name="btnEditVat" Char:height="1" Char:width="6" Char:x="41"
-              Char:y="6" label="Edit...">
-        <trigger type="On-Action" name="btnEditVatTrigger"><![CDATA[##
-          location = "TAX_Vat.gfd"
-          form.runForm(location)
-        ]]>
-        </trigger>
-      </button>
-      <button name="btnRefreshVat" Char:height="1" Char:width="3"
-              Char:x="47" Char:y="6" label="@">
-        <trigger type="On-Action" name="btnRefreshVatTrigger"><![CDATA[##
+      <label name="lblItem Vat:" c:height="1" c:width="9" c:x="1" c:y="6"
+          text="Item Vat:"/>
+      <entry name="entItemVat" c:height="1" c:width="28" c:x="13" c:y="6"
+          block="blkITEM_Item" field="fldItemVat" label="" style="dropdown"/>
+      <button name="btnEditVat" c:height="1" c:width="6" c:x="41" c:y="6"
+          label="Edit...">
+        <trigger type="On-Action" name="btnEditVatTrigger">
+          form.runForm('TAX_Vat.gfd')
           blkITEM_Item.fldItemVat.resetForeignKey()
-        ]]>
         </trigger>
       </button>
     </page>

Modified: gnue-invoice/forms/ITEM_ItemType.gfd
===================================================================
--- gnue-invoice/forms/ITEM_ItemType.gfd        2004-11-10 13:25:34 UTC (rev 
107)
+++ gnue-invoice/forms/ITEM_ItemType.gfd        2004-11-11 11:13:27 UTC (rev 
108)
@@ -23,26 +23,50 @@
 
      $Id$ -->
 
-<form title="ItemType">
+<form style="dialog" xmlns:c="GNUe:Layout:Char" title="Item type">
   <options/>
+  
+  <trigger type="On-Startup">
+    form.setFeature('GUI:MENUBAR:SUPPRESS', True)
+    form.setFeature('GUI:TOOLBAR:SUPPRESS', True)
+    form.setFeature('GUI:STATUSBAR:SUPPRESS', True)
+  </trigger>
+  
   <datasource name="dtsITEM_ItemType" connection="invoice"
               table="ITEM_ItemType"/>
+              
   <logic>
     <block name="blkITEM_ItemType" datasource="dtsITEM_ItemType">
       <field name="fldItemCode" field="ITEM_code" maxLength="35"/>
       <field name="fldItemValue" field="ITEM_value" maxLength="35"/>
     </block>
   </logic>
-  <layout xmlns:Char="GNUe:Layout:Char" Char:height="3" Char:width="30">
-    <page name="Page1">
-      <label name="lblItem Code:" Char:height="1" Char:width="5" Char:x="1"
-             Char:y="1" text="Code:"/>
-      <entry name="entItemCode" Char:height="1" Char:width="20" Char:x="8"
-             Char:y="1" block="blkITEM_ItemType" field="fldItemCode" label=""/>
-      <label name="lblItem Value:" Char:height="1" Char:width="6" Char:x="1"
-             Char:y="2" text="Value:"/>
-      <entry name="entItemValue" Char:height="1" Char:width="20" Char:x="8"
-             Char:y="2" block="blkITEM_ItemType" field="fldItemValue" 
label=""/>
+  
+  <layout c:height="4" c:width="30">
+    <page>
+      <label name="lblItem Code:" c:height="1" c:width="5" c:x="1" c:y="1"
+          text="Code:"/>
+      <entry name="entItemCode" c:height="1" c:width="20" c:x="8" c:y="1"
+          block="blkITEM_ItemType" field="fldItemCode" label=""/>
+      <label name="lblItem Value:" c:height="1" c:width="6" c:x="1" c:y="2"
+          text="Value:"/>
+      <entry name="entItemValue" c:height="1" c:width="20" c:x="8" c:y="2"
+          block="blkITEM_ItemType" field="fldItemValue" label=""/>
+      <button c:x="5" c:y="4" c:width="8" c:height="1" label="Ok">
+        <trigger name="Ok" type="On-Action">
+          if not blkITEM_ItemType.isSaved():
+            blkITEM_ItemType.commit()
+          close()
+        </trigger>
+      </button>
+      <button c:x="15" c:y="4" c:width="8" c:height="1" label="Cancel">
+        <trigger name="Cancel" type="On-Action">
+          if not blkITEM_ItemType.isSaved():
+            blkITEM_ItemType.rollback()
+          close()
+        </trigger>
+      </button>
     </page>
   </layout>
+  
 </form>

Modified: gnue-invoice/forms/ITEM_UnitType.gfd
===================================================================
--- gnue-invoice/forms/ITEM_UnitType.gfd        2004-11-10 13:25:34 UTC (rev 
107)
+++ gnue-invoice/forms/ITEM_UnitType.gfd        2004-11-11 11:13:27 UTC (rev 
108)
@@ -23,26 +23,50 @@
 
      $Id$ -->
 
-<form title="UnitType">
+<form style="dialog" xmlns:c="GNUe:Layout:Char" title="UnitType">
   <options/>
+  
+  <trigger type="On-Startup">
+    form.setFeature('GUI:MENUBAR:SUPPRESS', True)
+    form.setFeature('GUI:TOOLBAR:SUPPRESS', True)
+    form.setFeature('GUI:STATUSBAR:SUPPRESS', True)
+  </trigger>
+  
   <datasource name="dtsITEM_UnitType" connection="invoice"
               table="ITEM_UnitType"/>
+              
   <logic>
     <block name="blkITEM_UnitType" datasource="dtsITEM_UnitType">
       <field name="fldItemCode" field="ITEM_code" maxLength="35"/>
       <field name="fldItemValue" field="ITEM_value" maxLength="35"/>
     </block>
   </logic>
-  <layout xmlns:Char="GNUe:Layout:Char" Char:height="3" Char:width="30">
-    <page name="Page1">
-      <label name="lblItem Code:" Char:height="1" Char:width="5" Char:x="1"
-             Char:y="1" text="Code:"/>
-      <entry name="entItemCode" Char:height="1" Char:width="20" Char:x="8"
-             Char:y="1" block="blkITEM_UnitType" field="fldItemCode" label=""/>
-      <label name="lblItem Value:" Char:height="1" Char:width="6" Char:x="1"
-             Char:y="2" text="Value:"/>
-      <entry name="entItemValue" Char:height="1" Char:width="20" Char:x="8"
-             Char:y="2" block="blkITEM_UnitType" field="fldItemValue" 
label=""/>
-    </page>
+  
+  <layout c:height="4" c:width="30">
+    <page>
+      <label name="lblItem Code:" c:height="1" c:width="5" c:x="1" c:y="1"
+          text="Code:"/>
+      <entry name="entItemCode" c:height="1" c:width="20" c:x="8" c:y="1"
+          block="blkITEM_UnitType" field="fldItemCode" label=""/>
+      <label name="lblItem Value:" c:height="1" c:width="6" c:x="1" c:y="2"
+          text="Value:"/>
+      <entry name="entItemValue" c:height="1" c:width="20" c:x="8" c:y="2"
+          block="blkITEM_UnitType" field="fldItemValue" label=""/>
+          <button c:x="5" c:y="4" c:width="8" c:height="1" label="Ok">
+        <trigger name="Ok" type="On-Action">
+          if not blkITEM_UnitType.isSaved():
+            blkITEM_UnitType.commit()
+          close()
+        </trigger>
+      </button>
+      <button c:x="15" c:y="4" c:width="8" c:height="1" label="Cancel">
+        <trigger name="Cancel" type="On-Action">
+          if not blkITEM_UnitType.isSaved():
+            blkITEM_UnitType.rollback()
+          close()
+        </trigger>
+      </button>
+</page>
   </layout>
+  
 </form>

Modified: gnue-invoice/forms/TAX_Vat.gfd
===================================================================
--- gnue-invoice/forms/TAX_Vat.gfd      2004-11-10 13:25:34 UTC (rev 107)
+++ gnue-invoice/forms/TAX_Vat.gfd      2004-11-11 11:13:27 UTC (rev 108)
@@ -23,9 +23,17 @@
 
      $Id$ -->
 
-<form title="VAT">
+<form style="dialog" xmlns:c="GNUe:Layout:Char" title="VAT">
   <options/>
+  
+  <trigger type="On-Startup">
+    form.setFeature('GUI:MENUBAR:SUPPRESS', True)
+    form.setFeature('GUI:TOOLBAR:SUPPRESS', True)
+    form.setFeature('GUI:STATUSBAR:SUPPRESS', True)
+  </trigger>
+  
   <datasource name="dtsTAX_Vat" connection="invoice" table="TAX_Vat"/>
+  
   <logic>
     <block name="blkTAX_Vat" datasource="dtstax_vat">
       <field name="fldTaxName" field="TAX_name" maxLength="40"/>
@@ -39,24 +47,40 @@
              typecast="number"/>
     </block>
   </logic>
-  <layout xmlns:Char="GNUe:Layout:Char" Char:height="5" Char:width="55">
-    <page name="Page1">
-      <label name="lblTax Name:" Char:height="1" Char:width="11" Char:x="1"
-             Char:y="1" text="VAT name:"/>
-      <entry name="entTaxName" Char:height="1" Char:width="40" Char:x="14"
-             Char:y="1" block="blkTAX_Vat" field="fldTaxName" label=""/>
-      <label name="lblTax Rate:" Char:height="1" Char:width="9" Char:x="1"
-             Char:y="2" text="Rate:"/>
-      <entry name="entTaxRate" Char:height="1" Char:width="6" Char:x="14"
-             Char:y="2" block="blkTAX_Vat" field="fldTaxRate" label=""/>
-      <label name="lblTax Validfrom:" Char:height="1" Char:width="13"
-             Char:x="1" Char:y="3" text="Valid from:"/>
-      <entry name="entTaxValidfrom" Char:height="1" Char:width="10"
-             Char:x="14" Char:y="3" block="blkTAX_Vat" field="fldTaxValidfrom" 
label=""/>
-      <label name="lblTax Validuntil:" Char:height="1" Char:width="10"
-             Char:x="1" Char:y="4" text="Valid until:"/>
-      <entry name="entTaxValiduntil" Char:height="1" Char:width="10"
-             Char:x="14" Char:y="4" block="blkTAX_Vat" 
field="fldTaxValiduntil" label=""/>
+  
+  <layout c:height="6" c:width="55">
+    <page>
+      <label name="lblTax Name:" c:height="1" c:width="11" c:x="1" c:y="1"
+          text="VAT name:"/>
+      <entry name="entTaxName" c:height="1" c:width="40" c:x="14" c:y="1"
+          block="blkTAX_Vat" field="fldTaxName" label=""/>
+      <label name="lblTax Rate:" c:height="1" c:width="9" c:x="1" c:y="2"
+          text="Rate:"/>
+      <entry name="entTaxRate" c:height="1" c:width="6" c:x="14" c:y="2"
+          block="blkTAX_Vat" field="fldTaxRate" label=""/>
+      <label name="lblTax Validfrom:" c:height="1" c:width="13" c:x="1" c:y="3"
+          text="Valid from:"/>
+      <entry name="entTaxValidfrom" c:height="1" c:width="10" c:x="14" c:y="3"
+          block="blkTAX_Vat" field="fldTaxValidfrom" label=""/>
+      <label name="lblTax Validuntil:" c:height="1" c:width="10" c:x="1" 
c:y="4"
+          text="Valid until:"/>
+      <entry name="entTaxValiduntil" c:height="1" c:width="10" c:x="14" c:y="4"
+          block="blkTAX_Vat" field="fldTaxValiduntil" label=""/>
+      <button c:x="5" c:y="6" c:width="8" c:height="1" label="Ok">
+        <trigger name="Ok" type="On-Action">
+          if not blkTAX_Vat.isSaved():
+            blkTAX_Vat.commit()
+          close()
+        </trigger>
+      </button>
+      <button c:x="15" c:y="6" c:width="8" c:height="1" label="Cancel">
+        <trigger name="Cancel" type="On-Action">
+          if not blkTAX_Vat.isSaved():
+            blkTAX_Vat.rollback()
+          close()
+        </trigger>
+      </button>
     </page>
   </layout>
+  
 </form>





reply via email to

[Prev in Thread] Current Thread [Next in Thread]