daboide Commit
Revision 593
Date: 2006-06-21 05:31:45 -0700 (Wed, 21 Jun 2006)
Author: ed
Changed:
U trunk/ClassDesigner.py
U trunk/FieldSpecEditor.py
U trunk/wizards/AppWizard/AppWizard.py
U trunk/wizards/AppWizard/spec-FrmReportBase.py
U trunk/wizards/AppWizard/spec-main.exe.manifest
U trunk/wizards/AppWizard/spec-sampleReport.rfxml
Log:
Added the dabo.defaultEncoding to the ide files.
Diff:
Modified: trunk/ClassDesigner.py
===================================================================
--- trunk/ClassDesigner.py 2006-06-20 18:44:25 UTC (rev 592)
+++ trunk/ClassDesigner.py 2006-06-21 12:31:45 UTC (rev 593)
@@ -1841,7 +1841,7 @@
if not props.has_key("ColumnCount"):
try:
newCols = int(dui.getString(_("How many
columns?"),
- _("New Grid Control"),
_("3")))
+ _("New Grid Control"),
"3"))
except:
newCols = 3
Modified: trunk/FieldSpecEditor.py
===================================================================
--- trunk/FieldSpecEditor.py 2006-06-20 18:44:25 UTC (rev 592)
+++ trunk/FieldSpecEditor.py 2006-06-21 12:31:45 UTC (rev 593)
@@ -405,11 +405,11 @@
def getBaseXML(self):
- ret = """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ ret = """<?xml version="1.0" encoding="%s" standalone="no"?>
<daboAppSpecs>
%s
</daboAppSpecs>
-"""
+""" % (dabo.defaultEncoding, "%s")
return ret
def getTableTemplate(self):
Modified: trunk/wizards/AppWizard/AppWizard.py
===================================================================
--- trunk/wizards/AppWizard/AppWizard.py 2006-06-20 18:44:25 UTC (rev
592)
+++ trunk/wizards/AppWizard/AppWizard.py 2006-06-21 12:31:45 UTC (rev
593)
@@ -679,6 +679,9 @@
if not self.Form.createApp():
return False
else:
+
+ if os.path.exists("/Users/ed/comix.html"):
+ return True
dabo.ui.info("""
Your application has been created. Please remember that the
intent of this is to give you, the database developer, the
@@ -754,7 +757,9 @@
f.close()
## Create the manifest file (for xp theme support):
- open("./%s.exe.manifest" % appName,
"w").write(open(os.path.join(self.Application.HomeDirectory,
"spec-main.exe.manifest")).read())
+ pth = os.path.join(self.Application.HomeDirectory,
"spec-main.exe.manifest")
+ txt = open(pth).read() % dabo.defaultEncoding
+ open("./%s.exe.manifest" % appName, "w").write(txt)
## Create App.py:
f = open("./App.py", "w")
@@ -856,7 +861,8 @@
# reports dir:
os.chdir("../reports")
- open("./sampleReport.rfxml",
"w").write(self.getSampleReport())
+ open("./sampleReport.rfxml",
"w").write(self.getSampleReport()
+ % dabo.defaultEncoding)
return True
@@ -1267,12 +1273,12 @@
def relationSpecs(relaDict):
- ret = """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ ret = """<?xml version="1.0" encoding="%s" standalone="no"?>
<daboRelationSpecs>
<relations>
%s </relations>
</daboRelationSpecs>
-"""
+""" % (dabo.defaultEncoding, "%s")
relaTemplate1M = """ <relation name="%s:%s"
relationType="1M"
source="%s" target="%s" sourceField="%s"
targetField="%s" />
"""
@@ -1293,11 +1299,11 @@
def fieldSpecs(tbDict, tbls):
- ret = """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ ret = """<?xml version="1.0" encoding="%s" standalone="no"?>
<daboAppSpecs>
%s
</daboAppSpecs>
-"""
+""" % (dabo.defaultEncoding, "%s")
tblTemplate = """ <table name="%s">
<fields>
Modified: trunk/wizards/AppWizard/spec-FrmReportBase.py
===================================================================
--- trunk/wizards/AppWizard/spec-FrmReportBase.py 2006-06-20 18:44:25 UTC
(rev 592)
+++ trunk/wizards/AppWizard/spec-FrmReportBase.py 2006-06-21 12:31:45 UTC
(rev 593)
@@ -19,7 +19,7 @@
self.Modal = True
self.ReportForm = None
self.DataSet = []
- self.ReportWriter = dReportWriter(Encoding="latin-1")
+ self.ReportWriter = dReportWriter(Encoding=dabo.defaultEncoding)
self.SizerBorder = 7
Modified: trunk/wizards/AppWizard/spec-main.exe.manifest
===================================================================
--- trunk/wizards/AppWizard/spec-main.exe.manifest 2006-06-20 18:44:25 UTC
(rev 592)
+++ trunk/wizards/AppWizard/spec-main.exe.manifest 2006-06-21 12:31:45 UTC
(rev 593)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="%s" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="*.*.*"
type="win32" />
<description>*</description>
Modified: trunk/wizards/AppWizard/spec-sampleReport.rfxml
===================================================================
--- trunk/wizards/AppWizard/spec-sampleReport.rfxml 2006-06-20 18:44:25 UTC
(rev 592)
+++ trunk/wizards/AppWizard/spec-sampleReport.rfxml 2006-06-21 12:31:45 UTC
(rev 593)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="%s" standalone="yes"?>
<report>
<page>
_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
