X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a0be6d5a807d9295065cf9b40cd0dd5946c82be..084ad0c2424aa998a640c151f8fa762435364449:/utils/wxrc/wxrc.cpp?ds=sidebyside diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp index 7b74deabc6..8ac5aaef2f 100644 --- a/utils/wxrc/wxrc.cpp +++ b/utils/wxrc/wxrc.cpp @@ -1,18 +1,13 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wxrc.cpp // Purpose: XML resource compiler -// Author: Vaclav Slavik +// Author: Vaclav Slavik, Eduardo Marques <edrdo@netcabo.pt> // Created: 2000/03/05 // RCS-ID: $Id$ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma implementation - #pragma interface -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -20,10 +15,10 @@ #pragma hdrstop #endif -// for all others, include the necessary headers (this file is usually all you -// need because it includes almost all "standard" wxWindows headers +// for all others, include the necessary headers #ifndef WX_PRECOMP - #include "wx/wx.h" + #include "wx/app.h" + #include "wx/log.h" #endif #include "wx/cmdline.h" @@ -31,18 +26,185 @@ #include "wx/ffile.h" #include "wx/filename.h" #include "wx/wfstream.h" +#include "wx/utils.h" +#include "wx/hashset.h" + +WX_DECLARE_HASH_SET(wxString, wxStringHash, wxStringEqual, StringSet); + +class XRCWidgetData +{ +public: + XRCWidgetData(const wxString& vname,const wxString& vclass) + : m_class(vclass), m_name(vname) {} + const wxString& GetName() const { return m_name; } + const wxString& GetClass() const { return m_class; } +private: + wxString m_class; + wxString m_name; +}; + +#include "wx/arrimpl.cpp" +WX_DECLARE_OBJARRAY(XRCWidgetData,ArrayOfXRCWidgetData); +WX_DEFINE_OBJARRAY(ArrayOfXRCWidgetData) + +class XRCWndClassData +{ +private: + wxString m_className; + wxString m_parentClassName; + StringSet m_ancestorClassNames; + ArrayOfXRCWidgetData m_wdata; + + void BrowseXmlNode(wxXmlNode* node) + { + wxString classValue; + wxString nameValue; + wxXmlNode* children; + while (node) + { + if (node->GetName() == _T("object") + && node->GetPropVal(_T("class"),&classValue) + && node->GetPropVal(_T("name"),&nameValue)) + { + m_wdata.Add(XRCWidgetData(nameValue,classValue)); + } + children = node->GetChildren(); + if (children) + BrowseXmlNode(children); + node = node->GetNext(); + } + } + +public: + XRCWndClassData(const wxString& className, + const wxString& parentClassName, + const wxXmlNode* node) : + m_className(className) , m_parentClassName(parentClassName) + { + if ( className == _T("wxMenu") ) + { + m_ancestorClassNames.insert(_T("wxMenu")); + m_ancestorClassNames.insert(_T("wxMenuBar")); + } + else if ( className == _T("wxMDIChildFrame") ) + { + m_ancestorClassNames.insert(_T("wxMDIParentFrame")); + } + else if( className == _T("wxMenuBar") || + className == _T("wxStatusBar") || + className == _T("wxToolBar") ) + { + m_ancestorClassNames.insert(_T("wxFrame")); + } + else + { + m_ancestorClassNames.insert(_T("wxWindow")); + } + + BrowseXmlNode(node->GetChildren()); + } + + const ArrayOfXRCWidgetData& GetWidgetData() + { + return m_wdata; + } + + bool IsRealClass(const wxString& name) + { + if (name == _T("tool") || + name == _T("unknown") || + name == _T("notebookpage") || + name == _T("separator") || + name == _T("sizeritem") || + name == _T("wxMenuItem")) + { + return false; + } + return true; + } + + void GenerateHeaderCode(wxFFile& file) + { + + file.Write(_T("class ") + m_className + _T(" : public ") + m_parentClassName + + _T(" {\nprotected:\n")); + size_t i; + for(i=0;i<m_wdata.Count();++i) + { + const XRCWidgetData& w = m_wdata.Item(i); + if( !IsRealClass(w.GetClass()) ) continue; + if( w.GetName().Length() == 0 ) continue; + file.Write( + _T(" ") + w.GetClass() + _T("* ") + w.GetName() + + _T(";\n")); + } + file.Write(_T("\nprivate:\n void InitWidgetsFromXRC(wxWindow *parent){\n") + _T(" wxXmlResource::Get()->LoadObject(this,parent,_T(\"") + + m_className + + _T("\"), _T(\"") + + m_parentClassName + + _T("\"));\n")); + for(i=0;i<m_wdata.Count();++i) + { + const XRCWidgetData& w = m_wdata.Item(i); + if( !IsRealClass(w.GetClass()) ) continue; + if( w.GetName().Length() == 0 ) continue; + file.Write( _T(" ") + + w.GetName() + + _T(" = XRCCTRL(*this,\"") + + w.GetName() + + _T("\",") + + w.GetClass() + + _T(");\n")); + } + file.Write(_T(" }\n")); + + file.Write( _T("public:\n")); + + if ( m_ancestorClassNames.size() == 1 ) + { + file.Write + ( + m_className + + _T("(") + + *m_ancestorClassNames.begin() + + _T(" *parent=NULL){\n") + + _T(" InitWidgetsFromXRC((wxWindow *)parent);\n") + _T(" }\n") + _T("};\n") + ); + } + else + { + file.Write(m_className + _T("(){\n") + + _T(" InitWidgetsFromXRC(NULL);\n") + _T(" }\n") + _T("};\n")); + + for ( StringSet::const_iterator it = m_ancestorClassNames.begin(); + it != m_ancestorClassNames.end(); + ++it ) + { + file.Write(m_className + _T("(") + *it + _T(" *parent){\n") + + _T(" InitWidgetsFromXRC((wxWindow *)parent);\n") + _T(" }\n") + _T("};\n")); + } + } + } +}; +WX_DECLARE_OBJARRAY(XRCWndClassData,ArrayOfXRCWndClassData); +WX_DEFINE_OBJARRAY(ArrayOfXRCWndClassData) class XmlResApp : public wxAppConsole { public: // don't use builtin cmd line parsing: - virtual bool OnInit() { return true; } - + virtual bool OnInit() { return true; } virtual int OnRun(); - + private: - void ParseParams(const wxCmdLineParser& cmdline); void CompileRes(); wxArrayString PrepareTempFiles(); @@ -57,11 +219,15 @@ private: void OutputGettext(); wxArrayString FindStrings(); wxArrayString FindStrings(wxXmlNode *node); - + bool flagVerbose, flagCPP, flagPython, flagGettext; wxString parOutput, parFuncname, parOutputPath; wxArrayString parFiles; int retCode; + + ArrayOfXRCWndClassData aXRCWndClassData; + bool flagH; + void GenCPPHeader(); }; IMPLEMENT_APP_CONSOLE(XmlResApp) @@ -70,22 +236,23 @@ int XmlResApp::OnRun() { static const wxCmdLineEntryDesc cmdLineDesc[] = { - { wxCMD_LINE_SWITCH, _T("h"), _T("help"), _T("show help message"), + { wxCMD_LINE_SWITCH, _T("h"), _T("help"), _T("show help message"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, - { wxCMD_LINE_SWITCH, _T("v"), _T("verbose"), _T("be verbose") }, - { wxCMD_LINE_SWITCH, _T("c"), _T("cpp-code"), _T("output C++ source rather than .rsc file") }, - { wxCMD_LINE_SWITCH, _T("p"), _T("python-code"), _T("output wxPython source rather than .rsc file") }, - { wxCMD_LINE_SWITCH, _T("g"), _T("gettext"), _T("output list of translatable strings (to stdout or file if -o used)") }, - { wxCMD_LINE_OPTION, _T("n"), _T("function"), _T("C++/Python function name (with -c or -p) [InitXmlResource]") }, - { wxCMD_LINE_OPTION, _T("o"), _T("output"), _T("output file [resource.xrs/cpp]") }, + { wxCMD_LINE_SWITCH, _T("v"), _T("verbose"), _T("be verbose"), (wxCmdLineParamType)0, 0 }, + { wxCMD_LINE_SWITCH, _T("e"), _T("extra-cpp-code"), _T("output C++ header file with XRC derived classes"), (wxCmdLineParamType)0, 0 }, + { wxCMD_LINE_SWITCH, _T("c"), _T("cpp-code"), _T("output C++ source rather than .rsc file"), (wxCmdLineParamType)0, 0 }, + { wxCMD_LINE_SWITCH, _T("p"), _T("python-code"), _T("output wxPython source rather than .rsc file"), (wxCmdLineParamType)0, 0 }, + { wxCMD_LINE_SWITCH, _T("g"), _T("gettext"), _T("output list of translatable strings (to stdout or file if -o used)"), (wxCmdLineParamType)0, 0 }, + { wxCMD_LINE_OPTION, _T("n"), _T("function"), _T("C++/Python function name (with -c or -p) [InitXmlResource]"), (wxCmdLineParamType)0, 0 }, + { wxCMD_LINE_OPTION, _T("o"), _T("output"), _T("output file [resource.xrs/cpp]"), (wxCmdLineParamType)0, 0 }, #if 0 // not yet implemented - { wxCMD_LINE_OPTION, _T("l"), _T("list-of-handlers", _T("output list of neccessary handlers to this file" }, + { wxCMD_LINE_OPTION, _T("l"), _T("list-of-handlers"), _T("output list of necessary handlers to this file"), (wxCmdLineParamType)0, 0 }, #endif { wxCMD_LINE_PARAM, NULL, NULL, _T("input file(s)"), - wxCMD_LINE_VAL_STRING, + wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_OPTION_MANDATORY }, - { wxCMD_LINE_NONE } + { wxCMD_LINE_NONE, NULL, NULL, NULL, (wxCmdLineParamType)0, 0 } }; wxCmdLineParser parser(cmdLineDesc, argc, argv); @@ -94,10 +261,6 @@ int XmlResApp::OnRun() { case -1: return 0; - #if 0 - // break is unreachable because of return earlier - break; - #endif case 0: retCode = 0; @@ -107,17 +270,6 @@ int XmlResApp::OnRun() else CompileRes(); return retCode; - #if 0 - // break is unreachable because of return earlier - break; - #endif - - #if 0 - // default return moved outside of switch to avoid warning about lack of return in function - default: - return 1; - break; - #endif } return 1; } @@ -131,8 +283,10 @@ void XmlResApp::ParseParams(const wxCmdLineParser& cmdline) flagVerbose = cmdline.Found(_T("v")); flagCPP = cmdline.Found(_T("c")); flagPython = cmdline.Found(_T("p")); + flagH = flagCPP && cmdline.Found(_T("e")); - if (!cmdline.Found(_T("o"), &parOutput)) + + if (!cmdline.Found(_T("o"), &parOutput)) { if (flagGettext) parOutput = wxEmptyString; @@ -146,20 +300,23 @@ void XmlResApp::ParseParams(const wxCmdLineParser& cmdline) parOutput = _T("resource.xrs"); } } - wxFileName fn(parOutput); - fn.Normalize(); - parOutput = fn.GetFullPath(); - parOutputPath = wxPathOnly(parOutput); + if (!parOutput.empty()) + { + wxFileName fn(parOutput); + fn.Normalize(); + parOutput = fn.GetFullPath(); + parOutputPath = wxPathOnly(parOutput); + } if (!parOutputPath) parOutputPath = _T("."); - if (!cmdline.Found(_T("n"), &parFuncname)) + if (!cmdline.Found(_T("n"), &parFuncname)) parFuncname = _T("InitXmlResource"); for (size_t i = 0; i < cmdline.GetParamCount(); i++) { #ifdef __WINDOWS__ wxString fn=wxFindFirstFile(cmdline.GetParam(i), wxFILE); - while (!fn.IsEmpty()) + while (!fn.empty()) { parFiles.Add(fn); fn=wxFindNextFile(); @@ -180,15 +337,18 @@ void XmlResApp::CompileRes() wxRemoveFile(parOutput); if (!retCode) - { - if (flagCPP) + { + if (flagCPP){ MakePackageCPP(files); + if (flagH) + GenCPPHeader(); + } else if (flagPython) MakePackagePython(files); else MakePackageZIP(files); } - + DeleteTempFiles(files); } @@ -201,11 +361,11 @@ wxString XmlResApp::GetInternalFileName(const wxString& name, const wxArrayStrin name2.Replace(_T("\\"), _T("_")); name2.Replace(_T("*"), _T("_")); name2.Replace(_T("?"), _T("_")); - + wxString s = wxFileNameFromPath(parOutput) + _T("$") + name2; if (wxFileExists(s) && flist.Index(s) == wxNOT_FOUND) - { + { for (int i = 0;; i++) { s.Printf(wxFileNameFromPath(parOutput) + _T("$%03i-") + name2, i); @@ -219,32 +379,47 @@ wxString XmlResApp::GetInternalFileName(const wxString& name, const wxArrayStrin wxArrayString XmlResApp::PrepareTempFiles() { wxArrayString flist; - + for (size_t i = 0; i < parFiles.Count(); i++) { - if (flagVerbose) + if (flagVerbose) wxPrintf(_T("processing ") + parFiles[i] + _T("...\n")); wxXmlDocument doc; - + if (!doc.Load(parFiles[i])) { wxLogError(_T("Error parsing file ") + parFiles[i]); retCode = 1; continue; } - + wxString name, ext, path; wxSplitPath(parFiles[i], &path, &name, &ext); FindFilesInXML(doc.GetRoot(), flist, path); - + if (flagH) + { + wxXmlNode* node = (doc.GetRoot())->GetChildren(); + wxString classValue,nameValue; + while(node){ + if(node->GetName() == _T("object") + && node->GetPropVal(_T("class"),&classValue) + && node->GetPropVal(_T("name"),&nameValue)){ + + aXRCWndClassData.Add( + XRCWndClassData(nameValue,classValue,node) + ); + } + node = node -> GetNext(); + } + } wxString internalName = GetInternalFileName(parFiles[i], flist); - + doc.Save(parOutputPath + wxFILE_SEP_PATH + internalName); flist.Add(internalName); } - + return flist; } @@ -252,32 +427,37 @@ wxArrayString XmlResApp::PrepareTempFiles() // Does 'node' contain filename information at all? static bool NodeContainsFilename(wxXmlNode *node) { - // Any bitmaps: - if (node->GetName() == _T("bitmap")) - return TRUE; + const wxString name = node->GetName(); + + // Any bitmaps (bitmap2 is used for disabled toolbar buttons): + if ( name == _T("bitmap") || name == _T("bitmap2") ) + return true; + + if ( name == _T("icon") ) + return true; // URLs in wxHtmlWindow: - if (node->GetName() == _T("url")) - return TRUE; - + if ( name == _T("url") ) + return true; + // wxBitmapButton: wxXmlNode *parent = node->GetParent(); - if (parent != NULL && + if (parent != NULL && parent->GetPropVal(_T("class"), _T("")) == _T("wxBitmapButton") && - (node->GetName() == _T("focus") || - node->GetName() == _T("disabled") || - node->GetName() == _T("selected"))) - return TRUE; - + (name == _T("focus") || + name == _T("disabled") || + name == _T("selected"))) + return true; + // wxBitmap or wxIcon toplevel resources: - if (node->GetName() == _T("object")) + if ( name == _T("object") ) { wxString klass = node->GetPropVal(_T("class"), wxEmptyString); if (klass == _T("wxBitmap") || klass == _T("wxIcon")) - return TRUE; + return true; } - - return FALSE; + + return false; } // find all files mentioned in structure, e.g. <bitmap>filename</bitmap> @@ -293,7 +473,7 @@ void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxSt while (n) { if (containsFilename && - (n->GetType() == wxXML_TEXT_NODE || + (n->GetType() == wxXML_TEXT_NODE || n->GetType() == wxXML_CDATA_SECTION_NODE)) { wxString fullname; @@ -302,7 +482,7 @@ void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxSt else fullname = inputPath + wxFILE_SEP_PATH + n->GetContent(); - if (flagVerbose) + if (flagVerbose) wxPrintf(_T("adding ") + fullname + _T("...\n")); wxString filename = GetInternalFileName(n->GetContent(), flist); @@ -337,19 +517,19 @@ void XmlResApp::DeleteTempFiles(const wxArrayString& flist) void XmlResApp::MakePackageZIP(const wxArrayString& flist) { wxString files; - + for (size_t i = 0; i < flist.Count(); i++) files += flist[i] + _T(" "); files.RemoveLast(); - - if (flagVerbose) + + if (flagVerbose) wxPrintf(_T("compressing ") + parOutput + _T("...\n")); - + wxString cwd = wxGetCwd(); wxSetWorkingDirectory(parOutputPath); - int execres = wxExecute(_T("zip -9 -j ") + - wxString(flagVerbose ? _T("") : _T("-q ")) + - parOutput + _T(" ") + files, TRUE); + int execres = wxExecute(_T("zip -9 -j ") + + wxString(flagVerbose ? _T("\"") : _T("-q \"")) + + parOutput + _T("\" ") + files, true); wxSetWorkingDirectory(cwd); if (execres == -1) { @@ -362,24 +542,27 @@ void XmlResApp::MakePackageZIP(const wxArrayString& flist) - static wxString FileToCppArray(wxString filename, int num) { wxString output; wxString tmp; wxString snum; wxFFile file(filename, wxT("rb")); - size_t lng = file.Length(); - + wxFileOffset offset = file.Length(); + wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") ); + + const size_t lng = wx_truncate_cast(size_t, offset); + wxASSERT_MSG( lng == offset, wxT("Huge file not supported") ); + snum.Printf(_T("%i"), num); output.Printf(_T("static size_t xml_res_size_") + snum + _T(" = %i;\n"), lng); output += _T("static unsigned char xml_res_file_") + snum + _T("[] = {\n"); // we cannot use string literals because MSVC is dumb wannabe compiler // with arbitrary limitation to 2048 strings :( - + unsigned char *buffer = new unsigned char[lng]; file.Read(buffer, lng); - + for (size_t i = 0, linelng = 0; i < lng; i++) { tmp.Printf(_T("%i"), buffer[i]); @@ -392,11 +575,11 @@ static wxString FileToCppArray(wxString filename, int num) output << tmp; linelng += tmp.Length()+1; } - + delete[] buffer; - + output += _T("};\n\n"); - + return output; } @@ -406,9 +589,9 @@ void XmlResApp::MakePackageCPP(const wxArrayString& flist) wxFFile file(parOutput, wxT("wt")); size_t i; - if (flagVerbose) + if (flagVerbose) wxPrintf(_T("creating C++ source file ") + parOutput + _T("...\n")); - + file.Write(_T("") _T("//\n") _T("// This file was automatically generated by wxrc, do not edit by hand.\n") @@ -419,9 +602,6 @@ _T("#ifdef __BORLANDC__\n") _T(" #pragma hdrstop\n") _T("#endif\n") _T("\n") -_T("#ifndef WX_PRECOMP\n") -_T(" #include <wx/wx.h>\n") -_T("#endif\n") _T("") _T("#include <wx/filesys.h>\n") _T("#include <wx/fs_mem.h>\n") @@ -432,7 +612,7 @@ _T("\n")); for (i = 0; i < flist.Count(); i++) file.Write( FileToCppArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i)); - + file.Write(_T("") _T("void ") + parFuncname + wxT("()\n") _T("{\n") @@ -461,26 +641,52 @@ _T("\n")); file.Write(_T(" wxXmlResource::Get()->Load(wxT(\"memory:XRC_resource/") + GetInternalFileName(parFiles[i], flist) + _T("\"));\n")); } - + file.Write(_T("}\n")); } +void XmlResApp::GenCPPHeader() +{ + wxString fileSpec = ((parOutput.BeforeLast('.')).AfterLast('/')).AfterLast('\\'); + wxString heaFileName = fileSpec + _T(".h"); + + wxFFile file(heaFileName, wxT("wt")); + file.Write( +_T("//\n") +_T("// This file was automatically generated by wxrc, do not edit by hand.\n") +_T("//\n\n") +_T("#ifndef __") + fileSpec + _T("_h__\n") +_T("#define __") + fileSpec + _T("_h__\n") +); + for(size_t i=0;i<aXRCWndClassData.Count();++i){ + aXRCWndClassData.Item(i).GenerateHeaderCode(file); + } + file.Write( + _T("\nvoid \n") + + parFuncname + + _T("();\n#endif\n")); +} + static wxString FileToPythonArray(wxString filename, int num) { wxString output; wxString tmp; wxString snum; wxFFile file(filename, wxT("rb")); - size_t lng = file.Length(); - + wxFileOffset offset = file.Length(); + wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") ); + + const size_t lng = wx_truncate_cast(size_t, offset); + wxASSERT_MSG( offset == lng, wxT("Huge file not supported") ); + snum.Printf(_T("%i"), num); - output = _T(" xml_res_file_") + snum + _T(" = \"\"\"\\\n"); - + output = _T(" xml_res_file_") + snum + _T(" = '''\\\n"); + unsigned char *buffer = new unsigned char[lng]; file.Read(buffer, lng); - + for (size_t i = 0, linelng = 0; i < lng; i++) { unsigned char c = buffer[i]; @@ -489,7 +695,7 @@ static wxString FileToPythonArray(wxString filename, int num) tmp = (wxChar)c; linelng = 0; } - else if (c < 32 || c > 127) + else if (c < 32 || c > 127 || c == '\'') tmp.Printf(_T("\\x%02x"), c); else if (c == '\\') tmp = _T("\\\\"); @@ -503,11 +709,11 @@ static wxString FileToPythonArray(wxString filename, int num) output << tmp; linelng += tmp.Length(); } - + delete[] buffer; - - output += _T("\"\"\"\n\n"); - + + output += _T("'''\n\n"); + return output; } @@ -517,30 +723,53 @@ void XmlResApp::MakePackagePython(const wxArrayString& flist) wxFFile file(parOutput, wxT("wt")); size_t i; - if (flagVerbose) + if (flagVerbose) wxPrintf(_T("creating Python source file ") + parOutput + _T("...\n")); - + file.Write( _T("#\n") _T("# This file was automatically generated by wxrc, do not edit by hand.\n") _T("#\n\n") - _T("from wxPython.wx import *\n") - _T("from wxPython.xrc import *\n\n") + _T("import wx\n") + _T("import wx.xrc\n\n") ); - + file.Write(_T("def ") + parFuncname + _T("():\n")); for (i = 0; i < flist.Count(); i++) file.Write( FileToPythonArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i)); + file.Write( + _T(" # check if the memory filesystem handler has been loaded yet, and load it if not\n") + _T(" wx.MemoryFSHandler.AddFile('XRC_resource/dummy_file', 'dummy value')\n") + _T(" fsys = wx.FileSystem()\n") + _T(" f = fsys.OpenFile('memory:XRC_resource/dummy_file')\n") + _T(" wx.MemoryFSHandler.RemoveFile('XRC_resource/dummy_file')\n") + _T(" if f is not None:\n") + _T(" f.Destroy()\n") + _T(" else:\n") + _T(" wx.FileSystem.AddHandler(wx.MemoryFSHandler())\n") + _T("\n") + _T(" # load all the strings as memory files and load into XmlRes\n") + ); + + for (i = 0; i < flist.Count(); i++) { wxString s; - s.Printf(_T(" wxXmlResource_Get().LoadFromString(xml_res_file_%i)\n"), i); + s.Printf(_T(" wx.MemoryFSHandler.AddFile('XRC_resource/") + flist[i] + + _T("', xml_res_file_%i)\n"), i); file.Write(s); } + for (i = 0; i < parFiles.Count(); i++) + { + file.Write(_T(" wx.xrc.XmlResource.Get().Load('memory:XRC_resource/") + + GetInternalFileName(parFiles[i], flist) + _T("')\n")); + } + + file.Write(_T("\n")); } @@ -548,14 +777,16 @@ void XmlResApp::MakePackagePython(const wxArrayString& flist) void XmlResApp::OutputGettext() { wxArrayString str = FindStrings(); - + wxFFile fout; - if (!parOutput) fout.Attach(stdout); - else fout.Open(parOutput, wxT("wt")); - + if (parOutput.empty()) + fout.Attach(stdout); + else + fout.Open(parOutput, wxT("wt")); + for (size_t i = 0; i < str.GetCount(); i++) fout.Write(_T("_(\"") + str[i] + _T("\");\n")); - + if (!parOutput) fout.Detach(); } @@ -567,10 +798,10 @@ wxArrayString XmlResApp::FindStrings() for (size_t i = 0; i < parFiles.Count(); i++) { - if (flagVerbose) + if (flagVerbose) wxPrintf(_T("processing ") + parFiles[i] + _T("...\n")); - wxXmlDocument doc; + wxXmlDocument doc; if (!doc.Load(parFiles[i])) { wxLogError(_T("Error parsing file ") + parFiles[i]); @@ -580,7 +811,7 @@ wxArrayString XmlResApp::FindStrings() a2 = FindStrings(doc.GetRoot()); WX_APPEND_ARRAY(arr, a2); } - + return arr; } @@ -600,7 +831,7 @@ static wxString ConvertText(const wxString& str) else str2 << wxT('&') << *dt; } - else + else { switch (*dt) { @@ -612,7 +843,7 @@ static wxString ConvertText(const wxString& str) (*(dt+1) != 'r')) str2 << wxT("\\\\"); else - str2 << wxT("\\"); + str2 << wxT("\\"); break; case wxT('"') : str2 << wxT("\\\""); break; default : str2 << *dt; break; @@ -631,12 +862,12 @@ wxArrayString XmlResApp::FindStrings(wxXmlNode *node) wxXmlNode *n = node; if (n == NULL) return arr; n = n->GetChildren(); - + while (n) { if ((node->GetType() == wxXML_ELEMENT_NODE) && // parent is an element, i.e. has subnodes... - (n->GetType() == wxXML_TEXT_NODE || + (n->GetType() == wxXML_TEXT_NODE || n->GetType() == wxXML_CDATA_SECTION_NODE) && // ...it is textnode... ( @@ -652,16 +883,20 @@ wxArrayString XmlResApp::FindStrings(wxXmlNode *node) )) // ...and known to contain translatable string { - arr.Add(ConvertText(n->GetContent())); + if (!flagGettext || + node->GetPropVal(_T("translate"), _T("1")) != _T("0")) + { + arr.Add(ConvertText(n->GetContent())); + } } - + // subnodes: if (n->GetType() == wxXML_ELEMENT_NODE) { wxArrayString a2 = FindStrings(n); WX_APPEND_ARRAY(arr, a2); } - + n = n->GetNext(); } return arr;