[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r8341 - in trunk/gnue-designer/src: . base base/tools forms forms
|
From: |
jcater |
|
Subject: |
[gnue] r8341 - in trunk/gnue-designer/src: . base base/tools forms forms/LayoutEditor forms/LayoutEditor/renderers/Base forms/wizards reports reports/Char reports/Standard schema schema/wizards ui/wx ui/wx/uihelpers/doccanvas |
|
Date: |
Mon, 3 Apr 2006 18:25:15 -0500 (CDT) |
Author: jcater
Date: 2006-04-03 10:33:18 -0500 (Mon, 03 Apr 2006)
New Revision: 8341
Modified:
trunk/gnue-designer/src/Designer.py
trunk/gnue-designer/src/base/Document.py
trunk/gnue-designer/src/base/MRUManager.py
trunk/gnue-designer/src/base/PopupMenu.py
trunk/gnue-designer/src/base/TemplateChooser.py
trunk/gnue-designer/src/base/TemplateParser.py
trunk/gnue-designer/src/base/tools/DataSourceEditor.py
trunk/gnue-designer/src/base/tools/EventEditor.py
trunk/gnue-designer/src/base/tools/PropertyEditor.py
trunk/gnue-designer/src/base/tools/SchemaViewer.py
trunk/gnue-designer/src/forms/BlockEditor.py
trunk/gnue-designer/src/forms/Debugger.py
trunk/gnue-designer/src/forms/Document.py
trunk/gnue-designer/src/forms/LayoutEditor/DisplayDropTarget.py
trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py
trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditorTools.py
trunk/gnue-designer/src/forms/LayoutEditor/Workspace.py
trunk/gnue-designer/src/forms/LayoutEditor/renderers/Base/Driver.py
trunk/gnue-designer/src/forms/TreeView.py
trunk/gnue-designer/src/forms/wizards/AddBlock.py
trunk/gnue-designer/src/forms/wizards/AddBox.py
trunk/gnue-designer/src/forms/wizards/AddButton.py
trunk/gnue-designer/src/forms/wizards/AddCheckbox.py
trunk/gnue-designer/src/forms/wizards/AddDataSource.py
trunk/gnue-designer/src/forms/wizards/AddDropDown.py
trunk/gnue-designer/src/forms/wizards/AddEntry.py
trunk/gnue-designer/src/forms/wizards/AddLabel.py
trunk/gnue-designer/src/forms/wizards/AddPage.py
trunk/gnue-designer/src/forms/wizards/CreateSchema.py
trunk/gnue-designer/src/forms/wizards/CreateWebForm.py
trunk/gnue-designer/src/reports/Char/FilterSupport.py
trunk/gnue-designer/src/reports/Document.py
trunk/gnue-designer/src/reports/Standard/FilterSupport.py
trunk/gnue-designer/src/schema/Document.py
trunk/gnue-designer/src/schema/wizards/AddTable.py
trunk/gnue-designer/src/schema/wizards/WriteSchema.py
trunk/gnue-designer/src/ui/wx/Instance.py
trunk/gnue-designer/src/ui/wx/uihelpers/doccanvas/dnd.py
Log:
switched from _() to u_().
Modified: trunk/gnue-designer/src/Designer.py
===================================================================
--- trunk/gnue-designer/src/Designer.py 2006-04-03 15:30:16 UTC (rev 8340)
+++ trunk/gnue-designer/src/Designer.py 2006-04-03 15:33:18 UTC (rev 8341)
@@ -62,10 +62,10 @@
NAME = PACKAGE
VERSION = VERSION
COMMAND = "gnue-designer"
- SUMMARY = _("A graphical tool for the rapid deployment of GNU Enterprise
forms and reports.")
+ SUMMARY = u_("A graphical tool for the rapid deployment of GNU Enterprise
forms and reports.")
COMMAND_OPTIONS = [
[ 'new', 'n', 'new', 1, None, 'module',
- _('Starts up opening a new instance of <module>, where module can be
forms, reports, schema, etc.') ],
+ u_('Starts up opening a new instance of <module>, where module can
be forms, reports, schema, etc.') ],
]
USAGE = GClientApp.USAGE + " [file] [file] ..."
USE_DATABASE_OPTIONS = 1
@@ -114,7 +114,7 @@
print "Init'ing"
# Init the splashscreen
# self.ui.createStartupSplash()
- gStartupStatus(_('Initializing Client Library'))
+ gStartupStatus(u_('Initializing Client Library'))
print gStartupStatus
# Load the specified file, a requested new instance, or the default empty
instance
@@ -150,7 +150,7 @@
extracts from them a list of file types/extensions
that they support
"""
- gStartupStatus(_('Loading available tool modules'))
+ gStartupStatus(u_('Loading available tool modules'))
self.supportedModuleObjects = [] # A list of supported modules along with
their "nickname"
self.supportedOpenWildcard = "" #
@@ -214,7 +214,7 @@
@return: An instance of the appropriate editor module or None if
an error is encountered
"""
- gStartupStatus(_('Loading document'))
+ gStartupStatus(u_('Loading document'))
extension = string.lower(os.path.splitext(file)[1][1:])
@@ -292,12 +292,12 @@
param event: The event request
"""
- path = self.ui.dialogOpenFile(_("Open GNUe File..."),
+ path = self.ui.dialogOpenFile(u_("Open GNUe File..."),
wildcards = self.supportedOpenWildcard)
if path:
if self.isFileOpened(path):
- self.ui.dialogOk( _("File is already opened."), _("Notice"))
+ self.ui.dialogOk( u_("File is already opened."), u_("Notice"))
else:
self.load(path)
@@ -367,11 +367,11 @@
self.ui.dialogOk(self.NAME + " " +
- _("Version ") + self.VERSION + "\n\n" +
- _("Copyright 2001-2006 Free Software Foundation\n\n") +
- _("Environment:\n %s\n\n") % string.join(imports,'\n ')
+
- _("For help, email address@hidden"),
- _("About ") + self.NAME)
+ u_("Version ") + self.VERSION + "\n\n" +
+ u_("Copyright 2001-2006 Free Software Foundation\n\n") +
+ u_("Environment:\n %s\n\n") % string.join(imports,'\n
') +
+ u_("For help, email address@hidden"),
+ u_("About ") + self.NAME)
def OnNew(self, event):
"""
Modified: trunk/gnue-designer/src/base/Document.py
===================================================================
--- trunk/gnue-designer/src/base/Document.py 2006-04-03 15:30:16 UTC (rev
8340)
+++ trunk/gnue-designer/src/base/Document.py 2006-04-03 15:33:18 UTC (rev
8341)
@@ -241,7 +241,7 @@
if not self._isdirty:
self._isdirty = True
if self._path == "":
- self.ui.setTitle( _("Untitled %s*") % self.properties.nickname)
+ self.ui.setTitle( u_("Untitled %s*") % self.properties.nickname)
else:
self.ui.setTitle(self._path + "*")
self.dispatchEvent('MakeDirty')
@@ -252,7 +252,7 @@
self._isdirty = 0
self._isnew = 0
if self._path == "":
- self.ui.setTitle( _("Untitled %s") % self.properties.nickname)
+ self.ui.setTitle( u_("Untitled %s") % self.properties.nickname)
else:
self.ui.setTitle( self._path)
self.dispatchEvent('MakeClean')
@@ -411,10 +411,10 @@
if not os.access (location, os.R_OK):
self.show()
if not self.ui.dialogYesNo(
- _('The requested file does not exist.\n') +
- _('Do you want to create this file?') +
- _('\n\nFile: %s') \
- % location, _("File Not Found"), self.ui):
+ u_('The requested file does not exist.\n') +
+ u_('Do you want to create this file?') +
+ u_('\n\nFile: %s') \
+ % location, u_("File Not Found"), self.ui):
# TODO: Is this right?
sys.exit()
self.hide()
@@ -425,10 +425,10 @@
elif not os.access (location, os.W_OK):
self.show()
if not self.ui.dialogCancel(
- _('The requested file is Read Only.\n') +
- _('To save any changes, you will \n') +
- _('be required to do a "Save As..."\n\nFile: %s') \
- % location, _("Read Only Warning"), self.ui) :
+ u_('The requested file is Read Only.\n') +
+ u_('To save any changes, you will \n') +
+ u_('be required to do a "Save As..."\n\nFile: %s') \
+ % location, u_("Read Only Warning"), self.ui) :
# TODO: Is this right?
sys.exit()
self.hide()
@@ -439,7 +439,7 @@
self.menubar = MenuBar(self)
- gStartupStatus(_('Creating User Interface'))
+ gStartupStatus(u_('Creating User Interface'))
# Set up the menu system
# ... our common menu
@@ -484,7 +484,7 @@
object=self.rootObject)
# Inventory the objects
- gStartupStatus(_('Inventorying Document Objects'))
+ gStartupStatus(u_('Inventorying Document Objects'))
self.rootObject.walk(self.__inventory)
self.finalize()
@@ -496,37 +496,37 @@
def _initMenu(self):
# Add the [sub]menus
for location, text, grouping in (
- ('File', _('&File'), 100),
- ('File|New', _('&New'), 100),
- ('File|Open Recent', _('&Open Recent'), 200.1),
- ('File|Connect To', _('&Connect To'), 400),
- ('Edit', _('&Edit'), 200),
- ('Insert',_('&Insert'), 300),
- ('Modify',_('&Modify'), 400),
- ('Tools',_('&Tools'), 500),
- ('View',_('&View'), 800),
- ('Help',_('&Help'), 999)):
+ ('File', u_('&File'), 100),
+ ('File|New', u_('&New'), 100),
+ ('File|Open Recent', u_('&Open Recent'), 200.1),
+ ('File|Connect To', u_('&Connect To'), 400),
+ ('Edit', u_('&Edit'), 200),
+ ('Insert',u_('&Insert'), 300),
+ ('Modify',u_('&Modify'), 400),
+ ('Tools',u_('&Tools'), 500),
+ ('View',u_('&View'), 800),
+ ('Help',u_('&Help'), 999)):
self.menubar.addMenu(location, text, grouping)
for location, event, text, hotkey, help, grouping in (
- ('File', 'RequestOpen', _('&Open'), 'Ctrl+O', _("Open an existing
document"), 200.1),
- ('File|Open Recent', 'XXXX', _('&Foo'), None, _("This is a placeholder
for the Open Recent menu"), 200.1),
- ('File|New', 'RequestNewWizard', _('From &Wizard...'), None, _("Create
a new document using a wizard"), 900.1),
- ('File', 'RequestSave', _("&Save"), 'Ctrl+S', _("Save the current
document"),300.1),
- ('File', 'RequestSaveAs', _("Save &As..."),None, _("Save the current
document under a new name"), 300.2),
- ('File', 'RequestSaveAll', _("Save A&ll"),None,_("Save all open
document"),300.3),
- ('File', 'RequestRevert', _("Reload"), None, _("Reload the current
document as of its last save (abandoning any changes)"), 500),
- ('File', 'RequestClose', _("&Close"), 'Ctrl+W', _("Close the current
document"), 990),
- ('File', 'RequestExit', _("E&xit"), None, _("Exit GNUe Designer"), 995),
- ('Edit', 'RequestUndo', _("&Undo"), 'Ctrl+Z', _("Undo the last
action"), 100.1),
- ('Edit', 'RequestRedo', _("&Redo"), 'Ctrl+Y', _("Redo the last undo
action"), 100.2),
- ('Edit', 'RequestCut', _("Cu&t"), 'Ctrl+X', _("Cut the current object
and move to the clipboard"), 200.1),
- ('Edit', 'RequestCopy', _("&Copy"), 'Ctrl+C', _("Copy the current
object to the clipboard"), 200.2),
- ('Edit', 'RequestPaste', _("&Paste"), 'Ctrl+V', _("Paste the current
object on the clipboard"), 200.3),
- ('Edit', 'RequestPasteSpecial', _("Paste &Special..."), None, _("Paste
the current object on the clipboard with special attributes"), 200.4),
- ('Modify','RequestDelete', _("&Delete Item"), 'Delete', _("Delete the
current object"),100),
- ('Help', 'RequestAbout', _("&About GNUe Designer"), None, _("More
information about GNUe Designer"), 900),
+ ('File', 'RequestOpen', u_('&Open'), 'Ctrl+O', u_("Open an existing
document"), 200.1),
+ ('File|Open Recent', 'XXXX', u_('&Foo'), None, u_("This is a
placeholder for the Open Recent menu"), 200.1),
+ ('File|New', 'RequestNewWizard', u_('From &Wizard...'), None,
u_("Create a new document using a wizard"), 900.1),
+ ('File', 'RequestSave', u_("&Save"), 'Ctrl+S', u_("Save the current
document"),300.1),
+ ('File', 'RequestSaveAs', u_("Save &As..."),None, u_("Save the current
document under a new name"), 300.2),
+ ('File', 'RequestSaveAll', u_("Save A&ll"),None,u_("Save all open
document"),300.3),
+ ('File', 'RequestRevert', u_("Reload"), None, u_("Reload the current
document as of its last save (abandoning any changes)"), 500),
+ ('File', 'RequestClose', u_("&Close"), 'Ctrl+W', u_("Close the current
document"), 990),
+ ('File', 'RequestExit', u_("E&xit"), None, u_("Exit GNUe Designer"),
995),
+ ('Edit', 'RequestUndo', u_("&Undo"), 'Ctrl+Z', u_("Undo the last
action"), 100.1),
+ ('Edit', 'RequestRedo', u_("&Redo"), 'Ctrl+Y', u_("Redo the last undo
action"), 100.2),
+ ('Edit', 'RequestCut', u_("Cu&t"), 'Ctrl+X', u_("Cut the current object
and move to the clipboard"), 200.1),
+ ('Edit', 'RequestCopy', u_("&Copy"), 'Ctrl+C', u_("Copy the current
object to the clipboard"), 200.2),
+ ('Edit', 'RequestPaste', u_("&Paste"), 'Ctrl+V', u_("Paste the current
object on the clipboard"), 200.3),
+ ('Edit', 'RequestPasteSpecial', u_("Paste &Special..."), None,
u_("Paste the current object on the clipboard with special attributes"), 200.4),
+ ('Modify','RequestDelete', u_("&Delete Item"), 'Delete', u_("Delete the
current object"),100),
+ ('Help', 'RequestAbout', u_("&About GNUe Designer"), None, u_("More
information about GNUe Designer"), 900),
):
self.menubar.addAction(location, text, event,
grouping, canDisable=True,
@@ -536,12 +536,12 @@
for tool in SupportedModules:
self.menubar.addAction('File|New', '&%s' % tool.properties.nickname,
'RequestNew', 100,
- help=_('Create a new %s') % tool.properties.nickname.lower(),
eventdata={'type': tool.properties.module })
+ help=u_('Create a new %s') % tool.properties.nickname.lower(),
eventdata={'type': tool.properties.module })
# Add connections
for conn in self.connections.getAllConnectionParameters().keys():
self.menubar.addAction('File|Connect To', conn, 'Connect:%s' % conn,
- help=_("Login to %s connection") % conn,
+ help=u_("Login to %s connection") % conn,
eventdata={'connection': conn})
self.registerEventListeners({'Connect:%s' % conn:self.__OnConnectTo})
@@ -678,7 +678,7 @@
self.dispatchEvent('ConnectionEstablished',connection=conn)
self.dispatchEvent('Disable:Connect:%s' % conn)
except:
- print _("Unable to connect to %s") % conn
+ print u_("Unable to connect to %s") % conn
#--------------------------------------------------------------------------
@@ -706,7 +706,7 @@
( type, self.properties.fileExtensions[type]) ]
filterIndex.append(type)
- path = self.ui.dialogSaveFile(_("Save %s As...") %
self.properties.description,
+ path = self.ui.dialogSaveFile(u_("Save %s As...") %
self.properties.description,
wildcards = wildcards,
parentWindow=self.ui)
@@ -716,9 +716,9 @@
if os.path.isfile(path):
overwrite = self.ui.dialogYesNo(
- _('The file "%s".\n' % path) +
- _("exists. Overwrite?"),
- _("Unsaved Changes"), icon="warn", parentWindow=self.ui)
+ u_('The file "%s".\n' % path) +
+ u_("exists. Overwrite?"),
+ u_("Unsaved Changes"), icon="warn", parentWindow=self.ui)
if not overwrite:
self.OnSaveAs(event)
return
@@ -732,9 +732,9 @@
def _OnClose(self, event):
if self.isDirty():
save = self.ui.dialogYesNoCancel(
- _("This document has unsaved changes.\n") +
- _("Save changes before closing?"),
- _("Unsaved Changes"), icon="warn", parentWindow=self.ui)
+ u_("This document has unsaved changes.\n") +
+ u_("Save changes before closing?"),
+ u_("Unsaved Changes"), icon="warn", parentWindow=self.ui)
if save == True:
self.OnSave(event)
elif save == -1:
Modified: trunk/gnue-designer/src/base/MRUManager.py
===================================================================
--- trunk/gnue-designer/src/base/MRUManager.py 2006-04-03 15:30:16 UTC (rev
8340)
+++ trunk/gnue-designer/src/base/MRUManager.py 2006-04-03 15:33:18 UTC (rev
8341)
@@ -153,7 +153,7 @@
for location in self.menulist:
tid = wx.NewId()
menu.Append ( tid, '&%s %s' % (i+1, location),
- _('Open "%s" in a new window') % self._locations[i] )
+ u_('Open "%s" in a new window') % self._locations[i] )
wx.EVT_MENU(menu.__instance.ui, tid, self.app.OnOpenRecent)
self.mruMenuMap[tid] = self._locations[i]
Modified: trunk/gnue-designer/src/base/PopupMenu.py
===================================================================
--- trunk/gnue-designer/src/base/PopupMenu.py 2006-04-03 15:30:16 UTC (rev
8340)
+++ trunk/gnue-designer/src/base/PopupMenu.py 2006-04-03 15:33:18 UTC (rev
8341)
@@ -47,9 +47,9 @@
if object == None:
- self.addCreateTag(_('datasource'),_('New Data Source'))
- self.addCreateTag(_('trigger'),_('New Shared Trigger'))
- self.addCreateTag(_('page'),_('New Page'))
+ self.addCreateTag(u_('datasource'),u_('New Data Source'))
+ self.addCreateTag(u_('trigger'),u_('New Shared Trigger'))
+ self.addCreateTag(u_('page'),u_('New Page'))
else:
@@ -58,20 +58,20 @@
# Properties
id = wx.NewId()
- self.Append(id, _("&Properties..."))
+ self.Append(id, u_("&Properties..."))
wx.EVT_MENU(self, id, self.OnEditProperties)
if not isinstance (object, GFForm.GFForm):
# Delete
id = wx.NewId()
- self.Append(id, _("&Delete %s") % object._type[2:])
+ self.Append(id, u_("&Delete %s") % object._type[2:])
wx.EVT_MENU(self, id, self.OnDeleteObject)
self.AppendSeparator()
# Events >
if isinstance (object, GTrigger.GTriggerExtension):
- menu = wx.Menu(_("Events..."))
+ menu = wx.Menu(u_("Events..."))
self._triggerMap = {}
keys = object._validTriggers.keys()
keys.sort()
@@ -80,7 +80,7 @@
self._triggerMap[tid] = trigger
menu.Append(tid, object._validTriggers[trigger] + "...")
wx.EVT_MENU(menu, tid, self.OnEditEvent)
- self.AppendMenu(wx.NewId(), _("&Events"), menu)
+ self.AppendMenu(wx.NewId(), u_("&Events"), menu)
if isinstance(object, GFObjects.GFPage) or \
@@ -88,7 +88,7 @@
self.AppendSeparator()
# Reorder
id = wx.NewId()
- self.Append(id, _("&Reorder by Location"))
+ self.Append(id, u_("&Reorder by Location"))
wx.EVT_MENU(self, id, self.OnReorderLayout)
@@ -226,7 +226,7 @@
class CreateObjectMenu(ActionMenu):
def __init__(self, instance, object, parent):
- ActionMenu.__init__(self, instance, None, parent, _('New...'),_('&New'))
+ ActionMenu.__init__(self, instance, None, parent, u_('New...'),u_('&New'))
self._object = object
@@ -249,7 +249,7 @@
# This menu is the popup menu on the object tree
class ObjectMenu(ActionMenu):
def __init__(self, instance, object):
- ActionMenu.__init__(self, instance, object, None, _("Object Tasks..."))
+ ActionMenu.__init__(self, instance, object, None, u_("Object Tasks..."))
Modified: trunk/gnue-designer/src/base/TemplateChooser.py
===================================================================
--- trunk/gnue-designer/src/base/TemplateChooser.py 2006-04-03 15:30:16 UTC
(rev 8340)
+++ trunk/gnue-designer/src/base/TemplateChooser.py 2006-04-03 15:33:18 UTC
(rev 8341)
@@ -40,7 +40,7 @@
def run(self):
- self.chooser = wx.Dialog(None, -1, _('Choose Wizard to Run...'),
+ self.chooser = wx.Dialog(None, -1, u_('Choose Wizard to Run...'),
style=wx.DEFAULT_DIALOG_STYLE|wx.DIALOG_MODAL)
@@ -48,8 +48,8 @@
self.notebook = wx.Notebook(self.panel, -1)
self.chooser.SetClientSize(wx.Size(400,340))
- self.chooseButton = wx.Button(self.panel, -1, _('Run Wizard'))
- self.cancelButton = wx.Button(self.panel, -1, _('Cancel'))
+ self.chooseButton = wx.Button(self.panel, -1, u_('Run Wizard'))
+ self.cancelButton = wx.Button(self.panel, -1, u_('Cancel'))
self.chooseButton.SetDefault()
@@ -105,11 +105,11 @@
# style=wx.LC_REPORT|wx.LC_SINGLE_SEL|wx.STATIC_BORDER)
#wx.LC_HRULES|wx.LC_VRULES|)
ctrl = wx.ListCtrl(self.notebook, -1,wx.Point(5,5), wx.Size(w-10,h-10),
style=wx.LC_REPORT|wx.LC_SINGLE_SEL|wx.STATIC_BORDER)
#wx.LC_HRULES|wx.LC_VRULES|)
- ctrl.InsertColumn(0, _("Name"), format=wx.LIST_FORMAT_LEFT, width=-1)
- ctrl.InsertColumn(1, _("Description"), format=wx.LIST_FORMAT_LEFT,
width=-1)
- ctrl.InsertColumn(2, _("Type"), format=wx.LIST_FORMAT_LEFT, width=-1)
- ctrl.InsertColumn(3, _("Author"), format=wx.LIST_FORMAT_LEFT, width=-1)
- ctrl.InsertColumn(4, _("Version"), format=wx.LIST_FORMAT_LEFT, width=-1)
+ ctrl.InsertColumn(0, u_("Name"), format=wx.LIST_FORMAT_LEFT, width=-1)
+ ctrl.InsertColumn(1, u_("Description"), format=wx.LIST_FORMAT_LEFT,
width=-1)
+ ctrl.InsertColumn(2, u_("Type"), format=wx.LIST_FORMAT_LEFT, width=-1)
+ ctrl.InsertColumn(3, u_("Author"), format=wx.LIST_FORMAT_LEFT, width=-1)
+ ctrl.InsertColumn(4, u_("Version"), format=wx.LIST_FORMAT_LEFT, width=-1)
wx.EVT_LIST_ITEM_SELECTED(self.chooser, ctrl.GetId(), self.OnSelect)
wx.EVT_LIST_ITEM_ACTIVATED(self.chooser, ctrl.GetId(), self.OnSelected)
@@ -125,22 +125,22 @@
if template.has_key('Description'):
ctrl.SetStringItem(i, 1, template['Description'])
else:
- ctrl.SetStringItem(i, 1, _('Unknown'))
+ ctrl.SetStringItem(i, 1, u_('Unknown'))
if template['Product'] == TemplateBase.TEMPLATE:
ctrl.SetStringItem(i, 2, 'Template')
elif template['Product'] == TemplateBase.WIZARD:
- ctrl.SetStringItem(i, 2, _('Wizard'))
+ ctrl.SetStringItem(i, 2, u_('Wizard'))
if template.has_key('Author'):
ctrl.SetStringItem(i, 3, template['Author'])
else:
- ctrl.SetStringItem(i, 3, _('Unknown'))
+ ctrl.SetStringItem(i, 3, u_('Unknown'))
if template.has_key('Version'):
ctrl.SetStringItem(i, 4, template['Version'])
else:
- ctrl.SetStringItem(i, 4, _('Unknown'))
+ ctrl.SetStringItem(i, 4, u_('Unknown'))
ctrl.SetItemData(i, lookupIndex)
self.lookup[notebookIndex][lookupIndex] = template
Modified: trunk/gnue-designer/src/base/TemplateParser.py
===================================================================
--- trunk/gnue-designer/src/base/TemplateParser.py 2006-04-03 15:30:16 UTC
(rev 8340)
+++ trunk/gnue-designer/src/base/TemplateParser.py 2006-04-03 15:33:18 UTC
(rev 8341)
@@ -71,9 +71,9 @@
self.wizardPage = WizardPage(self, self.panel)
- self.prevButton = wx.Button(self.panel, -1, _('< Back'))
- self.nextButton = wx.Button(self.panel, -1, _('Continue >'))
- self.cancelButton = wx.Button(self.panel, -1, _('Cancel'))
+ self.prevButton = wx.Button(self.panel, -1, u_('< Back'))
+ self.nextButton = wx.Button(self.panel, -1, u_('Continue >'))
+ self.cancelButton = wx.Button(self.panel, -1, u_('Cancel'))
self.nextButton.SetDefault()
@@ -94,14 +94,14 @@
wx.EVT_CLOSE(self.wizard, self.wizardPage.OnCancel)
- self.title = wx.StaticText(self.panel, -1, _("Wizard Header"),
pos=wx.Point(10,10))
+ self.title = wx.StaticText(self.panel, -1, u_("Wizard Header"),
pos=wx.Point(10,10))
font = self.title.GetFont()
font.SetPointSize(int(self.title.GetFont().GetPointSize()*1.5))
font.SetStyle(wx.ITALIC)
# font.SetWeight(wx.BOLD)
self.title.SetForegroundColour(wx.Colour(255,255,255))
self.title.SetFont(font)
- self.title2 = wx.StaticText(self.panel, -1, _("Wizard Header"),
pos=wx.Point(11,11))
+ self.title2 = wx.StaticText(self.panel, -1, u_("Wizard Header"),
pos=wx.Point(11,11))
self.title2.SetForegroundColour(wx.Colour(0,0,102))
self.title2.SetFont(font)
@@ -136,8 +136,8 @@
msg = ""
dlg = wx.MessageDialog(None,
- _("Unable to perform the requested action.") + msg,
- _("Wizard Error"), style=wx.OK|wx.ICON_WARNING)
+ u_("Unable to perform the requested action.") + msg,
+ u_("Wizard Error"), style=wx.OK|wx.ICON_WARNING)
dlg.ShowModal()
dlg.Destroy()
@@ -206,9 +206,9 @@
if validation:
# Give feedback
dlg = wx.MessageDialog(self.parser.wizard,
- _("Please correct the following mistakes before continuing:\n\n
- ") + \
+ u_("Please correct the following mistakes before continuing:\n\n
- ") + \
string.join(validation,'\n - '),
- _("Wizard Error"), style=wx.OK|wx.ICON_WARNING)
+ u_("Wizard Error"), style=wx.OK|wx.ICON_WARNING)
dlg.ShowModal()
dlg.Destroy()
@@ -248,9 +248,9 @@
nextY = yMargin
if self.nextStep == None:
- self.parser.nextButton.SetLabel(_('Finished'))
+ self.parser.nextButton.SetLabel(u_('Finished'))
else:
- self.parser.nextButton.SetLabel(_('Continue >'))
+ self.parser.nextButton.SetLabel(u_('Continue >'))
if self.prevStep == None:
self.parser.prevButton.Enable(0)
@@ -437,11 +437,11 @@
self.source = source
self.parent = parent
- self.addButton = wx.Button(self, -1, _(" Add >"))
- self.delButton = wx.Button(self, -1, _("< Remove "))
- self.upButton = wx.Button(self, -1, _("Move Up"))
- self.downButton = wx.Button(self, -1, _("Move Down"))
- self.selectAllButton = wx.Button(self, -1, _("Select All"))
+ self.addButton = wx.Button(self, -1, u_(" Add >"))
+ self.delButton = wx.Button(self, -1, u_("< Remove "))
+ self.upButton = wx.Button(self, -1, u_("Move Up"))
+ self.downButton = wx.Button(self, -1, u_("Move Down"))
+ self.selectAllButton = wx.Button(self, -1, u_("Select All"))
self.addButton.SetSize(self.downButton.GetSize())
self.delButton.SetSize(self.downButton.GetSize())
Modified: trunk/gnue-designer/src/base/tools/DataSourceEditor.py
===================================================================
--- trunk/gnue-designer/src/base/tools/DataSourceEditor.py 2006-04-03
15:30:16 UTC (rev 8340)
+++ trunk/gnue-designer/src/base/tools/DataSourceEditor.py 2006-04-03
15:33:18 UTC (rev 8341)
@@ -49,9 +49,9 @@
style=wx.LC_REPORT| # wx.LC_EDIT_LABELS|
wx.LC_HRULES|wx.LC_VRULES|wx.LC_SINGLE_SEL)
- self.list.InsertColumn(0,_('Name'))
- self.list.InsertColumn(1,_('Source'))
- self.list.InsertColumn(2,_('Connection'))
+ self.list.InsertColumn(0,u_('Name'))
+ self.list.InsertColumn(1,u_('Source'))
+ self.list.InsertColumn(2,u_('Connection'))
self.notebook = wx.Notebook(self.splitter, -1, style=wx.NB_BOTTOM)
@@ -59,9 +59,9 @@
self.referencesPanel = ReferencesViewer(self, self.notebook)
self.schemaPanel = SchemaViewer(self, self.notebook)
- self.notebook.AddPage(self.propertyPanel, _('Properties'))
- self.notebook.AddPage(self.referencesPanel, _('References'))
- self.notebook.AddPage(self.schemaPanel, _('Schema'))
+ self.notebook.AddPage(self.propertyPanel, u_('Properties'))
+ self.notebook.AddPage(self.referencesPanel, u_('References'))
+ self.notebook.AddPage(self.schemaPanel, u_('Schema'))
self.splitter.SplitHorizontally(self.list, self.notebook,200)
@@ -369,14 +369,14 @@
self.AddSimpleTool(self.addButtonId,
wx.Image(images_dir+gConfig('tb_insert'),
wx.BITMAP_TYPE_PNG).ConvertToBitmap(),
- _("Create Data Source"),
- _("Create a new data source"))
+ u_("Create Data Source"),
+ u_("Create a new data source"))
self.AddSimpleTool(self.deleteButtonId,
wx.Image(images_dir+gConfig('tb_delete'),
wx.BITMAP_TYPE_PNG).ConvertToBitmap(),
- _("Delete Data Source"),
- _("Delete the currently selected data source"))
+ u_("Delete Data Source"),
+ u_("Delete the currently selected data source"))
wx.EVT_TOOL(self, self.addButtonId, editor.OnAddDSSelected)
wx.EVT_TOOL(self, self.deleteButtonId, editor.OnDeleteDSSelected)
@@ -426,9 +426,9 @@
self.list = wx.ListCtrl(self, -1, pos=wx.Point(0,0),
style=wx.LC_REPORT|wx.LC_HRULES|wx.LC_VRULES)
- self.list.InsertColumn(REF_NAME, _('Reference'))
- self.list.InsertColumn(REF_REFR, _('Referrer'))
- self.list.InsertColumn(REF_TYPE, _('Type'), wx.LIST_FORMAT_RIGHT)
+ self.list.InsertColumn(REF_NAME, u_('Reference'))
+ self.list.InsertColumn(REF_REFR, u_('Referrer'))
+ self.list.InsertColumn(REF_TYPE, u_('Type'), wx.LIST_FORMAT_RIGHT)
wx.EVT_SIZE(self, self.OnSize)
@@ -467,14 +467,14 @@
for i in range(len(mfields)):
addLine( self, "%s.%s" % (mastertable, mfields[i]),
"%s.%s" % (item.name, dfields[i]),
- _("Detail Datasource") )
+ u_("Detail Datasource") )
for field in self.current._fieldFkReferences.keys():
for item in self.current._fieldFkReferences[field]:
addLine( self, "%s.%s" % (mastertable, field),
"%s.%s" % (item.getParent ().name, item.name),
- _("Dropdown Entry") )
+ u_("Dropdown Entry") )
for block in self.current._blockReferences:
@@ -488,7 +488,7 @@
addLine( self, "%s.%s" % (mastertable, item.field),
"%s.%s" % (block.name, item.name),
- _("Entry"))
+ u_("Entry"))
index = 0
self.list.DeleteAllItems()
@@ -538,11 +538,11 @@
self.list = wx.ListCtrl(self, -1, pos=wx.Point(0,0),
style=wx.LC_REPORT|wx.LC_HRULES|wx.LC_VRULES)
- self.list.InsertColumn(SCH_FIELD, _('Field'))
- self.list.InsertColumn(SCH_TYPE, _('Base Type'))
- self.list.InsertColumn(SCH_SIZE, _('Size'), wx.LIST_FORMAT_RIGHT)
- self.list.InsertColumn(SCH_NATIVE,_('Native Type'))
- self.list.InsertColumn(SCH_REQ, _('Required'))
+ self.list.InsertColumn(SCH_FIELD, u_('Field'))
+ self.list.InsertColumn(SCH_TYPE, u_('Base Type'))
+ self.list.InsertColumn(SCH_SIZE, u_('Size'), wx.LIST_FORMAT_RIGHT)
+ self.list.InsertColumn(SCH_NATIVE,u_('Native Type'))
+ self.list.InsertColumn(SCH_REQ, u_('Required'))
self.schemaMap = []
@@ -560,7 +560,7 @@
# TODO: Some other form of feedback
if not hasattr(self.editor,'_schemaMessageDisplayed'):
- print _("You are not logged in to %s... not retrieving schema") %
(conn)
+ print u_("You are not logged in to %s... not retrieving schema") %
(conn)
self.editor._schemaMessageDisplayed = 1
return
Modified: trunk/gnue-designer/src/base/tools/EventEditor.py
===================================================================
--- trunk/gnue-designer/src/base/tools/EventEditor.py 2006-04-03 15:30:16 UTC
(rev 8340)
+++ trunk/gnue-designer/src/base/tools/EventEditor.py 2006-04-03 15:33:18 UTC
(rev 8341)
@@ -182,8 +182,8 @@
# Create the number of rows we'll need
self.grid.InsertRows(0,len(self.rowList))
- self.triggerTypes = {'':_('(None)'),
- '(Custom Trigger)':_('(Custom Trigger)')}
+ self.triggerTypes = {'':u_('(None)'),
+ '(Custom Trigger)':u_('(Custom Trigger)')}
self.triggerMap = {}
for name in self.namedMap.keys():
Modified: trunk/gnue-designer/src/base/tools/PropertyEditor.py
===================================================================
--- trunk/gnue-designer/src/base/tools/PropertyEditor.py 2006-04-03
15:30:16 UTC (rev 8340)
+++ trunk/gnue-designer/src/base/tools/PropertyEditor.py 2006-04-03
15:33:18 UTC (rev 8341)
@@ -197,7 +197,7 @@
# otherwise create one from its name.
if self.attributes[key]['Typecast'] == GTypecast.boolean:
- text += _('?')
+ text += u_('?')
else:
text += ':'
@@ -451,8 +451,8 @@
except KeyError:
default = None
- self.True = _('Yes') + (default and '*' or '')
- self.False = _('No') + (not default and '*' or '')
+ self.True = u_('Yes') + (default and '*' or '')
+ self.False = u_('No') + (not default and '*' or '')
self.Append(self.True)
self.Append(self.False)
Modified: trunk/gnue-designer/src/base/tools/SchemaViewer.py
===================================================================
--- trunk/gnue-designer/src/base/tools/SchemaViewer.py 2006-04-03 15:30:16 UTC
(rev 8340)
+++ trunk/gnue-designer/src/base/tools/SchemaViewer.py 2006-04-03 15:33:18 UTC
(rev 8341)
@@ -55,8 +55,8 @@
style=wx.LC_REPORT|
wx.LC_HRULES|wx.LC_VRULES|wx.LC_SINGLE_SEL)
- self.list.InsertColumn(0,_('Name'))
- self.list.InsertColumn(1,_('Type'))
+ self.list.InsertColumn(0,u_('Name'))
+ self.list.InsertColumn(1,u_('Type'))
self.schemaPanel = ChildSchemaViewer(self, self.splitter)
@@ -82,13 +82,13 @@
style=wx.RAISED_BORDER|wx.CLIP_CHILDREN)
- self.connLabel = wx.StaticText(self.combopanel, -1, _("Connection: "),
+ self.connLabel = wx.StaticText(self.combopanel, -1, u_("Connection: "),
pos=wx.Point(4,6))
self.connCombo = wx.ComboBox(self.combopanel, -1,
pos=wx.Point(self.connLabel.GetSize().width + 10,4),
# size=self.connLabel.GetSize(),
style=wx.CB_READONLY)
- self.typeLabel = wx.StaticText(self.combopanel, -1, _("Show: "),
+ self.typeLabel = wx.StaticText(self.combopanel, -1, u_("Show: "),
pos=wx.Point(self.connCombo.GetPosition().x + \
self.connCombo.GetSize().width + 20,6))
self.typeCombo = wx.ComboBox(self.combopanel, -1,
@@ -323,11 +323,11 @@
self.list = wx.ListCtrl(self, -1, pos=wx.Point(0,0),
style=wx.LC_REPORT|wx.LC_HRULES|wx.LC_VRULES)
- self.list.InsertColumn(SCH_FIELD, _('Field'))
- self.list.InsertColumn(SCH_TYPE, _('Base Type'))
- self.list.InsertColumn(SCH_SIZE, _('Size'), wx.LIST_FORMAT_RIGHT)
- self.list.InsertColumn(SCH_NATIVE,_('Native Type'))
- self.list.InsertColumn(SCH_REQ, _('Required'))
+ self.list.InsertColumn(SCH_FIELD, u_('Field'))
+ self.list.InsertColumn(SCH_TYPE, u_('Base Type'))
+ self.list.InsertColumn(SCH_SIZE, u_('Size'), wx.LIST_FORMAT_RIGHT)
+ self.list.InsertColumn(SCH_NATIVE,u_('Native Type'))
+ self.list.InsertColumn(SCH_REQ, u_('Required'))
wx.EVT_SIZE(self, self.OnSize)
wx.EVT_LIST_ITEM_SELECTED(self, self.list.GetId(), self.OnFieldSelected)
Modified: trunk/gnue-designer/src/forms/BlockEditor.py
===================================================================
--- trunk/gnue-designer/src/forms/BlockEditor.py 2006-04-03 15:30:16 UTC
(rev 8340)
+++ trunk/gnue-designer/src/forms/BlockEditor.py 2006-04-03 15:33:18 UTC
(rev 8341)
@@ -73,21 +73,21 @@
return (
{'Name': 'Name', # Internal name
'Attribute': 'name', # Attribute (can be a method)
- 'Label': _('Name'), # Column label
+ 'Label': u_('Name'), # Column label
},
{'Name': 'Rows', # Internal name
'Attribute': 'rows', # Attribute (can be a method)
- 'Label': _('# Rows'), # Column label
+ 'Label': u_('# Rows'), # Column label
},
{'Name': 'DataSource', # Internal name
'Attribute': 'datasource', # Attribute (can be a method)
- 'Label': _('Data Source'), # Column label
+ 'Label': u_('Data Source'), # Column label
'ValidSet': self.__getDataSources,
},
{'Name': 'BaseTable', # Internal name
'Attribute': self.__getBaseTable, # Attribute (can be a method)
'ReadOnly': 1, # Can the user edit this field?
- 'Label': _('Base Table'), # Column label
+ 'Label': u_('Base Table'), # Column label
},
)
@@ -109,7 +109,7 @@
if hasattr(datasource,'table') and datasource.table:
return datasource.table
elif datasource.type == 'static':
- return _("(Custom List)")
+ return u_("(Custom List)")
else:
return ""
Modified: trunk/gnue-designer/src/forms/Debugger.py
===================================================================
--- trunk/gnue-designer/src/forms/Debugger.py 2006-04-03 15:30:16 UTC (rev
8340)
+++ trunk/gnue-designer/src/forms/Debugger.py 2006-04-03 15:33:18 UTC (rev
8341)
@@ -46,7 +46,7 @@
#~ #Open output window to show debug messages there
#~ #instead of the console
- #~ outputWindow = wx.Frame(caller, -1, _("Console Output"),
+ #~ outputWindow = wx.Frame(caller, -1, u_("Console Output"),
#~ size=wx.Size(300,50))
#~ outputWindow.text = wx.TextCtrl(outputWindow, -1, style=wx.TE_MULTILINE)
#~ outputWindow.Show(True)
@@ -76,12 +76,12 @@
except:
self.sanityCheck()
raise
- #~ self.outputWindow.text.AppendText(_('\n---- Form Closed Abruptly
----'))
+ #~ self.outputWindow.text.AppendText(u_('\n---- Form Closed Abruptly
----'))
def debugClosing(self):
self.sanityCheck()
- #~ self.outputWindow.text.AppendText(_('\n---- Form Closed ----'))
+ #~ self.outputWindow.text.AppendText(u_('\n---- Form Closed ----'))
#self.outputWindow.Close()
Modified: trunk/gnue-designer/src/forms/Document.py
===================================================================
--- trunk/gnue-designer/src/forms/Document.py 2006-04-03 15:30:16 UTC (rev
8340)
+++ trunk/gnue-designer/src/forms/Document.py 2006-04-03 15:33:18 UTC (rev
8341)
@@ -136,7 +136,7 @@
def loadEmpty(self, style=None):
form = GFForm.GFForm()
options = GFObjects.GFOptions(form)
- form.title = _("Untitled Form")
+ form.title = u_("Untitled Form")
form.height = 12
GFObjects.GFLogic(form)
layout = GFObjects.GFLayout(form)
@@ -156,20 +156,20 @@
def createTools(self):
- self.addTool('propertyEditor', _('Property Inspector'), PropertyEditor,
+ self.addTool('propertyEditor', u_('Property Inspector'), PropertyEditor,
hotkey='F10', menuGroup=301)
- self.addTool('treeEditor', _('Object Navigator'), TreeView,
+ self.addTool('treeEditor', u_('Object Navigator'), TreeView,
hotkey='F8', menuGroup=311)
- self.addTool('schemaNavigator',_('Schema Navigator'), SchemaNavigator,
+ self.addTool('schemaNavigator',u_('Schema Navigator'), SchemaNavigator,
menuGroup=301)
- #self.addTool('datasourceEditor',_('Data Source Editor'), DataSourceEditor,
+ #self.addTool('datasourceEditor',u_('Data Source Editor'),
DataSourceEditor,
# hotkey='F9', menuGroup=311)
- #self.addTool('blockEditor', _('Block Editor'), BlockEditor,
+ #self.addTool('blockEditor', u_('Block Editor'), BlockEditor,
# hotkey='F5', menuGroup=311)
- #self.addTool('fieldEditor', _('Field Editor'), FieldEditor,
+ #self.addTool('fieldEditor', u_('Field Editor'), FieldEditor,
# hotkey='F6', menuGroup=201)
- self.addTool('eventEditor', _('Trigger Mappings'), EventEditor,
+ self.addTool('eventEditor', u_('Trigger Mappings'), EventEditor,
hotkey='F7', menuGroup=321)
def createWizards(self):
@@ -183,28 +183,28 @@
def initMenu(self):
# Add the [sub]menus
for location, text, grouping in (
- ('Modify|Arrange Items',_('&Arrange Items'), 501),):
+ ('Modify|Arrange Items',u_('&Arrange Items'), 501),):
self.menubar.addMenu(location, text, grouping)
for location, event, text, hotkey, help, grouping, canToggle in (
- ('View', 'LayoutEditor:ZoomIn', _("Zoom In"), None, _("Zoom in"), 11.1,
0),
- ('View', 'LayoutEditor:ZoomOut', _("Zoom Out"), None, _("Zoom out"),
11.2, 0),
- ('View', 'LayoutEditor:ShowFocus', _("Show Focus Order"), None, _("Show
the navigation order on the layout editor"), 21, 1),
+ ('View', 'LayoutEditor:ZoomIn', u_("Zoom In"), None, u_("Zoom in"),
11.1, 0),
+ ('View', 'LayoutEditor:ZoomOut', u_("Zoom Out"), None, u_("Zoom out"),
11.2, 0),
+ ('View', 'LayoutEditor:ShowFocus', u_("Show Focus Order"), None,
u_("Show the navigation order on the layout editor"), 21, 1),
- ('Tools','Forms:RunForm', _("Run Form"), None, _("Display and run the
current form"), 101.1, 0),
- ('Tools','Forms:RequestDebugLevel', _("Change debugging level..."),
None, _("Change the debugging output level for the Run Form option"), 101.2, 0),
+ ('Tools','Forms:RunForm', u_("Run Form"), None, u_("Display and run the
current form"), 101.1, 0),
+ ('Tools','Forms:RequestDebugLevel', u_("Change debugging level..."),
None, u_("Change the debugging output level for the Run Form option"), 101.2,
0),
- ('Modify|Align Items','Forms:AlignLeft', _("&Align Left Edges"), None,
_("Horizontally align the currently selected items along their left
edges"),101.1, 0),
- ('Modify|Align Items','Forms:AlignRight', _("&Align Right Edges"),
None, _("Horizontally align the currently selected items along their right
edges"),101.2, 0),
- ('Modify|Align Items','Forms:AlignHCenter', _("&Align Horizontal
Center"), None, _("Horizontally align the currently selected items along their
centers"),101.2, 0),
- ('Modify|Align Items','Forms:AlignTop', _("&Align Top Edges"), None,
_("Vertically align the currently selected items along their top edges"),111.1,
0),
- ('Modify|Align Items','Forms:AlignBottom', _("&Align Bottom Edges"),
None, _("Vertically align the currently selected items along their bottom
edges"),111.2, 0),
- ('Modify|Align Items','Forms:AlignVCenter', _("&Align Vertical
Center"), None, _("Vertically align the currently selected items along their
centers"),111.3, 0),
- ('Modify|Align Items','Forms:SmartAlign', _("&Smart Align
Labels/Fields"), None, _("Align Labels and fields into a block formation, with
all fields left aligned and all labels left aligned."),121.1, 0),
+ ('Modify|Align Items','Forms:AlignLeft', u_("&Align Left Edges"), None,
u_("Horizontally align the currently selected items along their left
edges"),101.1, 0),
+ ('Modify|Align Items','Forms:AlignRight', u_("&Align Right Edges"),
None, u_("Horizontally align the currently selected items along their right
edges"),101.2, 0),
+ ('Modify|Align Items','Forms:AlignHCenter', u_("&Align Horizontal
Center"), None, u_("Horizontally align the currently selected items along their
centers"),101.2, 0),
+ ('Modify|Align Items','Forms:AlignTop', u_("&Align Top Edges"), None,
u_("Vertically align the currently selected items along their top
edges"),111.1, 0),
+ ('Modify|Align Items','Forms:AlignBottom', u_("&Align Bottom Edges"),
None, u_("Vertically align the currently selected items along their bottom
edges"),111.2, 0),
+ ('Modify|Align Items','Forms:AlignVCenter', u_("&Align Vertical
Center"), None, u_("Vertically align the currently selected items along their
centers"),111.3, 0),
+ ('Modify|Align Items','Forms:SmartAlign', u_("&Smart Align
Labels/Fields"), None, u_("Align Labels and fields into a block formation, with
all fields left aligned and all labels left aligned."),121.1, 0),
- ('Modify','LayoutEditor:FocusOrder', _("&Set Focus Order Manually"),
None, _("Set the focus order by hand"),201.2, 0),
- ('Modify','LayoutEditor:AutoArrange', _("&Reset Focus Order by
Position"), None, _("Automatically set the focus order based on an items
position"),201.3, 0)):
+ ('Modify','LayoutEditor:FocusOrder', u_("&Set Focus Order Manually"),
None, u_("Set the focus order by hand"),201.2, 0),
+ ('Modify','LayoutEditor:AutoArrange', u_("&Reset Focus Order by
Position"), None, u_("Automatically set the focus order based on an items
position"),201.3, 0)):
self.menubar.addAction(location, text, event,
grouping, canDisable=1, canToggle=canToggle,
icon=None, hotkey=hotkey, help=help)
@@ -268,11 +268,11 @@
if not valid:
if wx.MessageDialog(None,
- _('The form definition you are about to save\n' + \
+ u_('The form definition you are about to save\n' + \
'does not appear to be a workable definition.' + \
'\n\nIf you save an incomplete definition, you\n' + \
'may not be able to reopen it in Designer.\n\nSave anyway?'),
- _("Incomplete Form Definition"), wx.YES_NO|wx.ICON_QUESTION
).ShowModal() == wx.ID_NO:
+ u_("Incomplete Form Definition"), wx.YES_NO|wx.ICON_QUESTION
).ShowModal() == wx.ID_NO:
return 1
# Reorder the children so items of same class are grouped
@@ -391,8 +391,8 @@
before running a form inside Designer."""
tmpLevel = self.debugLevel
tmpRez = ''
- tmpMessage = _("Please enter debugging level - integer numbers [0..n]")
- tmpCaption = _("Choose debug level")
+ tmpMessage = u_("Please enter debugging level - integer numbers [0..n]")
+ tmpCaption = u_("Choose debug level")
tmpRez = wx.GetTextFromUser(tmpMessage, tmpCaption, tmpLevel, None)
if (tmpRez != ''):
self.debugLevel = tmpRez
@@ -404,10 +404,10 @@
GDebug.setDebug(str(self.debugLevel), "")
DebugSession(self)
#~ wx.MessageDialog(self,
- #~ _('Running a form within GNUe Designer is\n' + \
+ #~ u_('Running a form within GNUe Designer is\n' + \
#~ 'not implemented yet.' + \
#~ '\n\nPlease save the form and run it using\n' + \
#~ 'the GNUe Forms tool (gnue-forms).'),
- #~ _("NOT IMPLEMENTED"), wx.OK|wx.ICON_EXCLAMATION ).ShowModal()
+ #~ u_("NOT IMPLEMENTED"), wx.OK|wx.ICON_EXCLAMATION ).ShowModal()
Modified: trunk/gnue-designer/src/forms/LayoutEditor/DisplayDropTarget.py
===================================================================
--- trunk/gnue-designer/src/forms/LayoutEditor/DisplayDropTarget.py
2006-04-03 15:30:16 UTC (rev 8340)
+++ trunk/gnue-designer/src/forms/LayoutEditor/DisplayDropTarget.py
2006-04-03 15:33:18 UTC (rev 8341)
@@ -282,18 +282,18 @@
current = 0
if blocks and blocks[0] == self.editor.block:
wid = wx.NewId()
- menu.Append(wid, _('Add Fields to Current Block'))
+ menu.Append(wid, u_('Add Fields to Current Block'))
current = 1
wx.EVT_MENU(menu, wid,
lambda event, s=self, t=table, f=fields, x=x, y=y,
b=blocks[0]: s.schemaDrop_Add(t, f, b, x, y) )
wid = wx.NewId()
- menu.Append(wid, _('Add Fields to New Block'))
+ menu.Append(wid, u_('Add Fields to New Block'))
wx.EVT_MENU(menu, wid, lambda event, s=self, t=table, x=x, y=y,
f=fields: s.schemaDrop_Create(t, f, x, y) )
if len(blocks) > 1 + current:
smenu = wx.Menu()
- menu.AppendMenu(wx.NewId(), _("Add Fields to Block"), smenu)
+ menu.AppendMenu(wx.NewId(), u_("Add Fields to Block"), smenu)
for block in blocks[1:]:
wid = wx.NewId()
smenu.Append(wid, block.name)
@@ -304,18 +304,18 @@
## TODO: Finish schemaDrop_Dropdown
## menu.AppendSeparator()
## wid = wx.NewId()
-## menu.Append(wid, _("Add as a dropdown to current block"))
+## menu.Append(wid, u_("Add as a dropdown to current block"))
## wx.EVT_MENU(menu, wid,
## lambda event, s=self, t=table, x=x, y=y,
## f=fields: s.schemaDrop_Dropdown(t, f, x, y) )
menu.AppendSeparator()
wid = wx.NewId()
- menu.Append(wid, _("Create Block (no fields)"))
+ menu.Append(wid, u_("Create Block (no fields)"))
wx.EVT_MENU(menu, wid, lambda event, s=self, t=table,
f=fields: s.schemaDrop_Block(t, f, select=1) )
wid = wx.NewId()
- menu.Append(wid, _("Create Data Source (no bound block)"))
+ menu.Append(wid, u_("Create Data Source (no bound block)"))
wx.EVT_MENU(menu, wid, lambda event, s=self, t=table,
f=fields: s.schemaDrop_Datasource(t, f,
select=1) )
Modified: trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py
===================================================================
--- trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py 2006-04-03
15:30:16 UTC (rev 8340)
+++ trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py 2006-04-03
15:33:18 UTC (rev 8341)
@@ -720,9 +720,9 @@
UIwxpython.setPointSize(size)
self.calcGridSpacing()
self.refreshPage(self.page)
- self.setFeedback(_('Adjusting base point size to %spt') % size)
+ self.setFeedback(u_('Adjusting base point size to %spt') % size)
else:
- self.setFeedback(_('Cannot adjust point size to more than 72pt'))
+ self.setFeedback(u_('Cannot adjust point size to more than 72pt'))
def zoomOut(self, event):
@@ -732,9 +732,9 @@
UIwxpython.setPointSize(size)
self.calcGridSpacing()
self.refreshPage(self.page)
- self.setFeedback(_('Adjusting base point size to %spt') % size)
+ self.setFeedback(u_('Adjusting base point size to %spt') % size)
else:
- self.setFeedback(_('Cannot adjust point size to less than 6pt'))
+ self.setFeedback(u_('Cannot adjust point size to less than 6pt'))
def beginPrePositioningTemplate(self, event):
Modified: trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditorTools.py
===================================================================
--- trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditorTools.py
2006-04-03 15:30:16 UTC (rev 8340)
+++ trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditorTools.py
2006-04-03 15:33:18 UTC (rev 8341)
@@ -61,7 +61,7 @@
self.AddSeparator()
self.addToolbarMapping(ToolbarMapping2)
self.AddSeparator()
- self.AddControl(wx.StaticText(self,-1,_("Block: ")))
+ self.AddControl(wx.StaticText(self,-1,u_("Block: ")))
self.blockCombo = wx.ComboBox(self, -1)
w, h = self.blockCombo.GetSizeTuple()
self.blockCombo.SetSize((int(w*1.4), h))
Modified: trunk/gnue-designer/src/forms/LayoutEditor/Workspace.py
===================================================================
--- trunk/gnue-designer/src/forms/LayoutEditor/Workspace.py 2006-04-03
15:30:16 UTC (rev 8340)
+++ trunk/gnue-designer/src/forms/LayoutEditor/Workspace.py 2006-04-03
15:33:18 UTC (rev 8341)
@@ -632,9 +632,9 @@
UIwxpython.setPointSize(size)
self.calcGridSpacing()
self.refreshPage(self.page)
- self.layouteditor.setFeedback(_('Adjusting base point size to %spt') %
size)
+ self.layouteditor.setFeedback(u_('Adjusting base point size to %spt') %
size)
else:
- self.layouteditor.setFeedback(_('Cannot adjust point size to more than
72pt'))
+ self.layouteditor.setFeedback(u_('Cannot adjust point size to more than
72pt'))
def zoomOut(self, event):
@@ -644,9 +644,9 @@
UIwxpython.setPointSize(size)
self.calcGridSpacing()
self.refreshPage(self.page)
- self.layouteditor.setFeedback(_('Adjusting base point size to %spt') %
size)
+ self.layouteditor.setFeedback(u_('Adjusting base point size to %spt') %
size)
else:
- self.layouteditor.setFeedback(_('Cannot adjust point size to less than
6pt'))
+ self.layouteditor.setFeedback(u_('Cannot adjust point size to less than
6pt'))
def beginPrePositioningTemplate(self, event):
Modified: trunk/gnue-designer/src/forms/LayoutEditor/renderers/Base/Driver.py
===================================================================
--- trunk/gnue-designer/src/forms/LayoutEditor/renderers/Base/Driver.py
2006-04-03 15:30:16 UTC (rev 8340)
+++ trunk/gnue-designer/src/forms/LayoutEditor/renderers/Base/Driver.py
2006-04-03 15:33:18 UTC (rev 8341)
@@ -34,7 +34,7 @@
self.workspace = workspace
- StartupStatus(_('Loading Renderers'))
+ StartupStatus(u_('Loading Renderers'))
self.init()
Modified: trunk/gnue-designer/src/forms/TreeView.py
===================================================================
--- trunk/gnue-designer/src/forms/TreeView.py 2006-04-03 15:30:16 UTC (rev
8340)
+++ trunk/gnue-designer/src/forms/TreeView.py 2006-04-03 15:33:18 UTC (rev
8341)
@@ -55,22 +55,22 @@
layout = child
self.rootObject._treeItemFormProperties = \
- self.AppendItem(self.rootObject._treeItem, _("Properties"))
+ self.AppendItem(self.rootObject._treeItem, u_("Properties"))
self.tree.SetItemImage(self.rootObject._treeItemFormProperties,
treeIconMap['properties'])
self.rootObject._treeItemImportedLibraries = \
- self.AppendItem(self.rootObject._treeItem, _("Imported Libraries"))
+ self.AppendItem(self.rootObject._treeItem, u_("Imported Libraries"))
self.tree.SetItemImage(self.rootObject._treeItemImportedLibraries,
treeIconMap['import'])
self.rootObject._treeItemDataSources = \
- self.AppendItem(self.rootObject._treeItem, _("Data Sources"))
+ self.AppendItem(self.rootObject._treeItem, u_("Data Sources"))
self.tree.SetItemImage(self.rootObject._treeItemDataSources,
treeIconMap['datasource'])
self.rootObject._treeItemNamedTriggers = \
- self.AppendItem(self.rootObject._treeItem, _("Shared Triggers"))
+ self.AppendItem(self.rootObject._treeItem, u_("Shared Triggers"))
self.tree.SetItemImage(self.rootObject._treeItemNamedTriggers,
treeIconMap['trigger'])
self.rootObject._treeItemLogic = logic._treeItem = \
- self.AppendItem(self.rootObject._treeItem, _("Field Logic"))
+ self.AppendItem(self.rootObject._treeItem, u_("Field Logic"))
self.tree.SetItemImage(self.rootObject._treeItemLogic,
treeIconMap['block'])
self.rootObject._treeItemPageLayout = layout._treeItem = \
- self.AppendItem(self.rootObject._treeItem, _("Page Layout"))
+ self.AppendItem(self.rootObject._treeItem, u_("Page Layout"))
self.tree.SetItemImage(self.rootObject._treeItemPageLayout,
treeIconMap['page'])
self.tree.SetPyData(self.rootObject._treeItemFormProperties,
ObjectMenu(self.document,None))
@@ -100,7 +100,7 @@
if not hasattr(object.getParent (),'_treeItemTrigger'):
object.getParent ()._treeItemTrigger = \
- self.AppendItem(object.getParent ()._treeItem, _("Events"))
+ self.AppendItem(object.getParent ()._treeItem, u_("Events"))
#self.tree.SetItemImage(object._parent._treeItemTrigger,
treeIconMap['trigger'])
Modified: trunk/gnue-designer/src/forms/wizards/AddBlock.py
===================================================================
--- trunk/gnue-designer/src/forms/wizards/AddBlock.py 2006-04-03 15:30:16 UTC
(rev 8340)
+++ trunk/gnue-designer/src/forms/wizards/AddBlock.py 2006-04-03 15:33:18 UTC
(rev 8341)
@@ -75,27 +75,27 @@
self.variables['connection'] = self.__firstConnection
if len (self.__datasourceMap):
- set=((0,_('Create a new datasource')),
- (1,_('Use an existing datasource')),
- (2,_('Create an unbound block (no datasource)') )
+ set=((0,u_('Create a new datasource')),
+ (1,u_('Use an existing datasource')),
+ (2,u_('Create an unbound block (no datasource)') )
)
else:
- set=((0,_('Create a new datasource')),
- (2,_('Create an unbound block (no datasource)') )
+ set=((0,u_('Create a new datasource')),
+ (2,u_('Create an unbound block (no datasource)') )
)
- content = [WizardText(_('This will insert a new block.')),
- WizardInput('name',label=_('Object
Name:'),required=1,size=20),
- WizardText(_('Where will this block pull its data?')),
- WizardInput('datasource', label=_('Source:'), required=1,
+ content = [WizardText(u_('This will insert a new block.')),
+ WizardInput('name',label=u_('Object
Name:'),required=1,size=20),
+ WizardText(u_('Where will this block pull its data?')),
+ WizardInput('datasource', label=u_('Source:'), required=1,
maxSelections=1,
set=set),
- WizardText(_('How many rows should this block display at
once?')),
- WizardInput('rows', label=_('Rows Displayed:'), required=1,
+ WizardText(u_('How many rows should this block display at
once?')),
+ WizardInput('rows', label=u_('Rows Displayed:'), required=1,
typecast=whole
) ]
- return { 'title': _('Add Block'),
+ return { 'title': u_('Add Block'),
'content': content,
'prev': None,
'next': '1' }
@@ -104,7 +104,7 @@
# Step #2 [New Datasource] / Get Connection
#
elif stepCode == '1:new':
- return { 'title': _('DataSource Connection'),
+ return { 'title': u_('DataSource Connection'),
'content': (WizardText('What connection should this form use
to connect to the \ndatabase?'),
WizardInput('connection',label='Connection:',
required=1,
set=self.GetAvailableConnections()),
@@ -139,7 +139,7 @@
# Step #2 [no DAtasource]
#
elif stepCode == '1:none':
- return { 'title': _('Done'),
+ return { 'title': u_('Done'),
'content': (WizardText('We now have enough information to
create your block.'),),
'prev': '0',
'next': None }
@@ -214,11 +214,11 @@
'Product': 'forms',
'BaseID' : 'AddBlock',
'BaseClass' : AddBlockWizard,
- 'Name' : _('Add Block'),
- 'Description' : _('Inserts a Block'),
+ 'Name' : u_('Add Block'),
+ 'Description' : u_('Inserts a Block'),
'Version' : VERSION,
'Author' : 'The GNUe Designer Team',
'Behavior': WIZARD,
- 'MenuLocation' : ('Insert',_('Block'), 301.1)
+ 'MenuLocation' : ('Insert',u_('Block'), 301.1)
}
Modified: trunk/gnue-designer/src/forms/wizards/AddBox.py
===================================================================
--- trunk/gnue-designer/src/forms/wizards/AddBox.py 2006-04-03 15:30:16 UTC
(rev 8340)
+++ trunk/gnue-designer/src/forms/wizards/AddBox.py 2006-04-03 15:33:18 UTC
(rev 8341)
@@ -80,11 +80,11 @@
'Product': 'forms',
'BaseID' : 'AddBox',
'BaseClass' : AddBoxWizard,
- 'Name' : _('Add Box'),
- 'Description' : _('Inserts a basic box'),
+ 'Name' : u_('Add Box'),
+ 'Description' : u_('Inserts a basic box'),
'Version' : VERSION,
'Author' : 'The GNUe Designer Team',
'Behavior': TEMPLATE,
- 'MenuLocation' : ('Insert',_('Box'), 401.2)
+ 'MenuLocation' : ('Insert',u_('Box'), 401.2)
}
Modified: trunk/gnue-designer/src/forms/wizards/AddButton.py
===================================================================
--- trunk/gnue-designer/src/forms/wizards/AddButton.py 2006-04-03 15:30:16 UTC
(rev 8340)
+++ trunk/gnue-designer/src/forms/wizards/AddButton.py 2006-04-03 15:33:18 UTC
(rev 8341)
@@ -212,14 +212,14 @@
# Unique name for this wizard
'BaseID' : 'AddButton',
'BaseClass' : AddButtonWizard,
- 'Name' : _('Add Button'),
- 'Description' : _('Inserts a button bound to an event'),
+ 'Name' : u_('Add Button'),
+ 'Description' : u_('Inserts a button bound to an event'),
'Version' : VERSION,
'Author' : 'The GNUe Designer Team',
'Behavior': WIZARD,
# Add to the menu
- 'MenuLocation' : ('Insert', _('Button'), 401.5)
+ 'MenuLocation' : ('Insert', u_('Button'), 401.5)
}
Modified: trunk/gnue-designer/src/forms/wizards/AddCheckbox.py
===================================================================
--- trunk/gnue-designer/src/forms/wizards/AddCheckbox.py 2006-04-03
15:30:16 UTC (rev 8340)
+++ trunk/gnue-designer/src/forms/wizards/AddCheckbox.py 2006-04-03
15:33:18 UTC (rev 8341)
@@ -50,7 +50,7 @@
self.height = height
if not self.current['block']:
- raise InsufficientInformation, _("There are no blocks in this form.")
+ raise InsufficientInformation, u_("There are no blocks in this form.")
###############
@@ -90,11 +90,11 @@
'Product': 'forms',
'BaseID' : 'AddCheckbox',
'BaseClass' : AddCheckboxWizard,
- 'Name' : _('Add Checkbox Entry'),
- 'Description' : _('Inserts a basic unbound checkbox entry'),
+ 'Name' : u_('Add Checkbox Entry'),
+ 'Description' : u_('Inserts a basic unbound checkbox entry'),
'Version' : VERSION,
'Author' : 'The GNUe Designer Team',
'Behavior': TEMPLATE,
- 'MenuLocation' : ('Insert',_('Checkbox Entry'),401.2)
+ 'MenuLocation' : ('Insert',u_('Checkbox Entry'),401.2)
}
Modified: trunk/gnue-designer/src/forms/wizards/AddDataSource.py
===================================================================
--- trunk/gnue-designer/src/forms/wizards/AddDataSource.py 2006-04-03
15:30:16 UTC (rev 8340)
+++ trunk/gnue-designer/src/forms/wizards/AddDataSource.py 2006-04-03
15:33:18 UTC (rev 8341)
@@ -167,11 +167,11 @@
'Product': 'forms',
'BaseID' : 'AddDataSource',
'BaseClass' : AddDataSourceWizard,
- 'Name' : _('Add a new Data Source'),
- 'Description' : _('Inserts a new DataSource'),
+ 'Name' : u_('Add a new Data Source'),
+ 'Description' : u_('Inserts a new DataSource'),
'Version' : VERSION,
'Author' : 'The GNUe Designer Team',
'Behavior': WIZARD,
- 'MenuLocation' : ('Insert',_('Datasource'), 301.2)
+ 'MenuLocation' : ('Insert',u_('Datasource'), 301.2)
}
Modified: trunk/gnue-designer/src/forms/wizards/AddDropDown.py
===================================================================
--- trunk/gnue-designer/src/forms/wizards/AddDropDown.py 2006-04-03
15:30:16 UTC (rev 8340)
+++ trunk/gnue-designer/src/forms/wizards/AddDropDown.py 2006-04-03
15:33:18 UTC (rev 8341)
@@ -62,7 +62,7 @@
self.height = height
if not self.current['block']:
- raise InsufficientInformation, _("There are no blocks in this form.")
+ raise InsufficientInformation, u_("There are no blocks in this form.")
self.__getExistingDatasources()
@@ -333,11 +333,11 @@
'Product': 'forms',
'BaseID' : 'AddDropDown',
'BaseClass' : AddDropDownWizard,
- 'Name' : _('Add Bound Drop Down'),
- 'Description' : _('Inserts a bound dropdown'),
+ 'Name' : u_('Add Bound Drop Down'),
+ 'Description' : u_('Inserts a bound dropdown'),
'Version' : VERSION,
'Author' : 'The GNUe Designer Team',
'Behavior': WIZARD,
- 'MenuLocation' : ('Insert',_('Dropdown'), 501.2)
+ 'MenuLocation' : ('Insert',u_('Dropdown'), 501.2)
}
Modified: trunk/gnue-designer/src/forms/wizards/AddEntry.py
===================================================================
--- trunk/gnue-designer/src/forms/wizards/AddEntry.py 2006-04-03 15:30:16 UTC
(rev 8340)
+++ trunk/gnue-designer/src/forms/wizards/AddEntry.py 2006-04-03 15:33:18 UTC
(rev 8341)
@@ -50,7 +50,7 @@
self.height = height
if not self.current['block']:
- raise InsufficientInformation, _("There are no blocks in this form.")
+ raise InsufficientInformation, u_("There are no blocks in this form.")
###############
@@ -89,11 +89,11 @@
'Product': 'forms',
'BaseID' : 'AddEntry',
'BaseClass' : AddEntryWizard,
- 'Name' : _('Add Entry'),
- 'Description' : _('Inserts a basic unbound entry'),
+ 'Name' : u_('Add Entry'),
+ 'Description' : u_('Inserts a basic unbound entry'),
'Version' : VERSION,
'Author' : 'The GNUe Designer Team',
'Behavior': TEMPLATE,
- 'MenuLocation' : ('Insert',_('Unbound Entry'), 501.1)
+ 'MenuLocation' : ('Insert',u_('Unbound Entry'), 501.1)
}
Modified: trunk/gnue-designer/src/forms/wizards/AddLabel.py
===================================================================
--- trunk/gnue-designer/src/forms/wizards/AddLabel.py 2006-04-03 15:30:16 UTC
(rev 8340)
+++ trunk/gnue-designer/src/forms/wizards/AddLabel.py 2006-04-03 15:33:18 UTC
(rev 8341)
@@ -81,11 +81,11 @@
'Product': 'forms',
'BaseID' : 'AddLabel',
'BaseClass' : AddLabelWizard,
- 'Name' : _('Add Label'),
- 'Description' : _('Inserts a basic label'),
+ 'Name' : u_('Add Label'),
+ 'Description' : u_('Inserts a basic label'),
'Version' : VERSION,
'Author' : 'The GNUe Designer Team',
'Behavior': TEMPLATE,
- 'MenuLocation' : ('Insert',_('Label'), 401.1)
+ 'MenuLocation' : ('Insert',u_('Label'), 401.1)
}
Modified: trunk/gnue-designer/src/forms/wizards/AddPage.py
===================================================================
--- trunk/gnue-designer/src/forms/wizards/AddPage.py 2006-04-03 15:30:16 UTC
(rev 8340)
+++ trunk/gnue-designer/src/forms/wizards/AddPage.py 2006-04-03 15:33:18 UTC
(rev 8341)
@@ -139,11 +139,11 @@
'Product': 'forms',
'BaseClass' : AddPageWizard,
'BaseID' : 'AddPage',
- 'Name' : _('Add Page'),
- 'Description' : _('Inserts a blank page'),
+ 'Name' : u_('Add Page'),
+ 'Description' : u_('Inserts a blank page'),
'Version' : VERSION,
'Author' : 'The GNUe Designer Team',
'Behavior': WIZARD,
- 'MenuLocation' : ('Insert',_('Blank Page'), 201)
+ 'MenuLocation' : ('Insert',u_('Blank Page'), 201)
}
Modified: trunk/gnue-designer/src/forms/wizards/CreateSchema.py
===================================================================
--- trunk/gnue-designer/src/forms/wizards/CreateSchema.py 2006-04-03
15:30:16 UTC (rev 8340)
+++ trunk/gnue-designer/src/forms/wizards/CreateSchema.py 2006-04-03
15:33:18 UTC (rev 8341)
@@ -70,9 +70,9 @@
#
if step == '0':
- content = [WizardText(_('This will create a GNUe schema definition '+
+ content = [WizardText(u_('This will create a GNUe schema definition '+
'according to the needs of this form.')),
- WizardInput('file',label=_('Write to
File:'),required=1,size=20)]
+ WizardInput('file',label=u_('Write to
File:'),required=1,size=20)]
return { 'title': 'Create Schema Definition',
'content': content,
@@ -318,11 +318,11 @@
'Product': 'forms',
'BaseID' : 'CreateSchema',
'BaseClass' : CreateSchemaWizard,
- 'Name' : _('Create Schema Definition'),
- 'Description' : _('Create a gnue schema definition file'),
+ 'Name' : u_('Create Schema Definition'),
+ 'Description' : u_('Create a gnue schema definition file'),
'Version' : VERSION,
'Author' : 'The GNUe Designer Team',
'Behavior': WIZARD,
- 'MenuLocation' : ('Tools|Extras',_('Create Schema from Form'))
+ 'MenuLocation' : ('Tools|Extras',u_('Create Schema from Form'))
}
Modified: trunk/gnue-designer/src/forms/wizards/CreateWebForm.py
===================================================================
--- trunk/gnue-designer/src/forms/wizards/CreateWebForm.py 2006-04-03
15:30:16 UTC (rev 8340)
+++ trunk/gnue-designer/src/forms/wizards/CreateWebForm.py 2006-04-03
15:33:18 UTC (rev 8341)
@@ -592,12 +592,12 @@
'Product': 'forms',
'BaseID' : 'CreateWebForm',
'BaseClass' : CreateWebFormWizard,
- 'Name' : _('Compile Form for GNUe JsForms'),
- 'Description' : _('Create an intermediate html+java for the jsForms
client'),
+ 'Name' : u_('Compile Form for GNUe JsForms'),
+ 'Description' : u_('Create an intermediate html+java for the jsForms
client'),
'Version' : VERSION,
'Author' : 'The GNUe Designer Team',
'Behavior': WIZARD,
- 'MenuLocation' : (_('Tools|Extras'),_('Compile Form for GNUe JsForms'))
+ 'MenuLocation' : (u_('Tools|Extras'),u_('Compile Form for GNUe JsForms'))
}
if __name__ == "__main__":
Modified: trunk/gnue-designer/src/reports/Char/FilterSupport.py
===================================================================
--- trunk/gnue-designer/src/reports/Char/FilterSupport.py 2006-04-03
15:30:16 UTC (rev 8340)
+++ trunk/gnue-designer/src/reports/Char/FilterSupport.py 2006-04-03
15:33:18 UTC (rev 8341)
@@ -45,7 +45,7 @@
def addTools(self):
- self.document.addTool('visualEditor', _('Layout Editor'), LayoutEditor,
+ self.document.addTool('visualEditor', u_('Layout Editor'), LayoutEditor,
hotkey='F11', menuGroup=301)
Modified: trunk/gnue-designer/src/reports/Document.py
===================================================================
--- trunk/gnue-designer/src/reports/Document.py 2006-04-03 15:30:16 UTC (rev
8340)
+++ trunk/gnue-designer/src/reports/Document.py 2006-04-03 15:33:18 UTC (rev
8341)
@@ -126,23 +126,23 @@
def createTools(self):
- self.addTool('propertyEditor', _('Property Inspector'), PropertyEditor,
+ self.addTool('propertyEditor', u_('Property Inspector'), PropertyEditor,
hotkey='F10', menuGroup=301)
- self.addTool('treeEditor', _('Object Navigator'), TreeView,
+ self.addTool('treeEditor', u_('Object Navigator'), TreeView,
hotkey='F8', menuGroup=301)
- self.addTool('schemaViewer', _('Schema Navigator'), SchemaViewer,
+ self.addTool('schemaViewer', u_('Schema Navigator'), SchemaViewer,
menuGroup=301)
- self.addTool('datasourceEditor',_('Data Source Editor'), DataSourceEditor,
+ self.addTool('datasourceEditor',u_('Data Source Editor'), DataSourceEditor,
hotkey='F9', menuGroup=311)
- #self.addTool('groupEditor', _('Group Editor'), GroupEditor,
+ #self.addTool('groupEditor', u_('Group Editor'), GroupEditor,
# hotkey='F5', menuGroup=311)
- #self.addTool('fieldEditor', _('Field Editor'), FieldEditor,
+ #self.addTool('fieldEditor', u_('Field Editor'), FieldEditor,
# hotkey='F6', menuGroup=311)
- self.addTool('eventEditor', _('Trigger Inspector'), EventEditor,
+ self.addTool('eventEditor', u_('Trigger Inspector'), EventEditor,
hotkey='F7', menuGroup=321)
- self.addTool('triggerEditor', _('Code Editor'), TriggerEditor,
+ self.addTool('triggerEditor', u_('Code Editor'), TriggerEditor,
hotkey='F12', menuGroup=321)
# Add filter-specific tools
Modified: trunk/gnue-designer/src/reports/Standard/FilterSupport.py
===================================================================
--- trunk/gnue-designer/src/reports/Standard/FilterSupport.py 2006-04-03
15:30:16 UTC (rev 8340)
+++ trunk/gnue-designer/src/reports/Standard/FilterSupport.py 2006-04-03
15:33:18 UTC (rev 8341)
@@ -51,8 +51,8 @@
def addTools(self):
self.document.addToolSeparator()
- self.document.addTool('groupEditor', _('Group Editor'), GroupEditor,
'F5')
- self.document.addTool('visualEditor', _('Layout Editor'), LayoutEditor,
+ self.document.addTool('groupEditor', u_('Group Editor'), GroupEditor,
'F5')
+ self.document.addTool('visualEditor', u_('Layout Editor'), LayoutEditor,
hotkey='F11', menuGroup=301)
Modified: trunk/gnue-designer/src/schema/Document.py
===================================================================
--- trunk/gnue-designer/src/schema/Document.py 2006-04-03 15:30:16 UTC (rev
8340)
+++ trunk/gnue-designer/src/schema/Document.py 2006-04-03 15:33:18 UTC (rev
8341)
@@ -79,16 +79,16 @@
table._fieldMap[object.name.lower()] = object
def createTools(self):
- self.addTool('tableEditor', _('Table/Field Editor'), TableEditor,
+ self.addTool('tableEditor', u_('Table/Field Editor'), TableEditor,
hotkey='F11', menuGroup=301)
- self.addTool('propertyEditor', _('Property Inspector'), PropertyEditor,
+ self.addTool('propertyEditor', u_('Property Inspector'), PropertyEditor,
hotkey='F10', menuGroup=301)
- self.addTool('treeEditor', _('Object Navigator'), TreeView,
+ self.addTool('treeEditor', u_('Object Navigator'), TreeView,
hotkey='F8', menuGroup=311)
- self.addTool('schemaNavigator',_('Schema Navigator'), SchemaNavigator,
+ self.addTool('schemaNavigator',u_('Schema Navigator'), SchemaNavigator,
menuGroup=301)
- self.addTool('visualEditor',_('Visual Editor'), VisualEditor,
+ self.addTool('visualEditor',u_('Visual Editor'), VisualEditor,
hotkey='F9', menuGroup=311)
def createWizards(self):
Modified: trunk/gnue-designer/src/schema/wizards/AddTable.py
===================================================================
--- trunk/gnue-designer/src/schema/wizards/AddTable.py 2006-04-03 15:30:16 UTC
(rev 8340)
+++ trunk/gnue-designer/src/schema/wizards/AddTable.py 2006-04-03 15:33:18 UTC
(rev 8341)
@@ -60,10 +60,10 @@
#
if stepCode == '0':
- content = [WizardText(_('This will insert a new table definition.')),
- WizardInput('name',label=_('Table Name:'),required=1,size=20)
]
+ content = [WizardText(u_('This will insert a new table definition.')),
+ WizardInput('name',label=u_('Table
Name:'),required=1,size=20) ]
- return { 'title': _('Add Table'),
+ return { 'title': u_('Add Table'),
'content': content,
'prev': None,
'next': None }
@@ -101,6 +101,6 @@
'Version' : VERSION,
'Author' : 'The GNUe Designer Team',
'Behavior': WIZARD,
- 'MenuLocation' : ('Insert', _('Table'))
+ 'MenuLocation' : ('Insert', u_('Table'))
}
Modified: trunk/gnue-designer/src/schema/wizards/WriteSchema.py
===================================================================
--- trunk/gnue-designer/src/schema/wizards/WriteSchema.py 2006-04-03
15:30:16 UTC (rev 8340)
+++ trunk/gnue-designer/src/schema/wizards/WriteSchema.py 2006-04-03
15:33:18 UTC (rev 8341)
@@ -122,6 +122,6 @@
'Version' : VERSION,
'Author' : 'The GNUe Designer Team',
'Behavior': WIZARD,
- 'MenuLocation' : ('Extras',_('Write Schema to Database'))
+ 'MenuLocation' : ('Extras',u_('Write Schema to Database'))
}
Modified: trunk/gnue-designer/src/ui/wx/Instance.py
===================================================================
--- trunk/gnue-designer/src/ui/wx/Instance.py 2006-04-03 15:30:16 UTC (rev
8340)
+++ trunk/gnue-designer/src/ui/wx/Instance.py 2006-04-03 15:33:18 UTC (rev
8341)
@@ -320,7 +320,7 @@
# Create the status bar
self.statusbar = self.CreateStatusBar()
- self.SetStatusText(_('Welcome to GNUe Designer.'))
+ self.SetStatusText(u_('Welcome to GNUe Designer.'))
# Add the primary tool bar to the tool pane
# DO NOT CALL self.SetToolbar, as it botches PyAUI
Modified: trunk/gnue-designer/src/ui/wx/uihelpers/doccanvas/dnd.py
===================================================================
--- trunk/gnue-designer/src/ui/wx/uihelpers/doccanvas/dnd.py 2006-04-03
15:30:16 UTC (rev 8340)
+++ trunk/gnue-designer/src/ui/wx/uihelpers/doccanvas/dnd.py 2006-04-03
15:33:18 UTC (rev 8341)
@@ -18,7 +18,7 @@
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: TriggerEditor.py 8210 2006-03-07 00:04:31Z jcater $
+# $Id$
"""
Drag and Drop helper classes
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r8341 - in trunk/gnue-designer/src: . base base/tools forms forms/LayoutEditor forms/LayoutEditor/renderers/Base forms/wizards reports reports/Char reports/Standard schema schema/wizards ui/wx ui/wx/uihelpers/doccanvas,
jcater <=