[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r7593 - in trunk/gnue-designer/src: base/tools forms/LayoutEditor
From: |
johannes |
Subject: |
[gnue] r7593 - in trunk/gnue-designer/src: base/tools forms/LayoutEditor templates/forms templates/schema |
Date: |
Mon, 13 Jun 2005 08:10:42 -0500 (CDT) |
Author: johannes
Date: 2005-06-13 08:10:40 -0500 (Mon, 13 Jun 2005)
New Revision: 7593
Modified:
trunk/gnue-designer/src/base/tools/PropertyEditor.py
trunk/gnue-designer/src/base/tools/SchemaNavigator.py
trunk/gnue-designer/src/base/tools/SchemaViewer.py
trunk/gnue-designer/src/forms/LayoutEditor/DisplayDropTarget.py
trunk/gnue-designer/src/templates/forms/FormBuilder.py
trunk/gnue-designer/src/templates/forms/Simple.py
trunk/gnue-designer/src/templates/schema/Introspection.py
Log:
use proper typecasts for fields
Modified: trunk/gnue-designer/src/base/tools/PropertyEditor.py
===================================================================
--- trunk/gnue-designer/src/base/tools/PropertyEditor.py 2005-06-12
22:16:09 UTC (rev 7592)
+++ trunk/gnue-designer/src/base/tools/PropertyEditor.py 2005-06-13
13:10:40 UTC (rev 7593)
@@ -210,7 +210,10 @@
else:
text += ':'
- label = wxStaticText(self.labelPanel, -1, text)
+ try:
+ label = wxStaticText (self.labelPanel, -1, text)
+ except:
+ pass
# Determine the type of Cell Editor we want
# (Integer, Boolean, Dropdown, Char)
Modified: trunk/gnue-designer/src/base/tools/SchemaNavigator.py
===================================================================
--- trunk/gnue-designer/src/base/tools/SchemaNavigator.py 2005-06-12
22:16:09 UTC (rev 7592)
+++ trunk/gnue-designer/src/base/tools/SchemaNavigator.py 2005-06-13
13:10:40 UTC (rev 7593)
@@ -124,15 +124,15 @@
def OnBeginRDrag(self, event):
self.OnBeginDrag(event, right=1)
- def OnSelectionChange(self, event):
- try:
+ def OnSelectionChange(self, event):
+ try:
o = self.tree.GetPyData(event.GetItem())
if o.getColumn():
self.setFeedback(o.getLabel() + ': ' + o.getColumn())
else:
self.setFeedback('')
- except:
- pass
+ except:
+ pass
def __addTable(self, object):
# Find the "connection" node
Modified: trunk/gnue-designer/src/base/tools/SchemaViewer.py
===================================================================
--- trunk/gnue-designer/src/base/tools/SchemaViewer.py 2005-06-12 22:16:09 UTC
(rev 7592)
+++ trunk/gnue-designer/src/base/tools/SchemaViewer.py 2005-06-13 13:10:40 UTC
(rev 7593)
@@ -359,7 +359,7 @@
self.list.InsertStringItem(index, field.name)
self.list.SetStringItem(index, SCH_TYPE,
- string.upper(field.datatype[0]) + field.datatype[1:])
+ string.upper(field.type[0]) + field.type[1:])
self.list.SetStringItem(index, SCH_NATIVE,
hasattr(field, 'nativetype') and field.nativetype or '(unknown)')
self.list.SetStringItem(index, SCH_REQ,
@@ -423,8 +423,8 @@
string.join(string.split(string.capwords( \
string.replace(object.name,'_',' '))),''))),
"field": object.name,
- "datatype": object.datatype,
- "required" : object.required,
+ "datatype": object.type,
+ "required" : not object.nullable,
}
if hasattr(object,'length') and object.length:
Modified: trunk/gnue-designer/src/forms/LayoutEditor/DisplayDropTarget.py
===================================================================
--- trunk/gnue-designer/src/forms/LayoutEditor/DisplayDropTarget.py
2005-06-12 22:16:09 UTC (rev 7592)
+++ trunk/gnue-designer/src/forms/LayoutEditor/DisplayDropTarget.py
2005-06-13 13:10:40 UTC (rev 7593)
@@ -36,6 +36,10 @@
# Drag and Drop support for our grid
#
class DisplayDropTarget(wxPyDropTarget):
+ TYPEMAP = {'date' : 'date',
+ 'datetime': 'date',
+ 'time' : 'date',
+ 'number' : 'number'}
def __init__(self, editor):
wxPyDropTarget.__init__(self)
@@ -343,7 +347,7 @@
fattr = {'name': instance.getUniqueName('fld' + f['name'].capitalize()),
'field':f['name'],
- 'typecast':f['type']}
+ 'typecast': self.TYPEMAP.get (f['type'], 'text')}
try:
fattr['required'] = f['required']
Modified: trunk/gnue-designer/src/templates/forms/FormBuilder.py
===================================================================
--- trunk/gnue-designer/src/templates/forms/FormBuilder.py 2005-06-12
22:16:09 UTC (rev 7592)
+++ trunk/gnue-designer/src/templates/forms/FormBuilder.py 2005-06-13
13:10:40 UTC (rev 7593)
@@ -58,7 +58,8 @@
'time' : 'date',
'datetime': 'date',
'boolean' : 'boolean',
- 'number' : 'number'}
+ 'number' : 'number',
+ 'string' : 'text'}
Modified: trunk/gnue-designer/src/templates/forms/Simple.py
===================================================================
--- trunk/gnue-designer/src/templates/forms/Simple.py 2005-06-12 22:16:09 UTC
(rev 7592)
+++ trunk/gnue-designer/src/templates/forms/Simple.py 2005-06-13 13:10:40 UTC
(rev 7593)
@@ -49,7 +49,8 @@
'time' : 'date',
'datetime': 'date',
'boolean' : 'boolean',
- 'number' : 'number'}
+ 'number' : 'number',
+ 'string' : 'text'}
# The first step in our wizard.
# The template parser will initially
Modified: trunk/gnue-designer/src/templates/schema/Introspection.py
===================================================================
--- trunk/gnue-designer/src/templates/schema/Introspection.py 2005-06-12
22:16:09 UTC (rev 7592)
+++ trunk/gnue-designer/src/templates/schema/Introspection.py 2005-06-13
13:10:40 UTC (rev 7593)
@@ -169,7 +169,7 @@
except AttributeError:
if field.type == 'number':
attrs['length'] = 12
- elif field.type == 'text':
+ elif field.type == 'string':
attrs['length'] = 200
# ... precision
@@ -188,7 +188,7 @@
if hasattr(field,'defaulttype'):
if field.defaulttype == 'serial':
attrs['defaultwith'] = 'serial'
- if field.name in primarykeys and field.datatype == 'number':
+ if field.name in primarykeys and field.type == 'number':
attrs['type'] = 'key'
elif field.defaulttype == 'sequence':
attrs['defaultwith'] = 'sequence'
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r7593 - in trunk/gnue-designer/src: base/tools forms/LayoutEditor templates/forms templates/schema,
johannes <=