Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch from Eli Golovinsky. Adds generation of _() code for gettext

Browse Source 
and other tweaks.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-05-03 01:47:57 +00:00
parent a717bd116a
commit 7e05216cce
3 changed files with 146 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wxPython/wx/tools/XRCed/xrced.py
View File

@@ -405,7 +405,8 @@ class Frame(wxFrame):
if conf.localconf.ReadBool("autogenerate", False):
pypath = conf.localconf.Read("filename")
embed = conf.localconf.ReadBool("embedResource", False)
self.GeneratePython(self.dataFile, pypath, embed)
genGettext = conf.localconf.ReadBool("genGettext", False)
self.GeneratePython(self.dataFile, pypath, embed, genGettext)
self.SetStatusText('Data saved')
self.SaveRecent(path)
@@ -422,11 +423,11 @@ class Frame(wxFrame):
EVT_MENU(self, newid, self.OnRecentFile)
conf.recentfiles[newid] = path
def GeneratePython(self, dataFile, pypath, embed):
def GeneratePython(self, dataFile, pypath, embed, genGettext):
try:
import wx.tools.pywxrc
rescomp = wx.tools.pywxrc.XmlResourceCompiler()
rescomp.MakePythonModule(dataFile, pypath, embed)
rescomp.MakePythonModule(dataFile, pypath, embed, genGettext)
except:
inf = sys.exc_info()
wxLogError(traceback.format_exception(inf[0], inf[1], None)[-1])
@@ -1280,7 +1281,8 @@ class PythonOptions(wx.Dialog):
def OnGenerate(self, evt):
pypath = self.FileNameTC.GetValue()
embed = self.EmbedCB.GetValue()
frame.GeneratePython(self.dataFile, pypath, embed)
genGettext = self.GettextCB.GetValue()
frame.GeneratePython(self.dataFile, pypath, embed, genGettext)
self.OnSaveOpts()

26
wxPython/wx/tools/XRCed/xrced.xrc
View File

@@ -522,31 +522,38 @@
<object class="wxCheckBox" name="AutoGenerateCB">
<label>Autogenerate Python module when saving XRC</label>
</object>
<flag>wxBOTTOM|wxLEFT|wxRIGHT</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxCheckBox" name="EmbedCB">
<label>Embed resource in python module</label>
<label>Embed resources in the Python module</label>
</object>
<flag>wxBOTTOM|wxLEFT|wxRIGHT</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxCheckBox" name="GettextCB">
<label>Generate gettext strings</label>
<enabled>0</enabled>
</object>
<flag>wxBOTTOM|wxLEFT|wxRIGHT</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxCheckBox" name="MakeXRSFileCB">
<label>Generate and use compressed XRS file</label>
<enabled>0</enabled>
<hidden>1</hidden>
</object>
</object>
<object class="spacer">
<size>1,10</size>
<flag>wxBOTTOM|wxLEFT|wxRIGHT</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxStaticText">
<label>Filename:</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxBoxSizer">
@@ -555,17 +562,18 @@
<object class="wxTextCtrl" name="FileNameTC">
<size>500,-1</size>
</object>
<flag>wxALIGN_CENTRE_VERTICAL</flag>
</object>
<object class="spacer">
<size>5,0</size>
<flag>wxBOTTOM|wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxButton" name="BrowseBtn">
<label>Browse...</label>
</object>
<flag>wxBOTTOM|wxRIGHT</flag>
<border>5</border>
</object>
</object>
<flag>wxEXPAND</flag>
</object>
</object>
<flag>wxALL</flag>