dabo Commit
Revision 5075
Date: 2009-02-23 09:40:30 -0800 (Mon, 23 Feb 2009)
Author: Ed
Trac: http://trac.dabodev.com/changeset/5075
Changed:
U trunk/ide/ClassDesigner.py
U trunk/ide/ClassDesignerFormMixin.py
U trunk/ide/ClassDesignerPropSheet.py
Log:
Removed the CxnFile property and support for editing it. Modified the Class
Designer to discard that property when opening existing .cdxml files that may
still contain it.
Diff:
Modified: trunk/ide/ClassDesigner.py
===================================================================
--- trunk/ide/ClassDesigner.py 2009-02-23 17:39:06 UTC (rev 5074)
+++ trunk/ide/ClassDesigner.py 2009-02-23 17:40:30 UTC (rev 5075)
@@ -124,7 +124,6 @@
# Get rid of the update/refresh delays
dabo.useUpdateDelays = False
-
# Define the controls that can be added to the ClassDesigner.
The
# 'order' value will determine their order in the menu. One plan
# is to keep track of the user's choices, and weight the orders
@@ -554,6 +553,8 @@
self._initDB(os.path.dirname(currdir))
# We need to remove the menu bar class for now, since it isn't
used at design time.
mbf = self._extractKey(atts, "MenuBarFile")
+ # 'CxnFile' has been removed as a property, but some old cdxml
files may still reference it.
+ self._extractKey(atts, "CxnFile")
if self._reuseMainForm(useSizers=atts.get("UseSizers", False)):
# Original form hasn't changed, so just use it.
frm = self.MainForm
Modified: trunk/ide/ClassDesignerFormMixin.py
===================================================================
--- trunk/ide/ClassDesignerFormMixin.py 2009-02-23 17:39:06 UTC (rev 5074)
+++ trunk/ide/ClassDesignerFormMixin.py 2009-02-23 17:40:30 UTC (rev 5075)
@@ -794,7 +794,6 @@
_("No Slot Selected"))
return
wiz = QuickLayoutWizard(self)
- wiz.ConnectionFile = self.CxnFile
wiz.ConnectionName = self.CxnName
wiz.callback = self.addQuickLayout
wiz.start()
@@ -803,7 +802,6 @@
def addQuickLayout(self, layoutInfo):
- self.CxnFile = layoutInfo["connectionFile"]
self.CxnName = layoutInfo["connectionName"]
if layoutInfo["createBizobj"]:
self.addBizobjCode(layoutInfo)
@@ -1503,8 +1501,6 @@
"ShowCaption": {"type" : bool, "readonly" :
False},
"MenuBarFile": {"type" : "path", "readonly" :
False,
"customEditor": "editMenuBarFile"},
- "CxnFile": {"type" : "path", "readonly" :
False,
- "customEditor": "editCxnFile"},
"CxnName": {"type" : unicode, "readonly" :
False},
"Tag" : {"type" : "multi", "readonly" : False},
"Transparency" : {"type" : int, "readonly" :
False},
Modified: trunk/ide/ClassDesignerPropSheet.py
===================================================================
--- trunk/ide/ClassDesignerPropSheet.py 2009-02-23 17:39:06 UTC (rev 5074)
+++ trunk/ide/ClassDesignerPropSheet.py 2009-02-23 17:40:30 UTC (rev 5075)
@@ -502,16 +502,6 @@
dlg.release()
- def editCxnFile(self, objs, prop, val):
- # Select a connection file
- obj = objs[0]
- newVal = dabo.ui.getFile("cnxml", "*")
- if newVal is not None:
- self.propGrid.CurrentValue = newVal
- self.updateVal(prop, newVal, unicode)
- self.propGrid.refresh()
-
-
def editMenuBarFile(self, objs, prop, val):
# Select a connection file
obj = objs[0]
_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
Searchable Archives: http://leafe.com/archives/search/dabo-dev
This message:
http://leafe.com/archives/byMID/[email protected]
