gnue/forms/src GFObjects/GFEntry.py GFObjects/G...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Branch:         
Changes by:     Jason Cater <address@hidden>    03/06/11 15:55:17

Modified files:
        forms/src/GFObjects: GFEntry.py GFField.py GFImage.py GFLabel.py 
                             GFOptions.py GFScrollBar.py 
        forms/src/uidrivers/_base/widgets: _base.py 

Log message:
        more fixes for the Char__ namespace change

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFEntry.py.diff?tr1=1.86&tr2=1.87&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFField.py.diff?tr1=1.89&tr2=1.90&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFImage.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFLabel.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFOptions.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFScrollBar.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/widgets/_base.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFObjects/GFEntry.py
diff -c gnue/forms/src/GFObjects/GFEntry.py:1.86 
gnue/forms/src/GFObjects/GFEntry.py:1.87
*** gnue/forms/src/GFObjects/GFEntry.py:1.86    Mon Feb 17 02:32:53 2003
--- gnue/forms/src/GFObjects/GFEntry.py Wed Jun 11 15:55:17 2003
***************
*** 45,52 ****
      GFTabStop.__init__(self, parent, 'GFEntry')
  
      # Default attributes (these may be replaced by parser)
!     self.height = float(gConfig('widgetHeight'))
!     self.width = float(gConfig('widgetWidth'))
      self.style = "default"
  
      self._inits = [self.initialize]
--- 45,52 ----
      GFTabStop.__init__(self, parent, 'GFEntry')
  
      # Default attributes (these may be replaced by parser)
!     self.Char__height = float(gConfig('widgetHeight'))
!     self.Char__width = float(gConfig('widgetWidth'))
      self.style = "default"
  
      self._inits = [self.initialize]
Index: gnue/forms/src/GFObjects/GFField.py
diff -c gnue/forms/src/GFObjects/GFField.py:1.89 
gnue/forms/src/GFObjects/GFField.py:1.90
*** gnue/forms/src/GFObjects/GFField.py:1.89    Tue Apr  1 23:08:57 2003
--- gnue/forms/src/GFObjects/GFField.py Wed Jun 11 15:55:17 2003
***************
*** 44,51 ****
      GFValue.__init__(self, parent, value, 'GFField')
  
      # Default attributes (these may be replaced by parser)
!     self.height = float(gConfig('widgetHeight'))
!     self.width = float(gConfig('widgetWidth'))
      self.typecast="text"
      self.case="mixed"
      self.style="default"
--- 44,51 ----
      GFValue.__init__(self, parent, value, 'GFField')
  
      # Default attributes (these may be replaced by parser)
!     self.Char__height = float(gConfig('widgetHeight'))
!     self.Char__width = float(gConfig('widgetWidth'))
      self.typecast="text"
      self.case="mixed"
      self.style="default"
Index: gnue/forms/src/GFObjects/GFImage.py
diff -c gnue/forms/src/GFObjects/GFImage.py:1.3 
gnue/forms/src/GFObjects/GFImage.py:1.4
*** gnue/forms/src/GFObjects/GFImage.py:1.3     Sun Mar 23 22:39:18 2003
--- gnue/forms/src/GFObjects/GFImage.py Wed Jun 11 15:55:17 2003
***************
*** 42,48 ****
  
      # Default attributes (these may be replaced by parser)
      self.type = "URL"
!     self.height = float(gConfig('widgetHeight'))
  
      # Runtime Variables
      self._inits = [self.initialize]
--- 42,48 ----
  
      # Default attributes (these may be replaced by parser)
      self.type = "URL"
!     self.Char__height = float(gConfig('widgetHeight'))
  
      # Runtime Variables
      self._inits = [self.initialize]
Index: gnue/forms/src/GFObjects/GFLabel.py
diff -c gnue/forms/src/GFObjects/GFLabel.py:1.10 
gnue/forms/src/GFObjects/GFLabel.py:1.11
*** gnue/forms/src/GFObjects/GFLabel.py:1.10    Wed Jan  1 19:45:48 2003
--- gnue/forms/src/GFObjects/GFLabel.py Wed Jun 11 15:55:17 2003
***************
*** 42,48 ****
  
      # Default attributes (these may be replaced by parser)
      self.alignment = "left"
!     self.height = float(gConfig('widgetHeight'))
  
      # Runtime Variables
      self._inits = [self.initialize]
--- 42,48 ----
  
      # Default attributes (these may be replaced by parser)
      self.alignment = "left"
!     self.Char__height = float(gConfig('widgetHeight'))
  
      # Runtime Variables
      self._inits = [self.initialize]
Index: gnue/forms/src/GFObjects/GFOptions.py
diff -c gnue/forms/src/GFObjects/GFOptions.py:1.3 
gnue/forms/src/GFObjects/GFOptions.py:1.4
*** gnue/forms/src/GFObjects/GFOptions.py:1.3   Mon Feb 17 02:32:53 2003
--- gnue/forms/src/GFObjects/GFOptions.py       Wed Jun 11 15:55:17 2003
***************
*** 16,22 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # Copyright 2000. 2001 Free Software Foundation
  #
  #
  # FILE:
--- 16,22 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # Copyright 2000-2003 Free Software Foundation
  #
  #
  # FILE:
Index: gnue/forms/src/GFObjects/GFScrollBar.py
diff -c gnue/forms/src/GFObjects/GFScrollBar.py:1.3 
gnue/forms/src/GFObjects/GFScrollBar.py:1.4
*** gnue/forms/src/GFObjects/GFScrollBar.py:1.3 Wed Sep 19 01:11:15 2001
--- gnue/forms/src/GFObjects/GFScrollBar.py     Wed Jun 11 15:55:17 2003
***************
*** 28,34 ****
  # NOTES:
  #
  # HISTORY:
! # Copyright (c) 2000 Free Software Foundation
  #
  
  from GFObj import GFObj
--- 28,34 ----
  # NOTES:
  #
  # HISTORY:
! # Copyright 2000-2003 Free Software Foundation
  #
  
  from GFObj import GFObj
Index: gnue/forms/src/uidrivers/_base/widgets/_base.py
diff -c gnue/forms/src/uidrivers/_base/widgets/_base.py:1.6 
gnue/forms/src/uidrivers/_base/widgets/_base.py:1.7
*** gnue/forms/src/uidrivers/_base/widgets/_base.py:1.6 Wed Jun 11 14:23:36 2003
--- gnue/forms/src/uidrivers/_base/widgets/_base.py     Wed Jun 11 15:55:17 2003
***************
*** 64,74 ****
      if not hasattr(self._gfObject,'_gap'):
        self._gfObject._gap = 0
  
      if hasattr(self._gfObject,'Char__width'):
        self.itemWidth = self._gfObject.Char__width*int(event.textWidth)
-       self.itemHeight = self._gfObject.Char__height*int(event.textHeight)
      else:
        self.itemWidth = -1
        self.itemHeight = -1
  
      if hasattr(self._gfObject,'Char__x'):
--- 64,78 ----
      if not hasattr(self._gfObject,'_gap'):
        self._gfObject._gap = 0
  
+     print self._gfObject.__dict__
      if hasattr(self._gfObject,'Char__width'):
        self.itemWidth = self._gfObject.Char__width*int(event.textWidth)
      else:
        self.itemWidth = -1
+ 
+     if hasattr(self._gfObject,'Char__height'):
+       self.itemHeight = self._gfObject.Char__height*int(event.textHeight)
+     else:
        self.itemHeight = -1
  
      if hasattr(self._gfObject,'Char__x'):
***************
*** 92,98 ****
  
        if not hasattr(self._creationEvent, 'container'):
          self._creationEvent.container = None
!  
      #print "The container will be ",self._creationEvent.container
      if not self._gfObject.hidden:
        for spacer in range(int(self._gfObject._rows)):
--- 96,102 ----
  
        if not hasattr(self._creationEvent, 'container'):
          self._creationEvent.container = None
! 
      #print "The container will be ",self._creationEvent.container
      if not self._gfObject.hidden:
        for spacer in range(int(self._gfObject._rows)):