gnue common/src/GTrigger.py forms/src/GFForm.py...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/04/14 01:13:04

Modified files:
        common/src     : GTrigger.py 
        forms/src      : GFForm.py GFTrigger.py 
        forms/src/GFObjects: GFBlock.py GFEntry.py 
        forms/src/uidrivers/_base: UIdriver.py 
Removed files:
        forms/src      : GFError.py GFTriggerError.py 

Log message:
        Lots of code cleanup and new bugs implemented

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GTrigger.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.162&tr2=1.163&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFTrigger.py.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFBlock.py.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFEntry.py.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/UIdriver.py.diff?tr1=1.65&tr2=1.66&r1=text&r2=text

Patches:
Index: gnue/common/src/GTrigger.py
diff -c gnue/common/src/GTrigger.py:1.11 gnue/common/src/GTrigger.py:1.12
*** gnue/common/src/GTrigger.py:1.11    Wed Apr  3 01:18:05 2002
--- gnue/common/src/GTrigger.py Sun Apr 14 01:13:04 2002
***************
*** 439,445 ****
          break
  
      revisedTriggerCode = \
!       "from gnue.forms.GFTriggerError import *\n"
      for line in string.split(string.replace(self._text,'\r',''),'\n'):
        revisedTriggerCode = revisedTriggerCode + line[indentLevel:] + '\n'
      revisedTriggerCode = revisedTriggerCode + \
--- 439,445 ----
          break
  
      revisedTriggerCode = \
!       "from gnue.common.GTrigger import TriggerError\n"
      for line in string.split(string.replace(self._text,'\r',''),'\n'):
        revisedTriggerCode = revisedTriggerCode + line[indentLevel:] + '\n'
      revisedTriggerCode = revisedTriggerCode + \
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.162 gnue/forms/src/GFForm.py:1.163
*** gnue/forms/src/GFForm.py:1.162      Thu Apr  4 12:41:11 2002
--- gnue/forms/src/GFForm.py    Sun Apr 14 01:13:04 2002
***************
*** 37,43 ****
  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
  import GFParser
--- 37,44 ----
  from GFEvent import *
  from gnue.common.GDataObjects import ConnectionError as DBError
  from gnue.common.GRootObj import GRootObj
! #from GFTriggerError import *
! from gnue.common.GTrigger import TriggerError
  from GFLibrary import *
  import GFLibrary
  import GFParser
***************
*** 220,230 ****
    #
    def changeFocus(self, widget, fireFocusTriggers=1):
  
-     message = None
- 
      if not hasattr(widget,'_block'):
!       return message
  
      try:
        if self._currentEntry:
          event = GFEvent('endEDITMODE', None)
--- 221,231 ----
    #
    def changeFocus(self, widget, fireFocusTriggers=1):
  
      if not hasattr(widget,'_block'):
!       return None
  
+     message = None
+     
      try:
        if self._currentEntry:
          event = GFEvent('endEDITMODE', None)
***************
*** 252,259 ****
          except AttributeError:
            pass
  
-       oldPage  = self._currentPage
-       oldBlock = self._currentBlock
        oldEntry = self._currentEntry
  
        self._currentEntry = widget
--- 253,258 ----
***************
*** 371,385 ****
  
    def updateUIEntry(self,entry):
      self._app.dispatchEvent(GFEvent('updateENTRY',entry));
- 
-   def findValue(self, blockname, fieldname):
-     for block in self._blockList:
-       if block.name == blockname:
-         value = block._dataSourceLink.getField(block._currentRecord,fieldname)
-         GDebug.printMesg(2,"block %s with field %s found.  Value is %s" % 
(block.name, fieldname, value))
- 
-         return value
-     return None
  
    #
    # Incomming Event handlers
--- 370,375 ----
Index: gnue/forms/src/GFObjects/GFBlock.py
diff -c gnue/forms/src/GFObjects/GFBlock.py:1.46 
gnue/forms/src/GFObjects/GFBlock.py:1.47
*** gnue/forms/src/GFObjects/GFBlock.py:1.46    Sat Apr 13 12:08:39 2002
--- gnue/forms/src/GFObjects/GFBlock.py Sun Apr 14 01:13:04 2002
***************
*** 198,204 ****
        self._form.updateUIEntry(entry)
  
      if adjustment <> 0:
!       self.processTrigger('on-switch')
  
    #
    # newRecord
--- 198,204 ----
        self._form.updateUIEntry(entry)
  
      if adjustment <> 0:
!       self.processTrigger('ON-SWITCH')
  
    #
    # newRecord
***************
*** 209,215 ****
      if self._resultSet.insertRecord():
        self._recordCount = self._resultSet.getRecordCount()
        self.switchRecord(1)
!       self.processTrigger('on-newrecord')
  
    def nextRecord(self):
      if self._resultSet.nextRecord():
--- 209,215 ----
      if self._resultSet.insertRecord():
        self._recordCount = self._resultSet.getRecordCount()
        self.switchRecord(1)
!       self.processTrigger('ON-NEWRECORD')
  
    def nextRecord(self):
      if self._resultSet.nextRecord():
***************
*** 365,371 ****
        self._dataSourceLink.createResultSet(conditions)
        self._recordCount = self._resultSet.getRecordCount()
  
!       self.processTrigger('Post-Query')
  
  
  
--- 365,371 ----
        self._dataSourceLink.createResultSet(conditions)
        self._recordCount = self._resultSet.getRecordCount()
  
!       self.processTrigger('POST-QUERY')
  
  
  
Index: gnue/forms/src/GFObjects/GFEntry.py
diff -c gnue/forms/src/GFObjects/GFEntry.py:1.52 
gnue/forms/src/GFObjects/GFEntry.py:1.53
*** gnue/forms/src/GFObjects/GFEntry.py:1.52    Fri Apr 12 22:25:39 2002
--- gnue/forms/src/GFObjects/GFEntry.py Sun Apr 14 01:13:04 2002
***************
*** 133,139 ****
      self._inputmask = ""
      self._displaymask = ""
  
-     self._cursorPosition = len(self._oldval)
      self._block = self.findParentOfType('GFBlock')
  
      if hasattr(self, 'default') and self.default != None and 
len(self.default):
--- 133,138 ----
***************
*** 243,248 ****
--- 242,248 ----
      # TODO: number type is blowing this function up but I'm not
      # TODO: sure if jcater wanted to keep data in it's backend
      # TODO: type while in the recordSets
+ 
      value = 1
      if len("%s" % self._oldval) != 0:
          if self._allowedValues:
Index: gnue/forms/src/GFTrigger.py
diff -c gnue/forms/src/GFTrigger.py:1.55 gnue/forms/src/GFTrigger.py:1.56
*** gnue/forms/src/GFTrigger.py:1.55    Wed Apr  3 01:18:05 2002
--- gnue/forms/src/GFTrigger.py Sun Apr 14 01:13:04 2002
***************
*** 27,40 ****
  #
  # 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 gnue.common.GTrigger import GTrigger
! from xml.sax import saxutils
  
  import string
  
--- 27,35 ----
  #
  # NOTES:
  #
! from gnue.common.GParser import GContent, GDebug
  from gnue.common.GObjects import GObj
! from gnue.common.GTrigger import GTrigger, TriggerError
  
  import string
  
***************
*** 71,79 ****
    # addTrigger
    # Associates a trigger with the object
    def addTrigger(self, key, function):
      if not self._trigger.has_key(key):
!       self._trigger[string.upper(key)] = []
!     self._trigger[string.upper(key)].append(function)
  
    # processTrigger
    # "fires" the trigger
--- 66,75 ----
    # 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
Index: gnue/forms/src/uidrivers/_base/UIdriver.py
diff -c gnue/forms/src/uidrivers/_base/UIdriver.py:1.65 
gnue/forms/src/uidrivers/_base/UIdriver.py:1.66
*** gnue/forms/src/uidrivers/_base/UIdriver.py:1.65     Thu Apr  4 12:41:11 2002
--- gnue/forms/src/uidrivers/_base/UIdriver.py  Sun Apr 14 01:13:04 2002
***************
*** 289,304 ****
      handler = entry._displayHandler
      prehandling = handler.editing
      handler.editing = 0
- 
      index = entry._visibleIndex
- 
      block = entry._block
      currentRecord = block._resultSet.getRecordNumber()
- 
-     if hasattr(entry, 'style'):
-       style = entry.style
-     else:
-       style = 'text'
  
      # Fill the prior spots
      for count in range(index):
--- 289,297 ----