gnue/forms/src GFForm.py GFObjects/GFBlock.py G...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/11/18 01:40:55

Modified files:
        forms/src      : GFForm.py 
        forms/src/GFObjects: GFBlock.py GFButton.py GFEntry.py 
                             GFField.py __init__.py 

Log message:
        cleanup in preparation for structural changes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFForm.py.diff?cvsroot=OldCVS&tr1=1.202&tr2=1.203&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFObjects/GFBlock.py.diff?cvsroot=OldCVS&tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFObjects/GFButton.py.diff?cvsroot=OldCVS&tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFObjects/GFEntry.py.diff?cvsroot=OldCVS&tr1=1.78&tr2=1.79&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFObjects/GFField.py.diff?cvsroot=OldCVS&tr1=1.78&tr2=1.79&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFObjects/__init__.py.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.202 gnue/forms/src/GFForm.py:1.203
*** gnue/forms/src/GFForm.py:1.202      Sat Nov 16 16:14:39 2002
--- gnue/forms/src/GFForm.py    Mon Nov 18 01:40:55 2002
***************
*** 277,283 ****
  
        fieldChange = widget != self._currentEntry
        blockChange = widget._block != self._currentBlock
!       pageChange = widget._block._page != self._currentPage
  
        if fireFocusTriggers:
          try:
--- 277,283 ----
  
        fieldChange = widget != self._currentEntry
        blockChange = widget._block != self._currentBlock
!       pageChange = widget._page != self._currentPage
  
        if fireFocusTriggers:
          try:
***************
*** 299,305 ****
  
        self._currentEntry = widget
        self._currentBlock = self._currentEntry._block
!       self._currentPage = self._currentBlock._page
  
        if pageChange:
          self.dispatchEvent(events.Event('gotoPAGE',self._currentPage));
--- 299,305 ----
  
        self._currentEntry = widget
        self._currentBlock = self._currentEntry._block
!       self._currentPage = self._currentEntry._page
  
        if pageChange:
          self.dispatchEvent(events.Event('gotoPAGE',self._currentPage));
Index: gnue/forms/src/GFObjects/GFBlock.py
diff -c gnue/forms/src/GFObjects/GFBlock.py:1.61 
gnue/forms/src/GFObjects/GFBlock.py:1.62
*** gnue/forms/src/GFObjects/GFBlock.py:1.61    Wed Nov  6 14:13:16 2002
--- gnue/forms/src/GFObjects/GFBlock.py Mon Nov 18 01:40:55 2002
***************
*** 132,138 ****
    #
    def initialize(self):
      self._form = form = self.findParentOfType('GFForm')
!     self._page = self.findParentOfType('GFPage')
  
      form._blockList.append(self)
  
--- 132,138 ----
    #
    def initialize(self):
      self._form = form = self.findParentOfType('GFForm')
! ##    self._page = self.findParentOfType('GFPage')
  
      form._blockList.append(self)
  
Index: gnue/forms/src/GFObjects/GFButton.py
diff -c gnue/forms/src/GFObjects/GFButton.py:1.10 
gnue/forms/src/GFObjects/GFButton.py:1.11
*** gnue/forms/src/GFObjects/GFButton.py:1.10   Thu Nov 14 20:44:28 2002
--- gnue/forms/src/GFObjects/GFButton.py        Mon Nov 18 01:40:55 2002
***************
*** 44,50 ****
  
  
    def initialize(self):
!     self._block = self.findParentOfType('GFBlock')
  
  
  
--- 44,51 ----
  
  
    def initialize(self):
! ##    self._block = self.findParentOfType('GFBlock')
!     self._page = self.findParentOfType('GFPage')
  
  
  
Index: gnue/forms/src/GFObjects/GFEntry.py
diff -c gnue/forms/src/GFObjects/GFEntry.py:1.78 
gnue/forms/src/GFObjects/GFEntry.py:1.79
*** gnue/forms/src/GFObjects/GFEntry.py:1.78    Sun Nov 17 20:27:05 2002
--- gnue/forms/src/GFObjects/GFEntry.py Mon Nov 18 01:40:55 2002
***************
*** 155,160 ****
--- 155,164 ----
      return GFValue._buildObject(self)
  
    def initialize(self):
+     # Find parents/relatives
+     self._block = self.findParentOfType('GFBlock')
+     self._page = self.findParentOfType('GFPage')
+     
      if self.typecast == 'number':
        self._numeric = 1
        self._allowFormulas = gConfig("AllowNumericFormulas")
***************
*** 167,173 ****
      self._inputmask = hasattr(self,'inputmask') and self.inputmask or ""
      self._displaymask = hasattr(self,'displaymask') and self.displaymask or ""
  
-     self._block = self.findParentOfType('GFBlock')
  
      if hasattr(self, 'default') and self.default != None and 
len(self.default):
        default = self.default
--- 171,176 ----
Index: gnue/forms/src/GFObjects/GFField.py
diff -c gnue/forms/src/GFObjects/GFField.py:1.78 
gnue/forms/src/GFObjects/GFField.py:1.79
*** gnue/forms/src/GFObjects/GFField.py:1.78    Sun Nov 17 20:27:05 2002
--- gnue/forms/src/GFObjects/GFField.py Mon Nov 18 01:40:55 2002
***************
*** 19,25 ****
  # Copyright 2000-2002 Free Software Foundation
  #
  # FILE:
! # GFEntry.py
  #
  # DESCRIPTION:
  # The primary data entry widget in forms
--- 19,25 ----
  # Copyright 2000-2002 Free Software Foundation
  #
  # FILE:
! # GFField.py
  #
  # DESCRIPTION:
  # The primary data entry widget in forms
***************
*** 34,48 ****
  import string
  
  ############################################################
! # GFEntry
  #
  # Matches the Entry form tag in the gfd
  #
  # It send events to its parent GFBlock
  #
! class GFEntry(GFValue, GFTabStop):
    def __init__(self, parent=None, value=None):
!     GFValue.__init__(self, parent, value, 'GFEntry')
  
      # Default attributes (these may be replaced by parser)
      self.height = float(gConfig('widgetHeight'))
--- 34,48 ----
  import string
  
  ############################################################
! # GFField
  #
  # Matches the Entry form tag in the gfd
  #
  # It send events to its parent GFBlock
  #
! class GFField(GFValue, GFTabStop):
    def __init__(self, parent=None, value=None):
!     GFValue.__init__(self, parent, value, 'GFField')
  
      # Default attributes (these may be replaced by parser)
      self.height = float(gConfig('widgetHeight'))
Index: gnue/forms/src/GFObjects/__init__.py
diff -c gnue/forms/src/GFObjects/__init__.py:1.4 
gnue/forms/src/GFObjects/__init__.py:1.5
*** gnue/forms/src/GFObjects/__init__.py:1.4    Tue Sep 10 14:35:58 2002
--- gnue/forms/src/GFObjects/__init__.py        Mon Nov 18 01:40:55 2002
***************
*** 11,16 ****
--- 11,17 ----
        "GFValue",
        "GFButton",
        "GFEntry",
+       "GFField",
        "GFObj",
        "GFPage", 
          "GFParameter"
***************
*** 24,27 ****
  #from GFObj import GFObj 
  
  
! from GFParameter import GFCParam
\ No newline at end of file
--- 25,28 ----
  #from GFObj import GFObj 
  
  
! from GFParameter import GFCParam