gnue/forms/src GFDisplayHandler.py GFObjects/GF...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/06/17 20:18:16

Modified files:
        forms/src      : GFDisplayHandler.py 
        forms/src/GFObjects: GFEntry.py 
        forms/src/uidrivers/nstti: UIdriver.py 
        forms/src/uidrivers/wx: UIdriver.py 

Log message:
        [ticket #62] Removed auto-sorting of combo-boxes.  Combo-boxes now 
honor the order_by= attribute of datasources

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFDisplayHandler.py.diff?cvsroot=OldCVS&tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFObjects/GFEntry.py.diff?cvsroot=OldCVS&tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/uidrivers/nstti/UIdriver.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?cvsroot=OldCVS&tr1=1.177&tr2=1.178&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFDisplayHandler.py
diff -c gnue/forms/src/GFDisplayHandler.py:1.25 
gnue/forms/src/GFDisplayHandler.py:1.26
*** gnue/forms/src/GFDisplayHandler.py:1.25     Thu May 30 16:56:55 2002
--- gnue/forms/src/GFDisplayHandler.py  Mon Jun 17 20:18:15 2002
***************
*** 696,702 ****
        self.value = '' # None
      else:
        try:
!         self.value = 
self.entry._allowedValuesReverse[string.lower(self.display)]
        except KeyError:
          return 0
      return 1
--- 696,702 ----
        self.value = '' # None
      else:
        try:
!         self.value = self.entry._allowedValuesReverse[self.display]
        except KeyError:
          return 0
      return 1
Index: gnue/forms/src/GFObjects/GFEntry.py
diff -c gnue/forms/src/GFObjects/GFEntry.py:1.59 
gnue/forms/src/GFObjects/GFEntry.py:1.60
*** gnue/forms/src/GFObjects/GFEntry.py:1.59    Sat May 11 19:52:30 2002
--- gnue/forms/src/GFObjects/GFEntry.py Mon Jun 17 20:18:16 2002
***************
*** 58,63 ****
--- 58,64 ----
  
      self._inits = [self.initialize]
      self._allowedValues = None
+     self._allowedValuesDescr = [""]
  
      self._maskHandler = None
  
***************
*** 212,218 ****
      return value
  
    #
!   # triggerSetValue 
    #
    # does proper typecasting when value is set via a trigger
    #
--- 213,219 ----
      return value
  
    #
!   # triggerSetValue
    #
    # does proper typecasting when value is set via a trigger
    #
***************
*** 260,274 ****
              descr = "%s" % rs.current.getField(self.foreign_key_description)
  
              self._allowedValues[key] = descr
!             self._allowedValuesDescr.append(string.lower(descr))
!             self._allowedValuesReverse[string.lower(descr)] = key
            else:
              # No descriptions defined
              self._allowedValues["%s" % rs.current.getField(self.fieldName)] = 
""
          except AttributeError:
            self._allowedValues[rs.current.getField(self.fieldName)] = None
          more = rs.nextRecord()
!       self._allowedValuesDescr.sort()
        GDebug.printMesg (5,'Created for DropDown: %s' % self._allowedValues)
  
!     return self._allowedValues
--- 261,275 ----
              descr = "%s" % rs.current.getField(self.foreign_key_description)
  
              self._allowedValues[key] = descr
!             self._allowedValuesDescr.append(descr)
!             self._allowedValuesReverse[descr] = key
            else:
              # No descriptions defined
              self._allowedValues["%s" % rs.current.getField(self.fieldName)] = 
""
          except AttributeError:
            self._allowedValues[rs.current.getField(self.fieldName)] = None
          more = rs.nextRecord()
! ##      self._allowedValuesDescr.sort()
        GDebug.printMesg (5,'Created for DropDown: %s' % self._allowedValues)
  
!     return (self._allowedValues, self._allowedValuesDescr)
Index: gnue/forms/src/uidrivers/nstti/UIdriver.py
diff -c gnue/forms/src/uidrivers/nstti/UIdriver.py:1.3 
gnue/forms/src/uidrivers/nstti/UIdriver.py:1.4
*** gnue/forms/src/uidrivers/nstti/UIdriver.py:1.3      Thu Jun  6 14:06:11 2002
--- gnue/forms/src/uidrivers/nstti/UIdriver.py  Mon Jun 17 20:18:16 2002
***************
*** 515,521 ****
      style = object.style
      if style == 'dropdown':
        if event.initialize:
!         choices = object.allowedValues().values()
        else:
          choices = [""]
        newWidget = ComboBox(event.container, 'name',object.y,object.x, 
object.width)
--- 515,521 ----
      style = object.style
      if style == 'dropdown':
        if event.initialize:
!         choices = object.allowedValues()[1]
        else:
          choices = [""]
        newWidget = ComboBox(event.container, 'name',object.y,object.x, 
object.width)
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.177 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.178
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.177       Sat Jun 15 17:15:09 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Mon Jun 17 20:18:16 2002
***************
*** 741,751 ****
  
      if style == 'dropdown':
        if event.initialize:
!         choices = object.allowedValues().values()
        else:
          choices = [""]
- 
-       choices.sort()
  
        newWidget = wxComboBox(event.container, -1, "",defaultPoint,
                                wxSize(self.itemWidth,self.itemHeight),
--- 741,749 ----
  
      if style == 'dropdown':
        if event.initialize:
!         choices = object.allowedValues()[1]
        else:
          choices = [""]
  
        newWidget = wxComboBox(event.container, -1, "",defaultPoint,
                                wxSize(self.itemWidth,self.itemHeight),