gnue common/doc/TriggerSpecifications.txt commo...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/01/30 13:54:45

Modified files:
        common/doc     : TriggerSpecifications.txt 
        common/src     : GObjects.py GTrigger.py 
        designer/doc/installer: gfdesigner.cfg 
        forms/doc/installer: gfclient.cfg 
        forms/src      : GFForm.py 
        forms/src/GFObjects: GFEntry.py 

Log message:
        Trigger changes
        Win32 build changes
        Mainly checking in to get a second set of eyes on a problem piece of 
code

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/doc/TriggerSpecifications.txt.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GObjects.py.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GTrigger.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/doc/installer/gfdesigner.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/doc/installer/gfclient.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.140&tr2=1.141&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFEntry.py.diff?tr1=1.32&tr2=1.33&r1=text&r2=text

Patches:
Index: gnue/common/doc/TriggerSpecifications.txt
diff -c gnue/common/doc/TriggerSpecifications.txt:1.12 
gnue/common/doc/TriggerSpecifications.txt:1.13
*** gnue/common/doc/TriggerSpecifications.txt:1.12      Wed Jan 23 23:30:40 2002
--- gnue/common/doc/TriggerSpecifications.txt   Wed Jan 30 13:54:44 2002
***************
*** 325,331 ****
  with the local trigger namespace extracted from the object which is having 
the trigger
  fired against it.
  
- 
  If a namespace conflict occurs then the local one wins out
  
  
--- 325,330 ----
Index: gnue/common/src/GObjects.py
diff -c gnue/common/src/GObjects.py:1.25 gnue/common/src/GObjects.py:1.26
*** gnue/common/src/GObjects.py:1.25    Wed Jan 30 10:23:56 2002
--- gnue/common/src/GObjects.py Wed Jan 30 13:54:45 2002
***************
*** 46,52 ****
  import types
  from GParserHelpers import GContent
  import GTypecast
! from GTrigger import GTriggerCore
  
  #
  # Class GObj
--- 46,52 ----
  import types
  from GParserHelpers import GContent
  import GTypecast
! from GTriggerCore import GTriggerCore
  
  #
  # Class GObj
Index: gnue/common/src/GTrigger.py
diff -c gnue/common/src/GTrigger.py:1.3 gnue/common/src/GTrigger.py:1.4
*** gnue/common/src/GTrigger.py:1.3     Wed Jan 30 10:23:56 2002
--- gnue/common/src/GTrigger.py Wed Jan 30 13:54:45 2002
***************
*** 27,53 ****
  #
  # NOTES:
  #
- import sys
- from GFEvent import *
- from GFTriggerError import *
- from gnue.common.GParser import GContent
  from gnue.common.GObjects import GObj
! from gnue.common import GConfig, GTypecast
! from xml.sax import saxutils
! 
! #
! # GTriggerCore
! #
! # A base class inherited by GObj.  It's only purpose
! # is to keep all the trigger code in one place instead
! # of tacking some trigger code into GObj directly
! #
! class GTriggerCore:
!   def __init__(self):
!     self._triggerGlobal = 0
!     self._triggerTransparent = 0
!     self._triggerNamespace = {}
!     self._triggerProperties = {}
  
  
  #
--- 27,34 ----
  #
  # NOTES:
  #
  from gnue.common.GObjects import GObj
! import types
  
  
  #
***************
*** 66,89 ****
  class GTriggerNamespace(GObj):
    def __init__(self,objectTree = None):
      if objectTree:
!       self.walk(self.constructTriggerObjectTree)
      else:
        print "ERROR!"
  
!   def constructTriggerObjectTree(self, object):
!     print object.name
  
  #
  # GTriggerObject
  #
  # Inherrits GObj to gain it's parent/child system
  #
  class GTriggerObject(GObj):
    # This needs to be overwritten to fill in the values
    # of a specific GTriggerAttribute via it's _set function
    #
    def __setattr__(self, name, value):
      pass
      
  class GTriggerFunction:
    def __init__(self, name, functionLink):
--- 47,97 ----
  class GTriggerNamespace(GObj):
    def __init__(self,objectTree = None):
      if objectTree:
!       self.constructTriggerObjectTree(objectTree)
      else:
        print "ERROR!"
+   
  
!   def constructTriggerObjectTree(self, gobjObject, triggerParent=None):
!     triggerObject = GTriggerObject(triggerParent)
  
+     print triggerObject._children
+     
+     # Process GObj children
+     if len(gobjObject._children):
+       for child in gobjObject._children:
+         self.constructTriggerObjectTree(child, triggerObject)
+ 
+ # This actually goes above
+ #
+ #    if len(gobjObject._triggerNamespace):
+ #      for item in gobjObject._triggerNamespace.keys():
+ #        print "Parent ",parentObject
+ #        if type(gobjObject._triggerNamespace[item]) == types.MethodType:
+ #          trigObject = 
GTriggerFunction(item,gobjObject._triggerNamespace[item])
+ #          print "  ",trigObject
+ #        else:          
+ #          print "  This is an attribute ", item
+ #    if len(object._triggerProperties):
+ #      print "got properties"
+ 
+       
  #
  # GTriggerObject
  #
  # Inherrits GObj to gain it's parent/child system
  #
  class GTriggerObject(GObj):
+   def __init__(self,parent=None):
+     print "Creating GTriggerObject"
+     GObj.__init__(self, parent)
+     print self._children
    # This needs to be overwritten to fill in the values
    # of a specific GTriggerAttribute via it's _set function
    #
    def __setattr__(self, name, value):
      pass
+ 
      
  class GTriggerFunction:
    def __init__(self, name, functionLink):
Index: gnue/designer/doc/installer/gfdesigner.cfg
diff -c gnue/designer/doc/installer/gfdesigner.cfg:1.4 
gnue/designer/doc/installer/gfdesigner.cfg:1.5
*** gnue/designer/doc/installer/gfdesigner.cfg:1.4      Sat Jan 19 15:57:38 2002
--- gnue/designer/doc/installer/gfdesigner.cfg  Wed Jan 30 13:54:45 2002
***************
*** 12,18 ****
  script= c:\installer\designer\gfd
  zlib = APPZLIB
  ; set userunw to 1 to disable dos window
! userunw = 1
  support = 0
  debug = 0
  
--- 12,18 ----
  script= c:\installer\designer\gfd
  zlib = APPZLIB
  ; set userunw to 1 to disable dos window
! userunw = 0
  support = 0
  debug = 0
  
Index: gnue/forms/doc/installer/gfclient.cfg
diff -c gnue/forms/doc/installer/gfclient.cfg:1.4 
gnue/forms/doc/installer/gfclient.cfg:1.5
*** gnue/forms/doc/installer/gfclient.cfg:1.4   Sat Jan 19 15:57:38 2002
--- gnue/forms/doc/installer/gfclient.cfg       Wed Jan 30 13:54:45 2002
***************
*** 11,17 ****
  script= c:\installer\gfclient\gfc
  zlib = APPZLIB
  ; Set userunx to 1 to disable dos window
! userunw = 1
  support = 0
  debug = 0
  
--- 11,17 ----
  script= c:\installer\gfclient\gfc
  zlib = APPZLIB
  ; Set userunx to 1 to disable dos window
! userunw = 0
  support = 0
  debug = 0
  
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.140 gnue/forms/src/GFForm.py:1.141
*** gnue/forms/src/GFForm.py:1.140      Thu Jan 10 15:59:18 2002
--- gnue/forms/src/GFForm.py    Wed Jan 30 13:54:45 2002
***************
*** 36,41 ****
--- 36,42 ----
  from GFObjects import *
  from GFEvent import *
  from gnue.common.GDataObjects import ConnectionError as DBError
+ from gnue.common.GRootObj import GRootObj
  from GFTriggerError import *
  from GFLibrary import *
  import GFLibrary
***************
*** 46,52 ****
  #TabStops = ('GFEntry','GFButton')
  TabStops = ('GFEntry',)
  
! class GFForm(GFObj, GFEventAware):
    def __init__(self, parent=None, app=None):
      GFObj.__init__(self, parent)
      GFEventAware.__init__(self)
--- 47,53 ----
  #TabStops = ('GFEntry','GFButton')
  TabStops = ('GFEntry',)
  
! class GFForm(GFObj, GRootObj, GFEventAware):
    def __init__(self, parent=None, app=None):
      GFObj.__init__(self, parent)
      GFEventAware.__init__(self)
***************
*** 80,85 ****
--- 81,87 ----
  
      # The "None" init gives datasources time to setup master/detail
      self._inits = [self.primaryInit, None, self.secondaryInit]
+ #    self._inits = [self.primaryInit, None, self.secondaryInit, 
self.initTriggerSystem]
  
    def _buildObject(self):
  
Index: gnue/forms/src/GFObjects/GFEntry.py
diff -c gnue/forms/src/GFObjects/GFEntry.py:1.32 
gnue/forms/src/GFObjects/GFEntry.py:1.33
*** gnue/forms/src/GFObjects/GFEntry.py:1.32    Tue Jan  8 22:59:11 2002
--- gnue/forms/src/GFObjects/GFEntry.py Wed Jan 30 13:54:45 2002
***************
*** 69,74 ****
--- 69,84 ----
      self._rows = 1
      self._gap = 0
  
+     #
+     # Trigger exposure
+     #
+     self._triggerNamespace={'rows':self._rows,
+                             'testFunc':self.testFunc,
+                             }
+ 
+   def testFunc(self):
+     print "I have to do something"
+     
    def _buildObject(self):
      # Convert deprecated attributes