gnue designer/src/forms/Instance.py designer/sr...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/11/25 09:22:36

Modified files:
        designer/src/forms: Instance.py TreeView.py 
        forms/src/GFObjects: __init__.py 
        forms/src/uidrivers/_base: UIdriver.py 

Log message:
        fix display for entries with a rows attribute
        replaced references to GFDataSource w/ GConnection

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/Instance.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/TreeView.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/__init__.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/UIdriver.py.diff?tr1=1.79&tr2=1.80&r1=text&r2=text

Patches:
Index: gnue/designer/src/forms/Instance.py
diff -c gnue/designer/src/forms/Instance.py:1.18 
gnue/designer/src/forms/Instance.py:1.19
*** gnue/designer/src/forms/Instance.py:1.18    Mon Nov 25 00:41:42 2002
--- gnue/designer/src/forms/Instance.py Mon Nov 25 09:22:36 2002
***************
*** 49,55 ****
  
  from gnue.forms import GFInstance
  from gnue.forms import GFForm, GFParser, GFObjects, GFLibrary
! from gnue.common import GTrigger
  
  class Instance(BaseInstance, GFInstance.GFInstance):
  
--- 49,55 ----
  
  from gnue.forms import GFInstance
  from gnue.forms import GFForm, GFParser, GFObjects, GFLibrary
! from gnue.common import GTrigger, GDataSource
  
  class Instance(BaseInstance, GFInstance.GFInstance):
  
***************
*** 163,169 ****
          options.append(child)
        elif isinstance(child, GFLibrary.GFImport):
          imports.append(child)
!       elif isinstance(child, GFObjects.GFDatabase):
          databases.append(child)
        elif isinstance(child, GFObjects.GFDataSource) or \
          (isinstance(child, GFLibrary.GFImportItem) and
--- 163,169 ----
          options.append(child)
        elif isinstance(child, GFLibrary.GFImport):
          imports.append(child)
!       elif isinstance(child, GDataSource.GConnection):
          databases.append(child)
        elif isinstance(child, GFObjects.GFDataSource) or \
          (isinstance(child, GFLibrary.GFImportItem) and
Index: gnue/designer/src/forms/TreeView.py
diff -c gnue/designer/src/forms/TreeView.py:1.5 
gnue/designer/src/forms/TreeView.py:1.6
*** gnue/designer/src/forms/TreeView.py:1.5     Mon Nov 25 00:41:42 2002
--- gnue/designer/src/forms/TreeView.py Mon Nov 25 09:22:36 2002
***************
*** 32,38 ****
  
  import sys, os
  from wxPython.wx import *
! from gnue.common import GDebug, GTrigger
  from gnue.forms import GFForm, GFObjects, GFLibrary
  from gnue.designer.PopupMenu import ObjectMenu
  from gnue.designer.Icons import treeIconMap, treeIconList
--- 32,38 ----
  
  import sys, os
  from wxPython.wx import *
! from gnue.common import GDebug, GTrigger, GDataSource
  from gnue.forms import GFForm, GFObjects, GFLibrary
  from gnue.designer.PopupMenu import ObjectMenu
  from gnue.designer.Icons import treeIconMap, treeIconList
***************
*** 110,116 ****
            parentTreeItem = object._parent._treeItemTrigger
            icon = 'trigger'
          elif isinstance(object, GFObjects.GFDataSource) or \
!            isinstance(object, GFObjects.GFDatabase):
            parentTreeItem = self.rootObject._treeItemDataSources
            icon = 'datasource'
          elif isinstance(object, GFObjects.GFPage) and \
--- 110,116 ----
            parentTreeItem = object._parent._treeItemTrigger
            icon = 'trigger'
          elif isinstance(object, GFObjects.GFDataSource) or \
!            isinstance(object, GDataSource.GConnection):
            parentTreeItem = self.rootObject._treeItemDataSources
            icon = 'datasource'
          elif isinstance(object, GFObjects.GFPage) and \
Index: gnue/forms/src/GFObjects/__init__.py
diff -c gnue/forms/src/GFObjects/__init__.py:1.6 
gnue/forms/src/GFObjects/__init__.py:1.7
*** gnue/forms/src/GFObjects/__init__.py:1.6    Wed Nov 20 20:39:37 2002
--- gnue/forms/src/GFObjects/__init__.py        Mon Nov 25 09:22:36 2002
***************
*** 5,11 ****
          "GFOption",
          "GFScrollBar",
          "GFBox",
-         "GFDatabase",
          "GFMsgBox",
          "GFOptions",
          "GFValue",
--- 5,10 ----
Index: gnue/forms/src/uidrivers/_base/UIdriver.py
diff -c gnue/forms/src/uidrivers/_base/UIdriver.py:1.79 
gnue/forms/src/uidrivers/_base/UIdriver.py:1.80
*** gnue/forms/src/uidrivers/_base/UIdriver.py:1.79     Thu Nov 21 21:57:24 2002
--- gnue/forms/src/uidrivers/_base/UIdriver.py  Mon Nov 25 09:22:36 2002
***************
*** 338,349 ****
      # Fill the prior spots
      for count in range(index):
        value = 
handler.getDisplayFiller(block._resultSet.getRecord(currentRecord- \
!                               (index-count)).getField(entry.field))
  
        self._formToUIWidget[entry].setValue(value,count)
  
- 
- 
      # Fill current spot
      value = handler.getDisplayFiller(entry.getValue())
      self._formToUIWidget[entry].setValue(value, index)
--- 338,347 ----
      # Fill the prior spots
      for count in range(index):
        value = 
handler.getDisplayFiller(block._resultSet.getRecord(currentRecord- \
!                               (index-count)).getField(field.field))
  
        self._formToUIWidget[entry].setValue(value,count)
  
      # Fill current spot
      value = handler.getDisplayFiller(entry.getValue())
      self._formToUIWidget[entry].setValue(value, index)
***************
*** 366,372 ****
            # Don't ask... but it's needed
            lastRow -= 1
          else:
!           value = handler.getDisplayFiller(rec.getField(entry.field))
  
          self._formToUIWidget[entry].setValue(value, count, cr <= lastRow)
        count += 1
--- 364,370 ----
            # Don't ask... but it's needed
            lastRow -= 1
          else:
!           value = handler.getDisplayFiller(rec.getField(field.field))
  
          self._formToUIWidget[entry].setValue(value, count, cr <= lastRow)
        count += 1