gnue common/src/GTrigger.py designer/src/PopupM...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/10/23 23:00:25

Modified files:
        common/src     : GTrigger.py 
        designer/src   : PopupMenu.py 
        forms/src      : GFTrigger.py 
        forms/src/GFObjects: GFObj.py 

Log message:
        Partial removal of the GFTrigger class being replaced by common trigger 
system.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GTrigger.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/PopupMenu.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFTrigger.py.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFObj.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: gnue/common/src/GTrigger.py
diff -c gnue/common/src/GTrigger.py:1.22 gnue/common/src/GTrigger.py:1.23
*** gnue/common/src/GTrigger.py:1.22    Sun Oct 20 14:55:49 2002
--- gnue/common/src/GTrigger.py Wed Oct 23 23:00:24 2002
***************
*** 401,407 ****
  
      if self.type != "NAMED":
        if self._parent:
!         self._parent.addTrigger( self.type, self )
          self._triggerns.update(self._parent._localTriggerNamespace)
      else:
        self._root._triggerDictionary[self.name] = self
--- 401,407 ----
  
      if self.type != "NAMED":
        if self._parent:
!         self._parent.associateTrigger( self.type, self )
          self._triggerns.update(self._parent._localTriggerNamespace)
      else:
        self._root._triggerDictionary[self.name] = self
***************
*** 483,489 ****
        except TriggerError:
          raise
        except:
!         # May be better to deal with this in GFTriggerAware
          raise
          import sys
          GDebug.printMesg(0, "%s in trigger code, value: %s" % (sys.exc_type, 
sys.exc_value))
--- 483,489 ----
        except TriggerError:
          raise
        except:
!         # May be better to deal with this in GTriggerExtension
          raise
          import sys
          GDebug.printMesg(0, "%s in trigger code, value: %s" % (sys.exc_type, 
sys.exc_value))
***************
*** 589,599 ****
  # capable of processing triggers
  #
  class GTriggerExtension:
!   def __init__(self):
      self._trigger = {}
!     self._validTriggers = {} # TODO : This probably needs moved into the apps 
trigger manager.
!                              # TODO : I'll think about this more after sleep.
! 
    # associateTrigger
    #
    # Associates a trigger with the object.  More than one trigger of a 
specific type
--- 589,598 ----
  # capable of processing triggers
  #
  class GTriggerExtension:
!   def __init__(self, validTriggers):
      self._trigger = {}
!     self._validTriggers = validTriggers 
!                                         
    # associateTrigger
    #
    # Associates a trigger with the object.  More than one trigger of a 
specific type
***************
*** 601,607 ****
    #
    def associateTrigger(self, key, function):
      key = string.upper(key)
!     if key in self._validTriggers:
        if not self._trigger.has_key(key):
          self._trigger[string.upper(key)] = []
        self._trigger[string.upper(key)].append(function)
--- 600,606 ----
    #
    def associateTrigger(self, key, function):
      key = string.upper(key)
!     if key in self._validTriggers.keys():
        if not self._trigger.has_key(key):
          self._trigger[string.upper(key)] = []
        self._trigger[string.upper(key)].append(function)
***************
*** 613,619 ****
    # "fires" the trigger
    def processTrigger(self, key):
      key = string.upper(key)
!     if key in self._validTriggers:
        if self._trigger.has_key(key):
          for function in self._trigger[key]:
            function(self)
--- 612,618 ----
    # "fires" the trigger
    def processTrigger(self, key):
      key = string.upper(key)
!     if key in self._validTriggers.keys():
        if self._trigger.has_key(key):
          for function in self._trigger[key]:
            function(self)
Index: gnue/designer/src/PopupMenu.py
diff -c gnue/designer/src/PopupMenu.py:1.13 gnue/designer/src/PopupMenu.py:1.14
*** gnue/designer/src/PopupMenu.py:1.13 Wed Jul  3 10:14:39 2002
--- gnue/designer/src/PopupMenu.py      Wed Oct 23 23:00:24 2002
***************
*** 27,34 ****
  
  import sys, os, time, string
  from wxPython.wx import *
! from gnue.common import GDebug, GObjects
! from gnue.forms import GFForm, GFObjects, GFTrigger, GFLibrary
  
  
  
--- 27,34 ----
  
  import sys, os, time, string
  from wxPython.wx import *
! from gnue.common import GDebug, GObjects, GTrigger
! from gnue.forms import GFForm, GFObjects, GFLibrary
  
  
  
***************
*** 68,82 ****
        self.AppendSeparator()
  
        # Events >
!       if isinstance (object, GFTrigger.GFTriggerAware):
          menu = wxMenu(_("Events..."))
          self._triggerMap = {}
!         keys = GFTrigger.VALIDTRIGGERS.keys()
          keys.sort()
          for trigger in (keys):
            tid = wxNewId()
            self._triggerMap[tid] = trigger
!           menu.Append(tid, GFTrigger.VALIDTRIGGERS[trigger] + "...")
            EVT_MENU(menu, tid, self.OnEditEvent)
          self.AppendMenu(wxNewId(), _("&Events"), menu)
  
--- 68,82 ----
        self.AppendSeparator()
  
        # Events >
!       if isinstance (object, GTrigger.GTriggerExtension):
          menu = wxMenu(_("Events..."))
          self._triggerMap = {}
!         keys = object._validTriggers.keys()
          keys.sort()
          for trigger in (keys):
            tid = wxNewId()
            self._triggerMap[tid] = trigger
!           menu.Append(tid, object._validTriggers[trigger] + "...")
            EVT_MENU(menu, tid, self.OnEditEvent)
          self.AppendMenu(wxNewId(), _("&Events"), menu)
  
Index: gnue/forms/src/GFObjects/GFObj.py
diff -c gnue/forms/src/GFObjects/GFObj.py:1.10 
gnue/forms/src/GFObjects/GFObj.py:1.11
*** gnue/forms/src/GFObjects/GFObj.py:1.10      Wed Apr  3 01:18:06 2002
--- gnue/forms/src/GFObjects/GFObj.py   Wed Oct 23 23:00:25 2002
***************
*** 31,46 ****
  #
  
  from gnue.common.GObjects import GObj
! from gnue.forms.GFTrigger import GFTriggerAware
  
  #
  # Class GFObj
  #
  # Base internal object for GNUE Forms
  #
! class GFObj(GObj, GFTriggerAware):
    def __init__(self, parent=None, type='GFObj'):
!     GFTriggerAware.__init__(self)
      GObj.__init__(self, parent, type)
      self.hidden = 0
      self.readonly = 0
--- 31,47 ----
  #
  
  from gnue.common.GObjects import GObj
! from gnue.common.GTrigger import GTriggerExtension
! from gnue.forms.GFTrigger import VALIDTRIGGERS
  
  #
  # Class GFObj
  #
  # Base internal object for GNUE Forms
  #
! class GFObj(GObj, GTriggerExtension):
    def __init__(self, parent=None, type='GFObj'):
!     GTriggerExtension.__init__(self,VALIDTRIGGERS)
      GObj.__init__(self, parent, type)
      self.hidden = 0
      self.readonly = 0
Index: gnue/forms/src/GFTrigger.py
diff -c gnue/forms/src/GFTrigger.py:1.61 gnue/forms/src/GFTrigger.py:1.62
*** gnue/forms/src/GFTrigger.py:1.61    Sun Oct 20 14:55:49 2002
--- gnue/forms/src/GFTrigger.py Wed Oct 23 23:00:25 2002
***************
*** 54,90 ****
                    'ON-STARTUP':     'On-Startup',
                    'ON-EXIT':        'On-Exit' }
  
- #
- # GFTriggerAware
- #
- # Objects that inherit this class will be
- # capable of processing triggers
- #
- class GFTriggerAware:
-   def __init__(self):
-     self._trigger = {}
-     self._validTriggers = VALIDTRIGGERS.keys()
- 
-   # addTrigger
-   # Associates a trigger with the object
-   def addTrigger(self, key, function):
-     key = string.upper(key)
-     if not self._trigger.has_key(key):
-       self._trigger[key] = []
-     self._trigger[key].append(function)
- 
-   # processTrigger
-   # "fires" the trigger
-   def processTrigger(self, key):
-     key = string.upper(key)
-     if self._validTriggers.count(key):
-       if self._trigger.has_key(key):
-         for function in self._trigger[key]:
-           function(self)
-       else:
-         GDebug.printMesg(10, "No triggers to fire")
-     else:
-       print _("Invalid trigger "),key
  
  #
  # GFTrigger
--- 54,59 ----
***************
*** 97,114 ****
      params['validtriggers'] = VALIDTRIGGERS
      GTrigger.__init__(self, *args, **params)
      self._type = "GFTrigger"
- 
- ##    self._text=''
- ##    self.language=language
- ##    self._triggerns={}
- ##    self.src = src
- ##    self.type = type
- ##    self.name = name
- ##    self._inits   = [None,self.initialize]
- ##    if text != None:
- ##      GContent(self, text)
- ##    if self.type != None:
- ##      self._buildObject()
  
    def initialize(self, *args, **parms):
      self._root = self.findParentOfType('GFForm')
--- 66,71 ----