[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue common/src/GObjects.py common/src/GParser....
|
From: |
James Thompson |
|
Subject: |
gnue common/src/GObjects.py common/src/GParser.... |
|
Date: |
Wed, 17 Apr 2002 15:09:23 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: James Thompson <address@hidden> 02/04/17 15:09:20
Modified files:
common/src : GObjects.py GParser.py GParserHelpers.py
GTypecast.py
common/src/commdrivers/_corba: CommDriver.py
common/src/dbdrivers/_dbsig: DBdriver.py
common/src/dbdrivers/geas: DBdriver.py
common/src/dbdrivers/msado: DBdriver.py
common/src/dbdrivers/odbc: DBdriver.py
designer/src : Instance.py PopupMenu.py PropertyEditor.py
TreeView.py
designer/src/forms/LayoutEditor: LayoutEditor.py PropertyBar.py
Utils.py
forms/src : GFDisplayHandler.py GFForm.py GFInstance.py
forms/src/GFObjects: GFBlock.py GFEntry.py
forms/src/uidrivers/_base: UIdriver.py
navigator/src : __init__.py
reports/src : GRLayout.py GRSources.py
Log message:
removed getObjectType()
clean up
start of some subtle new bugs
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GObjects.py.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GParser.py.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GParserHelpers.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GTypecast.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/commdrivers/_corba/CommDriver.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/_dbsig/DBdriver.py.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/geas/DBdriver.py.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/msado/DBdriver.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/odbc/DBdriver.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/Instance.py.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/PopupMenu.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/PropertyEditor.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/TreeView.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditor.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/PropertyBar.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/Utils.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFDisplayHandler.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.164&tr2=1.165&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFBlock.py.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFEntry.py.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/UIdriver.py.diff?tr1=1.67&tr2=1.68&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/src/__init__.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GRLayout.py.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GRSources.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
Patches:
Index: gnue/common/src/GObjects.py
diff -c gnue/common/src/GObjects.py:1.33 gnue/common/src/GObjects.py:1.34
*** gnue/common/src/GObjects.py:1.33 Wed Apr 17 11:25:15 2002
--- gnue/common/src/GObjects.py Wed Apr 17 15:09:17 2002
***************
*** 81,95 ****
if isinstance(child, GObj):
child._phaseInit(phase)
-
- #
- # getObjectType
- #
- # Return the _type of this object
- #
- def getObjectType(self):
- return self._type
-
# This function is called after the parsers have completely
# constructed. All children should be in place and
# attributes and content should be set at this point.
--- 81,86 ----
***************
*** 253,259 ****
if hasattr(self,'_description'):
return self._description
elif hasattr(self,'name'):
! return self.name + " (%s)" % self.getObjectType()[2:]
else:
! return self._type[2:] + " (%s)" % self.getObjectType()[2:]
--- 244,250 ----
if hasattr(self,'_description'):
return self._description
elif hasattr(self,'name'):
! return self.name + " (%s)" % self._type[2:]
else:
! return self._type[2:] + " (%s)" % self._type[2:]
Index: gnue/common/src/GParser.py
diff -c gnue/common/src/GParser.py:1.35 gnue/common/src/GParser.py:1.36
*** gnue/common/src/GParser.py:1.35 Fri Apr 12 00:41:43 2002
--- gnue/common/src/GParser.py Wed Apr 17 15:09:17 2002
***************
*** 204,210 ****
GDebug.printMesg(50, "<%s>" % name)
try:
! baseAttrs = default(self.xmlElements[name],'Attributes',{})
except KeyError:
raise MarkupError, 'Error processing <%s> tag [I do not know what a
<%s> tag does]' % (name, name)
--- 204,210 ----
GDebug.printMesg(50, "<%s>" % name)
try:
! baseAttrs = self.xmlElements[name].get('Attributes',{}) #
default(self.xmlElements[name],'Attributes',{})
except KeyError:
raise MarkupError, 'Error processing <%s> tag [I do not know what a
<%s> tag does]' % (name, name)
***************
*** 215,221 ****
# Typecasting, anyone? If attribute should be int, make it an int
try:
! attrs[attr] =
default(baseAttrs[attr],'Typecast',char)(saxattrs[qattr])
loadedxmlattrs[attr] = attrs[attr]
except KeyError:
raise MarkupError, 'Error processing <%s> tag [I do not recognize
the "%s" attribute' % (name, attr)
--- 215,221 ----
# Typecasting, anyone? If attribute should be int, make it an int
try:
! attrs[attr] = baseAttrs[attr].get('Typecast',char)(saxattrs[qattr])
# default(baseAttrs[attr],'Typecast',char)(saxattrs[qattr])
loadedxmlattrs[attr] = attrs[attr]
except KeyError:
raise MarkupError, 'Error processing <%s> tag [I do not recognize
the "%s" attribute' % (name, attr)
***************
*** 223,229 ****
raise MarkupError, 'Error processing <%s> tag [invalid type for
"%s" attribute; value is "%s"]' % (name, attr, saxattrs[qattr])
# If this attribute must be unique, check for duplicates
! if default (baseAttrs[attr],'Unique',0):
if self.uniqueIDs.has_key('%s' % (saxattrs[qattr])):
raise MarkupError, 'Error processing <%s> tag ["%s" attribute
should be unique; duplicate value is "%s"]' % (name, attr, saxattrs[qattr])
--- 223,229 ----
raise MarkupError, 'Error processing <%s> tag [invalid type for
"%s" attribute; value is "%s"]' % (name, attr, saxattrs[qattr])
# If this attribute must be unique, check for duplicates
! if baseAttrs[attr].get('Unique',0): # default
(baseAttrs[attr],'Unique',0):
if self.uniqueIDs.has_key('%s' % (saxattrs[qattr])):
raise MarkupError, 'Error processing <%s> tag ["%s" attribute
should be unique; duplicate value is "%s"]' % (name, attr, saxattrs[qattr])
***************
*** 232,241 ****
# Pull default values for missing attributes
if baseAttrs[attr].has_key ('Default'):
! attrs[attr] = default(baseAttrs[attr],'Typecast', char)
(baseAttrs[attr]['Default'])
# Check for missing required attributes
! elif default(baseAttrs[attr], 'Required', 0):
raise MarkupError, 'Error processing <%s> tag [required attribute
"%s" not present]' % (name, attr)
--- 232,241 ----
# Pull default values for missing attributes
if baseAttrs[attr].has_key ('Default'):
! attrs[attr] = baseAttrs[attr].get('Typecast', char)
(baseAttrs[attr]['Default'])# default(baseAttrs[attr],'Typecast', char)
(baseAttrs[attr]['Default'])
# Check for missing required attributes
! elif baseAttrs.get('Required', 0): #default(baseAttrs[attr],
'Required', 0):
raise MarkupError, 'Error processing <%s> tag [required attribute
"%s" not present]' % (name, attr)
***************
*** 299,307 ****
GContent(self.xmlStack[0], text)
# Should we keep the text?
! elif default(self.xmlElements[self.nameStack[0]],'MixedContent',0):
! if default(self.xmlElements[self.nameStack[0]],'KeepWhitespace',0):
GContent(self.xmlStack[0], text)
else:
# Normalize
--- 299,307 ----
GContent(self.xmlStack[0], text)
# Should we keep the text?
! elif self.xmlElements[self.nameStack[0]].get('MixedContent',0):#
default(self.xmlElements[self.nameStack[0]],'MixedContent',0):
! if self.xmlElements[self.nameStack[0]].get('KeepWhitespace',0): #
default(self.xmlElements[self.nameStack[0]],'KeepWhitespace',0):
GContent(self.xmlStack[0], text)
else:
# Normalize
Index: gnue/common/src/GParserHelpers.py
diff -c gnue/common/src/GParserHelpers.py:1.3
gnue/common/src/GParserHelpers.py:1.4
*** gnue/common/src/GParserHelpers.py:1.3 Mon Apr 8 17:53:03 2002
--- gnue/common/src/GParserHelpers.py Wed Apr 17 15:09:17 2002
***************
*** 62,69 ****
def showTree(self, indent=0):
print ' '*indent + 'GContent ' + `self._content`
! def getObjectType(self):
! return "_content_"
#
# getDescription
--- 62,69 ----
def showTree(self, indent=0):
print ' '*indent + 'GContent ' + `self._content`
! #def _type(self):
! # return "_content_"
#
# getDescription
Index: gnue/common/src/GTypecast.py
diff -c gnue/common/src/GTypecast.py:1.1 gnue/common/src/GTypecast.py:1.2
*** gnue/common/src/GTypecast.py:1.1 Wed Jul 4 20:24:11 2001
--- gnue/common/src/GTypecast.py Wed Apr 17 15:09:17 2002
***************
*** 86,97 ****
#
######################################################
def boolean (value):
! if value == 0 or value == 1:
return value
! rv = string.lower(string.strip(value))
if len(rv):
! return not (rv[0] == 'n' or rv[0] == 'f' or rv == '0')
else:
# This may seem counter-intuitive, but if attribute was present
# without a specified value, then treat as true
--- 86,97 ----
#
######################################################
def boolean (value):
! if value in (0,1):
return value
! rv = string.strip(value)
if len(rv):
! return not (string.lower(rv) in ('n','f','0'))
else:
# This may seem counter-intuitive, but if attribute was present
# without a specified value, then treat as true
Index: gnue/common/src/commdrivers/_corba/CommDriver.py
diff -c gnue/common/src/commdrivers/_corba/CommDriver.py:1.2
gnue/common/src/commdrivers/_corba/CommDriver.py:1.3
*** gnue/common/src/commdrivers/_corba/CommDriver.py:1.2 Fri Oct 26
01:40:45 2001
--- gnue/common/src/commdrivers/_corba/CommDriver.py Wed Apr 17 15:09:17 2002
***************
*** 33,36 ****
pass
class CorbaServer(GBaseApp.Server):
- pass
\ No newline at end of file
--- 33,35 ----
Index: gnue/common/src/dbdrivers/_dbsig/DBdriver.py
diff -c gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.45
gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.46
*** gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.45 Sat Apr 13 12:08:39 2002
--- gnue/common/src/dbdrivers/_dbsig/DBdriver.py Wed Apr 17 15:09:17 2002
***************
*** 338,344 ****
return "%s" % element
else:
# Note that we strip the GC from the object types and lowercase the rest
! otype = string.lower(element.getObjectType()[2:])
#print "Otype: ",otype
if otype == 'cfield':
return "%s" % element.name
--- 338,344 ----
return "%s" % element
else:
# Note that we strip the GC from the object types and lowercase the rest
! otype = string.lower(element._type[2:])
#print "Otype: ",otype
if otype == 'cfield':
return "%s" % element.name
Index: gnue/common/src/dbdrivers/geas/DBdriver.py
diff -c gnue/common/src/dbdrivers/geas/DBdriver.py:1.23
gnue/common/src/dbdrivers/geas/DBdriver.py:1.24
*** gnue/common/src/dbdrivers/geas/DBdriver.py:1.23 Thu Jan 10 17:42:19 2002
--- gnue/common/src/dbdrivers/geas/DBdriver.py Wed Apr 17 15:09:17 2002
***************
*** 210,217 ****
if type(conditionTree) != types.InstanceType:
return "%s" % conditionTree # This is usless in this driver as it
won't be a string
else:
! print ":"*count, conditionTree.getObjectType()
! otype = string.lower(conditionTree.getObjectType()[2:])
if otype == 'cfield':
return "%s" % conditionTree.name
elif otype == 'cconst':
--- 210,217 ----
if type(conditionTree) != types.InstanceType:
return "%s" % conditionTree # This is usless in this driver as it
won't be a string
else:
! print ":"*count, conditionTree._type
! otype = string.lower(conditionTree._type[2:])
if otype == 'cfield':
return "%s" % conditionTree.name
elif otype == 'cconst':
***************
*** 246,252 ****
raise GConditions.ConditionNotSupported, \
'Condition clause "%s" is not supported by this db
driver.' % otype
! #print " "*count, conditionTree.getObjectType()," : ",
conditionTree.getValue()
#for i in range(0, len(conditionTree._children)):
# self.__conditionToGEASQuery(queryObject,
conditionTree._children[i],count+1)
--- 246,252 ----
raise GConditions.ConditionNotSupported, \
'Condition clause "%s" is not supported by this db
driver.' % otype
! #print " "*count, conditionTree._type," : ",
conditionTree.getValue()
#for i in range(0, len(conditionTree._children)):
# self.__conditionToGEASQuery(queryObject,
conditionTree._children[i],count+1)
Index: gnue/common/src/dbdrivers/msado/DBdriver.py
diff -c gnue/common/src/dbdrivers/msado/DBdriver.py:1.2
gnue/common/src/dbdrivers/msado/DBdriver.py:1.3
*** gnue/common/src/dbdrivers/msado/DBdriver.py:1.2 Thu Jan 10 15:59:18 2002
--- gnue/common/src/dbdrivers/msado/DBdriver.py Wed Apr 17 15:09:17 2002
***************
*** 200,206 ****
if type(element) != types.InstanceType:
return "%s" % element
else:
! otype = string.lower(element.getObjectType()[2:])
if otype == 'field':
return "[%s]" % element.name
elif otype == 'const':
--- 200,206 ----
if type(element) != types.InstanceType:
return "%s" % element
else:
! otype = string.lower(element._type[2:])
if otype == 'field':
return "[%s]" % element.name
elif otype == 'const':
Index: gnue/common/src/dbdrivers/odbc/DBdriver.py
diff -c gnue/common/src/dbdrivers/odbc/DBdriver.py:1.14
gnue/common/src/dbdrivers/odbc/DBdriver.py:1.15
*** gnue/common/src/dbdrivers/odbc/DBdriver.py:1.14 Tue Jan 29 16:02:43 2002
--- gnue/common/src/dbdrivers/odbc/DBdriver.py Wed Apr 17 15:09:18 2002
***************
*** 377,383 ****
if type(element) != types.InstanceType:
return "%s" % element
else:
! otype = string.lower(element.getObjectType()[2:])
if otype == 'cfield':
return "%s" % element.name
elif otype == 'cconst':
--- 377,383 ----
if type(element) != types.InstanceType:
return "%s" % element
else:
! otype = string.lower(element._type[2:])
if otype == 'cfield':
return "%s" % element.name
elif otype == 'cconst':
Index: gnue/designer/src/Instance.py
diff -c gnue/designer/src/Instance.py:1.49 gnue/designer/src/Instance.py:1.50
*** gnue/designer/src/Instance.py:1.49 Thu Apr 4 20:23:20 2002
--- gnue/designer/src/Instance.py Wed Apr 17 15:09:18 2002
***************
*** 267,273 ****
if (object.name == None or ( \
object.name[:3] == "__<" and \
object.name[-3:] == ">__")):
! object.name = self.getNextGenericName(object.getObjectType()[2:])
self.nameMappings[string.lower(object.name)] = object
# Now, give the tool-specific instances a chance
--- 267,273 ----
if (object.name == None or ( \
object.name[:3] == "__<" and \
object.name[-3:] == ">__")):
! object.name = self.getNextGenericName(object._type[2:])
self.nameMappings[string.lower(object.name)] = object
# Now, give the tool-specific instances a chance
Index: gnue/designer/src/PopupMenu.py
diff -c gnue/designer/src/PopupMenu.py:1.9 gnue/designer/src/PopupMenu.py:1.10
*** gnue/designer/src/PopupMenu.py:1.9 Mon Jan 14 15:29:54 2002
--- gnue/designer/src/PopupMenu.py Wed Apr 17 15:09:18 2002
***************
*** 63,69 ****
if not isinstance (object, GFForm.GFForm):
# Delete
id = wxNewId()
! self.Append(id, "&Delete %s" % object.getObjectType()[2:])
EVT_MENU(self, id, self.OnDeleteObject)
self.AppendSeparator()
--- 63,69 ----
if not isinstance (object, GFForm.GFForm):
# Delete
id = wxNewId()
! self.Append(id, "&Delete %s" % object._type[2:])
EVT_MENU(self, id, self.OnDeleteObject)
self.AppendSeparator()
***************
*** 98,105 ****
for child in object._children:
if isinstance (child, GObjects.GObj):
self.AppendMenu(wxNewId(), hasattr(child,'name') and child.name or \
! string.upper(child.getObjectType()[2]) + \
! string.lower(child.getObjectType()[3:]),
PageMenu(self.__instance, child, self.x, self.y))
--- 98,105 ----
for child in object._children:
if isinstance (child, GObjects.GObj):
self.AppendMenu(wxNewId(), hasattr(child,'name') and child.name or \
! string.upper(child._type[2]) + \
! string.lower(child._type[3:]),
PageMenu(self.__instance, child, self.x, self.y))
***************
*** 152,160 ****
for object in self._object._children[:]:
if hasattr(object, 'hidden') and object.hidden:
hiddenObjects.append(object)
! elif object.getObjectType() == 'GFTrigger':
triggerObjects.append(object)
! elif object.getObjectType() == 'GFBlock':
object._popupMenu.OnReorderLayout(event)
object.__savedChildren = object._children[:]
for o2 in object.__savedChildren:
--- 152,160 ----
for object in self._object._children[:]:
if hasattr(object, 'hidden') and object.hidden:
hiddenObjects.append(object)
! elif object._type == 'GFTrigger':
triggerObjects.append(object)
! elif object._type == 'GFBlock':
object._popupMenu.OnReorderLayout(event)
object.__savedChildren = object._children[:]
for o2 in object.__savedChildren:
***************
*** 172,178 ****
oid = "%5d.%5d.%5d" % (object.y, object.x, unqId)
unqId = unqId + 1
! if object.getObjectType() == 'GFBox':
boxObjects[oid] = object
else:
navObjects[oid] = object
--- 172,178 ----
oid = "%5d.%5d.%5d" % (object.y, object.x, unqId)
unqId = unqId + 1
! if object._type == 'GFBox':
boxObjects[oid] = object
else:
navObjects[oid] = object
***************
*** 226,232 ****
self._object = object
self.AppendSeparator()
! tag = string.lower(object.getObjectType()[2:])
if Incubator.elementMapping.has_key(tag):
Incubator.elementMapping[tag].sort()
for element in Incubator.elementMapping[tag]:
--- 226,232 ----
self._object = object
self.AppendSeparator()
! tag = string.lower(object._type[2:])
if Incubator.elementMapping.has_key(tag):
Incubator.elementMapping[tag].sort()
for element in Incubator.elementMapping[tag]:
***************
*** 252,259 ****
class PageMenu(ActionMenu):
def __init__(self, instance, object, x, y):
ActionMenu.__init__(self, instance, object, None, hasattr(object,'name')
and \
! object.name or string.upper(object.getObjectType()[2]) + \
! string.lower(object.getObjectType()[3:]) )
self.x = x
self.y = y
--- 252,259 ----
class PageMenu(ActionMenu):
def __init__(self, instance, object, x, y):
ActionMenu.__init__(self, instance, object, None, hasattr(object,'name')
and \
! object.name or string.upper(object._type[2]) + \
! string.lower(object._type[3:]) )
self.x = x
self.y = y
Index: gnue/designer/src/PropertyEditor.py
diff -c gnue/designer/src/PropertyEditor.py:1.21
gnue/designer/src/PropertyEditor.py:1.22
*** gnue/designer/src/PropertyEditor.py:1.21 Tue Jan 22 13:17:14 2002
--- gnue/designer/src/PropertyEditor.py Wed Apr 17 15:09:18 2002
***************
*** 63,73 ****
self.object = object
try:
! self.attributes =
elements[string.lower(object.getObjectType()[2:])]['Attributes']
except KeyError:
self.attributes = {}
! self.elements = elements[string.lower(object.getObjectType()[2:])]
# Speed up the process by not refreshing the grid yet
--- 63,73 ----
self.object = object
try:
! self.attributes =
elements[string.lower(object._type[2:])]['Attributes']
except KeyError:
self.attributes = {}
! self.elements = elements[string.lower(object._type[2:])]
# Speed up the process by not refreshing the grid yet
***************
*** 493,503 ****
self.object = object
try:
! self.attributes =
elements[string.lower(object.getObjectType()[2:])]['Attributes']
except KeyError:
self.attributes = {}
! self.elements = elements[string.lower(object.getObjectType()[2:])]
# This is a nasty temporary way of refreshing grid
if self.grid:
--- 493,503 ----
self.object = object
try:
! self.attributes =
elements[string.lower(object._type[2:])]['Attributes']
except KeyError:
self.attributes = {}
! self.elements = elements[string.lower(object._type[2:])]
# This is a nasty temporary way of refreshing grid
if self.grid:
Index: gnue/designer/src/TreeView.py
diff -c gnue/designer/src/TreeView.py:1.18 gnue/designer/src/TreeView.py:1.19
*** gnue/designer/src/TreeView.py:1.18 Mon Nov 19 21:00:16 2001
--- gnue/designer/src/TreeView.py Wed Apr 17 15:09:18 2002
***************
*** 108,121 ****
object._parent == self.form:
parentTreeItem = self.form._treeItemPageLayout
icon = 'page'
! elif object.getObjectType() in ('GFBlock',):
icon = 'block'
! elif object.getObjectType() in ('GFOption',):
icon = 'properties'
! elif object.getObjectType() in ('GFEntry',):
icon = 'entry'
! elif len(object.getObjectType()) >= 8 and \
! object.getObjectType()[:8] == 'GFImport':
icon = 'import'
elif object.findParentOfType('GFPage') != None:
icon = 'pagewidget'
--- 108,121 ----
object._parent == self.form:
parentTreeItem = self.form._treeItemPageLayout
icon = 'page'
! elif object._type in ('GFBlock',):
icon = 'block'
! elif object._type in ('GFOption',):
icon = 'properties'
! elif object._type in ('GFEntry',):
icon = 'entry'
! elif len(object._type) >= 8 and \
! object._type[:8] == 'GFImport':
icon = 'import'
elif object.findParentOfType('GFPage') != None:
icon = 'pagewidget'
***************
*** 144,150 ****
if object == None:
return
if handler != __name__:
! GDebug.printMesg(4,"Adding %s (%s)" % (object.name,
object.getObjectType()))
self.inventoryObject(object)
def onModifyObject (self, object, handler, modifications):
--- 144,150 ----
if object == None:
return
if handler != __name__:
! GDebug.printMesg(4,"Adding %s (%s)" % (object.name, object._type))
self.inventoryObject(object)
def onModifyObject (self, object, handler, modifications):
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.18
gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.19
*** gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.18 Tue Apr 2
17:14:01 2002
--- gnue/designer/src/forms/LayoutEditor/LayoutEditor.py Wed Apr 17
15:09:18 2002
***************
*** 315,328 ****
def __drawItem(self, object):
! if self.widgets.has_key(object.getObjectType()) and \
(not hasattr(object, 'hidden') or not object.hidden):
if hasattr(object, 'name'):
! GDebug.printMesg(7, 'Drawing item %s of type %s' % (object.name,
object.getObjectType()))
else:
! GDebug.printMesg(7, 'Drawing item of type %s' %
(object.getObjectType()))
object._widgetHandler = WidgetHandler(self, object)
! object._widget = self.widgets[object.getObjectType()]\
(object,self.panel, self.textWidth, self.textHeight, \
self.widgetWidth, self.widgetHeight, self,initialize=0)
object._widget._object = object
--- 315,328 ----
def __drawItem(self, object):
! if self.widgets.has_key(object._type) and \
(not hasattr(object, 'hidden') or not object.hidden):
if hasattr(object, 'name'):
! GDebug.printMesg(7, 'Drawing item %s of type %s' % (object.name,
object._type))
else:
! GDebug.printMesg(7, 'Drawing item of type %s' % (object._type))
object._widgetHandler = WidgetHandler(self, object)
! object._widget = self.widgets[object._type]\
(object,self.panel, self.textWidth, self.textHeight, \
self.widgetWidth, self.widgetHeight, self,initialize=0)
object._widget._object = object
***************
*** 500,510 ****
y = int(y / self.gridHeight)
menu = wxMenu('Layout Editor')
! form = self._currentObject.getObjectType() == 'GFForm' and
self._currentObject or \
self._currentObject.findParentOfType('GFForm')
! page = self._currentObject.getObjectType() == 'GFPage' and
self._currentObject or \
self._currentObject.findParentOfType('GFPage')
! block = self._currentObject.getObjectType() == 'GFBlock' and
self._currentObject or \
self._currentObject.findParentOfType('GFBlock')
menu.AppendMenu(wxNewId(), 'Form', PageMenu(self._instance, form, x, y))
--- 500,510 ----
y = int(y / self.gridHeight)
menu = wxMenu('Layout Editor')
! form = self._currentObject._type == 'GFForm' and self._currentObject or \
self._currentObject.findParentOfType('GFForm')
! page = self._currentObject._type == 'GFPage' and self._currentObject or \
self._currentObject.findParentOfType('GFPage')
! block = self._currentObject._type == 'GFBlock' and self._currentObject or
\
self._currentObject.findParentOfType('GFBlock')
menu.AppendMenu(wxNewId(), 'Form', PageMenu(self._instance, form, x, y))
Index: gnue/designer/src/forms/LayoutEditor/PropertyBar.py
diff -c gnue/designer/src/forms/LayoutEditor/PropertyBar.py:1.1
gnue/designer/src/forms/LayoutEditor/PropertyBar.py:1.2
*** gnue/designer/src/forms/LayoutEditor/PropertyBar.py:1.1 Wed Jan 30
12:29:46 2002
--- gnue/designer/src/forms/LayoutEditor/PropertyBar.py Wed Apr 17 15:09:18 2002
***************
*** 123,129 ****
def setCurrentObject(self, object):
self.object = object
! self.typeEditor.SetValue(object.getObjectType()[2:])
if hasattr(object, 'x'):
self.xEditor.SetValue(object.x)
--- 123,129 ----
def setCurrentObject(self, object):
self.object = object
! self.typeEditor.SetValue(object._type[2:])
if hasattr(object, 'x'):
self.xEditor.SetValue(object.x)
Index: gnue/designer/src/forms/LayoutEditor/Utils.py
diff -c gnue/designer/src/forms/LayoutEditor/Utils.py:1.1
gnue/designer/src/forms/LayoutEditor/Utils.py:1.2
*** gnue/designer/src/forms/LayoutEditor/Utils.py:1.1 Wed Jan 30 12:29:46 2002
--- gnue/designer/src/forms/LayoutEditor/Utils.py Wed Apr 17 15:09:18 2002
***************
*** 74,77 ****
def GiveFeedback(self, effect, scrolling=0):
return 0
-
\ No newline at end of file
--- 74,76 ----
Index: gnue/forms/src/GFDisplayHandler.py
diff -c gnue/forms/src/GFDisplayHandler.py:1.20
gnue/forms/src/GFDisplayHandler.py:1.21
*** gnue/forms/src/GFDisplayHandler.py:1.20 Tue Apr 16 22:05:17 2002
--- gnue/forms/src/GFDisplayHandler.py Wed Apr 17 15:09:18 2002
***************
*** 495,501 ****
# TODO: Replace with format mask
def _buildDisplayHelper(self, val, editing):
- #print "_buildDisplayHelper('%s')" % val
if val in (None,""):
return ""
--- 495,500 ----
***************
*** 683,689 ****
if self.cursor > len(self.work):
self.work = self.display
else:
! self.display = self._buildDisplayHelper(str(self.value), 0)
def replaceText(self, event):
--- 682,688 ----
if self.cursor > len(self.work):
self.work = self.display
else:
! self.display = self._buildDisplayHelper(self.value, 0)
def replaceText(self, event):
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.164 gnue/forms/src/GFForm.py:1.165
*** gnue/forms/src/GFForm.py:1.164 Tue Apr 16 22:05:17 2002
--- gnue/forms/src/GFForm.py Wed Apr 17 15:09:18 2002
***************
*** 162,182 ****
# constructs the trigger namespace
#
def analyzeTree(self,object):
! if object.getObjectType() == 'GFBlock':
self._blockList.append(object)
if self._currentBlock == None:
self._currentBlock = object
! elif object.getObjectType() == 'GFPage':
self._pageList.append(object)
if self._currentPage == None:
self._currentPage = object
! elif object.getObjectType() in TabStops and self._currentEntry == None
and \
not object.hidden and not object.readonly:
self._currentEntry = object
! elif object.getObjectType() =='GFDataSource':
object.name = string.lower(object.name)
self._datasourceDictionary[object.name]=object
--- 162,182 ----
# constructs the trigger namespace
#
def analyzeTree(self,object):
! if object._type == 'GFBlock':
self._blockList.append(object)
if self._currentBlock == None:
self._currentBlock = object
! elif object._type == 'GFPage':
self._pageList.append(object)
if self._currentPage == None:
self._currentPage = object
! elif object._type in TabStops and self._currentEntry == None and \
not object.hidden and not object.readonly:
self._currentEntry = object
! elif object._type =='GFDataSource':
object.name = string.lower(object.name)
self._datasourceDictionary[object.name]=object
***************
*** 517,523 ****
for object in self._currentEntry._block._children:
# Put the first field as the next to rollover
! if (object.getObjectType() in TabStops and
(not object.hidden) and ((not object.readonly) or
(self._currentBlock.mode=='query' and object._queryable))):
if nextEntry == None:
--- 517,523 ----
for object in self._currentEntry._block._children:
# Put the first field as the next to rollover
! if (object._type in TabStops and
(not object.hidden) and ((not object.readonly) or
(self._currentBlock.mode=='query' and object._queryable))):
if nextEntry == None:
***************
*** 551,557 ****
lastEntry = self._currentEntry
for object in self._currentEntry._block._children:
! if object.getObjectType() in TabStops and \
not object.hidden and (not object.readonly or \
(self._currentBlock.mode=='query' and object._queryable)):
nextEntry = object
--- 551,557 ----
lastEntry = self._currentEntry
for object in self._currentEntry._block._children:
! if object._type in TabStops and \
not object.hidden and (not object.readonly or \
(self._currentBlock.mode=='query' and object._queryable)):
nextEntry = object
***************
*** 560,566 ****
keepNext = 0
for object in self._currentEntry._block._children:
# Put the first field as the next to rollover
! if object.getObjectType() in TabStops and not object.hidden and not
object.readonly:
if object == self._currentEntry:
break
--- 560,566 ----
keepNext = 0
for object in self._currentEntry._block._children:
# Put the first field as the next to rollover
! if object._type in TabStops and not object.hidden and not
object.readonly:
if object == self._currentEntry:
break
***************
*** 570,576 ****
prevBlock = self.findPreviousBlock()
# Move to the new last record of the new current block
for object in prevBlock._children:
! if object.getObjectType() in TabStops and \
not object.hidden and (not object.readonly or
self._currentBlock.mode=='query'):
nextEntry = object
--- 570,576 ----
prevBlock = self.findPreviousBlock()
# Move to the new last record of the new current block
for object in prevBlock._children:
! if object._type in TabStops and \
not object.hidden and (not object.readonly or
self._currentBlock.mode=='query'):
nextEntry = object
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.45 gnue/forms/src/GFInstance.py:1.46
*** gnue/forms/src/GFInstance.py:1.45 Wed Apr 17 11:25:16 2002
--- gnue/forms/src/GFInstance.py Wed Apr 17 15:09:18 2002
***************
*** 497,503 ****
def changeFocus(self, event):
if not self._form.endEditing():
return
! if event.data.getObjectType()=='GFEntry' and (event.data.hidden or
(event.data.readonly and
self._form._currentBlock.mode!='query')):
return
newEntry = event.data
--- 497,503 ----
def changeFocus(self, event):
if not self._form.endEditing():
return
! if event.data._type=='GFEntry' and (event.data.hidden or
(event.data.readonly and
self._form._currentBlock.mode!='query')):
return
newEntry = event.data
Index: gnue/forms/src/GFObjects/GFBlock.py
diff -c gnue/forms/src/GFObjects/GFBlock.py:1.48
gnue/forms/src/GFObjects/GFBlock.py:1.49
*** gnue/forms/src/GFObjects/GFBlock.py:1.48 Wed Apr 17 11:25:16 2002
--- gnue/forms/src/GFObjects/GFBlock.py Wed Apr 17 15:09:18 2002
***************
*** 66,72 ****
self._queryDefaults = {}
self._queryValues = {}
self._lastQueryValues = {}
!
self._gap = 0
self._rows = 1
--- 66,72 ----
self._queryDefaults = {}
self._queryValues = {}
self._lastQueryValues = {}
! self._autocreate = int(GConfig.get('autocreate'))
self._gap = 0
self._rows = 1
***************
*** 144,150 ****
def buildEntryList(self, object):
! if object.getObjectType() == 'GFEntry':
self._entryList.append(object)
#
--- 144,150 ----
def buildEntryList(self, object):
! if object._type == 'GFEntry':
self._entryList.append(object)
#
***************
*** 216,222 ****
if self._resultSet.nextRecord():
self._recordCount = self._resultSet.getRecordCount()
self.switchRecord(1)
! elif int(GConfig.get('autocreate')) and not self.isEmpty() and not
self.restrictInsert:
self.newRecord()
def lastRecord(self):
--- 216,222 ----
if self._resultSet.nextRecord():
self._recordCount = self._resultSet.getRecordCount()
self.switchRecord(1)
! elif self._autocreate and not self.isEmpty() and not self.restrictInsert:
self.newRecord()
def lastRecord(self):
Index: gnue/forms/src/GFObjects/GFEntry.py
diff -c gnue/forms/src/GFObjects/GFEntry.py:1.55
gnue/forms/src/GFObjects/GFEntry.py:1.56
*** gnue/forms/src/GFObjects/GFEntry.py:1.55 Wed Apr 17 11:25:16 2002
--- gnue/forms/src/GFObjects/GFEntry.py Wed Apr 17 15:09:19 2002
***************
*** 185,210 ****
# Pulls the proper value from the resultSet
#
def getValue(self):
# We have to check to see if the _block has been
# setup yet. The Trigger system calls getValue
# before it's ready so we fake it
! if hasattr(self,'_block'):
! if self._block.mode == 'query':
! if self._block._queryValues.has_key(self):
! value = self._block._queryValues[self]
! else:
! value = None
!
! elif self._block.mode == 'precommit':
value = self._block._preCommitWorkingRecord.getField(self.field)
- else:
- value = self._block._resultSet.current.getField(self.field)
else:
! value = None
if value == None: value = ''
#CheckBox does not work if comment following "if" block (ra3vat)
if self.style == 'checkbox' and value == '': value = 0
--- 185,212 ----
# Pulls the proper value from the resultSet
#
def getValue(self):
+ # TODO: No longer true...
# We have to check to see if the _block has been
# setup yet. The Trigger system calls getValue
# before it's ready so we fake it
! #if hasattr(self,'_block'):
! if self._block.mode == 'query':
! try:
! value = self._block._queryValues[self]
! except KeyError:
! value = None
! elif self._block.mode == 'precommit':
value = self._block._preCommitWorkingRecord.getField(self.field)
else:
! value = self._block._resultSet.current.getField(self.field)
! # TODO: part of the removed block check from above
! #else:
! # value = None
if value == None: value = ''
+ # TODO: check to see if this is still needed
#CheckBox does not work if comment following "if" block (ra3vat)
if self.style == 'checkbox' and value == '': value = 0
***************
*** 219,224 ****
--- 221,227 ----
if self.style=='checkbox' and value =='':
value = 0
if self.typecast == "number" and value != None:
+ print "value is ",value
value = float(value)
self.setValue(value)
Index: gnue/forms/src/uidrivers/_base/UIdriver.py
diff -c gnue/forms/src/uidrivers/_base/UIdriver.py:1.67
gnue/forms/src/uidrivers/_base/UIdriver.py:1.68
*** gnue/forms/src/uidrivers/_base/UIdriver.py:1.67 Wed Apr 17 11:25:16 2002
--- gnue/forms/src/uidrivers/_base/UIdriver.py Wed Apr 17 15:09:19 2002
***************
*** 100,106 ****
def _stdHandler(self):
object = self._currentObject[0]
container = self.currentWidget[0]
! newWidget = self.widgets[object.getObjectType()](object,container,
self.textWidth, self.textHeight,
self.widgetWidth,
self.widgetHeight, self)
return newWidget
--- 100,106 ----
def _stdHandler(self):
object = self._currentObject[0]
container = self.currentWidget[0]
! newWidget = self.widgets[object._type](object,container, self.textWidth,
self.textHeight,
self.widgetWidth,
self.widgetHeight, self)
return newWidget
***************
*** 114,120 ****
#
def _buildUI(self):
try:
! uiWidget =
self.widgetConstructorFunction[self._currentObject[0].getObjectType()] ()
widget = uiWidget.widgets
GDebug.printMesg(2, "Widget is %s" % widget)
self._formToUIWidget[self._currentObject[0]]=uiWidget
--- 114,120 ----
#
def _buildUI(self):
try:
! uiWidget = self.widgetConstructorFunction[self._currentObject[0]._type]
()
widget = uiWidget.widgets
GDebug.printMesg(2, "Widget is %s" % widget)
self._formToUIWidget[self._currentObject[0]]=uiWidget
Index: gnue/navigator/src/__init__.py
diff -c gnue/navigator/src/__init__.py:1.2 gnue/navigator/src/__init__.py:1.3
*** gnue/navigator/src/__init__.py:1.2 Fri Jan 11 02:35:56 2002
--- gnue/navigator/src/__init__.py Wed Apr 17 15:09:19 2002
***************
*** 49,52 ****
PACKAGE="GNUe Navigator"
- TITLE=PACKAGE
\ No newline at end of file
--- 49,51 ----
Index: gnue/reports/src/GRLayout.py
diff -c gnue/reports/src/GRLayout.py:1.30 gnue/reports/src/GRLayout.py:1.31
*** gnue/reports/src/GRLayout.py:1.30 Mon Apr 15 01:39:25 2002
--- gnue/reports/src/GRLayout.py Wed Apr 17 15:09:19 2002
***************
*** 423,429 ****
def processDefault(self, dest, mapper):
structuralComment(dest,"<!--[default]-->")
for child in self._children:
! if child.getObjectType() == "_content_":
dest.write(child.getContent())
structuralComment(dest,"<!--[/default]-->")
--- 423,429 ----
def processDefault(self, dest, mapper):
structuralComment(dest,"<!--[default]-->")
for child in self._children:
! if child._type == "_content_":
dest.write(child.getContent())
structuralComment(dest,"<!--[/default]-->")
Index: gnue/reports/src/GRSources.py
diff -c gnue/reports/src/GRSources.py:1.9 gnue/reports/src/GRSources.py:1.10
*** gnue/reports/src/GRSources.py:1.9 Mon Mar 25 23:34:07 2002
--- gnue/reports/src/GRSources.py Wed Apr 17 15:09:19 2002
***************
*** 57,70 ****
# Used internally by self.prepare()
# Connects to databases
def __initConnections(self, object):
! if object.getObjectType() == "GRDataSource":
GDebug.printMesg(3,"Connecting DataSource '%s' to connection '%s'" \
% (object.name, object.database) )
object.connect()
self._datasourceDictionary[object.name] = object
def __connectMasterDetail(self, object):
! if object.getObjectType() == "GRDataSource" and object.master != None:
GDebug.printMesg(3,"Linking detail '%s' to master '%s'" \
% (object.name, object.master) )
if self._datasourceDictionary.has_key(object.master):
--- 57,70 ----
# Used internally by self.prepare()
# Connects to databases
def __initConnections(self, object):
! if object._type == "GRDataSource":
GDebug.printMesg(3,"Connecting DataSource '%s' to connection '%s'" \
% (object.name, object.database) )
object.connect()
self._datasourceDictionary[object.name] = object
def __connectMasterDetail(self, object):
! if object._type == "GRDataSource" and object.master != None:
GDebug.printMesg(3,"Linking detail '%s' to master '%s'" \
% (object.name, object.master) )
if self._datasourceDictionary.has_key(object.master):
***************
*** 77,86 ****
% (object.name, object.master)
def __setUserOptions(self, object):
! if object.getObjectType() == 'GRParam':
object._value = self._parameters.getParameter(object.name)
! # if object.getObjectType() == 'GRSortOption':
# pass
--- 77,86 ----
% (object.name, object.master)
def __setUserOptions(self, object):
! if object._type == 'GRParam':
object._value = self._parameters.getParameter(object.name)
! # if object._type == 'GRSortOption':
# pass
- gnue common/src/GObjects.py common/src/GParser....,
James Thompson <=