[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r6184 - in trunk/gnue-forms/src: . uidrivers/gtk2 uidrivers/html uidrive
From: |
johannes |
Subject: |
r6184 - in trunk/gnue-forms/src: . uidrivers/gtk2 uidrivers/html uidrivers/win32 uidrivers/wx |
Date: |
Tue, 10 Aug 2004 06:57:10 -0500 (CDT) |
Author: johannes
Date: 2004-08-10 06:57:08 -0500 (Tue, 10 Aug 2004)
New Revision: 6184
Modified:
trunk/gnue-forms/src/GFClient.py
trunk/gnue-forms/src/GFDisplayHandler.py
trunk/gnue-forms/src/GFForm.py
trunk/gnue-forms/src/GFInstance.py
trunk/gnue-forms/src/GFKeyMapper.py
trunk/gnue-forms/src/uidrivers/gtk2/ErrorHandler.py
trunk/gnue-forms/src/uidrivers/html/ErrorHandler.py
trunk/gnue-forms/src/uidrivers/win32/ErrorHandler.py
trunk/gnue-forms/src/uidrivers/wx/ErrorHandler.py
trunk/gnue-forms/src/uidrivers/wx/common.py
Log:
*) Use u_() for messages with arguments, so translations will work
*) Exceptions during commits and queries doesn't leave wait-cursor
Modified: trunk/gnue-forms/src/GFClient.py
===================================================================
--- trunk/gnue-forms/src/GFClient.py 2004-08-10 07:45:38 UTC (rev 6183)
+++ trunk/gnue-forms/src/GFClient.py 2004-08-10 11:57:08 UTC (rev 6184)
@@ -92,28 +92,30 @@
self._ui = dyn_import("gnue.forms.uidrivers.%s" % (self.ui_type))
break
except ImportError, err:
- GDebug.printMesg(1,_("Unknown UI Driver:")+" %s" % self.ui_type)
- GDebug.printMesg(1,err)
+ gDebug (1, u_("Unknown UI Driver: %s") % self.ui_type)
+ gDebug (1, err)
try:
self._ui = dyn_import("%s" % (self.ui_type.replace('/','.')))
break
except ImportError, err:
- raise # TODO: TEMPORARY
- GDebug.printMesg(1,_("Unknown UI driver")+" %s" % self.ui_type)
- GDebug.printMesg(1,err)
+ # raise # TODO: TEMPORARY
+ gDebug (1, u_("Unknown UI Driver: %s") % self.ui_type)
+ gDebug (1,err)
- self.handleStartupError(_("Unknown UI driver specified: %s") %
self.ui_type)
+ self.handleStartupError(u_("Unknown UI driver specified: %s") \
+ % self.ui_type)
except Exceptions.UIException, err:
# If user specified a specific UI, don't cycle...
if SPECIFIC_UI:
- self.handleStartupError('Unable to load UI driver: %s' % err)
+ self.handleStartupError(u_("Unable to load UI driver: %s") % err)
if self.ui_type != 'curses':
self.ui_type = 'curses'
else:
- self.handleStartupError(_("Unable to load any valid UI drivers.
Aborting."))
+ self.handleStartupError(_("Unable to load any valid UI drivers."
+ "Aborting."))
if hasattr(self._ui,'handleStartupError') and not
self.OPTIONS['debug-level']:
self.handleStartupError = self._ui.handleStartupError
@@ -174,8 +176,8 @@
def __listUIs(self):
self.printHelpHeader()
- print _("The following interfaces are supported by GNUe Forms. You can
select an\n"
- "interface via the --interface option.")
+ print _("The following interfaces are supported by GNUe Forms. "
+ "You can select an\ninterface via the --interface option.")
print
print _("To view general help, run this command with the --help option.")
print
Modified: trunk/gnue-forms/src/GFDisplayHandler.py
===================================================================
--- trunk/gnue-forms/src/GFDisplayHandler.py 2004-08-10 07:45:38 UTC (rev
6183)
+++ trunk/gnue-forms/src/GFDisplayHandler.py 2004-08-10 11:57:08 UTC (rev
6184)
@@ -809,7 +809,8 @@
except KeyError:
self.work = ""
event.__error__ = True
- event.__errortext__ = _("Invalid value '%s' for keyed pull-down
field") % self.value
+ event.__errortext__ = u_("Invalid value '%s' for keyed pull-down "
+ "field") % self.value
self._buildDisplay()
@@ -910,7 +911,8 @@
except KeyError:
self.work = ""
event.__error__ = True
- event.__errortext__ = _("Invalid value '%s' for keyed pull-down
field") % self.value
+ event.__errortext__ = u_("Invalid value '%s' for keyed pull-down "
+ "field") % self.value
self._buildDisplay()
Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py 2004-08-10 07:45:38 UTC (rev 6183)
+++ trunk/gnue-forms/src/GFForm.py 2004-08-10 11:57:08 UTC (rev 6184)
@@ -33,7 +33,7 @@
import string
import traceback
-from gnue.common.apps import GDebug
+from gnue.common.apps import i18n
from gnue.common import events
from gnue.common.datasources.GDataObjects import ConnectionError as DBError
from gnue.common.definitions.GRootObj import GRootObj
@@ -253,7 +253,7 @@
def findFocus(self, object):
if object._type == 'GFField':
- GDebug.printMesg(0,"GFField was passed to 'findFocus'.")
+ gDebug (0, "GFField was passed to 'findFocus'.")
try:
object = object._entryList[0]
except IndexError:
@@ -313,13 +313,13 @@
# cannot change focus to same entry
if widget == self._currentEntry:
- GDebug.printMesg (1, "Widget is current entry %s" % widget)
+ gDebug (1, "Widget is current entry %s" % widget)
return
cen = self._currentEntry is not None and self._currentEntry.name or '-'
win = widget is not None and widget.name or '-'
- GDebug.printMesg (1, "Changing focus from %s (%s) to %s (%s)" % \
- (self._currentEntry, cen, widget, win))
+ gDebug (1, "Changing focus from %s (%s) to %s (%s)" % \
+ (self._currentEntry, cen, widget, win))
try:
if self._currentEntry:
@@ -385,8 +385,8 @@
if blockChange:
self.refreshDisplay(self._currentBlock)
- GDebug.printMesg (1, "Updating entries old: %s, new: %s" % \
- (oldEntry, self._currentEntry))
+ gDebug (1, "Updating entries old: %s, new: %s" % \
+ (oldEntry, self._currentEntry))
self.dispatchEvent('updateENTRY', oldEntry, _form=self)
self.dispatchEvent('updateENTRY', self._currentEntry, _form=self)
@@ -408,13 +408,14 @@
if pageChange:
self._currentPage.processTrigger('Post-FocusIn', ignoreAbort=False)
- GDebug.printMesg (1, "calling refreshUIEvents ()")
+ gDebug (1, "calling refreshUIEvents ()")
self.refreshUIEvents()
- GDebug.printMesg (1, "CurrentEntry is %s" % self._currentEntry)
+ gDebug (1, "CurrentEntry is %s" % self._currentEntry)
except AbortRequest, t:
- GDebug.printMesg(1, "Trigger Error!")
+ gDebug (1, "Trigger Error!")
message = _("Trigger Exception :\n") + t.message
+
return message
@@ -458,14 +459,15 @@
for block in self._logic._blockList:
if not block.isSaved():
- message = _('Data not saved. Save changes or clear the form to
proceed.')
+ message = _("Data not saved. Save changes or clear the form to "
+ "proceed.")
return message
for block in self._logic._blockList:
block.processRollback()
for entry in block._entryList:
if hasattr(entry,'queryDefault'):
- GDebug.printMesg(1, "%s will be set to %s" % (entry.name,
entry.queryDefault))
+ gDebug (1, "%s will be set to %s" % (entry.name, entry.queryDefault))
entry.setValue(entry.queryDefault)
# If Enter-Query is hit once, enter query mode
@@ -505,101 +507,105 @@
return message
- def executeQuery(self):
+ def executeQuery (self):
if self._currentBlock.mode != 'query':
return _("Form not in query mode")
- self.dispatchEvent('endENTERQUERY', _form=self);
- self.dispatchEvent('beginWAIT',None, _form=self);
- #self._instance.dispatchEvent('endENTERQUERY', _form=self);
- #self._instance.dispatchEvent('beginWAIT',None, _form=self);
+ message = None
+ self.dispatchEvent ('endENTERQUERY', _form = self);
+ self.dispatchEvent ('beginWAIT', _form = self);
- message = None
try:
- self._currentBlock.processQuery()
+ try:
+ self._currentBlock.processQuery ()
- except DBError:
- self.rollback(1)
- message = _("Database query error:\n%s\n%s ") % (sys.exc_info()[0],
sys.exc_info()[1])
+ except DBError:
+ self.rollback (1)
+ message = u_("Database query error:\n%(exType)s\n%(exMessage)s") \
+ % {'exType' : sys.exc_info ()[0],
+ 'exMessage': sys.exc_info ()[1]}
+ finally:
+ self.dispatchEvent ('endWAIT', _form = self)
- self.dispatchEvent('endWAIT', _form=self)
- #self._instance.dispatchEvent('endWAIT', _form=self)
- # TODO: may need to make self._currentBlock just self
- self.refreshDisplay(self._currentBlock)
- if self._currentBlock.isEmpty():
- self.triggerSetStatusText(_('Query returned no results.'))
+ self.refreshDisplay (self._currentBlock)
+ if self._currentBlock.isEmpty ():
+ self.triggerSetStatusText (_('Query returned no results.'))
else:
- self.triggerSetStatusText(_('Query successful.'))
+ self.triggerSetStatusText (_('Query successful.'))
+ return message
+
+ # ---------------------------------------------------------------------------
+ # Commit all pending changes
+ # ---------------------------------------------------------------------------
+
def commit(self):
- self.dispatchEvent('beginWAIT', _form=self)
- #self._instance.dispatchEvent('beginWAIT', _form=self)
-
message = None
+ self.dispatchEvent ('beginWAIT', _form = self)
try:
- if not self.readonly:
- # Form level pre-commit
- try:
- self.processTrigger('Pre-Commit', ignoreAbort=False)
- except AbortRequest:
- GDebug.printMesg(1, "Trigger form Pre-Commit threw a AbortRequest!")
- self.dispatchEvent('endWAIT',None, _form=self)
- #self._instance.dispatchEvent('endWAIT',None, _form=self)
- return _("Form trigger returned error")
-
- for block in self._logic._blockList:
- GDebug.printMesg(1, "Saving %s"%block.name)
+ try:
+ if not self.readonly:
+ # Form level pre-commit
try:
+ self.processTrigger ('Pre-Commit', ignoreAbort = False)
+
+ except AbortRequest:
+ gDebug (1, "Trigger form Pre-Commit threw a AbortRequest!")
+ return _("Form trigger returned error")
- # This gets lost in the Pre-Commit code
- block._precommitRecord = block._currentRecord
+ for block in self._logic._blockList:
+ gDebug (1, "Saving %s" % block.name)
+ try:
+ # This gets lost in the Pre-Commit code
+ block._precommitRecord = block._currentRecord
+ block.processCommit ()
- block.processCommit()
- except AbortRequest:
- GDebug.printMesg(1, "Trigger block Pre-Commit threw a
AbortRequest!")
- self.dispatchEvent('endWAIT',None, _form=self)
- #self._instance.dispatchEvent('endWAIT',None, _form=self)
- return _("Block trigger returned error")
- block.processTrigger('Post-Commit')
+ except AbortRequest:
+ gDebug (1, "Trigger block Pre-Commit threw a AbortRequest!")
+ return _("Block trigger returned error")
- for block in self._logic._blockList:
- if block.autoClear:
- block.processClear()
- else:
- GDebug.printMesg (1, "switchRecord (0) from commit")
- block.switchRecord(0)
+ block.processTrigger ('Post-Commit')
- self.dispatchEvent('cannotCOMMIT')
- self.dispatchEvent('cannotROLLBACK')
+ for block in self._logic._blockList:
+ if block.autoClear:
+ block.processClear ()
- else:
- message = _('Form is readonly')
- #self._instance.dispatchEvent('endWAIT',None, _form=self)
- self.dispatchEvent('endWAIT',None, _form=self)
+ else:
+ gDebug (1, "switchRecord (0) from commit")
+ block.switchRecord(0)
- return message
+ self.dispatchEvent ('cannotCOMMIT')
+ self.dispatchEvent ('cannotROLLBACK')
- self.processTrigger('Post-Commit')
+ else:
+ return _('Form is readonly')
- except DBError:
- self.rollback(1)
- message = _("Database commit error:\n%s\n%s ") % (sys.exc_info()[0],
sys.exc_info()[1])
- except:
- print _("\n\nGFForm: Unexpected Exception:")
- print '-'*60
- traceback.print_exc(file=sys.stdout)
- print '-'*60
+ self.processTrigger ('Post-Commit')
- #self._instance.dispatchEvent('endWAIT',None, _form=self)
- self.dispatchEvent('endWAIT',None, _form=self)
+ except DBError:
+ self.rollback (1)
+ message = u_("Database commit error:\n%(exType)s\n%(exMessage)s") \
+ % {'exType' : sys.exc_info ()[0],
+ 'exMessage': sys.exc_info ()[1]}
+ except:
+ message = u_("GFForm: Unexcpected Exception:\n%s") % \
+ unicode (string.join (traceback.format_exception (*sys.exc_info ())),
+ i18n.encoding)
+
+ finally:
+ self.dispatchEvent ('endWAIT', _form = self)
+
return message
+
+
+
def rollback(self, recover=0):
self.endEditing()
for block in self._logic._blockList:
@@ -1027,7 +1033,11 @@
# the parameters dictionary
#
def triggerActivateDialog(self,dialogName, parameters={}, modal=0):
- self._instance.activateForm(dialogName,parameters, modal)
+ if dialogName == '_about' and \
+ hasattr (self._instance._uiinstance, 'aboutBox'):
+ self._instance._uiinstance.aboutBox (parameters, self)
+ else:
+ self._instance.activateForm(dialogName,parameters, modal)
#
# triggerClose
Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py 2004-08-10 07:45:38 UTC (rev 6183)
+++ trunk/gnue-forms/src/GFInstance.py 2004-08-10 11:57:08 UTC (rev 6184)
@@ -187,8 +187,10 @@
fileHandle=openBuffer(buffer)
self.addFormFromFilehandle(fileHandle)
fileHandle.close()
+
except IOError, mesg:
- self.manager.handleStartupError(_("Unable to open file\n\n %s")%mesg)
+ self.manager.handleStartupError (u_("Unable to open file\n\n %s") \
+ % mesg)
def addFormFromFile(self,fileName):
"""
@@ -209,7 +211,8 @@
except IOError, mesg:
- self.manager.handleStartupError(_("Unable to open file\n\n %s")%mesg)
+ self.manager.handleStartupError(u_("Unable to open file\n\n %s") \
+ % mesg)
except Exception, mesg:
self.manager.handleStartupError ("%s" % mesg)
@@ -283,11 +286,11 @@
except GDataObjects.ConnectError, mesg:
self.manager.handleStartupError(
- _("Unable to login to datasource.\n\n %s") %mesg)
+ u_("Unable to login to datasource.\n\n %s") % mesg)
except GDataObjects.ConnectionError, mesg:
self.manager.handleStartupError(
- _("Error while communicating with datasource.\n\n %s") %mesg)
+ u_("Error while communicating with datasource.\n\n %s") % mesg)
except GDataObjects.Error, mesg:
self.manager.handleStartupError(mesg)
@@ -321,7 +324,8 @@
form._parameters=parameters
if not form._currentEntry:
- raise _('There are no navigable widgets in this form. Unable to
display.')
+ raise _("There are no navigable widgets in this form. "
+ "Unable to display.")
form.processTrigger('On-Activation')
@@ -753,7 +757,7 @@
if not event._form.isSaved():
- self.displayMessageBox (u_("Data not saved. Save changes or clear "
+ self.displayMessageBox (_("Data not saved. Save changes or clear "
"the form to proceed."), 'Error')
event._form.refreshUIEvents()
else:
@@ -843,24 +847,24 @@
# then jumps to the requested record
#
def requestJumpTo(self,event):
- parameters = {
- 'recordnumber': ''
- }
+ parameters = {'recordnumber': ''}
self.activateForm ('_jumpto', parameters, modal = True)
- if not parameters.has_key('cancel'):
- if not event._form.endEditing():
+ if not parameters.has_key ('cancel'):
+ if not event._form.endEditing ():
return
+
try:
- count = abs(int(float(parameters['recordnumber'])))-1
+ count = abs (int (float (parameters ['recordnumber']))) - 1
+
except ValueError:
message = _("Invalid numeric value entered.")
+
else:
- message = event._form.jumpRecord(count)
+ message = event._form.jumpRecord (count)
if message:
- self.displayMessageBox (message)
-
+ self.displayMessageBox (message, 'Error')
return
self._entryUpdated(event._form)
@@ -945,7 +949,7 @@
message = event._form.initQuery()
if message:
- self.displayMessageBox (message)
+ self.displayMessageBox (message, 'Error')
return
@@ -963,7 +967,7 @@
message = event._form.cancelQuery()
if message:
- self.displayMessageBox (message)
+ self.displayMessageBox (message, 'Error')
return
@@ -981,7 +985,7 @@
message = event._form.copyQuery()
if message:
- self.displayMessageBox (message)
+ self.displayMessageBox (message, 'Error')
return
@@ -997,7 +1001,7 @@
return
message = event._form.executeQuery()
if message:
- self.displayMessageBox (message)
+ self.displayMessageBox (message, 'Error')
self.dispatchEvent('gotoENTRY',object=event._form._currentEntry,
_form=event._form)
event._form.refreshDisplay(event._form._currentBlock)
@@ -1011,7 +1015,7 @@
return
message = event._form.commit()
if message:
- self.displayMessageBox (message)
+ self.displayMessageBox (message, 'Error')
return
self._entryUpdated(event._form)
Modified: trunk/gnue-forms/src/GFKeyMapper.py
===================================================================
--- trunk/gnue-forms/src/GFKeyMapper.py 2004-08-10 07:45:38 UTC (rev 6183)
+++ trunk/gnue-forms/src/GFKeyMapper.py 2004-08-10 11:57:08 UTC (rev 6184)
@@ -115,12 +115,15 @@
key = ord(key)
else:
raise InvalidKeystrokeName, \
- _("Invalid keystroke id '%s' in keymap for '%s'") % (key,event)
+ u_("Invalid keystroke id '%(key)s' in keymap for '%(event)s'") \
+ % {'key': key, 'event': event}
if base is None:
raise InvalidKeystrokeName, \
- _("Invalid keystroke combination '%s' in keymap for '%s'") % \
- (dict[event],event)
+ u_("Invalid keystroke combination '%(comb)s' in keymap "
+ "for '%(event)s'") \
+ % {'comb' : dict [event],
+ 'event': event}
usermap[(base, shifted, ctrl, meta)] = string.upper(event)
Modified: trunk/gnue-forms/src/uidrivers/gtk2/ErrorHandler.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/ErrorHandler.py 2004-08-10 07:45:38 UTC
(rev 6183)
+++ trunk/gnue-forms/src/uidrivers/gtk2/ErrorHandler.py 2004-08-10 11:57:08 UTC
(rev 6184)
@@ -24,6 +24,8 @@
import gtk
import sys
import types
+import string
+import traceback
from gnue.common.apps import i18n
@@ -48,8 +50,9 @@
def handleUncaughtException (extype, exvalue, traceback):
+ print "Catch the uncaught"
# If we throw an exception, we don't want circular calls
- sys.excepthook = sys._orig_excepthook
+ sys.excepthook = sys.__excepthook__
_ExceptionDisplay (extype, exvalue, traceback)
@@ -80,11 +83,17 @@
# =============================================================================
class _ExceptionDisplay (gtk.MessageDialog):
- def __init__(self, extype, exvalue, traceback):
- message = u_("Exception occured in GNUe Forms:\n\n"
- "Type %(type)s\nValue %(value)s") \
- % {'type': extype,
- 'value': exvalue}
+ def __init__(self, exType, exValue, tbObject):
+ sType = unicode ("%s" % exType, i18n.encoding)
+ sValue = unicode ("%s" % exValue, i18n.encoding)
+ tLines = traceback.format_exception (exType, exValue, tbObject)
+ sTrace = unicode (string.join (tLines), i18n.encoding)
+
+ message = u_("Exception occured in GNUe Forms:\n"
+ "%(exType)s\n%(exValue)s\n\n%(trace)s") \
+ % {'exType' : sType,
+ 'exValue': sValue,
+ 'trace' : sTrace}
gtk.MessageDialog.__init__ (self, None,
gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
Modified: trunk/gnue-forms/src/uidrivers/html/ErrorHandler.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/ErrorHandler.py 2004-08-10 07:45:38 UTC
(rev 6183)
+++ trunk/gnue-forms/src/uidrivers/html/ErrorHandler.py 2004-08-10 11:57:08 UTC
(rev 6184)
@@ -32,7 +32,7 @@
def handleStartupError(errortext):
print
print '-' * 60
- print _("Error: %s") % errortext
+ print o (u_("Error: %s") % errortext)
print '-' * 60
print
Modified: trunk/gnue-forms/src/uidrivers/win32/ErrorHandler.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/ErrorHandler.py 2004-08-10
07:45:38 UTC (rev 6183)
+++ trunk/gnue-forms/src/uidrivers/win32/ErrorHandler.py 2004-08-10
11:57:08 UTC (rev 6184)
@@ -34,7 +34,7 @@
def handleStartupError(errortext):
print
print '-' * 60
- print _("Error: %s") % errortext
+ print o (u_("Error: %s") % errortext)
print '-' * 60
print
Modified: trunk/gnue-forms/src/uidrivers/wx/ErrorHandler.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/ErrorHandler.py 2004-08-10 07:45:38 UTC
(rev 6183)
+++ trunk/gnue-forms/src/uidrivers/wx/ErrorHandler.py 2004-08-10 11:57:08 UTC
(rev 6184)
@@ -35,7 +35,7 @@
def handleStartupError(errortext):
print
print '-' * 60
- print _("Error: %s") % errortext
+ print o(u_("Error: %s") % errortext)
print '-' * 60
print
@@ -46,7 +46,7 @@
def handleUncaughtException(extype, exvalue, traceback):
# If we throw an exception, we don't want circular calls
- sys.excepthook = sys._orig_excepthook
+ sys.excepthook = sys.__excepthook__
_ExceptionDisplay(extype, exvalue, traceback).ShowModal()
Modified: trunk/gnue-forms/src/uidrivers/wx/common.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/common.py 2004-08-10 07:45:38 UTC (rev
6183)
+++ trunk/gnue-forms/src/uidrivers/wx/common.py 2004-08-10 11:57:08 UTC (rev
6184)
@@ -105,7 +105,7 @@
try:
enc=encodings[gConfigForms('textEncoding')]
except:
- GDebug.printMesg(1,_('Encoding %s is not supported by the wx UI driver')
%\
+ gDebug (1, u_('Encoding %s is not supported by the wx UI driver') % \
gConfigForms('textEncoding'))
enc=encodings['iso8859-1']
widget.SetFont(wxFont(getPointSize(),wxMODERN,wxNORMAL,\
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- r6184 - in trunk/gnue-forms/src: . uidrivers/gtk2 uidrivers/html uidrivers/win32 uidrivers/wx,
johannes <=