gnue/gnuef src/GFForm.py src/GFObjects.py sampl...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/06/07 18:36:53

Modified files:
        gnuef/src      : GFForm.py GFObjects.py 
        gnuef/samples  : helloworld2.gfd 
        gnuef/samples/button/forms: form.gfd 
        gnuef/samples/geas: users.gfd 
        gnuef/samples/po: sc_po_entry.gfd 
        gnuef/samples/track/forms: contact_manager.gfd 
        gnuef/doc      : techref.lyx 

Log message:
        Changed references to old trigger 'id=' attribute to 'name='

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFForm.py.diff?cvsroot=OldCVS&tr1=1.99&tr2=1.100&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects.py.diff?cvsroot=OldCVS&tr1=1.92&tr2=1.93&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/samples/helloworld2.gfd.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/samples/button/forms/form.gfd.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/samples/geas/users.gfd.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/samples/po/sc_po_entry.gfd.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/samples/track/forms/contact_manager.gfd.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/doc/techref.lyx.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gnue/gnuef/doc/techref.lyx
diff -u gnue/gnuef/doc/techref.lyx:1.5 gnue/gnuef/doc/techref.lyx:1.6
--- gnue/gnuef/doc/techref.lyx:1.5      Thu Jun  7 15:08:53 2001
+++ gnue/gnuef/doc/techref.lyx  Thu Jun  7 18:36:53 2001
@@ -4445,7 +4445,7 @@
 <form>
 \layout Standard
 
-<trigger type="named" id="trggrAmount">
+<trigger type="named" name="trggrAmount">
 \layout Standard
 
 # 
@@ -4838,7 +4838,7 @@
 \layout Standard
 
 All <import-[object]> style tags take a minimum of two tags, location and
- name (or id for triggers), plus any tags available to the imported tag.
+ name, plus any tags available to the imported tag.
  Location works the same as in the above table for form-level objects.
 \layout Standard
 
Index: gnue/gnuef/samples/button/forms/form.gfd
diff -u gnue/gnuef/samples/button/forms/form.gfd:1.1 
gnue/gnuef/samples/button/forms/form.gfd:1.2
--- gnue/gnuef/samples/button/forms/form.gfd:1.1        Mon Feb 19 18:47:24 2001
+++ gnue/gnuef/samples/button/forms/form.gfd    Thu Jun  7 18:36:52 2001
@@ -8,19 +8,19 @@
   <author>James Thompson</author>
 </options>
 
-<trigger type="named" id="HelloWorld">
+<trigger type="named" name="HelloWorld">
 print "Hello There!"
 </trigger>
 
-<trigger type="named" id="GoodbyeWorld">
+<trigger type="named" name="GoodbyeWorld">
 print "See Ya!"
 </trigger>
 
-<trigger type="named" id="Foo">
+<trigger type="named" name="Foo">
 print "Foo!"
 </trigger>
 
-<trigger type="named" id="Bar">
+<trigger type="named" name="Bar">
 print "Bar!"
 </trigger>
 
Index: gnue/gnuef/samples/geas/users.gfd
diff -u gnue/gnuef/samples/geas/users.gfd:1.1 
gnue/gnuef/samples/geas/users.gfd:1.2
--- gnue/gnuef/samples/geas/users.gfd:1.1       Tue Mar  6 17:16:20 2001
+++ gnue/gnuef/samples/geas/users.gfd   Thu Jun  7 18:36:52 2001
@@ -11,7 +11,7 @@
   <database name="gnue" provider="geas" dbname="test" host="gnue"/>
   <datasource name="users" database="gnue" table="geas::user" prequery=""/>
 
-<trigger type="named" id="randompw">
+<trigger type="named" name="randompw">
 import string
 import whrandom
 newpass = ""
Index: gnue/gnuef/samples/helloworld2.gfd
diff -u gnue/gnuef/samples/helloworld2.gfd:1.4 
gnue/gnuef/samples/helloworld2.gfd:1.5
--- gnue/gnuef/samples/helloworld2.gfd:1.4      Fri Apr 13 05:58:40 2001
+++ gnue/gnuef/samples/helloworld2.gfd  Thu Jun  7 18:36:52 2001
@@ -8,7 +8,7 @@
   <height>12</height>
 </options>
 
-<trigger type="named" id="HelloWorld">
+<trigger type="named" name="HelloWorld">
 #
 #Populate User Name from Name
 #
Index: gnue/gnuef/samples/po/sc_po_entry.gfd
diff -u gnue/gnuef/samples/po/sc_po_entry.gfd:1.4 
gnue/gnuef/samples/po/sc_po_entry.gfd:1.5
--- gnue/gnuef/samples/po/sc_po_entry.gfd:1.4   Sun Jan  7 23:36:47 2001
+++ gnue/gnuef/samples/po/sc_po_entry.gfd       Thu Jun  7 18:36:52 2001
@@ -9,7 +9,7 @@
     <width>80</width>
   </options>
 
-<trigger type="named" id="trggrAmount">
+<trigger type="named" name="trggrAmount">
 #
 #Calculate Amount
 #
@@ -17,7 +17,7 @@
 blckPOItem.fields.ntryAmount = str(int(blckPOItem.fields.ntryQuantity) * 
float(blckPOItem.fields.ntryUnitPrice))
 </trigger>
 
-<trigger type="named" id="trggrTotal">
+<trigger type="named" name="trggrTotal">
 #
 #Calculate Total
 #
Index: gnue/gnuef/samples/track/forms/contact_manager.gfd
diff -u gnue/gnuef/samples/track/forms/contact_manager.gfd:1.2 
gnue/gnuef/samples/track/forms/contact_manager.gfd:1.3
--- gnue/gnuef/samples/track/forms/contact_manager.gfd:1.2      Fri May  4 
16:27:03 2001
+++ gnue/gnuef/samples/track/forms/contact_manager.gfd  Thu Jun  7 18:36:52 2001
@@ -12,7 +12,7 @@
     <width>69</width>
   </options>
 
-<trigger type="named" id="getFullName">
+<trigger type="named" name="getFullName">
 import sys
 <![CDATA[
 if blckPerson.fields.ntryFirstName <> "" or blckPerson.fields.ntryLastName <> 
"":
@@ -20,7 +20,7 @@
 ]]>
 </trigger>
 
-<trigger type="named" id="validatePhoneArea">
+<trigger type="named" name="validatePhoneArea">
 import sys
 import string
 <![CDATA[
@@ -31,55 +31,55 @@
 
 <!--
 
-<trigger type="named" id="phoneNew">
+<trigger type="named" name="phoneNew">
 blckPersonPhone.helper.object.newRecord()
 </trigger>
 
-<trigger type="named" id="phoneDelete">
+<trigger type="named" name="phoneDelete">
 blckPersonPhone.helper.object.deleteRecord()
 </trigger>
 
-<trigger type="named" id="phonePrev">
+<trigger type="named" name="phonePrev">
 blckPersonPhone.helper.object.prevRecord()
 </trigger>
 
-<trigger type="named" id="phoneNext">
+<trigger type="named" name="phoneNext">
 blckPersonPhone.helper.object.nextRecord()
 </trigger>
 
-<trigger type="named" id="recordTrigger">
+<trigger type="named" name="recordTrigger">
 print "mommie, i see a new record!"
 </trigger>
 
-<trigger type="named" id="addrNew">
+<trigger type="named" name="addrNew">
 blckPersonAddress.helper.object.newRecord()
 </trigger>
 
-<trigger type="named" id="addrDelete">
+<trigger type="named" name="addrDelete">
 blckPersonAddress.helper.object.deleteRecord()
 </trigger>
 
-<trigger type="named" id="addrPrev">
+<trigger type="named" name="addrPrev">
 blckPersonAddress.helper.object.prevRecord()
 </trigger>
 
-<trigger type="named" id="addrNext">
+<trigger type="named" name="addrNext">
 blckPersonAddress.helper.object.nextRecord()
 </trigger>
 
-<trigger type="named" id="emailNew">
+<trigger type="named" name="emailNew">
 blckPersonEmail.helper.object.newRecord()
 </trigger>
 
-<trigger type="named" id="emailDelete">
+<trigger type="named" name="emailDelete">
 blckPersonEmail.helper.object.deleteRecord()
 </trigger>
 
-<trigger type="named" id="emailPrev">
+<trigger type="named" name="emailPrev">
 blckPersonEmail.helper.object.prevRecord()
 </trigger>
 
-<trigger type="named" id="emailNext">
+<trigger type="named" name="emailNext">
 blckPersonEmail.helper.object.nextRecord()
 </trigger>
 -->
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.99 gnue/gnuef/src/GFForm.py:1.100
--- gnue/gnuef/src/GFForm.py:1.99       Thu Jun  7 18:22:12 2001
+++ gnue/gnuef/src/GFForm.py    Thu Jun  7 18:36:52 2001
@@ -154,7 +154,7 @@
       if importAllTriggers or len(importTriggers):
         for child in form._children:
           if isinstance(child, GFTrigger.GFTrigger) and \
-             (importAllTriggers or child.id in importTriggers):
+             (importAllTriggers or child.name in importTriggers):
             child._parent = object 
             child._IMPORTED = 1
             object._children.append(child)
Index: gnue/gnuef/src/GFObjects.py
diff -u gnue/gnuef/src/GFObjects.py:1.92 gnue/gnuef/src/GFObjects.py:1.93
--- gnue/gnuef/src/GFObjects.py:1.92    Thu Jun  7 09:58:15 2001
+++ gnue/gnuef/src/GFObjects.py Thu Jun  7 18:36:52 2001
@@ -59,6 +59,7 @@
     self.hidden = 0
     self.readonly = 0
     self._visibleIndex = 0
+    self.name = "__%s__" % self
 
 
   #
@@ -163,9 +164,6 @@
     GFObj.__init__(self, parent)
     self._type = "GFPage"
 
-    # Internally, we need a unique name for all pages
-    # so generate one if designer didn't
-    self.name = "__%s__" % self
     
 #
 # GFBox
@@ -192,7 +190,6 @@
     GFObj.__init__(self, parent)
     self._type = "GFButton"
     self.label = ""
-    self.name = "__%s__" % self
 
 #
 # GFOptions