[gnue-contrib] r235 - address

[johannes]

Author: johannes
Date: 2006-02-27 03:36:10 -0600 (Mon, 27 Feb 2006)
New Revision: 235

Modified:
   address/address.gfd
   address/schema.gsd
Log:
Added memo dialog


Modified: address/address.gfd
===================================================================
--- address/address.gfd 2006-02-24 17:39:45 UTC (rev 234)
+++ address/address.gfd 2006-02-27 09:36:10 UTC (rev 235)
@@ -39,6 +39,7 @@
       <field name="eShipment" field="shipment" maxLength="64" />
       <field name="eCategory" field="category" fk_key="id"
         fk_description="text" fk_source="dtsCategory"/>
+      <field name="eMemo" field="memo" />
     </block>
 
     <block name="blkContact" datasource="dtsContact">
@@ -53,6 +54,7 @@
       <field name="ePhone2" field="phone2" maxLength="32" />
       <field name="eFax" field="fax" maxLength="32" />
       <field name="eMail" field="email" maxLength="64" />
+      <field name="eMemo" field="memo" />
     </block>
 
     <block name="unbound" >
@@ -96,7 +98,15 @@
 
       <entry c:x="27" c:y="8" c:width="10" block="unbound" field="companymemo"
         style="label" />
-      <button c:x="37" c:y="8" c:width="12" label="Memo" />
+      <button c:x="37" c:y="8" c:width="12" c:height="1" label="Memo">
+        <trigger type="ON-ACTION"><![CDATA[
+          params = {'memo': blkCompany.eMemo.get ()}
+          activateDialog ('editMemo', params, True)
+          if params.get ('mres'):
+            blkCompany.eMemo.set (params.get ('memo'))
+          ]]>
+        </trigger>
+      </button>
 
       <label c:x="50" c:y="1" c:width="12" text="Tel.allg.:" 
alignment="right"/>
       <label c:x="50" c:y="2" c:width="12" text="Fax allg.:" 
alignment="right"/>
@@ -159,8 +169,61 @@
       <entry c:x="63" c:y="13" c:width="38" block="blkContact" field="eFax" />
       <entry c:x="63" c:y="14" c:width="38" block="blkContact" field="eMail" />
 
-      <button c:x="89" c:y="15" c:width="12" label="Memo" />
+      <button c:x="89" c:y="15" c:width="12" c:height="1" label="Memo">
+        <trigger type="ON-ACTION"><![CDATA[
+          params = {'memo': blkContact.eMemo.get ()}
+          activateDialog ('editMemo', params, True)
+          if params.get ('mres'):
+            blkContact.eMemo.set (params.get ('memo'))
+          ]]>
+        </trigger>
+      </button>
     </page>
 
   </layout>
+
+  <dialog xmlns:c="GNUe:Layout:Char" name="editMemo" title="Memo bearbeiten">
+
+    <trigger type="On-Startup">
+      form.setFeature ('GUI:MENUBAR:SUPPRESS', 1)
+      form.setFeature ('GUI:TOOLBAR:SUPPRESS', 1)
+      form.setFeature ('GUI:STATUSBAR:SUPPRESS', 1)
+    </trigger>
+
+    <trigger type="On-Activation">
+      blk.memo.set (getParameter ('memo'))
+      setFocus (blk.memo)
+    </trigger>
+
+    <logic>
+      <block name="blk">
+        <field name="memo" />
+      </block>
+    </logic>
+
+    <layout c:height="10" c:width="40">
+      <page name="Page">
+        <label c:x="1" c:y="0" c:width="10" text="Memo:" />
+        <entry c:x="1" c:y="1" c:width="39" c:height="8" block="blk"
+            field="memo" />
+
+        <button c:x="18" c:y="9" c:width="10" c:height="1" label="Ok" >
+          <trigger type="ON-ACTION"><![CDATA[
+            setParameter ('memo', blk.memo.get ())
+            setParameter ('mres', True)
+            close ()
+            ]]>
+          </trigger>
+        </button>
+
+        <button c:x="30" c:y="9" c:width="10" c:height="1" label="Abbrechen" >
+          <trigger type="ON-ACTION"><![CDATA[
+            setParameter ('mres', False)
+            close ()
+            ]]>
+          </trigger>
+        </button>
+      </page>
+    </layout>
+  </dialog>
 </form>

Modified: address/schema.gsd
===================================================================
--- address/schema.gsd  2006-02-24 17:39:45 UTC (rev 234)
+++ address/schema.gsd  2006-02-27 09:36:10 UTC (rev 235)
@@ -25,6 +25,7 @@
         <field name="shipment" type="string" length="64" />
         <field name="category" type="number" length="8" />
 
+        <field name="memo" type="string" length="2000" />
       </fields>
 
       <primarykey name="pk_company">
@@ -38,25 +39,6 @@
       </constraints>
     </table>
 
-    <table name="cpmemo">
-      <fields>
-        <field name="id" type="number" length="8" nullable="False"
-          defaultwith="serial" />
-        <field name="company" type="number" length="8" nullable="False" />
-        <field name="text" type="string" length="2000" />
-      </fields>
-
-      <primarykey name="pk_cpmemo">
-        <pkfield name="id" />
-      </primarykey>
-
-      <constraints>
-        <foreignkey name="fk_cpmemo_has_company" references="company">
-          <fkfield name="company" references="id" />
-        </foreignkey>
-      </constraints>
-    </table>
-
     <table name="contact">
       <fields>
         <field name="id" type="number" length="8" nullable="False" />
@@ -72,6 +54,7 @@
         <field name="phone2" type="string" length="32" />
         <field name="fax" type="string" length="32" />
         <field name="email" type="string" length="64" />
+        <field name="memo" type="string" length="2000" />
       </fields>
 
       <primarykey name="pk_contact">
@@ -89,30 +72,6 @@
       </constraints>
     </table>
 
-    <table name="ctmemo">
-      <fields>
-        <field name="id" type="number" length="8" nullable="False"
-          defaultwith="serial" />
-        <field name="company" type="number" length="8" nullable="False" />
-        <field name="contact" type="number" length="8" nullable="False" />
-        <field name="text" type="string" length="2000" />
-      </fields>
-
-      <primarykey name="pk_ctmemo">
-        <pkfield name="id" />
-      </primarykey>
-
-      <constraints>
-        <foreignkey name="fk_ctmemo_has_company" references="company">
-          <fkfield name="company" references="id" />
-        </foreignkey>
-        <foreignkey name="fk_ctmemo_has_contanct" references="contact">
-          <fkfield name="contact" references="id" />
-        </foreignkey>
-      </constraints>
-    </table>
-
-
     <table name="category">
       <fields>
         <field name="id" type="number" length="8" nullable="False"