r5301 - in trunk: gnue-forms/src/uidrivers/win32 gnue-forms/src/uidrivers/win32/widgets gnue-forms/src/uidrivers/win32/widgets/form gnue-navigator/src

[btami]

Author: btami
Date: 2004-03-11 09:00:02 -0600 (Thu, 11 Mar 2004)
New Revision: 5301

Modified:
   trunk/gnue-forms/src/uidrivers/win32/common.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/box.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/button.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/label.py
   trunk/gnue-navigator/src/UIwin32.py
   trunk/gnue-navigator/src/UIwx.py
Log:
work on unicode to locale

Modified: trunk/gnue-forms/src/uidrivers/win32/common.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/common.py      2004-03-11 13:59:33 UTC 
(rev 5300)
+++ trunk/gnue-forms/src/uidrivers/win32/common.py      2004-03-11 15:00:02 UTC 
(rev 5301)
@@ -26,12 +26,13 @@
 #
 # NOTES:
 #
-
+
 import string
 import win32gui, win32con, win32ui
 from win32con import *
 from gnue.common import events
 from gnue.common.apps import GConfig
+from types import UnicodeType, StringType
 
 
 _idPos = 1000
@@ -48,3 +49,17 @@
   dt_l, dt_t, dt_r, dt_b = win32gui.GetWindowRect(desktop)
   center_x, center_y = win32gui.ClientToScreen( desktop, ( (dt_r-dt_l)/2, 
(dt_b-dt_t)/2) )
   win32gui.MoveWindow(hwnd, center_x-(r/2), center_y-(b/2), r-l, b-t, 0)
+
+
+def textEncode(u_string):    
+    if type(u_string)==UnicodeType:
+        return u_string.encode(gConfig('textEncoding'),'replace')
+    else:
+        return u_string
+
+
+def textDecode(string):    
+    if type(string)==StringType:
+        return unicode(string, gConfig('textEncoding'))
+    else:
+        return string

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2004-03-11 
13:59:33 UTC (rev 5300)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2004-03-11 
15:00:02 UTC (rev 5301)
@@ -35,6 +35,7 @@
 
 from gnue.forms.GFForm import *
 from gnue.forms.uidrivers._base.widgets._base import *
+from gnue.forms.uidrivers.win32.common import *
 
 try:
   import ImageWin
@@ -495,14 +496,14 @@
         widget._origAllowedValues = gfObject._field._allowedValues
         win32gui.SendMessage(widget.GetHwnd(), win32con.CB_RESETCONTENT, 0, 0)
         for value in gfObject._field.allowedValues()[1]:
-          win32gui.SendMessage(widget.GetHwnd(), win32con.CB_ADDSTRING, 0, 
value)
+          win32gui.SendMessage(widget.GetHwnd(), win32con.CB_ADDSTRING, 0, 
textEncode(value.encode))
         widget.SetValue("")
     except AttributeError:
       pass
 
     # display unicode chars properly
     if type(value)==UnicodeType:
-      value=value.encode('mbcs')
+      value=textEncode(value) #.encode('mbcs')
       
     widget.SetValue(value)
     widget.Enable(enabled)

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/box.py 2004-03-11 13:59:33 UTC 
(rev 5300)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/box.py 2004-03-11 15:00:02 UTC 
(rev 5301)
@@ -29,6 +29,7 @@
 import win32gui, win32con
 
 from gnue.forms.uidrivers.win32.widgets._base import UIHelper, Win32Window
+from gnue.forms.uidrivers.win32.common import *
 
 #
 # UIBox
@@ -42,7 +43,7 @@
     object = event.object
     style = win32con.WS_CHILD | win32con.BS_GROUPBOX | win32con.WS_GROUP 
     styleEx = 0
-    newWidget = Win32Window(self._uiDriver, styleEx, 'BUTTON', 
str(object.label), style,
+    newWidget = Win32Window(self._uiDriver, styleEx, 'BUTTON', 
textEncode(object.label), style,
                        object.Char__x*event.widgetWidth+(event.widgetWidth/2),
                        
(object.Char__y+spacer+(spacer*object._gap))*event.widgetHeight+(event.widgetHeight/2),
                        (object.Char__width-1)*event.widgetWidth,

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/button.py      2004-03-11 
13:59:33 UTC (rev 5300)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/button.py      2004-03-11 
15:00:02 UTC (rev 5301)
@@ -31,7 +31,7 @@
 
 from gnue.common import events
 from gnue.forms.uidrivers.win32.widgets._base import UIHelper, Win32Button
-from gnue.forms.uidrivers.win32.common import getNextId
+from gnue.forms.uidrivers.win32.common import *
 
 #
 # UIButton
@@ -43,7 +43,7 @@
     object = event.object
     style = win32con.BS_PUSHBUTTON | win32con.WS_CHILD
     styleEx = 0
-    newWidget = Win32Button(self._uiDriver, styleEx, 'BUTTON', 
str(object.label), style,
+    newWidget = Win32Button(self._uiDriver, styleEx, 'BUTTON', 
textEncode(object.label), style,
                         object.Char__x*event.widgetWidth,
                         
(object.Char__y+spacer+(spacer*object._gap))*event.widgetHeight, 
                         object.Char__width*event.widgetWidth+8,

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py       2004-03-11 
13:59:33 UTC (rev 5300)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py       2004-03-11 
15:00:02 UTC (rev 5301)
@@ -31,7 +31,7 @@
 from gnue.common import events
 
 from gnue.forms.uidrivers.win32.widgets._base import UIHelper, Win32Entry
-from gnue.forms.uidrivers.win32.common import getNextId
+from gnue.forms.uidrivers.win32.common import *
 
 #
 # UIEntry
@@ -90,7 +90,7 @@
       else:
         choices = [""]
       for item in choices:
-        win32gui.SendMessage(newWidget.GetHwnd(), win32con.CB_ADDSTRING, 0, 
item)
+        win32gui.SendMessage(newWidget.GetHwnd(), win32con.CB_ADDSTRING, 0, 
textEncode(item))
       if event.initialize:
         newWidget._origAllowedValues = object._field._allowedValues
         newWidget.SetValue("")

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2004-03-11 
13:59:33 UTC (rev 5300)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2004-03-11 
15:00:02 UTC (rev 5301)
@@ -86,7 +86,7 @@
     else:
       style = win32con.WS_OVERLAPPEDWINDOW | win32con.WS_CLIPCHILDREN
     styleEx = 0
-    self.mainWindow = Win32Window(self._uiDriver, styleEx, 
self._uiDriver._wndclass, str(self._form.title),
+    self.mainWindow = Win32Window(self._uiDriver, styleEx, 
self._uiDriver._wndclass, textEncode(self._form.title),
       style, win32con.CW_USEDEFAULT, 0,
       max(formWidth*self._uiDriver.widgetWidth+10, 
self.buttonbarWidth)+self.tabWidth+10,
       
formHeight*self._uiDriver.widgetHeight+self.buttonbarHeight+self.tabHeight+90,

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py       
2004-03-11 13:59:33 UTC (rev 5300)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py       
2004-03-11 15:00:02 UTC (rev 5301)
@@ -33,7 +33,7 @@
 from gnue.common import events
 from gnue.common.apps import GDebug
 from gnue.forms.uidrivers.win32.widgets._base import UIHelper, Win32Window, 
Win32Page
-from gnue.forms.uidrivers.win32.common import getNextId
+from gnue.forms.uidrivers.win32.common import *
 
 class ScrollableWrapper(Win32Window): 
   def __init__(self, uiform): 
@@ -98,7 +98,7 @@
 
   def createPage(self, object): 
     pszText = hasattr(object,'caption') and object.caption or object.name
-    buff = array.array('c', pszText + "\0")
+    buff = array.array('c', textEncode(pszText) + "\0")
     addrText = buff.buffer_info()[0]
     tab=struct.pack("iilliii", commctrl.TCIF_TEXT | commctrl.TCIF_STATE, 0, 0, 
addrText, 0, 0, -1)
     icount = win32gui.SendMessage(self.pane.GetHwnd(), 
commctrl.TCM_GETITEMCOUNT, 0, 0)

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/label.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/label.py       2004-03-11 
13:59:33 UTC (rev 5300)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/label.py       2004-03-11 
15:00:02 UTC (rev 5301)
@@ -30,6 +30,7 @@
 import win32gui, win32con
 
 from gnue.forms.uidrivers.win32.widgets._base import UIHelper, Win32Window
+from gnue.forms.uidrivers.win32.common import *
 
 #
 # UILabel
@@ -49,7 +50,7 @@
       self.itemHeight = len(str(object.text))*event.widgetHeight
     style = self.alignmentStyle[object.alignment]
     styleEx = 0
-    newWidget = Win32Window(self._uiDriver, styleEx, 'STATIC', 
str(object.text), style,
+    newWidget = Win32Window(self._uiDriver, styleEx, 'STATIC', 
textEncode(object.text), style,
                         object.Char__x*event.widgetWidth,
                         
(object.Char__y+spacer+(spacer*object._gap))*event.widgetHeight, 
                         self.itemWidth,

Modified: trunk/gnue-navigator/src/UIwin32.py
===================================================================
--- trunk/gnue-navigator/src/UIwin32.py 2004-03-11 13:59:33 UTC (rev 5300)
+++ trunk/gnue-navigator/src/UIwin32.py 2004-03-11 15:00:02 UTC (rev 5301)
@@ -260,7 +260,7 @@
     else:
       parent=commctrl.TVI_ROOT
 
-    buff = array.array('c', '%s \0x00' % text)
+    buff = array.array('c', '%s \0x00' % 
text.encode(gConfig('textEncoding'),'replace'))
     addrText = buff.buffer_info()[0]
     # TVINSTERTSTRUCT:
     # hParent, hInsertAfter ,mask, hItem, state, stateMask, pszText, 
cchTextMax, iImage, iSelectedImage, cChildren, lParam

Modified: trunk/gnue-navigator/src/UIwx.py
===================================================================
--- trunk/gnue-navigator/src/UIwx.py    2004-03-11 13:59:33 UTC (rev 5300)
+++ trunk/gnue-navigator/src/UIwx.py    2004-03-11 15:00:02 UTC (rev 5301)
@@ -128,9 +128,9 @@
   def __buildTreeControl(self, object):
 
     if object._type == 'GNProcesses':
-      node = self.tree.AddRoot(object.title)
+      node = 
self.tree.AddRoot(object.title.encode(gConfig('textEncoding'),'replace'))
     elif object._type in ('GNStep','GNProcess'):
-      node = self.tree.AppendItem(object._parent.__node, object.title)
+      node = self.tree.AppendItem(object._parent.__node, 
object.title.encode(gConfig('textEncoding'),'replace'))
     else:
       return