[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue common/src/GBaseApp.py common/src/GConfig....
|
From: |
James Thompson |
|
Subject: |
gnue common/src/GBaseApp.py common/src/GConfig.... |
|
Date: |
Sat, 04 May 2002 12:45:09 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: James Thompson <address@hidden> 02/05/04 12:45:09
Modified files:
common/src : GBaseApp.py GConfig.py GDataObjects.py
GServerApp.py GTrigger.py
common/src/FormatMasks: BaseMask.py
common/src/commdrivers/_helpers: RpcDoc.py
common/src/dbdrivers/geas: DBdriver.py
designer/src : DataSourceEditor.py Designer.py Instance.py
MenuBar.py PopupMenu.py PropertyEditor.py
SchemaViewer.py ToolFrame.py TreeView.py
TriggerEditor.py
designer/src/forms/LayoutEditor: DisplayDropTarget.py
GridPane.py LayoutEditor.py
PopupEditor.py PropertyBar.py
Utils.py WidgetHandler.py
WidgetHighlighter.py
designer/src/navigator: LayoutEditor.py
forms : BUGS
forms/src : GFClient.py GFConfig.py GFDisplayHandler.py
GFForm.py GFInstance.py
forms/src/GFObjects: GFBlock.py GFEntry.py GFLabel.py
forms/src/uidrivers/nstti: UIdriver.py
forms/src/uidrivers/wx: UIdriver.py
navigator/src : GNClient.py GNObjects.py UIwxpython.py
navigator/src/Actions: gnome_menu.py kde_menu.py
reports/adapters/destinations/email: sendmail.py
reports/adapters/destinations/fax: hylafax.py
reports/adapters/destinations/printer: bsd.py
reports/src : GREngine.py GRFilters.py GROutputAdapter.py
GRRun.py GRServer.py
Added files:
designer/src : Config.py
navigator/src : GNConfig.py
reports/src : GRConfig.py
Removed files:
common/src : GImport.py
designer : GFDesigner-old.py
Log message:
Removed dependency on gnue.conf files (new config system)
Moved text out of gnue.conf setting as the new i18n stuff replaces it
Something else I've forgotten :)
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GBaseApp.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GConfig.py.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GDataObjects.py.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GServerApp.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GTrigger.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/FormatMasks/BaseMask.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/commdrivers/_helpers/RpcDoc.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/geas/DBdriver.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/Config.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/DataSourceEditor.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/Designer.py.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/Instance.py.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/MenuBar.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/PopupMenu.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/PropertyEditor.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/SchemaViewer.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/ToolFrame.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/TreeView.py.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/TriggerEditor.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/DisplayDropTarget.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/GridPane.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditor.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/PopupEditor.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/PropertyBar.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/Utils.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/WidgetHandler.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/WidgetHighlighter.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/navigator/LayoutEditor.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/BUGS.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFClient.py.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFConfig.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFDisplayHandler.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.165&tr2=1.166&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFBlock.py.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFEntry.py.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFLabel.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/nstti/UIdriver.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.166&tr2=1.167&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/src/GNConfig.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/src/GNClient.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/src/GNObjects.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/src/UIwxpython.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/src/Actions/gnome_menu.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/src/Actions/kde_menu.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/adapters/destinations/email/sendmail.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/adapters/destinations/fax/hylafax.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/adapters/destinations/printer/bsd.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GRConfig.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GREngine.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GRFilters.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GROutputAdapter.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GRRun.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GRServer.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: gnue/common/src/FormatMasks/BaseMask.py
diff -c gnue/common/src/FormatMasks/BaseMask.py:1.13
gnue/common/src/FormatMasks/BaseMask.py:1.14
*** gnue/common/src/FormatMasks/BaseMask.py:1.13 Tue Jan 8 12:05:56 2002
--- gnue/common/src/FormatMasks/BaseMask.py Sat May 4 12:45:07 2002
***************
*** 26,32 ****
# NOTES:
#
! from gnue.common import GConfig, GDebug
from FormatExceptions import *
# This is a class for a mask literal element
--- 26,32 ----
# NOTES:
#
! from gnue.common import GDebug
from FormatExceptions import *
# This is a class for a mask literal element
***************
*** 102,111 ****
# TODO: Should predefined masks be pulled from other than gnue.conf?
if len(mask) > 1 and mask[0] == '&':
if mask[1:] == self.basetype:
! mask = GConfig.get('%smask' % self.basetype, self.defaultmask)
else:
try:
! mask = GConfig.get('%smask_%s' % (self.basetype, mask[1:]))
except KeyError:
raise PredefinedMaskNotFound, \
'The requested format mask "%s" is not defined for %s fields' \
--- 102,111 ----
# TODO: Should predefined masks be pulled from other than gnue.conf?
if len(mask) > 1 and mask[0] == '&':
if mask[1:] == self.basetype:
! mask = gConfig('%smask' % self.basetype, self.defaultmask)
else:
try:
! mask = gConfig('%smask_%s' % (self.basetype, mask[1:]))
except KeyError:
raise PredefinedMaskNotFound, \
'The requested format mask "%s" is not defined for %s fields' \
Index: gnue/common/src/GBaseApp.py
diff -c gnue/common/src/GBaseApp.py:1.17 gnue/common/src/GBaseApp.py:1.18
*** gnue/common/src/GBaseApp.py:1.17 Fri May 3 11:37:34 2002
--- gnue/common/src/GBaseApp.py Sat May 4 12:45:07 2002
***************
*** 65,71 ****
! def __init__(self, connections=None, application=None):
#
# i18n support
#
--- 65,71 ----
! def __init__(self, connections=None, application=None, defaults=None):
#
# i18n support
#
***************
*** 182,188 ****
# Read the config files
if application:
try:
! GConfig.GConfig(application)
except ConfigParser.NoSectionError, msg:
self.handleStartupError(_('The gnue.conf file is incomplete: ')\
+ '\n %s' % msg)
--- 182,188 ----
# Read the config files
if application:
try:
! self.configurationManager = GConfig.GConfig(application, defaults)
except ConfigParser.NoSectionError, msg:
self.handleStartupError(_('The gnue.conf file is incomplete: ')\
+ '\n %s' % msg)
Index: gnue/common/src/GConfig.py
diff -c gnue/common/src/GConfig.py:1.19 gnue/common/src/GConfig.py:1.20
*** gnue/common/src/GConfig.py:1.19 Thu May 2 21:57:20 2002
--- gnue/common/src/GConfig.py Sat May 4 12:45:07 2002
***************
*** 36,140 ****
import GDebug
import copy
- TRUE = 1
- FALSE = 0
-
- _OPTION = {}
-
- class _NOOPTION:
- pass
-
- def get(varName, default=_NOOPTION):
- global _OPTION
- if _OPTION.has_key(string.lower(varName)) or default == _NOOPTION:
- return _OPTION[string.lower(varName)]
- else:
- GDebug.printMesg(1,"Returning default value %s for %s" % (varName,
default))
- return default
-
- def getDict():
- try:
- return copy.deepcopy(_OPTION.options)
- except:
- return {}
-
class InvalidFormatError (StandardError):
# Raised if the Connections Definition File is
# in an unreadable format.
pass
-
class GConfig:
! def __init__(self, application, configFilename="gnue.conf",
homeConfigDir=".gnue"):
! self._applicationConfigInfo = {}
! self._defaultApplication = application
- self._application = application
! _success = FALSE
! _error_type = None
! GDebug.printMesg(1,'Application style: %s' % self._application)
! GDebug.printMesg(1,'Reading basic configuration')
! etc_base = getInstalledBase('%s_etc' % application, 'common_etc')
! locations = []
# system config file
if etc_base:
! locations.append(os.path.join(etc_base,configFilename))
# user config file
try:
! locations.append(os.path.join(os.environ['HOME'], homeConfigDir
,configFilename))
except KeyError:
pass
# system fixed config file
if etc_base:
! locations.append(os.path.join(etc_base,configFilename+'.fixed'))
!
! # Now, try each file
! for location in locations:
! GDebug.printMesg(1,'Reading configuration file %s' % location)
! try:
! self.readConfigFile(location)
! _success = TRUE
! except IOError:
! GDebug.printMesg (1,'File not available')
! except:
! _error_type=sys.exc_type
! _error_msg=sys.exc_value
!
! if not _success:
! if _error_type==None:
! sys.stderr.write(_("The configuration file appears to be missing\n")
+ \
! _("The file should be located in one of the
following locations\n"))
! if etc_base:
! sys.stderr.write(os.path.join(etc_base,configFilename)+'\n')
!
sys.stderr.write(os.path.join(etc_base,configFilename+'.fixed')+'\n')
! if os.environ.has_key('HOME'):
! sys.stderr.write(os.path.join(os.environ['HOME'],
homeConfigDir,configFilename)+'\n')
! sys.stderr.write(_("We will bravely attempt to continue but
you"+'\n') + \
! _("may encounter issues running the software.\n"))
! else:
! raise Exception,_error_msg
!
!
! def readConfigFile(self,location):
! global _OPTION
! self._parser = ConfigParser()
!
! GDebug.printMesg(1,'Configuration File: "%s"' % location)
!
! fileHandle = openResource(location)
!
try:
! self._parser.readfp(fileHandle)
! try:
! fileHandle.close()
! except AttributeError:
! pass
except DuplicateSectionError:
raise InvalidFormatError, _('The file has duplicate source
definitions.')
except MissingSectionHeaderError:
--- 36,87 ----
import GDebug
import copy
class InvalidFormatError (StandardError):
# Raised if the Connections Definition File is
# in an unreadable format.
pass
class GConfig:
! def __init__(self, section, defaults=None, configFilename="gnue.conf",
homeConfigDir=".gnue"):
! self._defaultConfigFilename = configFilename
! self._defaultSection = section
! self._loadedConfigs = {}
! self.loadApplicationConfig(configFilename,homeConfigDir,section, defaults)
!
! # Add global gConfig function to application namespace
! import __builtin__
! __builtin__.__dict__['gConfig'] = self.gConfig
! __builtin__.__dict__['gConfigDict'] = self.gConfigDict
! def loadApplicationConfig(self, configFilename="gnue.conf",
homeConfigDir=".gnue", section="DEFAULT", defaults = None):
! GDebug.printMesg(1,'Reading configuration info from %s section %s'
%(configFilename,section))
! defaultValues = self._buildDefaults(defaults)
! parser = ConfigParser(defaultValues)
! self._loadedConfigs[configFilename]=parser
!
! # Build valid file list
! fileLocations = []
! etc_base = getInstalledBase('%s_etc' % section, 'common_etc')
# system config file
if etc_base:
! fileLocations.append(os.path.join(etc_base,configFilename))
# user config file
try:
! fileLocations.append(os.path.join(os.environ['HOME'], homeConfigDir
,configFilename))
except KeyError:
pass
# system fixed config file
if etc_base:
! fileLocations.append(os.path.join(etc_base,configFilename+'.fixed'))
!
try:
! parser.read(fileLocations)
except DuplicateSectionError:
raise InvalidFormatError, _('The file has duplicate source
definitions.')
except MissingSectionHeaderError:
***************
*** 142,153 ****
except:
print _('The file cannot be parsed. %s :: %s') % (sys.exc_type,
sys.exc_value)
raise InvalidFormatError, _('The file cannot be parsed.')
! for option in self._parser.options(self._application):
! _OPTION[option] = self._parser.get(self._application,option)
def getInstalledBase(*parameters):
for param in parameters:
--- 89,127 ----
except:
print _('The file cannot be parsed. %s :: %s') % (sys.exc_type,
sys.exc_value)
raise InvalidFormatError, _('The file cannot be parsed.')
+
+ if not parser.options(section):
+ sys.stderr.write(_("The configuration files appear to be missing\n") + \
+ _("The files should be located in one or more of the
following locations\n"))
+ for location in fileLocations:
+ sys.stderr.write(location+'\n')
+ sys.stderr.write(_("We will bravely attempt to continue but you"+'\n')
+ \
+ _("may encounter issues running the software.\n"))
+
! def gConfig(self, varName, configFilename=None, section=None):
! if not configFilename: configFilename = self._defaultConfigFilename
! if not section: section = self._defaultSection
+ return self._loadedConfigs[configFilename].get(section,varName)
+ def gConfigDict(self, configFilename=None, section=None):
+ if not configFilename: configFilename = self._defaultConfigFilename
+ if not section: section = self._defaultSection
+
+ options = {}
+ for option in self._loadedConfigs[configFilename].options(section):
+ options[option] =
self._loadedConfigs[configFilename].get(section,string.lower(option))
+
+ return options
+
+ def _buildDefaults(self, defaultDefinitions):
+ defaults = {}
+ if defaultDefinitions:
+ for definition in defaultDefinitions:
+
defaults[string.lower(definition['Name'])]=string.lower(str(definition['Default']))
+ return defaults
def getInstalledBase(*parameters):
for param in parameters:
Index: gnue/common/src/GDataObjects.py
diff -c gnue/common/src/GDataObjects.py:1.50
gnue/common/src/GDataObjects.py:1.51
*** gnue/common/src/GDataObjects.py:1.50 Fri May 3 19:07:18 2002
--- gnue/common/src/GDataObjects.py Sat May 4 12:45:07 2002
***************
*** 30,36 ****
#
import GDebug
- import GConfig
import GConditions
import string
--- 30,35 ----
***************
*** 246,252 ****
# master record set, then just return/reuse this old set (after all,
# it may contain uncommitted changes)
if (not master.current._cachedDetailResultSets.has_key(self)) or \
! ( not int(GConfig.get('CacheDetailRecords','1')) and \
not master.current._cachedDetailResultSets[self].isPending() ):
for i in range(0, len(self._masterfields)):
GDebug.printMesg(10,"Adding criteria")
--- 245,251 ----
# master record set, then just return/reuse this old set (after all,
# it may contain uncommitted changes)
if (not master.current._cachedDetailResultSets.has_key(self)) or \
! ( not int(gConfig('CacheDetailRecords')) and \
not master.current._cachedDetailResultSets[self].isPending() ):
for i in range(0, len(self._masterfields)):
GDebug.printMesg(10,"Adding criteria")
Index: gnue/common/src/GServerApp.py
diff -c gnue/common/src/GServerApp.py:1.6 gnue/common/src/GServerApp.py:1.7
*** gnue/common/src/GServerApp.py:1.6 Fri May 3 13:38:16 2002
--- gnue/common/src/GServerApp.py Sat May 4 12:45:07 2002
***************
*** 39,45 ****
class GServerApp(GBaseApp):
! def __init__(self, connections=None, application=None):
self.COMMAND_OPTIONS.append (
[ 'foreground','Z','no-detach',0,0, None,
_('Do not send the server into the background. For a POSIX system,
')
--- 39,45 ----
class GServerApp(GBaseApp):
! def __init__(self, connections=None, application=None, defaults=None):
self.COMMAND_OPTIONS.append (
[ 'foreground','Z','no-detach',0,0, None,
_('Do not send the server into the background. For a POSIX system,
')
Index: gnue/common/src/GTrigger.py
diff -c gnue/common/src/GTrigger.py:1.14 gnue/common/src/GTrigger.py:1.15
*** gnue/common/src/GTrigger.py:1.14 Fri May 3 13:43:17 2002
--- gnue/common/src/GTrigger.py Sat May 4 12:45:07 2002
***************
*** 33,39 ****
from gnue.common.GObjects import GObj
from gnue.common import GDebug
! from gnue.common import GConfig, GTypecast
from xml.sax import saxutils
from gnue.common.GParser import GContent
--- 33,39 ----
from gnue.common.GObjects import GObj
from gnue.common import GDebug
! from gnue.common import GTypecast
from xml.sax import saxutils
from gnue.common.GParser import GContent
***************
*** 493,499 ****
# used in saving
#
def dumpXML(self, lookupDict, treeDump=None, gap=None):
! escape = not int(GConfig.get('StoreTriggersAsCDATA','0'))
xmlEntity = "trigger"
xmlString = "%s<%s" % (gap[:-2],xmlEntity)
--- 493,499 ----
# used in saving
#
def dumpXML(self, lookupDict, treeDump=None, gap=None):
! escape = not int(gConfig('StoreTriggersAsCDATA'))
xmlEntity = "trigger"
xmlString = "%s<%s" % (gap[:-2],xmlEntity)
Index: gnue/common/src/commdrivers/_helpers/RpcDoc.py
diff -c gnue/common/src/commdrivers/_helpers/RpcDoc.py:1.3
gnue/common/src/commdrivers/_helpers/RpcDoc.py:1.4
*** gnue/common/src/commdrivers/_helpers/RpcDoc.py:1.3 Fri May 3 22:59:25 2002
--- gnue/common/src/commdrivers/_helpers/RpcDoc.py Sat May 4 12:45:07 2002
***************
*** 33,39 ****
import sys, string
! from gnue.common import GImport,dyn_import
def run (interface, command, *arguments):
--- 33,39 ----
import sys, string
! from gnue.common import dyn_import
def run (interface, command, *arguments):
Index: gnue/common/src/dbdrivers/geas/DBdriver.py
diff -c gnue/common/src/dbdrivers/geas/DBdriver.py:1.24
gnue/common/src/dbdrivers/geas/DBdriver.py:1.25
*** gnue/common/src/dbdrivers/geas/DBdriver.py:1.24 Wed Apr 17 15:09:17 2002
--- gnue/common/src/dbdrivers/geas/DBdriver.py Sat May 4 12:45:07 2002
***************
*** 31,37 ****
# HISTORY:
#
! from gnue.common import GDataObjects, GDebug, GConditions, GConfig
import string
import types
import md5
--- 31,37 ----
# HISTORY:
#
! from gnue.common import GDataObjects, GDebug, GConditions
import string
import types
import md5
***************
*** 39,45 ****
try:
import CORBA
! idlFiles=GConfig.get('GEASDIR')+"/share/idl/geas.idl"
GDebug.printMesg(1,"IDL being loaded from %s" % (idlFiles))
CORBA._load_idl(idlFiles)
import GEAS
--- 39,45 ----
try:
import CORBA
! idlFiles=gConfig('GEASDIR')+"/share/idl/geas.idl"
GDebug.printMesg(1,"IDL being loaded from %s" % (idlFiles))
CORBA._load_idl(idlFiles)
import GEAS
***************
*** 140,147 ****
# find the object server base object
self.orb = CORBA.ORB_init(() , CORBA.ORB_ID)
try:
! print GConfig.get('GEASDIR')+"/var/run/geas-server.ior"
! self.ior =
open(GConfig.get('GEASDIR')+"/var/run/geas-server.ior").readline()
except (IOError), ex:
GDebug.printMesg(1, "*** Error: ior file for geas was not found... is
geas running?")
raise GDataObjects.LoginError, 'Unable to connect to GEAS. Is it
running?'
--- 140,147 ----
# find the object server base object
self.orb = CORBA.ORB_init(() , CORBA.ORB_ID)
try:
! print gConfig('GEASDIR')+"/var/run/geas-server.ior"
! self.ior =
open(gConfig('GEASDIR')+"/var/run/geas-server.ior").readline()
except (IOError), ex:
GDebug.printMesg(1, "*** Error: ior file for geas was not found... is
geas running?")
raise GDataObjects.LoginError, 'Unable to connect to GEAS. Is it
running?'
Index: gnue/designer/src/DataSourceEditor.py
diff -c gnue/designer/src/DataSourceEditor.py:1.21
gnue/designer/src/DataSourceEditor.py:1.22
*** gnue/designer/src/DataSourceEditor.py:1.21 Sat Apr 27 16:30:42 2002
--- gnue/designer/src/DataSourceEditor.py Sat May 4 12:45:08 2002
***************
*** 29,35 ****
import sys, os, cPickle, traceback, StringIO
from wxPython.wx import *
! from gnue.common import GDebug, GConfig, GDataSource
from gnue.common import RuntimeSettings
import Incubator
--- 29,35 ----
import sys, os, cPickle, traceback, StringIO
from wxPython.wx import *
! from gnue.common import GDebug, GDataSource, GConfig
from gnue.common import RuntimeSettings
import Incubator
***************
*** 353,365 ****
self.deleteButtonId = wxNewId()
self.AddSimpleTool(self.addButtonId,
! wxImage(iamges_dir+GConfig.get('tb_insert'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(),
"Create Data Source",
"Create a new data source")
self.AddSimpleTool(self.deleteButtonId,
! wxImage(iamges_dir+GConfig.get('tb_delete'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(),
"Delete Data Source",
"Delete the currently selected data source")
--- 353,365 ----
self.deleteButtonId = wxNewId()
self.AddSimpleTool(self.addButtonId,
! wxImage(iamges_dir+gConfig('tb_insert'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(),
"Create Data Source",
"Create a new data source")
self.AddSimpleTool(self.deleteButtonId,
! wxImage(iamges_dir+gConfig('tb_delete'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(),
"Delete Data Source",
"Delete the currently selected data source")
***************
*** 542,548 ****
conn = self.editor.current.database
if not self.editor.connections.isConnectionActive(conn) and \
! not int(GConfig.get("AutoConnect","0")):
# TODO: Some other form of feedback
if not hasattr(self.editor,'_schemaMessageDisplayed'):
--- 542,548 ----
conn = self.editor.current.database
if not self.editor.connections.isConnectionActive(conn) and \
! not int(gConfig("AutoConnect",section="reports")):
# TODO: Some other form of feedback
if not hasattr(self.editor,'_schemaMessageDisplayed'):
Index: gnue/designer/src/Designer.py
diff -c gnue/designer/src/Designer.py:1.36 gnue/designer/src/Designer.py:1.37
*** gnue/designer/src/Designer.py:1.36 Mon Feb 18 00:24:08 2002
--- gnue/designer/src/Designer.py Sat May 4 12:45:08 2002
***************
*** 59,69 ****
from StringIO import StringIO
from wxPython.wx import *
! from gnue.common import GDebug, GConfig, dyn_import
from gnue.designer import VERSION, PACKAGE
from ToolSupport import SupportedTools
import TemplateParser, TemplateChooser, MRUManager
from gnue.common.GClientApp import GClientApp
# TODO: Must go!!
from gnue.forms import GFForm
--- 59,71 ----
from StringIO import StringIO
from wxPython.wx import *
! from gnue.common import GDebug, dyn_import
from gnue.designer import VERSION, PACKAGE
from ToolSupport import SupportedTools
import TemplateParser, TemplateChooser, MRUManager
from gnue.common.GClientApp import GClientApp
+ from gnue.forms.GFConfig import ConfigOptions
+ from Config import ConfigOptions as DesignerConfigOptions
# TODO: Must go!!
from gnue.forms import GFForm
***************
*** 84,90 ****
def __init__(self):
self.mru = MRUManager.MRUManager(self)
self._instances = []
! GClientApp.__init__(self, application="forms")
self.getConnectionManager().setLoginHandler(UIwxpython.UILoginHandler())
self.loadToolInformation()
wxApp.__init__(self,0)
--- 86,93 ----
def __init__(self):
self.mru = MRUManager.MRUManager(self)
self._instances = []
! GClientApp.__init__(self, application="forms",defaults=ConfigOptions)
!
self.configurationManager.loadApplicationConfig(section="reports",defaults=DesignerConfigOptions)
self.getConnectionManager().setLoginHandler(UIwxpython.UILoginHandler())
self.loadToolInformation()
wxApp.__init__(self,0)
Index: gnue/designer/src/Instance.py
diff -c gnue/designer/src/Instance.py:1.50 gnue/designer/src/Instance.py:1.51
*** gnue/designer/src/Instance.py:1.50 Wed Apr 17 15:09:18 2002
--- gnue/designer/src/Instance.py Sat May 4 12:45:08 2002
***************
*** 28,34 ****
import sys, os, time
from wxPython.wx import *
! from gnue.common import GDebug, GConfig
from MenuBar import MainMenuBar
from gnue.common import RuntimeSettings
from ToolFrame import ToolFrame
--- 28,34 ----
import sys, os, time
from wxPython.wx import *
! from gnue.common import GDebug
from MenuBar import MainMenuBar
from gnue.common import RuntimeSettings
from ToolFrame import ToolFrame
Index: gnue/designer/src/MenuBar.py
diff -c gnue/designer/src/MenuBar.py:1.18 gnue/designer/src/MenuBar.py:1.19
*** gnue/designer/src/MenuBar.py:1.18 Mon Jan 28 00:44:12 2002
--- gnue/designer/src/MenuBar.py Sat May 4 12:45:08 2002
***************
*** 27,33 ****
import sys, os, string
from wxPython.wx import *
! from gnue.common import GDebug, GConfig
import Incubator, MRUManager
from ToolSupport import SupportedTools
--- 27,33 ----
import sys, os, string
from wxPython.wx import *
! from gnue.common import GDebug
import Incubator, MRUManager
from ToolSupport import SupportedTools
Index: gnue/designer/src/PopupMenu.py
diff -c gnue/designer/src/PopupMenu.py:1.10 gnue/designer/src/PopupMenu.py:1.11
*** gnue/designer/src/PopupMenu.py:1.10 Wed Apr 17 15:09:18 2002
--- gnue/designer/src/PopupMenu.py Sat May 4 12:45:08 2002
***************
*** 27,33 ****
import sys, os, time, string
from wxPython.wx import *
! from gnue.common import GDebug, GConfig, GObjects
from gnue.forms import GFForm, GFObjects, GFTrigger, GFLibrary
import Incubator
--- 27,33 ----
import sys, os, time, string
from wxPython.wx import *
! from gnue.common import GDebug, GObjects
from gnue.forms import GFForm, GFObjects, GFTrigger, GFLibrary
import Incubator
Index: gnue/designer/src/PropertyEditor.py
diff -c gnue/designer/src/PropertyEditor.py:1.22
gnue/designer/src/PropertyEditor.py:1.23
*** gnue/designer/src/PropertyEditor.py:1.22 Wed Apr 17 15:09:18 2002
--- gnue/designer/src/PropertyEditor.py Sat May 4 12:45:08 2002
***************
*** 30,36 ****
import sys, os, string
from wxPython.wx import *
from wxPython.grid import *
! from gnue.common import GDebug, GConfig, GTypecast
from ToolFrame import ToolFrame
from Incubator import elements
--- 30,36 ----
import sys, os, string
from wxPython.wx import *
from wxPython.grid import *
! from gnue.common import GDebug, GTypecast
from ToolFrame import ToolFrame
from Incubator import elements
Index: gnue/designer/src/SchemaViewer.py
diff -c gnue/designer/src/SchemaViewer.py:1.3
gnue/designer/src/SchemaViewer.py:1.4
*** gnue/designer/src/SchemaViewer.py:1.3 Tue Jan 22 21:48:53 2002
--- gnue/designer/src/SchemaViewer.py Sat May 4 12:45:08 2002
***************
*** 29,35 ****
import sys, os, cPickle, traceback, StringIO
from wxPython.wx import *
! from gnue.common import GDebug, GConfig, GDataSource
from gnue.common import RuntimeSettings
import Incubator
--- 29,35 ----
import sys, os, cPickle, traceback, StringIO
from wxPython.wx import *
! from gnue.common import GDebug, GDataSource
from gnue.common import RuntimeSettings
import Incubator
Index: gnue/designer/src/ToolFrame.py
diff -c gnue/designer/src/ToolFrame.py:1.8 gnue/designer/src/ToolFrame.py:1.9
*** gnue/designer/src/ToolFrame.py:1.8 Tue Jan 22 21:48:53 2002
--- gnue/designer/src/ToolFrame.py Sat May 4 12:45:08 2002
***************
*** 29,35 ****
import os, sys
from gnue.common import RuntimeSettings
from wxPython.wx import *
! from gnue.common import GDebug, GConfig
#
# Any tool frames inherit from this
--- 29,35 ----
import os, sys
from gnue.common import RuntimeSettings
from wxPython.wx import *
! from gnue.common import GDebug
#
# Any tool frames inherit from this
Index: gnue/designer/src/TreeView.py
diff -c gnue/designer/src/TreeView.py:1.19 gnue/designer/src/TreeView.py:1.20
*** gnue/designer/src/TreeView.py:1.19 Wed Apr 17 15:09:18 2002
--- gnue/designer/src/TreeView.py Sat May 4 12:45:08 2002
***************
*** 29,35 ****
import sys, os
from wxPython.wx import *
! from gnue.common import GDebug, GConfig
from gnue.forms import GFForm, GFObjects, GFTrigger, GFLibrary
from PopupMenu import ObjectMenu
from Icons import treeIconMap, treeIconList
--- 29,35 ----
import sys, os
from wxPython.wx import *
! from gnue.common import GDebug
from gnue.forms import GFForm, GFObjects, GFTrigger, GFLibrary
from PopupMenu import ObjectMenu
from Icons import treeIconMap, treeIconList
Index: gnue/designer/src/TriggerEditor.py
diff -c gnue/designer/src/TriggerEditor.py:1.16
gnue/designer/src/TriggerEditor.py:1.17
*** gnue/designer/src/TriggerEditor.py:1.16 Sat Apr 27 11:21:17 2002
--- gnue/designer/src/TriggerEditor.py Sat May 4 12:45:08 2002
***************
*** 28,34 ****
from wxPython.wx import *
! from gnue.common import GDebug, GParserHelpers, GConfig
from gnue.forms import GFTrigger
import keyword
--- 28,34 ----
from wxPython.wx import *
! from gnue.common import GDebug, GParserHelpers
from gnue.forms import GFTrigger
import keyword
***************
*** 176,182 ****
try:
! if int(GConfig.get('ForceSimpleEditor','0')):
raise ImportError
from wxPython.stc import *
--- 176,182 ----
try:
! if int(gConfig('ForceSimpleEditor',section="reports")):
raise ImportError
from wxPython.stc import *
***************
*** 231,237 ****
# TODO: A lot of this should be configurable
! if int(GConfig.get('ColorizeCode','0')):
# Global default styles for all languages
self.StyleSetSpec(wxSTC_STYLE_DEFAULT,
"face:%(helv)s,size:%(size)d" % faces)
--- 231,237 ----
# TODO: A lot of this should be configurable
! if int(gConfig('ColorizeCode',section="reports")):
# Global default styles for all languages
self.StyleSetSpec(wxSTC_STYLE_DEFAULT,
"face:%(helv)s,size:%(size)d" % faces)
Index: gnue/designer/src/forms/LayoutEditor/DisplayDropTarget.py
diff -c gnue/designer/src/forms/LayoutEditor/DisplayDropTarget.py:1.2
gnue/designer/src/forms/LayoutEditor/DisplayDropTarget.py:1.3
*** gnue/designer/src/forms/LayoutEditor/DisplayDropTarget.py:1.2 Sun Feb
10 23:34:19 2002
--- gnue/designer/src/forms/LayoutEditor/DisplayDropTarget.py Sat May 4
12:45:08 2002
***************
*** 28,34 ****
from wxPython.wx import *
import sys, string
from Utils import *
! from gnue.common import GDebug, GConfig
from gnue.designer import Incubator
import cPickle
--- 28,34 ----
from wxPython.wx import *
import sys, string
from Utils import *
! from gnue.common import GDebug
from gnue.designer import Incubator
import cPickle
***************
*** 125,131 ****
break
! createLabels =
string.lower(GConfig.get("CreateLabelsOnDrop","left"))
if createLabels != "no":
label = params["Label"] + ":"
--- 125,131 ----
break
! createLabels = string.lower(gConfig("CreateLabelsOnDrop","left"))
if createLabels != "no":
label = params["Label"] + ":"
Index: gnue/designer/src/forms/LayoutEditor/GridPane.py
diff -c gnue/designer/src/forms/LayoutEditor/GridPane.py:1.1
gnue/designer/src/forms/LayoutEditor/GridPane.py:1.2
*** gnue/designer/src/forms/LayoutEditor/GridPane.py:1.1 Wed Jan 30
12:29:46 2002
--- gnue/designer/src/forms/LayoutEditor/GridPane.py Sat May 4 12:45:08 2002
***************
*** 28,34 ****
from wxPython.wx import *
import sys, string
from Utils import *
! from gnue.common import GDebug, GConfig
#
--- 28,34 ----
from wxPython.wx import *
import sys, string
from Utils import *
! from gnue.common import GDebug
#
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.20
gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.21
*** gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.20 Thu Apr 18
10:53:20 2002
--- gnue/designer/src/forms/LayoutEditor/LayoutEditor.py Sat May 4
12:45:08 2002
***************
*** 28,34 ****
import sys, os
from wxPython.wx import *
! from gnue.common import GDebug, GConfig
from gnue.forms import GFObjects
from gnue.forms.uidrivers.wx import UIdriver as UIwxpython
from gnue.designer.PopupMenu import PageMenu
--- 28,34 ----
import sys, os
from wxPython.wx import *
! from gnue.common import GDebug
from gnue.forms import GFObjects
from gnue.forms.uidrivers.wx import UIdriver as UIwxpython
from gnue.designer.PopupMenu import PageMenu
***************
*** 285,292 ****
self.charWidth = maxWidth+maxLeading
self.charHeight = maxHeight+maxDescent
! self.borderPercentage = (int(GConfig.get('borderPercentage')) / 100.0)
! self.textPercentage = (int(GConfig.get('textPercentage')) / 100.0)
width = self.rootObject.width
height = self.rootObject.height
--- 285,292 ----
self.charWidth = maxWidth+maxLeading
self.charHeight = maxHeight+maxDescent
! self.borderPercentage = (int(gConfig('borderPercentage')) / 100.0)
! self.textPercentage = (int(gConfig('textPercentage')) / 100.0)
width = self.rootObject.width
height = self.rootObject.height
Index: gnue/designer/src/forms/LayoutEditor/PopupEditor.py
diff -c gnue/designer/src/forms/LayoutEditor/PopupEditor.py:1.1
gnue/designer/src/forms/LayoutEditor/PopupEditor.py:1.2
*** gnue/designer/src/forms/LayoutEditor/PopupEditor.py:1.1 Wed Jan 30
12:29:46 2002
--- gnue/designer/src/forms/LayoutEditor/PopupEditor.py Sat May 4 12:45:08 2002
***************
*** 28,34 ****
from wxPython.wx import *
import sys, string
from Utils import *
! from gnue.common import GDebug, GConfig
#
# Our text handler
--- 28,34 ----
from wxPython.wx import *
import sys, string
from Utils import *
! from gnue.common import GDebug
#
# Our text handler
Index: gnue/designer/src/forms/LayoutEditor/PropertyBar.py
diff -c gnue/designer/src/forms/LayoutEditor/PropertyBar.py:1.2
gnue/designer/src/forms/LayoutEditor/PropertyBar.py:1.3
*** gnue/designer/src/forms/LayoutEditor/PropertyBar.py:1.2 Wed Apr 17
15:09:18 2002
--- gnue/designer/src/forms/LayoutEditor/PropertyBar.py Sat May 4 12:45:08 2002
***************
*** 28,34 ****
from wxPython.wx import *
import sys, string
from Utils import *
! from gnue.common import GDebug, GConfig
#
#
--- 28,34 ----
from wxPython.wx import *
import sys, string
from Utils import *
! from gnue.common import GDebug
#
#
Index: gnue/designer/src/forms/LayoutEditor/Utils.py
diff -c gnue/designer/src/forms/LayoutEditor/Utils.py:1.2
gnue/designer/src/forms/LayoutEditor/Utils.py:1.3
*** gnue/designer/src/forms/LayoutEditor/Utils.py:1.2 Wed Apr 17 15:09:18 2002
--- gnue/designer/src/forms/LayoutEditor/Utils.py Sat May 4 12:45:08 2002
***************
*** 27,33 ****
from wxPython.wx import *
import sys, string
! from gnue.common import GDebug, GConfig
#
--- 27,33 ----
from wxPython.wx import *
import sys, string
! from gnue.common import GDebug
#
Index: gnue/designer/src/forms/LayoutEditor/WidgetHandler.py
diff -c gnue/designer/src/forms/LayoutEditor/WidgetHandler.py:1.3
gnue/designer/src/forms/LayoutEditor/WidgetHandler.py:1.4
*** gnue/designer/src/forms/LayoutEditor/WidgetHandler.py:1.3 Tue Apr 2
17:14:01 2002
--- gnue/designer/src/forms/LayoutEditor/WidgetHandler.py Sat May 4
12:45:08 2002
***************
*** 28,34 ****
from wxPython.wx import *
import sys, string
from Utils import *
! from gnue.common import GDebug, GConfig
import cPickle
# LayoutEditor support files
--- 28,34 ----
from wxPython.wx import *
import sys, string
from Utils import *
! from gnue.common import GDebug
import cPickle
# LayoutEditor support files
Index: gnue/designer/src/forms/LayoutEditor/WidgetHighlighter.py
diff -c gnue/designer/src/forms/LayoutEditor/WidgetHighlighter.py:1.2
gnue/designer/src/forms/LayoutEditor/WidgetHighlighter.py:1.3
*** gnue/designer/src/forms/LayoutEditor/WidgetHighlighter.py:1.2 Tue Apr
2 17:14:01 2002
--- gnue/designer/src/forms/LayoutEditor/WidgetHighlighter.py Sat May 4
12:45:08 2002
***************
*** 28,34 ****
from wxPython.wx import *
import sys, string
from Utils import *
! from gnue.common import GDebug, GConfig
#
--- 28,34 ----
from wxPython.wx import *
import sys, string
from Utils import *
! from gnue.common import GDebug
#
Index: gnue/designer/src/navigator/LayoutEditor.py
diff -c gnue/designer/src/navigator/LayoutEditor.py:1.4
gnue/designer/src/navigator/LayoutEditor.py:1.5
*** gnue/designer/src/navigator/LayoutEditor.py:1.4 Tue Jan 22 21:48:53 2002
--- gnue/designer/src/navigator/LayoutEditor.py Sat May 4 12:45:08 2002
***************
*** 28,34 ****
import sys, os, cPickle, string
from wxPython.wx import *
! from gnue.common import GDebug, GConfig
from gnue.common import RuntimeSettings
--- 28,34 ----
import sys, os, cPickle, string
from wxPython.wx import *
! from gnue.common import GDebug
from gnue.common import RuntimeSettings
Index: gnue/forms/BUGS
diff -c gnue/forms/BUGS:1.4 gnue/forms/BUGS:1.5
*** gnue/forms/BUGS:1.4 Fri Mar 1 00:43:15 2002
--- gnue/forms/BUGS Sat May 4 12:45:08 2002
***************
*** 18,20 ****
--- 18,21 ----
on some installations gnuef segfaults when the splashscreen timeout expires
tab key presses in dropdowns on Win32 are not correct
+
Index: gnue/forms/src/GFClient.py
diff -c gnue/forms/src/GFClient.py:1.38 gnue/forms/src/GFClient.py:1.39
*** gnue/forms/src/GFClient.py:1.38 Sat Apr 27 16:30:42 2002
--- gnue/forms/src/GFClient.py Sat May 4 12:45:08 2002
***************
*** 44,49 ****
--- 44,50 ----
from gnue.common import GConfig, GDataObjects, GConnections, dyn_import
from gnue.common.GClientApp import *
from gnue.forms import VERSION
+ from gnue.forms.GFConfig import ConfigOptions
class GFClient(GClientApp):
#
***************
*** 67,80 ****
# Initialize the class
#
def __init__(self, connections=None):
! GClientApp.__init__(self, connections,'forms')
self._formInstances = {}
self._lastSerialNumber = 0
self.ui_type = self.OPTIONS['user_interface']
! if GConfig.get('disableSplash') == '1':
self.disableSplash = 1
else:
self.disableSplash = self.OPTIONS['splash_screen']
--- 68,83 ----
# Initialize the class
#
def __init__(self, connections=None):
! GClientApp.__init__(self, connections,'forms',ConfigOptions)
self._formInstances = {}
self._lastSerialNumber = 0
self.ui_type = self.OPTIONS['user_interface']
+
+ print "Config", gConfig
! if gConfig('disableSplash') == '1':
self.disableSplash = 1
else:
self.disableSplash = self.OPTIONS['splash_screen']
***************
*** 95,101 ****
if string.split(string.lower(os.path.basename(sys.argv[0])),'.')[0]
!= 'gfclient':
formfile = os.path.join (
GConfig.getInstalledBase('forms_appbase','common_appbase','install_prefix'),
! GConfig.get('FormDir'),
os.path.basename(sys.argv[0])+".gfd" )
else:
raise IndexError
--- 98,104 ----
if string.split(string.lower(os.path.basename(sys.argv[0])),'.')[0]
!= 'gfclient':
formfile = os.path.join (
GConfig.getInstalledBase('forms_appbase','common_appbase','install_prefix'),
! gConfig('FormDir'),
os.path.basename(sys.argv[0])+".gfd" )
else:
raise IndexError
***************
*** 123,129 ****
def loadKeyMappings(self):
! options = GConfig.getDict()
mapping = {}
for key in options.keys():
--- 126,132 ----
def loadKeyMappings(self):
! options = gConfigDict()
mapping = {}
for key in options.keys():
Index: gnue/forms/src/GFConfig.py
diff -c gnue/forms/src/GFConfig.py:1.3 gnue/forms/src/GFConfig.py:1.4
*** gnue/forms/src/GFConfig.py:1.3 Tue Oct 9 09:35:12 2001
--- gnue/forms/src/GFConfig.py Sat May 4 12:45:08 2002
***************
*** 25,54 ****
#
# NOTES:
#
ConfigOptions = (
- { 'Name' : 'prefix',
- 'Dependency' : 'OS',
- 'Type' : 'Setting',
- 'Comment' : 'Base location for GNUe Tools',
- 'Description': 'Base location for GNUe Tools.',
- 'Typecast' : text,
- 'Default' :
- {'POSIX' : '/usr/local/gnue',
- 'WIN32' : 'c:\gnue'} },
-
- { 'Name' : 'FormDir',
- 'Type' : 'Setting',
- 'Comment' : 'Default location for GNUe Forms .GFD files',
- 'Description': 'Default location for GNUe Forms .GFD files.',
- 'Typecast' : text,
- 'Default' : '%(prefix)s/forms' },
-
{ 'Name' : 'AutoCreate',
'Type' : 'Setting',
'Comment' : 'Create new records in blocks automagically when you hit
the bottom',
'Description': 'Create new records in blocks automagically when you hit
the bottom.',
! 'Typecast' : boolean,
'Default' : 1 },
{ 'Name' : 'RememberLastQuery',
--- 25,38 ----
#
# NOTES:
#
+ from gnue.common import GTypecast
ConfigOptions = (
{ 'Name' : 'AutoCreate',
'Type' : 'Setting',
'Comment' : 'Create new records in blocks automagically when you hit
the bottom',
'Description': 'Create new records in blocks automagically when you hit
the bottom.',
! 'Typecast' : GTypecast.boolean,
'Default' : 1 },
{ 'Name' : 'RememberLastQuery',
***************
*** 57,63 ****
'Description': 'Remember last query entered. (If enabled, then the '
+ 'last values entered for a query can be retrieved by '
+ 'doing an Enter-Query twice)',
! 'Typecast' : boolean,
'Default' : 1 },
{ 'Name' : 'CacheDetailRecords',
--- 41,56 ----
'Description': 'Remember last query entered. (If enabled, then the '
+ 'last values entered for a query can be retrieved by '
+ 'doing an Enter-Query twice)',
! 'Typecast' : GTypecast.boolean,
! 'Default' : 1 },
!
! { 'Name' : 'AllowNumericFormulas',
! 'Type' : 'Setting',
! 'Comment' : 'Remember last query entered.',
! 'Description': 'Remember last query entered. (If enabled, then the '
! + 'last values entered for a query can be retrieved by '
! + 'doing an Enter-Query twice)',
! 'Typecast' : GTypecast.boolean,
'Default' : 1 },
{ 'Name' : 'CacheDetailRecords',
***************
*** 75,95 ****
+ 'method are that if another user modifies data '
+ 'and saves, then it will be available to your '
+ 'form much quicker.',
! 'Typecast' : boolean,
'Default' : 1 },
{ 'Name' : 'Encoding',
'Type' : 'Setting',
'Comment' : 'Hack for db encoding',
'Description': 'Hack for db encoding.',
! 'Typecast' : text,
'Default' : 'DEFAULT' },
{ 'Name' : 'SplashScreenPNG',
'Type' : 'Setting',
'Comment' : 'Location of startup graphic (PNG format)',
'Description': 'Location of startup graphic (PNG format)',
! 'Typecast' : text,
'Default' : '%(prefix)s/shared/images/gnue-splash.png' },
#
--- 68,88 ----
+ 'method are that if another user modifies data '
+ 'and saves, then it will be available to your '
+ 'form much quicker.',
! 'Typecast' : GTypecast.boolean,
'Default' : 1 },
{ 'Name' : 'Encoding',
'Type' : 'Setting',
'Comment' : 'Hack for db encoding',
'Description': 'Hack for db encoding.',
! 'Typecast' : GTypecast.text,
'Default' : 'DEFAULT' },
{ 'Name' : 'SplashScreenPNG',
'Type' : 'Setting',
'Comment' : 'Location of startup graphic (PNG format)',
'Description': 'Location of startup graphic (PNG format)',
! 'Typecast' : GTypecast.text,
'Default' : '%(prefix)s/shared/images/gnue-splash.png' },
#
***************
*** 100,160 ****
'Type' : 'Setting',
'Comment' : 'Location of "Commit" toolbar icon (PNG format)',
'Description': 'Location of "Commit" toolbar icon (PNG format)',
! 'Typecast' : text,
'Default' : '%(prefix)s/shared/images/tb_save.png' },
{ 'Name' : 'tb_insert',
'Type' : 'Setting',
'Comment' : 'Location of "Insert" toolbar icon (PNG format)',
'Description': 'Location of "Insert" toolbar icon (PNG format)',
! 'Typecast' : text,
'Default' : '%(prefix)s/shared/images/tb_new.png' },
{ 'Name' : 'tb_rollback',
'Type' : 'Setting',
'Comment' : 'Location of "Rollback" toolbar icon (PNG format)',
'Description': 'Location of "Rollback" toolbar icon (PNG format)',
! 'Typecast' : text,
'Default' : '%(prefix)s/shared/images/tb_undo.png' },
{ 'Name' : 'tb_delete',
'Type' : 'Setting',
'Comment' : 'Location of "Delete" toolbar icon (PNG format)',
'Description': 'Location of "Delete" toolbar icon (PNG format)',
! 'Typecast' : text,
'Default' : '%(prefix)s/shared/images/tb_trash.png' },
{ 'Name' : 'tb_previous',
'Type' : 'Setting',
'Comment' : 'Location of "Previous Record" toolbar icon (PNG format)',
'Description': 'Location of "Previous Record" toolbar icon (PNG format)',
! 'Typecast' : text,
'Default' : '%(prefix)s/shared/images/tb_left_arrow.png' },
{ 'Name' : 'tb_next',
'Type' : 'Setting',
'Comment' : 'Location of "Next Record" toolbar icon (PNG format)',
'Description': 'Location of "Next Record" toolbar icon (PNG format)',
! 'Typecast' : text,
'Default' : '%(prefix)s/shared/images/tb_right_arrow.png' },
{ 'Name' : 'tb_query_prep',
'Type' : 'Setting',
'Comment' : 'Location of "Prepare Query" toolbar icon (PNG format)',
'Description': 'Location of "Prepare Query" toolbar icon (PNG format)',
! 'Typecast' : text,
'Default' : '%(prefix)s/shared/images/tb_preferences.png' },
{ 'Name' : 'tb_insert',
'Type' : 'Setting',
'Comment' : 'Location of "Execute Query" toolbar icon (PNG format)',
'Description': 'Location of "Execute Query" toolbar icon (PNG format)',
! 'Typecast' : text,
'Default' : '%(prefix)s/shared/images/tb_search.png' },
{ 'Name' : 'tb_help',
'Type' : 'Setting',
'Comment' : 'Location of "Help" toolbar icon (PNG format)',
'Description': 'Location of "Help" toolbar icon (PNG format)',
! 'Typecast' : text,
'Default' : '%(prefix)s/shared/images/tb_help.png' },
{ 'Name' : 'SmallPNG',
'Type' : 'Setting',
'Comment' : 'Location of GNUe logo (PNG format)',
'Description': 'Location of GNUe logo (PNG format)',
! 'Typecast' : text,
'Default' : '%(prefix)s/shared/images/gnue.png' },
--- 93,153 ----
'Type' : 'Setting',
'Comment' : 'Location of "Commit" toolbar icon (PNG format)',
'Description': 'Location of "Commit" toolbar icon (PNG format)',
! 'Typecast' : GTypecast.text,
'Default' : '%(prefix)s/shared/images/tb_save.png' },
{ 'Name' : 'tb_insert',
'Type' : 'Setting',
'Comment' : 'Location of "Insert" toolbar icon (PNG format)',
'Description': 'Location of "Insert" toolbar icon (PNG format)',
! 'Typecast' : GTypecast.text,
'Default' : '%(prefix)s/shared/images/tb_new.png' },
{ 'Name' : 'tb_rollback',
'Type' : 'Setting',
'Comment' : 'Location of "Rollback" toolbar icon (PNG format)',
'Description': 'Location of "Rollback" toolbar icon (PNG format)',
! 'Typecast' : GTypecast.text,
'Default' : '%(prefix)s/shared/images/tb_undo.png' },
{ 'Name' : 'tb_delete',
'Type' : 'Setting',
'Comment' : 'Location of "Delete" toolbar icon (PNG format)',
'Description': 'Location of "Delete" toolbar icon (PNG format)',
! 'Typecast' : GTypecast.text,
'Default' : '%(prefix)s/shared/images/tb_trash.png' },
{ 'Name' : 'tb_previous',
'Type' : 'Setting',
'Comment' : 'Location of "Previous Record" toolbar icon (PNG format)',
'Description': 'Location of "Previous Record" toolbar icon (PNG format)',
! 'Typecast' : GTypecast.text,
'Default' : '%(prefix)s/shared/images/tb_left_arrow.png' },
{ 'Name' : 'tb_next',
'Type' : 'Setting',
'Comment' : 'Location of "Next Record" toolbar icon (PNG format)',
'Description': 'Location of "Next Record" toolbar icon (PNG format)',
! 'Typecast' : GTypecast.text,
'Default' : '%(prefix)s/shared/images/tb_right_arrow.png' },
{ 'Name' : 'tb_query_prep',
'Type' : 'Setting',
'Comment' : 'Location of "Prepare Query" toolbar icon (PNG format)',
'Description': 'Location of "Prepare Query" toolbar icon (PNG format)',
! 'Typecast' : GTypecast.text,
'Default' : '%(prefix)s/shared/images/tb_preferences.png' },
{ 'Name' : 'tb_insert',
'Type' : 'Setting',
'Comment' : 'Location of "Execute Query" toolbar icon (PNG format)',
'Description': 'Location of "Execute Query" toolbar icon (PNG format)',
! 'Typecast' : GTypecast.text,
'Default' : '%(prefix)s/shared/images/tb_search.png' },
{ 'Name' : 'tb_help',
'Type' : 'Setting',
'Comment' : 'Location of "Help" toolbar icon (PNG format)',
'Description': 'Location of "Help" toolbar icon (PNG format)',
! 'Typecast' : GTypecast.text,
'Default' : '%(prefix)s/shared/images/tb_help.png' },
{ 'Name' : 'SmallPNG',
'Type' : 'Setting',
'Comment' : 'Location of GNUe logo (PNG format)',
'Description': 'Location of GNUe logo (PNG format)',
! 'Typecast' : GTypecast.text,
'Default' : '%(prefix)s/shared/images/gnue.png' },
***************
*** 162,337 ****
'Type' : 'Setting',
'Comment' : 'Base location of GEAS files',
'Description': 'Base location of GEAS files',
! 'Typecast' : text,
'Default' : '/usr/local/' },
{ 'Name' : 'widgetHeight',
'Type' : 'Setting',
'Comment' : "The default height of widgets for widgets that don't
specify height in .gfd file",
'Description': "The default height of widgets for widgets that don't
specify height in .gfd file",
! 'Typecast' : whole,
'Default' : 1 },
{ 'Name' : 'widgetWidth',
'Type' : 'Setting',
'Comment' : "The default width of widgets for widgets that don't
specify width in .gfd file",
'Description': "The default width of widgets for widgets that don't
specify width in .gfd file",
! 'Typecast' : whole,
'Default' : 10 },
{ 'Name' : 'fixedWidthFont',
'Type' : 'Setting',
'Comment' : 'Set to true if wxWindows clients should use a fixed width
font',
'Description': 'Set to true if wxWindows clients should use a fixed width
font',
! 'Typecast' : boolean,
'Default' : 1 },
{ 'Name' : 'pointSize',
'Type' : 'Setting',
'Comment' : 'If fixedWidthFont is set to true, then this is the point
size used for fonts.',
'Description': 'If fixedWidthFont is set to true, then this is the point
size used for fonts.',
! 'Typecast' : whole,
'Default' : 1 },
#
# Do not alter below here unless you really, really want to (and you know
what you are doing)
#
! { 'Name' : 'DEBUG',
'Type' : 'Setting',
! 'Comment' : 'Enable debugging mode',
! 'Description': 'Enable debugging mode',
! 'Typecast' : boolean,
! 'Default' : 1 },
! { 'Name' : '_msgNOTSAVED',
'Type' : 'Setting',
'Comment' : 'Message to display when data has not been saved',
'Description': 'Message to display when data has not been saved',
! 'Typecast' : text,
'Default' : 'Data not saved. Commit or rollback changes.' },
{ 'Name' : '_msgDETAILNOTSAVED',
'Type' : 'Setting',
'Comment' : 'Message to display when detail data has not been saved',
'Description': 'Message to display when detail data has not been saved',
! 'Typecast' : text,
'Default' : "This record's detail information is not saved." },
{ 'Name' : 'BorderPercentage',
'Type' : 'Setting',
'Comment' : 'Fudge factor for altering widget size',
'Description': 'Fudge factor for altering widget size',
! 'Typecast' : number,
'Default' : 100.0 },
{ 'Name' : 'TextPercentage',
'Type' : 'Setting',
'Comment' : 'Fudge factor for altering text size',
'Description': 'Fudge factor for altering text size',
! 'Typecast' : number,
'Default' : 100.0 },
-
- #
- # GNUe Menu/Toolbar Status Bar Messages
- #
-
- { 'Name' : 'msg_commit',
- 'Type' : 'Setting',
- 'Comment' : 'Status bar message for the msg_commit event',
- 'Description': 'Status bar message for the msg_commit event',
- 'Typecast' : text,
- 'Default' : 'Save all changes to database.' },
-
- { 'Name' : 'msg_rollback',
- 'Type' : 'Setting',
- 'Comment' : 'Status bar message for the msg_rollback event',
- 'Description': 'Status bar message for the msg_rollback event',
- 'Typecast' : text,
- 'Default' : 'Discard all changes.' },
-
- { 'Name' : 'msg_exit',
- 'Type' : 'Setting',
- 'Comment' : 'Status bar message for the msg_exit event',
- 'Description': 'Status bar message for the msg_exit event',
- 'Typecast' : text,
- 'Default' : 'Leave the application.' },
-
- { 'Name' : 'msg_next',
- 'Type' : 'Setting',
- 'Comment' : 'Status bar message for the msg_next event',
- 'Description': 'Status bar message for the msg_next event',
- 'Typecast' : text,
- 'Default' : 'Navigate to next record in memory.' },
-
- { 'Name' : 'msg_previous',
- 'Type' : 'Setting',
- 'Comment' : 'Status bar message for the msg_previous event',
- 'Description': 'Status bar message for the msg_previous event',
- 'Typecast' : text,
- 'Default' : 'Navigate to previous record in memory.' },
-
- { 'Name' : 'msg_insert',
- 'Type' : 'Setting',
- 'Comment' : 'Status bar message for the msg_insert event',
- 'Description': 'Status bar message for the msg_insert event',
- 'Typecast' : text,
- 'Default' : 'Create a new record for data input.' },
-
- { 'Name' : 'msg_delete',
- 'Type' : 'Setting',
- 'Comment' : 'Status bar message for the msg_delete event',
- 'Description': 'Status bar message for the msg_delete event',
- 'Typecast' : text,
- 'Default' : 'Mark record for removal at next commit.' },
-
- { 'Name' : 'msg_next_block',
- 'Type' : 'Setting',
- 'Comment' : 'Status bar message for the msg_next_block event',
- 'Description': 'Status bar message for the msg_next_block event',
- 'Typecast' : text,
- 'Default' : 'Navigate to next data block.' },
-
- { 'Name' : 'msg_previous_block',
- 'Type' : 'Setting',
- 'Comment' : 'Status bar message for the msg_previous_block event',
- 'Description': 'Status bar message for the msg_previous_block event',
- 'Typecast' : text,
- 'Default' : 'Navigate to previous data block.' },
-
- { 'Name' : 'msg_query_prep',
- 'Type' : 'Setting',
- 'Comment' : 'Status bar message for the msg_query_prep event',
- 'Description': 'Status bar message for the msg_query_prep event',
- 'Typecast' : text,
- 'Default' : 'Switch to input query mask mode.' },
-
- { 'Name' : 'msg_query',
- 'Type' : 'Setting',
- 'Comment' : 'Status bar message for the msg_query event',
- 'Description': 'Status bar message for the msg_query event',
- 'Typecast' : text,
- 'Default' : 'Execute query using current mask.' },
-
- { 'Name' : 'msg_help',
- 'Type' : 'Setting',
- 'Comment' : 'Status bar message for the msg_help event',
- 'Description': 'Status bar message for the msg_help event',
- 'Typecast' : text,
- 'Default' : 'Display info about GNUe Forms.' },
-
- { 'Name' : 'msg_jump',
- 'Type' : 'Setting',
- 'Comment' : 'Status bar message for the msg_jump event',
- 'Description': 'Status bar message for the msg_jump event',
- 'Typecast' : text,
- 'Default' : 'Prompts for a record number to which the system should
jump.' },
-
- { 'Name' : 'msg_print',
- 'Type' : 'Setting',
- 'Comment' : 'Status bar message for the msg_print event',
- 'Description': 'Status bar message for the msg_print event',
- 'Typecast' : text,
- 'Default' : 'Perform print routine for this form' },
)
--- 155,228 ----
'Type' : 'Setting',
'Comment' : 'Base location of GEAS files',
'Description': 'Base location of GEAS files',
! 'Typecast' : GTypecast.text,
'Default' : '/usr/local/' },
{ 'Name' : 'widgetHeight',
'Type' : 'Setting',
'Comment' : "The default height of widgets for widgets that don't
specify height in .gfd file",
'Description': "The default height of widgets for widgets that don't
specify height in .gfd file",
! 'Typecast' : GTypecast.whole,
'Default' : 1 },
{ 'Name' : 'widgetWidth',
'Type' : 'Setting',
'Comment' : "The default width of widgets for widgets that don't
specify width in .gfd file",
'Description': "The default width of widgets for widgets that don't
specify width in .gfd file",
! 'Typecast' : GTypecast.whole,
'Default' : 10 },
{ 'Name' : 'fixedWidthFont',
'Type' : 'Setting',
'Comment' : 'Set to true if wxWindows clients should use a fixed width
font',
'Description': 'Set to true if wxWindows clients should use a fixed width
font',
! 'Typecast' : GTypecast.boolean,
'Default' : 1 },
{ 'Name' : 'pointSize',
'Type' : 'Setting',
'Comment' : 'If fixedWidthFont is set to true, then this is the point
size used for fonts.',
'Description': 'If fixedWidthFont is set to true, then this is the point
size used for fonts.',
! 'Typecast' : GTypecast.whole,
'Default' : 1 },
#
# Do not alter below here unless you really, really want to (and you know
what you are doing)
#
! { 'Name' : '_msgNOTSAVED',
'Type' : 'Setting',
! 'Comment' : 'Message to display when data has not been saved',
! 'Description': 'Message to display when data has not been saved',
! 'Typecast' : GTypecast.text,
! 'Default' : 'Data not saved. Commit or rollback changes.' },
! { 'Name' : 'DEBUG',
'Type' : 'Setting',
'Comment' : 'Message to display when data has not been saved',
'Description': 'Message to display when data has not been saved',
! 'Typecast' : GTypecast.text,
'Default' : 'Data not saved. Commit or rollback changes.' },
{ 'Name' : '_msgDETAILNOTSAVED',
'Type' : 'Setting',
'Comment' : 'Message to display when detail data has not been saved',
'Description': 'Message to display when detail data has not been saved',
! 'Typecast' : GTypecast.text,
'Default' : "This record's detail information is not saved." },
{ 'Name' : 'BorderPercentage',
'Type' : 'Setting',
'Comment' : 'Fudge factor for altering widget size',
'Description': 'Fudge factor for altering widget size',
! 'Typecast' : GTypecast.number,
'Default' : 100.0 },
{ 'Name' : 'TextPercentage',
'Type' : 'Setting',
'Comment' : 'Fudge factor for altering text size',
'Description': 'Fudge factor for altering text size',
! 'Typecast' : GTypecast.number,
'Default' : 100.0 },
)
Index: gnue/forms/src/GFDisplayHandler.py
diff -c gnue/forms/src/GFDisplayHandler.py:1.22
gnue/forms/src/GFDisplayHandler.py:1.23
*** gnue/forms/src/GFDisplayHandler.py:1.22 Thu Apr 25 21:26:21 2002
--- gnue/forms/src/GFDisplayHandler.py Sat May 4 12:45:08 2002
***************
*** 29,35 ****
import sys, string, types
from gnue.common.FormatMasks import DateMask, TextMask, NumberMask
! from gnue.common import GDebug, GConfig
from GFEvent import *
from mx.DateTime import DateTime
--- 29,35 ----
import sys, string, types
from gnue.common.FormatMasks import DateMask, TextMask, NumberMask
! from gnue.common import GDebug
from GFEvent import *
from mx.DateTime import DateTime
***************
*** 709,721 ****
#
class CheckboxDisplayHandler(FieldDisplayHandler):
! trueValue = GConfig.get("checkboxTrue","Y")
! falseValue = GConfig.get("checkboxFalse","N")
! trueValues = ('Y','y','T','t','1','x','X', trueValue)
! falseValues = ('N','n','F','f','0','', ' ', falseValue)
! def __init__(self, *args, **params):
FieldDisplayHandler.__init__(self, *args, **params)
--- 709,721 ----
#
class CheckboxDisplayHandler(FieldDisplayHandler):
! def __init__(self, *args, **params):
! self.trueValue = gConfig("checkboxTrue")
! self.falseValue = gConfig("checkboxFalse")
! self.trueValues = ('Y','y','T','t','1','x','X', trueValue)
! self.falseValues = ('N','n','F','f','0','', ' ', falseValue)
FieldDisplayHandler.__init__(self, *args, **params)
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.165 gnue/forms/src/GFForm.py:1.166
*** gnue/forms/src/GFForm.py:1.165 Wed Apr 17 15:09:18 2002
--- gnue/forms/src/GFForm.py Sat May 4 12:45:08 2002
***************
*** 32,38 ****
import string
import traceback
! from gnue.common import GDebug, openResource, GConnections, GConfig
from GFObjects import *
from GFEvent import *
from gnue.common.GDataObjects import ConnectionError as DBError
--- 32,38 ----
import string
import traceback
! from gnue.common import GDebug, openResource, GConnections
from GFObjects import *
from GFEvent import *
from gnue.common.GDataObjects import ConnectionError as DBError
***************
*** 396,402 ****
if self._currentBlock.mode != 'query':
for block in self._blockList:
if not block.isSaved():
! message = GConfig.get('_msgNOTSAVED')
return message
for block in self._blockList:
--- 396,402 ----
if self._currentBlock.mode != 'query':
for block in self._blockList:
if not block.isSaved():
! message = _('Data not saved. Save changes or clear the form to
proceed.')
return message
for block in self._blockList:
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.47 gnue/forms/src/GFInstance.py:1.48
*** gnue/forms/src/GFInstance.py:1.47 Thu Apr 25 21:26:21 2002
--- gnue/forms/src/GFInstance.py Sat May 4 12:45:08 2002
***************
*** 33,39 ****
import os
import sys
- import gnue.common.GConfig
from gnue.forms.GFForm import *
from gnue.forms.GFParser import loadForm
from gnue.forms import VERSION
--- 33,38 ----
***************
*** 359,365 ****
def executeExit(self, event):
if not self._form.isSaved():
! message = GFMsgBox(self, GConfig.get('_msgNOTSAVED'))
message.show()
else:
# If above loop didn't cause function to return then exit
--- 358,364 ----
def executeExit(self, event):
if not self._form.isSaved():
! message = GFMsgBox(self, _('Data not saved. Save changes or clear the
form to proceed.'))
message.show()
else:
# If above loop didn't cause function to return then exit
Index: gnue/forms/src/GFObjects/GFBlock.py
diff -c gnue/forms/src/GFObjects/GFBlock.py:1.49
gnue/forms/src/GFObjects/GFBlock.py:1.50
*** gnue/forms/src/GFObjects/GFBlock.py:1.49 Wed Apr 17 15:09:18 2002
--- gnue/forms/src/GFObjects/GFBlock.py Sat May 4 12:45:08 2002
***************
*** 34,40 ****
from gnue.forms.GFObjects.GFDataSource import GFDataSource
from gnue.common import GDebug
! from gnue.common import GConfig, GConditions
from GFObj import GFObj
import string
--- 34,40 ----
from gnue.forms.GFObjects.GFDataSource import GFDataSource
from gnue.common import GDebug
! from gnue.common import GConditions
from GFObj import GFObj
import string
***************
*** 66,72 ****
self._queryDefaults = {}
self._queryValues = {}
self._lastQueryValues = {}
! self._autocreate = int(GConfig.get('autocreate'))
self._gap = 0
self._rows = 1
--- 66,72 ----
self._queryDefaults = {}
self._queryValues = {}
self._lastQueryValues = {}
! self._autocreate = int(gConfig('autocreate'))
self._gap = 0
self._rows = 1
***************
*** 302,308 ****
if self.mode != 'query':
self.mode = 'query'
! self._query2 = int(GConfig.get("RememberLastQuery","1"))
self._queryValues = {}
self._queryValues.update(self._queryDefaults)
self.switchRecord(0)
--- 302,308 ----
if self.mode != 'query':
self.mode = 'query'
! self._query2 = int(gConfig("RememberLastQuery"))
self._queryValues = {}
self._queryValues.update(self._queryDefaults)
self.switchRecord(0)
Index: gnue/forms/src/GFObjects/GFEntry.py
diff -c gnue/forms/src/GFObjects/GFEntry.py:1.56
gnue/forms/src/GFObjects/GFEntry.py:1.57
*** gnue/forms/src/GFObjects/GFEntry.py:1.56 Wed Apr 17 15:09:19 2002
--- gnue/forms/src/GFObjects/GFEntry.py Sat May 4 12:45:08 2002
***************
*** 28,34 ****
#
from gnue.common import GDebug, FormatMasks
- from gnue.common import GConfig
from gnue.forms import GFDisplayHandler
from GFValue import GFValue
import string
--- 28,33 ----
***************
*** 45,52 ****
GFValue.__init__(self, parent, value, 'GFEntry')
# Default attributes (these may be replaced by parser)
! self.height = float(GConfig.get('widgetHeight'))
! self.width = float(GConfig.get('widgetWidth'))
self.typecast="text"
self.case="mixed"
self.style="default"
--- 44,51 ----
GFValue.__init__(self, parent, value, 'GFEntry')
# Default attributes (these may be replaced by parser)
! self.height = float(gConfig('widgetHeight'))
! self.width = float(gConfig('widgetWidth'))
self.typecast="text"
self.case="mixed"
self.style="default"
***************
*** 122,128 ****
def initialize(self):
if self.typecast == 'number':
self._numeric = 1
! self._allowFormulas = GConfig.get("AllowNumericFormulas",1)
if self.case == 'upper':
self._uppercase = 1
elif self.case == 'lower':
--- 121,127 ----
def initialize(self):
if self.typecast == 'number':
self._numeric = 1
! self._allowFormulas = gConfig("AllowNumericFormulas")
if self.case == 'upper':
self._uppercase = 1
elif self.case == 'lower':
Index: gnue/forms/src/GFObjects/GFLabel.py
diff -c gnue/forms/src/GFObjects/GFLabel.py:1.8
gnue/forms/src/GFObjects/GFLabel.py:1.9
*** gnue/forms/src/GFObjects/GFLabel.py:1.8 Mon Oct 8 08:38:14 2001
--- gnue/forms/src/GFObjects/GFLabel.py Sat May 4 12:45:08 2002
***************
*** 31,37 ****
# Copyright (c) 2000 Free Software Foundation
#
- from gnue.common import GConfig
from GFValue import GFValue
#
--- 31,36 ----
***************
*** 43,49 ****
# Default attributes (these may be replaced by parser)
self.alignment = "left"
! self.height = float(GConfig.get('widgetHeight'))
# Runtime Variables
self._inits = [self.initialize]
--- 42,48 ----
# Default attributes (these may be replaced by parser)
self.alignment = "left"
! self.height = float(gConfig('widgetHeight'))
# Runtime Variables
self._inits = [self.initialize]
Index: gnue/forms/src/uidrivers/nstti/UIdriver.py
diff -c gnue/forms/src/uidrivers/nstti/UIdriver.py:1.1
gnue/forms/src/uidrivers/nstti/UIdriver.py:1.2
*** gnue/forms/src/uidrivers/nstti/UIdriver.py:1.1 Tue Mar 12 20:51:16 2002
--- gnue/forms/src/uidrivers/nstti/UIdriver.py Sat May 4 12:45:08 2002
***************
*** 121,140 ****
menu = {'file':[ {'id' :100,
'text' :'Commit (F6)',
! 'tip' : "GConfig.get('msg_commit')",
'event':'requestCOMMIT'},
{'id' :102,
'text' :'Rollback (F11)',
! 'tip' : "GConfig.get('msg_rollback')",
'event':'requestROLLBACK'},
{'id': -1,'text': None, 'tip': None, 'event':None},
{'id' :104,
'text' :'Print ',
! 'tip' : "GConfig.get('msg_print')",
'event':'requestPRINTOUT'},
{'id' :101,
'text' :'Exit ',
! 'tip' : "GConfig.get('msg_exit')",
'event':"self.menuExitEvent"},
],
'edit':[ {'id' :401,
--- 121,140 ----
menu = {'file':[ {'id' :100,
'text' :'Commit (F6)',
! 'tip' : "gConfig('msg_commit')",
'event':'requestCOMMIT'},
{'id' :102,
'text' :'Rollback (F11)',
! 'tip' : "gConfig('msg_rollback')",
'event':'requestROLLBACK'},
{'id': -1,'text': None, 'tip': None, 'event':None},
{'id' :104,
'text' :'Print ',
! 'tip' : "gConfig('msg_print')",
'event':'requestPRINTOUT'},
{'id' :101,
'text' :'Exit ',
! 'tip' : "gConfig('msg_exit')",
'event':"self.menuExitEvent"},
],
'edit':[ {'id' :401,
***************
*** 152,193 ****
],
'data':[ {'id' :201,
'text' :'Next Record',
! 'tip' :"GConfig.get('msg_next')",
'event':'requestNEXTRECORD'},
{'id' :202,
'text' :'Previous Record',
! 'tip' :"GConfig.get('msg_previous')",
'event':'requestPREVRECORD'},
{'id' :209,
'text' :'Jump to Record...',
! 'tip' :"GConfig.get('msg_jump')",
'event':'self.promptForRecordNumber'},
{'id': -1,'text': None, 'tip': None, 'event':None},
{'id' :204,
'text' :'Delete Record (F5)',
! 'tip' :"GConfig.get('msg_delete')",
'event':'requestMARKFORDELETE'},
{'id' :205,
'text' :'Next Block (PgDn)',
! 'tip' :"GConfig.get('msg_next_block')",
'event':'requestNEXTBLOCK'},
{'id' :206,
'text' :'Previous Block (PgUp)',
! 'tip' :"GConfig.get('msg_previous_block')",
'event':'requestPREVBLOCK'},
{'id': -1,'text': None, 'tip': None, 'event':None},
{'id' :207,
'text' :'Enter Query (F8)',
! 'tip' :"GConfig.get('msg_query_prep')",
'event':'requestENTERQUERY'},
{'id' :208,
'text' :'Execute Query (F9)',
! 'tip' :"GConfig.get('msg_query')",
'event':'requestEXECQUERY'},
],
'help':[ {'id' :301,
'text' :'About...',
! 'tip' :"GConfig.get('msg_help')",
'event':'requestAbout'},
],
}
--- 152,193 ----
],
'data':[ {'id' :201,
'text' :'Next Record',
! 'tip' :"gConfig('msg_next')",
'event':'requestNEXTRECORD'},
{'id' :202,
'text' :'Previous Record',
! 'tip' :"gConfig('msg_previous')",
'event':'requestPREVRECORD'},
{'id' :209,
'text' :'Jump to Record...',
! 'tip' :"gConfig('msg_jump')",
'event':'self.promptForRecordNumber'},
{'id': -1,'text': None, 'tip': None, 'event':None},
{'id' :204,
'text' :'Delete Record (F5)',
! 'tip' :"gConfig('msg_delete')",
'event':'requestMARKFORDELETE'},
{'id' :205,
'text' :'Next Block (PgDn)',
! 'tip' :"gConfig('msg_next_block')",
'event':'requestNEXTBLOCK'},
{'id' :206,
'text' :'Previous Block (PgUp)',
! 'tip' :"gConfig('msg_previous_block')",
'event':'requestPREVBLOCK'},
{'id': -1,'text': None, 'tip': None, 'event':None},
{'id' :207,
'text' :'Enter Query (F8)',
! 'tip' :"gConfig('msg_query_prep')",
'event':'requestENTERQUERY'},
{'id' :208,
'text' :'Execute Query (F9)',
! 'tip' :"gConfig('msg_query')",
'event':'requestEXECQUERY'},
],
'help':[ {'id' :301,
'text' :'About...',
! 'tip' :"gConfig('msg_help')",
'event':'requestAbout'},
],
}
***************
*** 712,718 ****
## self.dlg = wxDialog(NULL, -1, "GNU Enterprise: Login")
## self.dlg.SetAutoLayout(true)
! ## bmp =
wxImage(os.environ['INSTALL_PREFIX']+'/'+GConfig.get('smallPNG'),
wxBITMAP_TYPE_PNG).ConvertToBitmap()
## self.textctrlList = []
## messageField = wxStaticText(self.dlg, 1010, str(loginMesg))
--- 712,718 ----
## self.dlg = wxDialog(NULL, -1, "GNU Enterprise: Login")
## self.dlg.SetAutoLayout(true)
! ## bmp = wxImage(os.environ['INSTALL_PREFIX']+'/'+gConfig('smallPNG'),
wxBITMAP_TYPE_PNG).ConvertToBitmap()
## self.textctrlList = []
## messageField = wxStaticText(self.dlg, 1010, str(loginMesg))
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.166
gnue/forms/src/uidrivers/wx/UIdriver.py:1.167
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.166 Sat Apr 27 16:30:42 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py Sat May 4 12:45:08 2002
***************
*** 88,95 ****
# TODO: Not completed
#
def initFont(widget, affectsLayout=1):
! if int(GConfig.get('fixedWidthFont')):
!
widget.SetFont(wxFont(int(GConfig.get('pointSize')),wxMODERN,wxNORMAL,wxNORMAL))
#
# GFUserInterface
--- 88,95 ----
# TODO: Not completed
#
def initFont(widget, affectsLayout=1):
! if int(gConfig('fixedWidthFont')):
!
widget.SetFont(wxFont(int(gConfig('pointSize')),wxMODERN,wxNORMAL,wxNORMAL))
#
# GFUserInterface
***************
*** 134,140 ****
# SplashScreen
#
if not self._disableSplash:
! self.splash =
SplashScreen(None,bitmapfile=images_dir+GConfig.get('splashScreenPNG'),
duration = 4000, callback=self.onCloseSplash,
style=wxSIMPLE_BORDER|wxCENTRE_ON_SCREEN )
swidth,sheight = self.splash.GetSizeTuple()
--- 134,140 ----
# SplashScreen
#
if not self._disableSplash:
! self.splash =
SplashScreen(None,bitmapfile=images_dir+gConfig('splashScreenPNG'),
duration = 4000, callback=self.onCloseSplash,
style=wxSIMPLE_BORDER|wxCENTRE_ON_SCREEN )
swidth,sheight = self.splash.GetSizeTuple()
***************
*** 206,220 ****
initFont(self.statusBar,0)
fileMenu = wxMenu()
! fileMenu.Append( 100, "Save (F6)",GConfig.get('msg_commit'))
EVT_MENU(self._wxapp, 100, lambda event, l=self:
l.dispatchEvent(GFEvent('requestCOMMIT')))
! fileMenu.Append( 102, "Clear Form(F11)",GConfig.get('msg_rollback'))
EVT_MENU(self._wxapp, 102, lambda event, l=self:
l.dispatchEvent(GFEvent('requestROLLBACK')))
fileMenu.AppendSeparator()
! fileMenu.Append( 104, "&Print",GConfig.get('msg_print'))
EVT_MENU(self._wxapp, 104, lambda event, l=self:
l.dispatchEvent(GFEvent('requestPRINTOUT')))
fileMenu.AppendSeparator()
! fileMenu.Append( 101, "E&xit",GConfig.get('msg_exit'))
EVT_MENU(self._wxapp, 101, self.menuExitEvent)
editMenu = wxMenu()
--- 206,220 ----
initFont(self.statusBar,0)
fileMenu = wxMenu()
! fileMenu.Append( 100, "Save (F6)",_('Save all changes to
database.'))
EVT_MENU(self._wxapp, 100, lambda event, l=self:
l.dispatchEvent(GFEvent('requestCOMMIT')))
! fileMenu.Append( 102, "Clear Form(F11)",_('Clear Form'))
EVT_MENU(self._wxapp, 102, lambda event, l=self:
l.dispatchEvent(GFEvent('requestROLLBACK')))
fileMenu.AppendSeparator()
! fileMenu.Append( 104, "&Print",_('Perform print routine for this form.'))
EVT_MENU(self._wxapp, 104, lambda event, l=self:
l.dispatchEvent(GFEvent('requestPRINTOUT')))
fileMenu.AppendSeparator()
! fileMenu.Append( 101, "E&xit",_('Leave the application.'))
EVT_MENU(self._wxapp, 101, self.menuExitEvent)
editMenu = wxMenu()
***************
*** 226,258 ****
EVT_MENU(self._wxapp, 403, lambda event, l=self:
l.dispatchEvent(GFEvent('requestPASTE')))
dataMenu = wxMenu()
! dataMenu.Append( 211, "First Record
(Shft+Up)",GConfig.get('msg_first'))
EVT_MENU(self._wxapp, 211, lambda event, l=self:
l.dispatchEvent(GFEvent('requestFIRSTRECORD')))
! dataMenu.Append( 202, "Previous Record
(Up)",GConfig.get('msg_previous'))
EVT_MENU(self._wxapp, 202, lambda event, l=self:
l.dispatchEvent(GFEvent('requestPREVRECORD')))
! dataMenu.Append( 201, "Next Record
(Down)",GConfig.get('msg_next'))
EVT_MENU(self._wxapp, 201, lambda event, l=self:
l.dispatchEvent(GFEvent('requestNEXTRECORD')))
! dataMenu.Append( 210, "Last Record
(Shft+Down)",GConfig.get('msg_last'))
EVT_MENU(self._wxapp, 210, lambda event, l=self:
l.dispatchEvent(GFEvent('requestLASTRECORD')))
! dataMenu.Append( 209, "Jump to Record...
(F2)",GConfig.get('msg_jump'))
EVT_MENU(self._wxapp, 209, _PROMPTFORRECORD)
! dataMenu.Append( 203, "New Record
(F12)",GConfig.get('msg_insert'))
EVT_MENU(self._wxapp, 203, lambda event, l=self:
l.dispatchEvent(GFEvent('requestNEWRECORD')))
! dataMenu.Append( 204, "Delete Record
(F5)",GConfig.get('msg_delete'))
EVT_MENU(self._wxapp, 204, lambda event, l=self:
l.dispatchEvent(GFEvent('requestMARKFORDELETE')))
dataMenu.AppendSeparator()
! dataMenu.Append( 205, "Next Block
(PgDn)",GConfig.get('msg_next_block'))
EVT_MENU(self._wxapp, 205, lambda event, l=self:
l.dispatchEvent(GFEvent('requestNEXTBLOCK')))
! dataMenu.Append( 206, "Previous Block
(PgUp)",GConfig.get('msg_previous_block'))
EVT_MENU(self._wxapp, 206, lambda event, l=self:
l.dispatchEvent(GFEvent('requestPREVBLOCK')))
dataMenu.AppendSeparator()
! dataMenu.Append( 207, "Enter Query
(F8)",GConfig.get('msg_query_prep'))
EVT_MENU(self._wxapp, 207, lambda event, l=self:
l.dispatchEvent(GFEvent('requestENTERQUERY')))
! dataMenu.Append( 208, "Execute Query (F9)",
GConfig.get('msg_query'))
EVT_MENU(self._wxapp, 208, lambda event, l=self:
l.dispatchEvent(GFEvent('requestEXECQUERY')))
helpMenu = wxMenu()
! helpMenu.Append( 300, "&About...", GConfig.get('msg_help'))
EVT_MENU(self._wxapp, 300, lambda event, l=self:
l.dispatchEvent(GFEvent('requestABOUT')))
menuBar = wxMenuBar()
--- 226,258 ----
EVT_MENU(self._wxapp, 403, lambda event, l=self:
l.dispatchEvent(GFEvent('requestPASTE')))
dataMenu = wxMenu()
! dataMenu.Append( 211, "First Record (Shft+Up)",_('Navigate to
first record in memory.'))
EVT_MENU(self._wxapp, 211, lambda event, l=self:
l.dispatchEvent(GFEvent('requestFIRSTRECORD')))
! dataMenu.Append( 202, "Previous Record (Up)",_('Navigate to
previous record in memory.'))
EVT_MENU(self._wxapp, 202, lambda event, l=self:
l.dispatchEvent(GFEvent('requestPREVRECORD')))
! dataMenu.Append( 201, "Next Record (Down)",_('Navigate to next
record in memory.'))
EVT_MENU(self._wxapp, 201, lambda event, l=self:
l.dispatchEvent(GFEvent('requestNEXTRECORD')))
! dataMenu.Append( 210, "Last Record (Shft+Down)",_('Navigate to last
record in memory.'))
EVT_MENU(self._wxapp, 210, lambda event, l=self:
l.dispatchEvent(GFEvent('requestLASTRECORD')))
! dataMenu.Append( 209, "Jump to Record... (F2)",_('Prompts for a
record number to which the system should jump.'))
EVT_MENU(self._wxapp, 209, _PROMPTFORRECORD)
! dataMenu.Append( 203, "New Record (F12)",_('Create a new
record for data input.'))
EVT_MENU(self._wxapp, 203, lambda event, l=self:
l.dispatchEvent(GFEvent('requestNEWRECORD')))
! dataMenu.Append( 204, "Delete Record (F5)",_('Mark record for
removal at next commit.'))
EVT_MENU(self._wxapp, 204, lambda event, l=self:
l.dispatchEvent(GFEvent('requestMARKFORDELETE')))
dataMenu.AppendSeparator()
! dataMenu.Append( 205, "Next Block (PgDn)",_('Navigate to
next data block.'))
EVT_MENU(self._wxapp, 205, lambda event, l=self:
l.dispatchEvent(GFEvent('requestNEXTBLOCK')))
! dataMenu.Append( 206, "Previous Block (PgUp)",_('Navigate to
previous data block.'))
EVT_MENU(self._wxapp, 206, lambda event, l=self:
l.dispatchEvent(GFEvent('requestPREVBLOCK')))
dataMenu.AppendSeparator()
! dataMenu.Append( 207, "Enter Query (F8)",_('Switch to input
query mask mode.'))
EVT_MENU(self._wxapp, 207, lambda event, l=self:
l.dispatchEvent(GFEvent('requestENTERQUERY')))
! dataMenu.Append( 208, "Execute Query (F9)", _('Execute query
using current mask.'))
EVT_MENU(self._wxapp, 208, lambda event, l=self:
l.dispatchEvent(GFEvent('requestEXECQUERY')))
helpMenu = wxMenu()
! helpMenu.Append( 300, "&About...", _('Display info about GNUe Forms.'))
EVT_MENU(self._wxapp, 300, lambda event, l=self:
l.dispatchEvent(GFEvent('requestABOUT')))
menuBar = wxMenuBar()
***************
*** 274,290 ****
mainToolBar =
self.mainWindow.CreateToolBar(wxTB_HORIZONTAL|wxTB_DOCKABLE)
mainToolBar.SetToolBitmapSize(wxSize(24,24))
! mainToolBar.AddSimpleTool(100,
wxImage(images_dir+GConfig.get('tb_commit'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Save Changes", GConfig.get('msg_commit'))
! mainToolBar.AddSimpleTool(203,
wxImage(images_dir+GConfig.get('tb_insert'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Insert Record",
GConfig.get('msg_insert'))
! mainToolBar.AddSimpleTool(204,
wxImage(images_dir+GConfig.get('tb_delete'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Delete Record",
GConfig.get('msg_delete'))
mainToolBar.AddSeparator()
! mainToolBar.AddSimpleTool(202,
wxImage(images_dir+GConfig.get('tb_previous'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Previous
Record",GConfig.get('msg_previous'))
! mainToolBar.AddSimpleTool(201, wxImage(images_dir+GConfig.get('tb_next'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Next Record",GConfig.get('msg_next'))
mainToolBar.AddSeparator()
! mainToolBar.AddSimpleTool(207,
wxImage(images_dir+GConfig.get('tb_query_prep'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Prepare Query",
GConfig.get('msg_query_prep'))
! mainToolBar.AddSimpleTool(208,
wxImage(images_dir+GConfig.get('tb_query'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Execute Query", GConfig.get('msg_query'))
mainToolBar.AddSeparator()
! mainToolBar.AddSimpleTool(102,
wxImage(images_dir+GConfig.get('tb_rollback'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Clear Form", GConfig.get('msg_rollback'))
mainToolBar.Realize()
self.mainWindow.panel = wxPanel(self.mainWindow,-1,
wxDefaultPosition,self.mainWindow.GetSize())
--- 274,290 ----
mainToolBar =
self.mainWindow.CreateToolBar(wxTB_HORIZONTAL|wxTB_DOCKABLE)
mainToolBar.SetToolBitmapSize(wxSize(24,24))
! mainToolBar.AddSimpleTool(100, wxImage(images_dir+gConfig('tb_commit'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Save Changes", _('Save all changes to
database.'))
! mainToolBar.AddSimpleTool(203, wxImage(images_dir+gConfig('tb_insert'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Insert Record", _('Create a new record
for data input.'))
! mainToolBar.AddSimpleTool(204, wxImage(images_dir+gConfig('tb_delete'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Delete Record", _('Mark record for
removal at next commit.'))
mainToolBar.AddSeparator()
! mainToolBar.AddSimpleTool(202, wxImage(images_dir+gConfig('tb_previous'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Previous Record",_('Navigate to previous
record in memory.'))
! mainToolBar.AddSimpleTool(201, wxImage(images_dir+gConfig('tb_next'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Next Record",_('Navigate to next record
in memory.'))
mainToolBar.AddSeparator()
! mainToolBar.AddSimpleTool(207,
wxImage(images_dir+gConfig('tb_query_prep'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Prepare Query", _('Switch to input query
mask mode.'))
! mainToolBar.AddSimpleTool(208, wxImage(images_dir+gConfig('tb_query'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Execute Query", _('Execute query using
current mask.'))
mainToolBar.AddSeparator()
! mainToolBar.AddSimpleTool(102, wxImage(images_dir+gConfig('tb_rollback'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), "Clear Form", _('Clear Form'))
mainToolBar.Realize()
self.mainWindow.panel = wxPanel(self.mainWindow,-1,
wxDefaultPosition,self.mainWindow.GetSize())
***************
*** 989,995 ****
not event.ShiftDown() and \
not event.ControlDown() and \
not event.AltDown() and \
! int (GConfig.get('enterIsNewLine',0)) and \
_IdToGFObj[_eventObjTowxWindow(event).GetId()].height > 1:
command = 'NEWLINE'
--- 989,995 ----
not event.ShiftDown() and \
not event.ControlDown() and \
not event.AltDown() and \
! int (gConfig('enterIsNewLine')) and \
_IdToGFObj[_eventObjTowxWindow(event).GetId()].height > 1:
command = 'NEWLINE'
***************
*** 1058,1064 ****
self.dlg = wxDialog(NULL, -1, "GNU Enterprise: Login to %s" %
loginData[0])
self.dlg.SetAutoLayout(true)
! bmp = wxImage(images_dir+GConfig.get('smallPNG'),
wxBITMAP_TYPE_PNG).ConvertToBitmap()
messageField = WrappedStaticText(self.dlg, -1, str(loginMesg), 300,
style=wxALIGN_CENTER)
--- 1058,1064 ----
self.dlg = wxDialog(NULL, -1, "GNU Enterprise: Login to %s" %
loginData[0])
self.dlg.SetAutoLayout(true)
! bmp = wxImage(images_dir+gConfig('smallPNG'),
wxBITMAP_TYPE_PNG).ConvertToBitmap()
messageField = WrappedStaticText(self.dlg, -1, str(loginMesg), 300,
style=wxALIGN_CENTER)
Index: gnue/navigator/src/Actions/gnome_menu.py
diff -c gnue/navigator/src/Actions/gnome_menu.py:1.3
gnue/navigator/src/Actions/gnome_menu.py:1.4
*** gnue/navigator/src/Actions/gnome_menu.py:1.3 Mon Jan 14 00:40:44 2002
--- gnue/navigator/src/Actions/gnome_menu.py Sat May 4 12:45:08 2002
***************
*** 34,40 ****
#
import string, sys, os
! from gnue.common import GConfig
def run(processes, args):
--- 34,40 ----
#
import string, sys, os
!
def run(processes, args):
***************
*** 93,102 ****
'.desktop'),'w')
if step.type == 'form':
! command = GConfig.get("RunFormCommand","gfclient")
icon = "gnome-applications.png"
elif step.type == 'report':
! command = GConfig.get("RunReportCommand","grrun")
icon = "gnome-note.png"
outfile.write("""\
--- 93,102 ----
'.desktop'),'w')
if step.type == 'form':
! command = gConfig("RunFormCommand")
icon = "gnome-applications.png"
elif step.type == 'report':
! command = gConfig("RunReportCommand")
icon = "gnome-note.png"
outfile.write("""\
Index: gnue/navigator/src/Actions/kde_menu.py
diff -c gnue/navigator/src/Actions/kde_menu.py:1.3
gnue/navigator/src/Actions/kde_menu.py:1.4
*** gnue/navigator/src/Actions/kde_menu.py:1.3 Mon Jan 14 00:40:44 2002
--- gnue/navigator/src/Actions/kde_menu.py Sat May 4 12:45:08 2002
***************
*** 35,41 ****
#
import string, sys, os
! from gnue.common import GConfig
def run(processes, args):
--- 35,41 ----
#
import string, sys, os
!
def run(processes, args):
***************
*** 88,97 ****
'.desktop'),'w')
if step.type == 'form':
! command = GConfig.get("RunFormCommand","gfclient")
icon = "konsole"
elif step.type == 'report':
! command = GConfig.get("RunReportCommand","grrun")
icon = "klpq"
outfile.write("""\
--- 88,97 ----
'.desktop'),'w')
if step.type == 'form':
! command = gConfig("RunFormCommand")
icon = "konsole"
elif step.type == 'report':
! command = gConfig("RunReportCommand")
icon = "klpq"
outfile.write("""\
Index: gnue/navigator/src/GNClient.py
diff -c gnue/navigator/src/GNClient.py:1.5 gnue/navigator/src/GNClient.py:1.6
*** gnue/navigator/src/GNClient.py:1.5 Wed Feb 13 15:38:42 2002
--- gnue/navigator/src/GNClient.py Sat May 4 12:45:08 2002
***************
*** 37,45 ****
from gnue.navigator.GNParser import loadProcesses
from gnue.navigator import Actions
from gnue.common import GDebug, openResource
! from gnue.common import GConfig, GDataObjects, GConnections
from gnue.common.GClientApp import *
from gnue.navigator import VERSION
class GNClient(GClientApp):
#
--- 37,46 ----
from gnue.navigator.GNParser import loadProcesses
from gnue.navigator import Actions
from gnue.common import GDebug, openResource
! from gnue.common import GDataObjects, GConnections
from gnue.common.GClientApp import *
from gnue.navigator import VERSION
+ from gnue.navigator.GNConfig import ConfigOptions
class GNClient(GClientApp):
#
***************
*** 67,79 ****
# Initialize the class
#
def __init__(self, connections=None):
! GClientApp.__init__(self, connections,'navigator')
self._formInstances = {}
self._lastSerialNumber = 0
self.ui_type = self.OPTIONS['user_interface']
! if GConfig.get('disableSplash') == '1':
self.disableSplash = 1
else:
self.disableSplash = self.OPTIONS['splash_screen']
--- 68,80 ----
# Initialize the class
#
def __init__(self, connections=None):
! GClientApp.__init__(self, connections,'navigator', ConfigOptions)
self._formInstances = {}
self._lastSerialNumber = 0
self.ui_type = self.OPTIONS['user_interface']
! if gConfig('disableSplash') == '1':
self.disableSplash = 1
else:
self.disableSplash = self.OPTIONS['splash_screen']
***************
*** 91,97 ****
except:
try:
if string.split(string.lower(os.path.basename(sys.argv[0])),'.')[0]
not in ('gnuenav','gncvs','gnclient'):
! processFile =
os.environ['INSTALL_PREFIX']+'/'+GConfig.get('ProcessDir')+"/"+os.path.basename(sys.argv[0])+".gpd"
else:
raise IndexError
except IndexError:
--- 92,98 ----
except:
try:
if string.split(string.lower(os.path.basename(sys.argv[0])),'.')[0]
not in ('gnuenav','gncvs','gnclient'):
! processFile =
os.environ['INSTALL_PREFIX']+'/'+gConfig('ProcessDir')+"/"+os.path.basename(sys.argv[0])+".gpd"
else:
raise IndexError
except IndexError:
Index: gnue/navigator/src/GNObjects.py
diff -c gnue/navigator/src/GNObjects.py:1.7 gnue/navigator/src/GNObjects.py:1.8
*** gnue/navigator/src/GNObjects.py:1.7 Tue Apr 2 22:52:32 2002
--- gnue/navigator/src/GNObjects.py Sat May 4 12:45:08 2002
***************
*** 28,34 ****
#
import sys, string, os, os.path
! from gnue.common import GObjects, GDebug, GConfig
import GNParser
--- 28,34 ----
#
import sys, string, os, os.path
! from gnue.common import GObjects, GDebug
import GNParser
***************
*** 55,68 ****
def _runForm(self, step):
! formCommand = GConfig.get('runFormCommand','')
!
! if not formCommand:
! formCommand = "gfcvs"
if os.path.basename(step.location) == step.location:
try:
! formdir = GConfig.get('FormDir')
except KeyError:
formdir = ""
formfile = os.environ['INSTALL_PREFIX']+'/'+formdir+"/"+step.location
--- 55,65 ----
def _runForm(self, step):
! formCommand = gConfig('runFormCommand')
if os.path.basename(step.location) == step.location:
try:
! formdir = gConfig('FormDir')
except KeyError:
formdir = ""
formfile = os.environ['INSTALL_PREFIX']+'/'+formdir+"/"+step.location
Index: gnue/navigator/src/UIwxpython.py
diff -c gnue/navigator/src/UIwxpython.py:1.5
gnue/navigator/src/UIwxpython.py:1.6
*** gnue/navigator/src/UIwxpython.py:1.5 Wed Feb 13 16:59:39 2002
--- gnue/navigator/src/UIwxpython.py Sat May 4 12:45:08 2002
***************
*** 31,37 ****
from wxPython.wx import *
from time import sleep
! from gnue.common import GConfig
class Instance(wxApp):
def __init__(self, processes):
--- 31,37 ----
from wxPython.wx import *
from time import sleep
!
class Instance(wxApp):
def __init__(self, processes):
***************
*** 101,107 ****
if object._type != 'GNStep':
self.buildMenu(object)
else:
! delay = GConfig.get('hourglassDelay','')
if not delay:
delay = 2
else:
--- 101,107 ----
if object._type != 'GNStep':
self.buildMenu(object)
else:
! delay = gConfig('hourglassDelay','')
if not delay:
delay = 2
else:
Index: gnue/reports/adapters/destinations/email/sendmail.py
diff -c gnue/reports/adapters/destinations/email/sendmail.py:1.5
gnue/reports/adapters/destinations/email/sendmail.py:1.6
*** gnue/reports/adapters/destinations/email/sendmail.py:1.5 Wed Apr 24
18:51:45 2002
--- gnue/reports/adapters/destinations/email/sendmail.py Sat May 4
12:45:08 2002
***************
*** 27,33 ****
# NOTES:
#
! from gnue.common import GConfig, GMimeTypes
from gnue.reports import VERSION
from gnue.reports.GROutputAdapter import DestinationAdapter as Base
import sys, os, string
--- 27,33 ----
# NOTES:
#
! from gnue.common import GMimeTypes
from gnue.reports import VERSION
from gnue.reports.GROutputAdapter import DestinationAdapter as Base
import sys, os, string
***************
*** 81,96 ****
file = self.tempfile
! email_from = GConfig.get('SendmailFrom',"GNUe Reports <address@hidden>")
email_to = string.replace(string.replace(self.destination, "`",""),';','')
! sendmail = os.popen(GConfig.get('SendmailBin',"/usr/sbin/sendmail")+"
'%s'" % email_to, 'w')
sendmail.write("""From: %s
To: %s
Subject: %s
X-Mailer: GNUe Reports v%s [sendmail]
MIME-Version: 1.0
! """ % (email_from, email_to, GConfig.get('SendmailSubject','Your Requested
Report'), VERSION))
mime = MimeWriter(sendmail)
--- 81,96 ----
file = self.tempfile
! email_from = gConfig('SendmailFrom')
email_to = string.replace(string.replace(self.destination, "`",""),';','')
! sendmail = os.popen(gConfig('SendmailBin')+" '%s'" % email_to, 'w')
sendmail.write("""From: %s
To: %s
Subject: %s
X-Mailer: GNUe Reports v%s [sendmail]
MIME-Version: 1.0
! """ % (email_from, email_to, gConfig('SendmailSubject'), VERSION))
mime = MimeWriter(sendmail)
Index: gnue/reports/adapters/destinations/fax/hylafax.py
diff -c gnue/reports/adapters/destinations/fax/hylafax.py:1.3
gnue/reports/adapters/destinations/fax/hylafax.py:1.4
*** gnue/reports/adapters/destinations/fax/hylafax.py:1.3 Sun Apr 14
16:20:42 2002
--- gnue/reports/adapters/destinations/fax/hylafax.py Sat May 4 12:45:09 2002
***************
*** 27,33 ****
# NOTES:
#
! from gnue.common import GConfig
from gnue.reports import VERSION
from gnue.reports.GROutputAdapter import DestinationAdapter as Base
import sys, os, string
--- 27,33 ----
# NOTES:
#
!
from gnue.reports import VERSION
from gnue.reports.GROutputAdapter import DestinationAdapter as Base
import sys, os, string
***************
*** 69,75 ****
fax_to = string.replace(string.replace(self.destination, "`",""),';','')
! os.system(GConfig.get('HylafaxBin',"/usr/bin/sendfax -d %s")+" " %
(fax_to) + file)
self.deleteTempFile(self.tempfile)
--- 69,75 ----
fax_to = string.replace(string.replace(self.destination, "`",""),';','')
! os.system(gConfig('HylafaxBin')+" " % (fax_to) + file)
self.deleteTempFile(self.tempfile)
Index: gnue/reports/adapters/destinations/printer/bsd.py
diff -c gnue/reports/adapters/destinations/printer/bsd.py:1.2
gnue/reports/adapters/destinations/printer/bsd.py:1.3
*** gnue/reports/adapters/destinations/printer/bsd.py:1.2 Sun Apr 14
16:20:43 2002
--- gnue/reports/adapters/destinations/printer/bsd.py Sat May 4 12:45:09 2002
***************
*** 27,33 ****
# NOTES:
#
! from gnue.common import GConfig
from gnue.reports import VERSION
from gnue.reports.GROutputAdapter import DestinationAdapter as Base
import sys, os, string
--- 27,33 ----
# NOTES:
#
!
from gnue.reports import VERSION
from gnue.reports.GROutputAdapter import DestinationAdapter as Base
import sys, os, string
***************
*** 69,74 ****
print_to = string.replace(string.replace(self.destination, "`",""),';','')
! os.system((GConfig.get('LprCommand',"/usr/bin/lpr -P%s") + " %s") %
(print_to, file))
self.deleteTempFile(self.tempfile)
--- 69,74 ----
print_to = string.replace(string.replace(self.destination, "`",""),';','')
! os.system((gConfig('LprCommand') + " %s") % (print_to, file))
self.deleteTempFile(self.tempfile)
Index: gnue/reports/src/GREngine.py
diff -c gnue/reports/src/GREngine.py:1.12 gnue/reports/src/GREngine.py:1.13
*** gnue/reports/src/GREngine.py:1.12 Sun Apr 28 21:52:53 2002
--- gnue/reports/src/GREngine.py Sat May 4 12:45:09 2002
***************
*** 35,41 ****
import GRParser
import GRExceptions
import GRFilters
! from gnue.common import openResource, GDebug, GConfig, dyn_import
class GREngine:
--- 35,41 ----
import GRParser
import GRExceptions
import GRFilters
! from gnue.common import openResource, GDebug, dyn_import
class GREngine:
***************
*** 77,83 ****
else:
# Load a destination adapter
destAdapter = dyn_import('gnue.reports.adapters.destinations.%s.%s' % \
! (destinationType, GConfig.get('%sAdapter' %
destinationType)))
# Create a Destination Adapter
dest = destAdapter.DestinationAdapter(destination, destinationOptions)
--- 77,83 ----
else:
# Load a destination adapter
destAdapter = dyn_import('gnue.reports.adapters.destinations.%s.%s' % \
! (destinationType, gConfig('%sAdapter' %
destinationType)))
# Create a Destination Adapter
dest = destAdapter.DestinationAdapter(destination, destinationOptions)
Index: gnue/reports/src/GRFilters.py
diff -c gnue/reports/src/GRFilters.py:1.9 gnue/reports/src/GRFilters.py:1.10
*** gnue/reports/src/GRFilters.py:1.9 Mon Apr 29 00:19:15 2002
--- gnue/reports/src/GRFilters.py Sat May 4 12:45:09 2002
***************
*** 78,84 ****
# Load the report-filters file
! location = GConfig.get('filters','')
if location:
if location[0] != '/':
location = os.path.join(
--- 78,84 ----
# Load the report-filters file
! location = gConfig('filters')
if location:
if location[0] != '/':
location = os.path.join(
***************
*** 118,124 ****
self.mappings[string.lower(option)] =
self._parser.get('mappings',option)
# Get the base directory for filters
! filterBase = GConfig.get('FiltersDir','filters')
if filterBase[0] != '/':
filterBase = os.path.join(GConfig.getInstalledBase('reports_shared',
'common_shared'), filterBase)
--- 118,124 ----
self.mappings[string.lower(option)] =
self._parser.get('mappings',option)
# Get the base directory for filters
! filterBase = gConfig('FiltersDir')
if filterBase[0] != '/':
filterBase = os.path.join(GConfig.getInstalledBase('reports_shared',
'common_shared'), filterBase)
Index: gnue/reports/src/GROutputAdapter.py
diff -c gnue/reports/src/GROutputAdapter.py:1.3
gnue/reports/src/GROutputAdapter.py:1.4
*** gnue/reports/src/GROutputAdapter.py:1.3 Fri Apr 12 20:54:21 2002
--- gnue/reports/src/GROutputAdapter.py Sat May 4 12:45:09 2002
***************
*** 39,45 ****
class _BaseAdapter:
def __init__(self, destination):
! tmpdir = GConfig.get('TempDir','')
if tmpdir:
tempfile.tmpdir = tmpdir
--- 39,45 ----
class _BaseAdapter:
def __init__(self, destination):
! tmpdir = gConfig('TempDir')
if tmpdir:
tempfile.tmpdir = tmpdir
Index: gnue/reports/src/GRRun.py
diff -c gnue/reports/src/GRRun.py:1.12 gnue/reports/src/GRRun.py:1.13
*** gnue/reports/src/GRRun.py:1.12 Mon Apr 15 00:36:31 2002
--- gnue/reports/src/GRRun.py Sat May 4 12:45:09 2002
***************
*** 29,35 ****
from gnue.reports import VERSION
! from gnue.common import GDebug, GConfig
from gnue.common.GClientApp import GClientApp
from GREngine import GREngine
import GRFilters
--- 29,35 ----
from gnue.reports import VERSION
! from gnue.common import GDebug
from gnue.common.GClientApp import GClientApp
from GREngine import GREngine
import GRFilters
Index: gnue/reports/src/GRServer.py
diff -c gnue/reports/src/GRServer.py:1.4 gnue/reports/src/GRServer.py:1.5
*** gnue/reports/src/GRServer.py:1.4 Mon Mar 25 23:34:07 2002
--- gnue/reports/src/GRServer.py Sat May 4 12:45:09 2002
***************
*** 34,39 ****
--- 34,40 ----
from gnue.common import GDebug
from gnue.common.GClientApp import GClientApp
from GREngine import GREngine
+ from GRConfig import ConfigOptions
import GRExceptions
import string, sys
***************
*** 56,62 ****
# Initialize the class
#
def __init__(self):
! GServerApp.__init__(self)
def run(self):
--- 57,63 ----
# Initialize the class
#
def __init__(self):
! GServerApp.__init__(self,defaults=ConfigOptions)
def run(self):
- gnue common/src/GBaseApp.py common/src/GConfig....,
James Thompson <=