gnue/forms/src/uidrivers/gtk2/widgets _base.py ...

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Branch:         
Changes by:     Jan Ischebeck <address@hidden>  03/06/17 08:31:49

Modified files:
        forms/src/uidrivers/gtk2/widgets: _base.py entry.py 

Log message:
        fix setValue for dropdown widget

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/gtk2/widgets/_base.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/gtk2/widgets/entry.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/gtk2/widgets/_base.py
diff -c gnue/forms/src/uidrivers/gtk2/widgets/_base.py:1.3 
gnue/forms/src/uidrivers/gtk2/widgets/_base.py:1.4
*** gnue/forms/src/uidrivers/gtk2/widgets/_base.py:1.3  Mon Jun 16 17:32:30 2003
--- gnue/forms/src/uidrivers/gtk2/widgets/_base.py      Tue Jun 17 08:31:49 2003
***************
*** 123,129 ****
  
    def setValue(self, value, index=0, enabled=1):
      # fix for 0.5.1 (Unicode is not internal encoding)
!     value = value.decode(gConfig('textEncoding'))
      
      widget = self.widgets[index]
      
--- 123,129 ----
  
    def setValue(self, value, index=0, enabled=1):
      # fix for 0.5.1 (Unicode is not internal encoding)
!     #value = value.decode(gConfig('textEncoding'))
      
      widget = self.widgets[index]
      
***************
*** 131,146 ****
  
        object = self._uiDriver._WidgetToGFObj[widget]
        
!       # Check if foreign key changed
        if object.style == "dropdown" and \
               not object._field._allowedValues == widget._origAllowedValues:
          
          widget._origAllowedValues = object._field._allowedValues
!         widget.Clear()
!         for value in object._field._allowedValuesDescr:
!           widget.Append(value)
!           widget.SetValue("")
! 
        # set the value
        widget.entry.set_text(value)
        
--- 131,143 ----
  
        object = self._uiDriver._WidgetToGFObj[widget]
        
!       # Check if list of allowed value (~= foreign keys, ~= dropdown content) 
changed
        if object.style == "dropdown" and \
               not object._field._allowedValues == widget._origAllowedValues:
          
          widget._origAllowedValues = object._field._allowedValues
!         widget.set_popdown_strings(object._field._allowedValuesDescr)
!         
        # set the value
        widget.entry.set_text(value)
        
Index: gnue/forms/src/uidrivers/gtk2/widgets/entry.py
diff -c gnue/forms/src/uidrivers/gtk2/widgets/entry.py:1.4 
gnue/forms/src/uidrivers/gtk2/widgets/entry.py:1.5
*** gnue/forms/src/uidrivers/gtk2/widgets/entry.py:1.4  Mon Jun 16 17:32:30 2003
--- gnue/forms/src/uidrivers/gtk2/widgets/entry.py      Tue Jun 17 08:31:49 2003
***************
*** 54,59 ****
--- 54,60 ----
        else:
          self.choices = [""]
  
+       # should we add this to the wx driver as well?
        self.choices.sort()
        
        newWidget = gtk.Combo()
***************
*** 67,77 ****
--- 68,80 ----
        newWidget.list.connect('select-child', self.comboHandler, newWidget)
  
        if event.initialize:
+         newWidget._origAllowedValues = object._field._allowedValues
          self._addDefaultEventHandler(newWidget.entry, event.eventHandler, \
                                       self._uiDriver)
          self._addDefaultEventHandler(newWidget.list,  event.eventHandler, \
                                       self._uiDriver)
  
+ 
      elif style == 'label':
        newWidget = gtk.Label("")      
        newWidget.set_size_request(self.itemWidth, self.itemHeight + 1)
***************
*** 124,130 ****
      if isinstance(widget,gtk.Entry) or isinstance(widget,MultiLineEdit):      
        widget.set_position(position)
      else:
!       print "Wrong Place to execute set CursorPosition"
  
    def setSelectedArea(self, selection1, selection2, index=0):
      widget=self.widgets[index]
--- 127,133 ----
      if isinstance(widget,gtk.Entry) or isinstance(widget,MultiLineEdit):      
        widget.set_position(position)
      else:
!       print "Wrong Place to execute set CursorPosition, widget is a %s" % 
widget
  
    def setSelectedArea(self, selection1, selection2, index=0):
      widget=self.widgets[index]
***************
*** 157,164 ****
      #       this should be passed with the event
  
      # Compatibility layer for 0.5.1
!     #text = newtext.decode('utf-8')    
!     text = newtext.decode('utf-8').encode(gConfig('textEncoding'))
      
      action = events.Event('requestKEYPRESS', text, text=text,
                            code=0, _form=object._form)
--- 160,167 ----
      #       this should be passed with the event
  
      # Compatibility layer for 0.5.1
!     text = newtext.decode('utf-8')    
!     #text = newtext.decode('utf-8').encode(gConfig('textEncoding'))
      
      action = events.Event('requestKEYPRESS', text, text=text,
                            code=0, _form=object._form)