[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r9053 - in trunk/gnue-forms/src/uidrivers/html: . widgets
|
From: |
jan |
|
Subject: |
[gnue] r9053 - in trunk/gnue-forms/src/uidrivers/html: . widgets |
|
Date: |
Mon, 20 Nov 2006 05:48:59 -0600 (CST) |
Author: jan
Date: 2006-11-20 05:48:53 -0600 (Mon, 20 Nov 2006)
New Revision: 9053
Modified:
trunk/gnue-forms/src/uidrivers/html/GFServer.py
trunk/gnue-forms/src/uidrivers/html/Generator.py
trunk/gnue-forms/src/uidrivers/html/MenuBar.py
trunk/gnue-forms/src/uidrivers/html/ToolBar.py
trunk/gnue-forms/src/uidrivers/html/widgets/_base.py
trunk/gnue-forms/src/uidrivers/html/widgets/box.py
trunk/gnue-forms/src/uidrivers/html/widgets/button.py
trunk/gnue-forms/src/uidrivers/html/widgets/entry.py
trunk/gnue-forms/src/uidrivers/html/widgets/form.py
trunk/gnue-forms/src/uidrivers/html/widgets/label.py
trunk/gnue-forms/src/uidrivers/html/widgets/page.py
Log:
Change internal html representation to unicode.
Modified: trunk/gnue-forms/src/uidrivers/html/GFServer.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/GFServer.py 2006-11-20 07:37:09 UTC
(rev 9052)
+++ trunk/gnue-forms/src/uidrivers/html/GFServer.py 2006-11-20 11:48:53 UTC
(rev 9053)
@@ -317,6 +317,7 @@
def push_content(self, response, content_type="text/html"):
if type(response)==UnicodeType:
+ # FIXME: Should local encoding be used?
response = response.encode('utf-8')
self.send_response (200, flush = False)
Modified: trunk/gnue-forms/src/uidrivers/html/Generator.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/Generator.py 2006-11-20 07:37:09 UTC
(rev 9052)
+++ trunk/gnue-forms/src/uidrivers/html/Generator.py 2006-11-20 11:48:53 UTC
(rev 9053)
@@ -26,63 +26,63 @@
FIX2 = 12
def _on_click_event(event):
- return ' onClick="sendCmd(\'event\',\'event=%s\');"' % event
+ return u' onClick="sendCmd(\'event\',\'event=%s\');"' % event
def _on_change_event(id):
- return 'onchange="sendCmd(\'onChange\',\'id=%s&text=\'+this.value)"\n' % id
+ return u'onchange="sendCmd(\'onChange\',\'id=%s&text=\'+this.value)"\n' %
id
def _on_focus_event(id):
- return 'onfocus="sendCmd(\'onFocus\',\'id=%s&text=\'+this.value)"\n' % id
+ return u'onfocus="sendCmd(\'onFocus\',\'id=%s&text=\'+this.value)"\n' % id
def _css_position(x,y,width,height):
- return ('style="position:absolute; top:%spx; left:%spx;'+\
- ' width:%spx; height:%spx;"') % (FIX + y, x, width, height)
+ return (u'style="position:absolute; top:%spx; left:%spx;'+\
+ u' width:%spx; height:%spx;"') % (FIX + y, x, width, height)
def build_label(id, value, x, y, width, height):
- return ('<div id="%s" %s>%s</div>\n') % \
+ return (u'<div id="%s" %s>%s</div>\n') % \
(id, _css_position(x,y,width,height-FIX2), value)
def build_entry_label(id, value, x, y, width, height):
- return ('<div id="%s" %s>%s</div>\n') % \
+ return (u'<div id="%s" %s>%s</div>\n') % \
(id, _css_position(x,y,width,height-FIX2), value)
def build_entry_checkbox(id, value, x, y):
- return ('<input type="checkbox" id="%s" value="%s" %s %s '+\
- 'style="position:absolute; top:%spx; left:%spx"/>\n') % \
+ return (u'<input type="checkbox" id="%s" value="%s" %s %s '+\
+ u'style="position:absolute; top:%spx; left:%spx"/>\n') % \
(id, value, _on_change_event(id),_on_focus_event(id), FIX + y, x)
def build_entry_default(id, value, x, y, width, height):
- return '<input type="text" id="%s" value="%s" %s\n %s\n %s/>\n' % \
+ return u'<input type="text" id="%s" value="%s" %s\n %s\n %s/>\n' % \
(id, value, _css_position(x,y,width,height-FIX2), \
_on_change_event(id),_on_focus_event(id))
def build_entry_multiline(id, value, rowcount, x, y, width, height):
- return '<textarea id="%s" rows="%s" %s\n %s\n %s/>%s</textarea>\n' % \
+ return u'<textarea id="%s" rows="%s" %s\n %s\n %s/>%s</textarea>\n' % \
(id, rowcount, _css_position(x,y,width,height-4), \
_on_change_event(id),_on_focus_event(id), value)
def _build_choices(choices):
out = ""
for i in choices:
- out+="<option>%s</option>\n" % i
+ out+=u"<option>%s</option>\n" % i
return out
def build_entry_listbox(id, value, choices, rows, x, y, width, height):
- return ('<select id="%s" value="%s" size="%s" %s\n %s\n'+ \
- '%s>\n%s</select>\n') % \
+ return (u'<select id="%s" value="%s" size="%s" %s\n %s\n'+ \
+ u'%s>\n%s</select>\n') % \
(id, value, rows, _css_position(x,y,width,height),
_on_change_event(id),_on_focus_event(id), _build_choices(choices))
def build_entry_combobox(id, value, choices, rows, x, y, width, height):
- return ('<select id="%s" value="%s" size="%s" dojoType="ComboBox" %s\n
%s\n'+ \
- '%s>\n%s</select>\n') % \
+ return (u'<select id="%s" value="%s" size="%s" dojoType="ComboBox" %s\n
%s\n'+ \
+ u'%s>\n%s</select>\n') % \
(id, value, rows, _css_position(x,y,width,height),
_on_change_event(id),_on_focus_event(id),
_build_choices(choices))
def build_toolbutton(id, label, event, iconpath, tooltip, enabled):
- return ('<td><button id="%s" class="Toolbutton" widgetId="%s" '+\
- 'dojoType="Button" name="%s" %s %s>\n'+\
- '<img src="%s">%s\n</button></td>\n') % \
+ return (u'<td><button id="%s" class="Toolbutton" widgetId="%s" '+\
+ u'dojoType="Button" name="%s" %s %s>\n'+\
+ u'<img src="%s">%s\n</button></td>\n') % \
(id, id, label, _on_click_event(event), enabled,
iconpath,"") # "<br>%s" % label)
@@ -90,30 +90,30 @@
# (id, label, iconpath, label, _on_click_event(event), enabled)
def build_toolbar(id, content):
- return '<table class="Toolbar"><tr>\n%s\n</tr></table>' % content
+ return u'<table class="Toolbar"><tr>\n%s\n</tr></table>' % content
def build_button(id, label, x, y, width, height):
- return '<input id="%s" type="button" value="%s" %s %s/>\n' % \
+ return u'<input id="%s" type="button" value="%s" %s %s/>\n' % \
(id, label, _css_position(x,y,width,height),
_button_on_click(id))
def _button_on_click(id):
- return 'onclick="sendCmd(\'btn\',\'id=%s\')"' % id
+ return u'onclick="sendCmd(\'btn\',\'id=%s\')"' % id
def build_image(id, value, x, y, width, height):
- return '<image id="%s" src="/images/%s" %s>' % \
+ return u'<image id="%s" src="/images/%s" %s>' % \
(id, value, _css_position(x,y,width,height))
def build_box(id, label, x, y, width, height):
- return '<div id="%s" %s border-width: 1px; border-style: solid">%s</div>'
% \
+ return u'<div id="%s" %s border-width: 1px; border-style: solid">%s</div>'
% \
(id, _css_position(x,y+FIX2,width,height-FIX)[0:-1], label)
def build_page(id, pagename, content):
- return ("<div id=\"%s\" dojoType=\"ContentPane\" label=\"%s\">\n" +\
- " %s \n</div>\n") % (id, pagename, content)
+ return (u"<div id=\"%s\" dojoType=\"ContentPane\" label=\"%s\">\n" +\
+ u" %s \n</div>\n") % (id, pagename, content)
def build_splashscreen(forward_url, VERSION):
- return """<HTML><HEAD>
+ return u"""<HTML><HEAD>
<meta http-equiv="refresh" content="4; URL=%s">
</HEAD>
<BODY>
@@ -128,7 +128,7 @@
</HTML>""" % (forward_url, VERSION, forward_url)
def build_form(title, header, pages, footer):
- return """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
+ return u"""<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
<html>
<head>
<title>"""+title+"""</title>
@@ -260,14 +260,14 @@
</style>
</head>
- <body>""" + header + """
+ <body>""" + header + u"""
<div dojoType="LayoutContainer"
layoutChildPriority='top-bottom'
style="width: 100%; height: 100%;">
<div id="mainTabContainer" dojoType="TabContainer" sizeMin="20"
sizeShare="70" style="width: 100%; height: 100%;">
- """ + pages + """
+ """ + pages + u"""
</div>
- """ + footer + """
+ """ + footer + u"""
</body>
</html>
"""
\ No newline at end of file
Modified: trunk/gnue-forms/src/uidrivers/html/MenuBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/MenuBar.py 2006-11-20 07:37:09 UTC
(rev 9052)
+++ trunk/gnue-forms/src/uidrivers/html/MenuBar.py 2006-11-20 11:48:53 UTC
(rev 9053)
@@ -76,33 +76,33 @@
def get_html(self):
if self._type == "MENU":
- self.dhtml=""
+ self.dhtml=u""
# add submenu code
for child in self._children:
self.dhtml += child.get_html()
- self.dhtml += '<div dojoType="MenuBar2">'
+ self.dhtml += u'<div dojoType="MenuBar2">'
for child in self._children:
- self.dhtml += ('<div dojoType="MenuBarItem2" '+\
- 'caption="%s" submenuId="%s"></div>') % \
+ self.dhtml += (u'<div dojoType="MenuBarItem2" '+\
+ u'caption="%s" submenuId="%s"></div>') % \
(child.name, child._id)
- self.dhtml += '</div>'
+ self.dhtml += u'</div>'
return self.dhtml
elif self._type == "SUBMENU":
- self.dhtml = '<div dojoType="PopupMenu2" '+\
- 'widgetId="%s" id="%s">\n' % (self._id,self._id)
+ self.dhtml = u'<div dojoType="PopupMenu2" '+\
+ u'widgetId="%s" id="%s">\n' % (self._id,self._id)
for child in self._children:
self.dhtml += child.get_html()
- self.dhtml += '</div>'
+ self.dhtml += u'</div>'
return self.dhtml
elif self._type == "MENUITEM":
event = "request%s" % self.action.event
- self.dhtml = ('<div dojoType="MenuItem2" caption="%s"' +\
- ' onClick="sendCmd(\'event\',\'id=%s&event=%s\');"' +\
- ' id="%s" widgetId="%s"%s></div>') % \
+ self.dhtml = (u'<div dojoType="MenuItem2" caption="%s"' +\
+ u' onClick="sendCmd(\'event\',\'id=%s&event=%s\');"'
+\
+ u' id="%s" widgetId="%s"%s></div>') % \
(self.name, self._id, event, self._id, self._id, \
self._disabled and ' disabled="True"' or "")
return self.dhtml
elif self._type == "SEPARATOR":
# TODO add seperator
- return '<div dojoType="MenuSeparator2"></div>'
+ return u'<div dojoType="MenuSeparator2"></div>'
Modified: trunk/gnue-forms/src/uidrivers/html/ToolBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/ToolBar.py 2006-11-20 07:37:09 UTC
(rev 9052)
+++ trunk/gnue-forms/src/uidrivers/html/ToolBar.py 2006-11-20 11:48:53 UTC
(rev 9053)
@@ -84,7 +84,7 @@
def get_html(self):
if self._type == "TOOLBAR":
- dhtml = ""
+ dhtml = u""
for child in self._children:
dhtml += child.get_html()
return build_toolbar("toolbar",dhtml)
Modified: trunk/gnue-forms/src/uidrivers/html/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/_base.py 2006-11-20
07:37:09 UTC (rev 9052)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/_base.py 2006-11-20
11:48:53 UTC (rev 9053)
@@ -243,19 +243,19 @@
elif self._type == "FORM": # DIALOG
pno=1
- pages=""
- header=""
- footer=""
+ pages=u""
+ header=u""
+ footer=u""
for child in self._children:
# self.dhtml = self.dhtml % ("CT: %s<BR>%%s" % child._type)
if child._type == "PAGE":
try:
gfObj=self._uiDriver._WidgetToGFObj[child._id]
- pagename=gfObj.name and gfObj.name or pno
+ pagename=u"%s" % (gfObj.name and gfObj.name or pno)
except:
- pagename = pno
- pages+=build_page("page_%s" % pno, pagename,
child.get_html())
+ pagename = u"%s" % pno
+ pages+=build_page(u"page_%s" % pno, pagename,
child.get_html())
pno+=1
if hasattr(self,"MenuBar"):
@@ -279,7 +279,7 @@
if value != None:
self.value = value
else:
- self.value = ""
+ self.value = u""
self._send_update(["set","%s" % self._id,self.value])
Modified: trunk/gnue-forms/src/uidrivers/html/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/box.py 2006-11-20 07:37:09 UTC
(rev 9052)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/box.py 2006-11-20 11:48:53 UTC
(rev 9053)
@@ -28,7 +28,7 @@
from gnue.forms.uidrivers.html.widgets._base import UIHelper, HtmlWidget
from gnue.forms.uidrivers.html.Generator import build_box
-from gnue.forms.uidrivers.html.common import getNextId, textEncode
+from gnue.forms.uidrivers.html.common import getNextId
class UIBox(UIHelper):
@@ -37,7 +37,7 @@
object = event.object
id = getNextId()
- dhtml = build_box(id, textEncode(object.label), \
+ dhtml = build_box(id, object.label, \
object.Char__x*event.widgetWidth, self.itemY,\
self.itemWidth, self.itemHeight)
Modified: trunk/gnue-forms/src/uidrivers/html/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/button.py 2006-11-20
07:37:09 UTC (rev 9052)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/button.py 2006-11-20
11:48:53 UTC (rev 9053)
@@ -28,7 +28,7 @@
from gnue.forms.uidrivers.html.widgets._base import UIHelper, HtmlWidget
from gnue.forms.uidrivers.html.Generator import build_button
-from gnue.forms.uidrivers.html.common import getNextId, textEncode
+from gnue.forms.uidrivers.html.common import getNextId
class UIButton(UIHelper):
@@ -36,7 +36,7 @@
def _create_widget(self, event, spacer):
object = event.object
id = getNextId()
- dhtml = build_button(id, textEncode(object.label), \
+ dhtml = build_button(id, object.label, \
object.Char__x*event.widgetWidth, self.itemY,\
self.itemWidth, self.itemHeight)
Modified: trunk/gnue-forms/src/uidrivers/html/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/entry.py 2006-11-20
07:37:09 UTC (rev 9052)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/entry.py 2006-11-20
11:48:53 UTC (rev 9053)
@@ -186,11 +186,12 @@
gfObject = self._uiDriver._WidgetToGFObj[self._id]
if gfObject.style == 'checkbox':
if self.value:
- return (self.dhtml % "checked")
+ return (self.dhtml % u"checked")
else:
- return (self.dhtml % "")
+ return (self.dhtml % u"")
else:
return (self.dhtml % self.value)
+
except Exception,e:
print e
print self.dhtml,self.value
Modified: trunk/gnue-forms/src/uidrivers/html/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/form.py 2006-11-20 07:37:09 UTC
(rev 9052)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/form.py 2006-11-20 11:48:53 UTC
(rev 9053)
@@ -55,7 +55,7 @@
self._formSize = formSize = (formWidth*self._uiDriver.widgetWidth,
formHeight*self._uiDriver.widgetHeight)
- dhtml = ""
+ dhtml = u""
if self._form.style == 'dialog':
newWidget = HtmlWidget(event.container, self._uiDriver, 'DIALOG',
dhtml, getNextId())
# FIXME: add dialogs
@@ -115,7 +115,7 @@
#
---------------------------------------------------------------------------
def _ui_goto_page_ (self, page):
- self._wrapper.setPage (page)
+ self.mainWindow.updates.append(["goto_page","",page])
#
---------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/html/widgets/label.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/label.py 2006-11-20
07:37:09 UTC (rev 9052)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/label.py 2006-11-20
11:48:53 UTC (rev 9053)
@@ -28,7 +28,7 @@
from gnue.forms.uidrivers.html.widgets._base import UIHelper, HtmlWidget
from gnue.forms.uidrivers.html.Generator import build_label
-from gnue.forms.uidrivers.html.common import getNextId, textEncode
+from gnue.forms.uidrivers.html.common import getNextId
class UILabel(UIHelper):
@@ -37,7 +37,7 @@
object = event.object
id = getNextId()
- dhtml = build_label(id, textEncode(object.text), \
+ dhtml = build_label(id, object.text, \
object.Char__x*event.widgetWidth, self.itemY,\
self.itemWidth, self.itemHeight)
Modified: trunk/gnue-forms/src/uidrivers/html/widgets/page.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/page.py 2006-11-20 07:37:09 UTC
(rev 9052)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/page.py 2006-11-20 11:48:53 UTC
(rev 9053)
@@ -27,14 +27,14 @@
#
from gnue.forms.uidrivers.html.widgets._base import UIHelper, HtmlWidget
-from gnue.forms.uidrivers.html.common import *
+from gnue.forms.uidrivers.html.common import getNextId
class UIPage(UIHelper):
def _create_widget(self, event, spacer):
object = event.object
id = getNextId()
- dhtml = ''
+ dhtml = u''
self._container = HtmlWidget(event.container, self._uiDriver, \
'PAGE', dhtml, id)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r9053 - in trunk/gnue-forms/src/uidrivers/html: . widgets,
jan <=