r5171 - in trunk/gnue-forms/src/uidrivers: gtk2/widgets qt/widgets qt/widgets/form

[jan]

Author: jan
Date: 2004-02-26 15:11:14 -0600 (Thu, 26 Feb 2004)
New Revision: 5171

Modified:
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/qt/widgets/box.py
   trunk/gnue-forms/src/uidrivers/qt/widgets/button.py
   trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/qt/widgets/label.py
Log:
make qt and gtk2 uidriver accept unicode (i.e. conversion to string by str() is 
dropped)


Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py        2004-02-26 
21:09:20 UTC (rev 5170)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py        2004-02-26 
21:11:14 UTC (rev 5171)
@@ -30,7 +30,7 @@
 import gtk
 
 from gnue.common import events
-
+from types import UnicodeType
 from gnue.forms.GFForm import *
 from gnue.forms.uidrivers._base.widgets._base import UIWidget
 from gnue.forms.uidrivers.gtk2.common import _setDefaultEventHandlers
@@ -125,8 +125,8 @@
     widget = self.widgets[index]
     
     # fix for 0.5.1 (Unicode is not internal encoding)
-    if widget.get_name()!='GtkCheckButton':
-      value = unicode(value,gConfigForms('textEncoding'))
+    if widget.get_name()!='GtkCheckButton' and type(value)!=UnicodeType:
+      value = unicode(value, gConfigForms('textEncoding'))
     
     if widget.get_name()=='GtkCombo':
 

Modified: trunk/gnue-forms/src/uidrivers/qt/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/widgets/box.py    2004-02-26 21:09:20 UTC 
(rev 5170)
+++ trunk/gnue-forms/src/uidrivers/qt/widgets/box.py    2004-02-26 21:11:14 UTC 
(rev 5171)
@@ -41,7 +41,7 @@
     object = event.object
     
     # Create a group box..
-    newWidget = QGroupBox(str(object.label), event.container)
+    newWidget = QGroupBox(object.label, event.container)
         
     # ..and move it to it's proper place
     newWidget.setGeometry(object.Char__x*event.widgetWidth,

Modified: trunk/gnue-forms/src/uidrivers/qt/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/widgets/button.py 2004-02-26 21:09:20 UTC 
(rev 5170)
+++ trunk/gnue-forms/src/uidrivers/qt/widgets/button.py 2004-02-26 21:11:14 UTC 
(rev 5171)
@@ -46,7 +46,7 @@
     newWidget = _Button(event, self)
 
     # .. set the label text..
-    newWidget.setText(str(object.label))
+    newWidget.setText(object.label)
 
     # .. the examples had this, so we do to ..  :)
     newWidget.setAutoDefault(1)

Modified: trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py    2004-02-26 
21:09:20 UTC (rev 5170)
+++ trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py    2004-02-26 
21:11:14 UTC (rev 5171)
@@ -164,7 +164,7 @@
     except AttributeError:
       return
 
-    if tip != None: self.statusFields[0].setText(str(tip))
+    if tip != None: self.statusFields[0].setText(tip)
 
     if statusValue:
       self.statusFields[1].setText(statusValue)

Modified: trunk/gnue-forms/src/uidrivers/qt/widgets/label.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/widgets/label.py  2004-02-26 21:09:20 UTC 
(rev 5170)
+++ trunk/gnue-forms/src/uidrivers/qt/widgets/label.py  2004-02-26 21:11:14 UTC 
(rev 5171)
@@ -49,7 +49,7 @@
     object = event.object
     
     # Create a label..
-    newWidget = QLabel(str(object.text), event.container)
+    newWidget = QLabel(object.text, event.container)
     
     # ..move it to it's proper place..
     print object.Char__x*event.widgetWidth, \