gnue/forms src/GFInstance.py src/GFParser.py sr...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/11/25 11:44:18

Modified files:
        forms/src      : GFInstance.py GFParser.py 
        forms/src/GFObjects: GFButton.py 
        forms/src/uidrivers/curses: UIdriver.py 
        forms/src/uidrivers/gtk2: UIdriver.py 
        forms/src/uidrivers/wx: UIdriver.py 
        forms/utils    : gfd04to05.py 

Log message:
        Made buttons like any other triggerable object. Instead of 
trigger="..." attribute, we have a <trigger type="On-Action">.  Conversion 
script reflects this.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.67&tr2=1.68&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFParser.py.diff?tr1=1.90&tr2=1.91&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFButton.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/curses/UIdriver.py.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/gtk2/UIdriver.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.216&tr2=1.217&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/utils/gfd04to05.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.67 gnue/forms/src/GFInstance.py:1.68
*** gnue/forms/src/GFInstance.py:1.67   Thu Nov 21 21:57:23 2002
--- gnue/forms/src/GFInstance.py        Mon Nov 25 11:44:18 2002
***************
*** 96,101 ****
--- 96,102 ----
                             'requestABOUT'        : self.executeAbout,
                             'requestMODETOGGLE'   : self.toggleInsertMode,
                             'fireTRIGGER'         : self.fireTrigger,
+                            'buttonActivated'     : self.fireButton,
  
                             # "Entry" events (proxied)
                             'requestKEYPRESS'     : self.proxyEntryEvent,
***************
*** 120,126 ****
                             'requestCOPY'         : self.proxyEntryEvent,
                             'requestCUT'          : self.proxyEntryEvent,
                             'requestPASTE'        : self.proxyEntryEvent,
- 
                       } )
  
    #
--- 121,126 ----
***************
*** 602,607 ****
--- 602,613 ----
    #
    def fireTrigger(self, event):
      self._form.fireTrigger(event.data)
+ 
+   #
+   # fireButton
+   #
+   def fireButton(self, event):
+     event.data.processTrigger('On-Action')
  
    #
    #  Activate this puppy...
Index: gnue/forms/src/GFObjects/GFButton.py
diff -c gnue/forms/src/GFObjects/GFButton.py:1.13 
gnue/forms/src/GFObjects/GFButton.py:1.14
*** gnue/forms/src/GFObjects/GFButton.py:1.13   Fri Nov 22 00:36:11 2002
--- gnue/forms/src/GFObjects/GFButton.py        Mon Nov 25 11:44:18 2002
***************
*** 37,43 ****
      self.label = ""
      self._inits = [self.initialize]
      self._navigable = 1
!     self._validTriggers ={ 'PRE-FOCUSOUT':   'Pre-FocusOut',
                             'POST-FOCUSOUT':  'Post-FocusOut',
                             'PRE-FOCUSIN':    'Pre-FocusIn',
                             'POST-FOCUSIN':   'Post-FocusIn',
--- 37,44 ----
      self.label = ""
      self._inits = [self.initialize]
      self._navigable = 1
!     self._validTriggers ={ 'ON-ACTION':      'On-Action',
!                            'PRE-FOCUSOUT':   'Pre-FocusOut',
                             'POST-FOCUSOUT':  'Post-FocusOut',
                             'PRE-FOCUSIN':    'Pre-FocusIn',
                             'POST-FOCUSIN':   'Post-FocusIn',
Index: gnue/forms/src/GFParser.py
diff -c gnue/forms/src/GFParser.py:1.90 gnue/forms/src/GFParser.py:1.91
*** gnue/forms/src/GFParser.py:1.90     Mon Nov 25 00:23:32 2002
--- gnue/forms/src/GFParser.py  Mon Nov 25 11:44:18 2002
***************
*** 527,535 ****
                 'Unique': 1,
                 'Typecast': GTypecast.name,
                 'Description': 'A unique ID for the widget. Useful for 
importable buttons. ' },
-             'trigger': {
-                'Typecast': GTypecast.name,
-                'Description': 'The name of a named trigger that this button 
will fire when pressed.' },
              'focusorder': {
                 'Typecast': GTypecast.whole,
                 'Description': 'TODO'},
--- 527,532 ----
Index: gnue/forms/src/uidrivers/curses/UIdriver.py
diff -c gnue/forms/src/uidrivers/curses/UIdriver.py:1.23 
gnue/forms/src/uidrivers/curses/UIdriver.py:1.24
*** gnue/forms/src/uidrivers/curses/UIdriver.py:1.23    Sun Nov 17 14:44:09 2002
--- gnue/forms/src/uidrivers/curses/UIdriver.py Mon Nov 25 11:44:18 2002
***************
*** 547,553 ****
      object = event.object
      newWidget = 
Button(event.container,'name',object.y+spacer,object.x,object.width,str(object.label))
      event.container.AddControl(newWidget)
!     self.__trigger = object.trigger
      newWidget.SetMethod("CLICK", self.buttonHandler)
      return newWidget
  
--- 547,553 ----
      object = event.object
      newWidget = 
Button(event.container,'name',object.y+spacer,object.x,object.width,str(object.label))
      event.container.AddControl(newWidget)
!     self.__gf = object
      newWidget.SetMethod("CLICK", self.buttonHandler)
      return newWidget
  
***************
*** 559,565 ****
  ##       id = object.GetId()
  ##       gfObject     = _IdToGFObj[id]
  
!     _EVENTPROCESSOR(events.Event('fireTRIGGER',self.__trigger))
  
  ##     if action:
  ##       _EVENTPROCESSOR(action)
--- 559,565 ----
  ##       id = object.GetId()
  ##       gfObject     = _IdToGFObj[id]
  
!     _EVENTPROCESSOR(events.Event('buttonActivated',self.__gf))
  
  ##     if action:
  ##       _EVENTPROCESSOR(action)
Index: gnue/forms/src/uidrivers/gtk2/UIdriver.py
diff -c gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.13 
gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.14
*** gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.13      Wed Nov 13 22:37:14 2002
--- gnue/forms/src/uidrivers/gtk2/UIdriver.py   Mon Nov 25 11:44:18 2002
***************
*** 988,994 ****
    def buttonHandler(self,event,newWidget):
      action = None
      gfObject  = _WidgetToGFObj[newWidget]
!     action = events.Event('fireTRIGGER',gfObject.trigger)
  
      if action:
        _EVENTPROCESSOR(action)
--- 988,994 ----
    def buttonHandler(self,event,newWidget):
      action = None
      gfObject  = _WidgetToGFObj[newWidget]
!     action = events.Event('buttonActivated',gfObject)
  
      if action:
        _EVENTPROCESSOR(action)
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.216 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.217
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.216       Mon Nov 25 00:29:20 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Mon Nov 25 11:44:18 2002
***************
*** 852,858 ****
  
        id = object.GetId()
        gfObject     = _IdToGFObj[id]
!       action = events.Event('fireTRIGGER',gfObject.trigger)
        self._eventHandler(action)
  
  
--- 852,858 ----
  
        id = object.GetId()
        gfObject     = _IdToGFObj[id]
!       action = events.Event('buttonActivated',gfObject)
        self._eventHandler(action)
  
  
***************
*** 1141,1147 ****
      #  print cursorPosition
  
  #    if gfObject._type == 'GFButton':
! #      self._eventProcessor(events.Event('fireTRIGGER',gfObject.trigger))
  
  
  
--- 1141,1147 ----
      #  print cursorPosition
  
  #    if gfObject._type == 'GFButton':
! #      self._eventProcessor(events.Event('buttonActivated',gfObject))
  
  
  
***************
*** 1202,1208 ****
        action = events.Event('request%s' % command)
  
      elif object._type == 'GFButton':
!       action = events.Event('fireTRIGGER',object.trigger)
  
      elif object.style == 'checkbox' and object._type == 'GFEntry':
        # <space> <=> <click>
--- 1202,1208 ----
        action = events.Event('request%s' % command)
  
      elif object._type == 'GFButton':
!       action = events.Event('buttonActivated',object)
  
      elif object.style == 'checkbox' and object._type == 'GFEntry':
        # <space> <=> <click>
Index: gnue/forms/utils/gfd04to05.py
diff -c gnue/forms/utils/gfd04to05.py:1.8 gnue/forms/utils/gfd04to05.py:1.9
*** gnue/forms/utils/gfd04to05.py:1.8   Mon Nov 25 01:07:14 2002
--- gnue/forms/utils/gfd04to05.py       Mon Nov 25 11:44:18 2002
***************
*** 183,189 ****
      # Remove trigger= support on buttons, and create a button
      named = object._properties['trigger']
      del object._properties['trigger']
!     t = modeler('trigger', {'type': 'On-Action','source': named} , object)
      object.reparent(object._parent._origparent)
  
    elif object._tag == 'page':
--- 183,189 ----
      # Remove trigger= support on buttons, and create a button
      named = object._properties['trigger']
      del object._properties['trigger']
!     t = modeler('trigger', {'type': 'On-Action','src': named} , object)
      object.reparent(object._parent._origparent)
  
    elif object._tag == 'page':