X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4249ec2c526b01fc35daedfdf4290959455cc4a5..8ece421c6c40b0977dc2a7f91f9eff7234b814dd:/utils/wxrc/wxrc.cpp diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp index c2aeec7a7e..fef806dec4 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 // 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,40 +15,218 @@ #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" + #include "wx/wxcrtvararg.h" #endif #include "wx/cmdline.h" -#include "wx/xrc/xml.h" +#include "wx/xml/xml.h" #include "wx/ffile.h" #include "wx/filename.h" #include "wx/wfstream.h" +#include "wx/utils.h" +#include "wx/hashset.h" +#include "wx/mimetype.h" +#include "wx/vector.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; -/* -#if wxUSE_GUI -#error "You must compile the resource compiler with wxBase!" -#endif -*/ + void BrowseXmlNode(wxXmlNode* node) + { + wxString classValue; + wxString nameValue; + wxXmlNode* children; + while (node) + { + if (node->GetName() == _T("object") + && node->GetAttribute(_T("class"),&classValue) + && node->GetAttribute(_T("name"),&nameValue)) + { + m_wdata.Add(XRCWidgetData(nameValue,classValue)); + } + children = node->GetChildren(); + if (children) + BrowseXmlNode(children); + node = node->GetNext(); + } + } -class XmlResApp : public wxApp -{ 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")); + } -#if wxUSE_GUI - bool OnInit(); -#else + BrowseXmlNode(node->GetChildren()); + } + + const ArrayOfXRCWidgetData& GetWidgetData() + { + return m_wdata; + } + + bool CanBeUsedWithXRCCTRL(const wxString& name) + { + if (name == _T("tool") || + name == _T("data") || + name == _T("unknown") || + name == _T("notebookpage") || + name == _T("separator") || + name == _T("sizeritem") || + name == _T("wxMenuBar") || + name == _T("wxMenuItem") || + name == _T("wxStaticBoxSizer") ) + { + 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;iLoadObject(this,parent,_T(\"") + + m_className + + _T("\"), _T(\"") + + m_parentClassName + + _T("\"));\n")); + for(i=0;i ExtractedStrings; + + +class XmlResApp : public wxAppConsole +{ +public: + // don't use builtin cmd line parsing: + virtual bool OnInit() { return true; } virtual int OnRun(); -#endif - + private: - void ParseParams(const wxCmdLineParser& cmdline); void CompileRes(); wxArrayString PrepareTempFiles(); @@ -66,41 +239,41 @@ private: void MakePackagePython(const wxArrayString& flist); void OutputGettext(); - wxArrayString FindStrings(); - wxArrayString FindStrings(wxXmlNode *node); - + ExtractedStrings FindStrings(); + ExtractedStrings FindStrings(const wxString& filename, wxXmlNode *node); + bool flagVerbose, flagCPP, flagPython, flagGettext; wxString parOutput, parFuncname, parOutputPath; wxArrayString parFiles; int retCode; + + ArrayOfXRCWndClassData aXRCWndClassData; + bool flagH; + void GenCPPHeader(); }; -IMPLEMENT_APP(XmlResApp) +IMPLEMENT_APP_CONSOLE(XmlResApp) -#if wxUSE_GUI -bool XmlResApp::OnInit() -#else int XmlResApp::OnRun() -#endif { static const wxCmdLineEntryDesc cmdLineDesc[] = { - { 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, "h", "help", "show help message", wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, + { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" }, + { wxCMD_LINE_SWITCH, "e", "extra-cpp-code", "output C++ header file with XRC derived classes" }, + { wxCMD_LINE_SWITCH, "c", "cpp-code", "output C++ source rather than .rsc file" }, + { wxCMD_LINE_SWITCH, "p", "python-code", "output wxPython source rather than .rsc file" }, + { wxCMD_LINE_SWITCH, "g", "gettext", "output list of translatable strings (to stdout or file if -o used)" }, + { wxCMD_LINE_OPTION, "n", "function", "C++/Python function name (with -c or -p) [InitXmlResource]" }, + { wxCMD_LINE_OPTION, "o", "output", "output file [resource.xrs/cpp]" }, #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, "l", "list-of-handlers", "output list of necessary handlers to this file" }, #endif - { wxCMD_LINE_PARAM, NULL, NULL, _T("input file(s)"), - wxCMD_LINE_VAL_STRING, + { wxCMD_LINE_PARAM, NULL, NULL, "input file(s)", + wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_OPTION_MANDATORY }, - { wxCMD_LINE_NONE } + wxCMD_LINE_DESC_END }; wxCmdLineParser parser(cmdLineDesc, argc, argv); @@ -109,7 +282,6 @@ int XmlResApp::OnRun() { case -1: return 0; - break; case 0: retCode = 0; @@ -118,21 +290,9 @@ int XmlResApp::OnRun() OutputGettext(); else CompileRes(); -#if wxUSE_GUI - return FALSE; -#else return retCode; -#endif - break; - - default: -#if wxUSE_GUI - return FALSE; -#else - return 1; -#endif - break; } + return 1; } @@ -140,12 +300,14 @@ int XmlResApp::OnRun() void XmlResApp::ParseParams(const wxCmdLineParser& cmdline) { - flagGettext = cmdline.Found(_T("g")); - flagVerbose = cmdline.Found(_T("v")); - flagCPP = cmdline.Found(_T("c")); - flagPython = cmdline.Found(_T("p")); + flagGettext = cmdline.Found("g"); + flagVerbose = cmdline.Found("v"); + flagCPP = cmdline.Found("c"); + flagPython = cmdline.Found("p"); + flagH = flagCPP && cmdline.Found("e"); - if (!cmdline.Found(_T("o"), &parOutput)) + + if (!cmdline.Found("o", &parOutput)) { if (flagGettext) parOutput = wxEmptyString; @@ -159,17 +321,31 @@ 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("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.empty()) + { + parFiles.Add(fn); + fn=wxFindNextFile(); + } +#else parFiles.Add(cmdline.GetParam(i)); +#endif + } } @@ -182,15 +358,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); } @@ -203,11 +382,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); @@ -221,32 +400,47 @@ wxString XmlResApp::GetInternalFileName(const wxString& name, const wxArrayStrin wxArrayString XmlResApp::PrepareTempFiles() { wxArrayString flist; - - for (size_t i = 0; i < parFiles.Count(); i++) + + for (size_t i = 0; i < parFiles.GetCount(); 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->GetAttribute(_T("class"),&classValue) + && node->GetAttribute(_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; } @@ -254,32 +448,45 @@ 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; - // wxBitmapButton: wxXmlNode *parent = node->GetParent(); - if (parent != NULL && - parent->GetPropVal(_T("class"), _T("")) == _T("wxBitmapButton") && - (node->GetName() == _T("focus") || - node->GetName() == _T("disabled") || - node->GetName() == _T("selected"))) - return TRUE; - + if (parent != NULL && + parent->GetAttribute(_T("class"), _T("")) == _T("wxBitmapButton") && + (name == _T("focus") || + name == _T("disabled") || + name == _T("hover") || + 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; + wxString klass = node->GetAttribute(_T("class"), wxEmptyString); + if (klass == _T("wxBitmap") || + klass == _T("wxIcon") || + klass == _T("data") ) + return true; } - - return FALSE; + + // URLs in wxHtmlWindow: + if ( name == _T("url") && + parent != NULL && + parent->GetAttribute(_T("class"), _T("")) == _T("wxHtmlWindow") ) + { + // FIXME: this is wrong for e.g. http:// URLs + return true; + } + + return false; } // find all files mentioned in structure, e.g. filename @@ -295,7 +502,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; @@ -304,7 +511,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); @@ -330,7 +537,7 @@ void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxSt void XmlResApp::DeleteTempFiles(const wxArrayString& flist) { - for (size_t i = 0; i < flist.Count(); i++) + for (size_t i = 0; i < flist.GetCount(); i++) wxRemoveFile(parOutputPath + wxFILE_SEP_PATH + flist[i]); } @@ -339,19 +546,19 @@ void XmlResApp::DeleteTempFiles(const wxArrayString& flist) void XmlResApp::MakePackageZIP(const wxArrayString& flist) { wxString files; - - for (size_t i = 0; i < flist.Count(); i++) + + for (size_t i = 0; i < flist.GetCount(); 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) { @@ -364,24 +571,28 @@ void XmlResApp::MakePackageZIP(const wxArrayString& flist) - static wxString FileToCppArray(wxString filename, int num) { wxString output; wxString tmp; wxString snum; - wxFFile file(filename, "rb"); - size_t lng = file.Length(); - + wxFFile file(filename, wxT("rb")); + wxFileOffset offset = file.Length(); + wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") ); + + const size_t lng = wx_truncate_cast(size_t, offset); + wxASSERT_MSG( wx_static_cast(wxFileOffset, 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]); @@ -394,95 +605,145 @@ static wxString FileToCppArray(wxString filename, int num) output << tmp; linelng += tmp.Length()+1; } - + delete[] buffer; - + output += _T("};\n\n"); - + return output; } void XmlResApp::MakePackageCPP(const wxArrayString& flist) { - wxFFile file(parOutput, "wt"); + 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") -_T("//\n\n") -_T("#include \n") -_T("\n") -_T("#ifdef __BORLANDC__\n") -_T(" #pragma hdrstop\n") -_T("#endif\n") -_T("\n") -_T("#ifndef WX_PRECOMP\n") -_T(" #include \n") -_T("#endif\n") -_T("") -_T("#include \n") -_T("#include \n") -_T("#include \n") -_T("#include \n") -_T("\n")); - - for (i = 0; i < flist.Count(); i++) + + file.Write("" +"//\n" +"// This file was automatically generated by wxrc, do not edit by hand.\n" +"//\n\n" +"#include \n" +"\n" +"#ifdef __BORLANDC__\n" +" #pragma hdrstop\n" +"#endif\n" +"\n" +"" +"#include \n" +"#include \n" +"#include \n" +"#include \n" +"\n" +"#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805\n" +" #define XRC_ADD_FILE(name, data, size, mime) \\\n" +" wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime)\n" +"#else\n" +" #define XRC_ADD_FILE(name, data, size, mime) \\\n" +" wxMemoryFSHandler::AddFile(name, data, size)\n" +"#endif\n" +"\n"); + + for (i = 0; i < flist.GetCount(); i++) file.Write( FileToCppArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i)); - - file.Write(_T("") -_T("void " + parFuncname + "()\n") -_T("{\n") -_T("\n") -_T(" // Check for memory FS. If not present, load the handler:\n") -_T(" {\n") -_T(" wxMemoryFSHandler::AddFile(\"XRC_resource/dummy_file\", \"dummy one\");\n") -_T(" wxFileSystem fsys;\n") -_T(" wxFSFile *f = fsys.OpenFile(\"memory:XRC_resource/dummy_file\");\n") -_T(" wxMemoryFSHandler::RemoveFile(\"XRC_resource/dummy_file\");\n") -_T(" if (f) delete f;\n") -_T(" else wxFileSystem::AddHandler(new wxMemoryFSHandler);\n") -_T(" }\n") -_T("\n")); - - for (i = 0; i < flist.Count(); i++) + + file.Write("" +"void " + parFuncname + "()\n" +"{\n" +"\n" +" // Check for memory FS. If not present, load the handler:\n" +" {\n" +" wxMemoryFSHandler::AddFile(wxT(\"XRC_resource/dummy_file\"), wxT(\"dummy one\"));\n" +" wxFileSystem fsys;\n" +" wxFSFile *f = fsys.OpenFile(wxT(\"memory:XRC_resource/dummy_file\"));\n" +" wxMemoryFSHandler::RemoveFile(wxT(\"XRC_resource/dummy_file\"));\n" +" if (f) delete f;\n" +" else wxFileSystem::AddHandler(new wxMemoryFSHandler);\n" +" }\n" +"\n"); + + for (i = 0; i < flist.GetCount(); i++) { wxString s; - s.Printf(_T(" wxMemoryFSHandler::AddFile(\"XRC_resource/") + flist[i] + - _T("\", xml_res_file_%i, xml_res_size_%i);\n"), i, i); + + wxString mime; + wxString ext = wxFileName(flist[i]).GetExt(); + if ( ext.Lower() == _T("xrc") ) + mime = _T("text/xml"); +#if wxUSE_MIMETYPE + else + { + wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext); + if ( ft ) + { + ft->GetMimeType(&mime); + delete ft; + } + } +#endif // wxUSE_MIMETYPE + + s.Printf(" XRC_ADD_FILE(wxT(\"XRC_resource/" + flist[i] + + "\"), xml_res_file_%i, xml_res_size_%i, _T(\"%s\"));\n", + i, i, mime.c_str()); file.Write(s); } - for (i = 0; i < parFiles.Count(); i++) + for (i = 0; i < parFiles.GetCount(); i++) { - file.Write(_T(" wxXmlResource::Get()->Load(\"memory:XRC_resource/") + - GetInternalFileName(parFiles[i], flist) + _T("\");\n")); + file.Write(" wxXmlResource::Get()->Load(wxT(\"memory:XRC_resource/" + + GetInternalFileName(parFiles[i], flist) + "\"));\n"); } - - file.Write(_T("}\n")); + + file.Write("}\n"); } +void XmlResApp::GenCPPHeader() +{ + wxString fileSpec = ((parOutput.BeforeLast('.')).AfterLast('/')).AfterLast('\\'); + wxString heaFileName = fileSpec + _T(".h"); + + wxFFile file(heaFileName, wxT("wt")); + file.Write( +"//\n" +"// This file was automatically generated by wxrc, do not edit by hand.\n" +"//\n\n" +"#ifndef __" + fileSpec + "_h__\n" +"#define __" + fileSpec + "_h__\n" +); + for(size_t i=0;i= 0 , wxT("Invalid file length") ); + + const size_t lng = wx_truncate_cast(size_t, offset); + wxASSERT_MSG( wx_static_cast(wxFileOffset, lng) == offset, + wxT("Huge file not supported") ); + snum.Printf(_T("%i"), num); - output = _T(" xml_res_file_") + snum + _T(" = \"\"\"\\\n"); - + output = " xml_res_file_" + snum + " = '''\\\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]; @@ -491,7 +752,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("\\\\"); @@ -505,84 +766,116 @@ static wxString FileToPythonArray(wxString filename, int num) output << tmp; linelng += tmp.Length(); } - + delete[] buffer; - - output += _T("\"\"\"\n\n"); - + + output += _T("'''\n\n"); + return output; } void XmlResApp::MakePackagePython(const wxArrayString& flist) { - wxFFile file(parOutput, "wt"); + 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") + "#\n" + "# This file was automatically generated by wxrc, do not edit by hand.\n" + "#\n\n" + "import wx\n" + "import wx.xrc\n\n" ); - - file.Write(_T("def ") + parFuncname + _T("():\n")); - for (i = 0; i < flist.Count(); i++) + file.Write("def " + parFuncname + "():\n"); + + for (i = 0; i < flist.GetCount(); i++) file.Write( FileToPythonArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i)); - for (i = 0; i < flist.Count(); i++) + file.Write( + " # check if the memory filesystem handler has been loaded yet, and load it if not\n" + " wx.MemoryFSHandler.AddFile('XRC_resource/dummy_file', 'dummy value')\n" + " fsys = wx.FileSystem()\n" + " f = fsys.OpenFile('memory:XRC_resource/dummy_file')\n" + " wx.MemoryFSHandler.RemoveFile('XRC_resource/dummy_file')\n" + " if f is not None:\n" + " f.Destroy()\n" + " else:\n" + " wx.FileSystem.AddHandler(wx.MemoryFSHandler())\n" + "\n" + " # load all the strings as memory files and load into XmlRes\n" + ); + + + for (i = 0; i < flist.GetCount(); i++) { wxString s; - s.Printf(_T(" wxXmlResource_Get().LoadFromString(xml_res_file_%i)\n"), i); + s.Printf(" wx.MemoryFSHandler.AddFile('XRC_resource/" + flist[i] + + "', xml_res_file_%i)\n", i); file.Write(s); } + for (i = 0; i < parFiles.GetCount(); i++) + { + file.Write(" wx.xrc.XmlResource.Get().Load('memory:XRC_resource/" + + GetInternalFileName(parFiles[i], flist) + "')\n"); + } + + file.Write("\n"); } void XmlResApp::OutputGettext() { - wxArrayString str = FindStrings(); - + ExtractedStrings str = FindStrings(); + wxFFile fout; - if (!parOutput) fout.Attach(stdout); - else fout.Open(parOutput, "wt"); - - for (size_t i = 0; i < str.GetCount(); i++) - fout.Write(_T("_(\"") + str[i] + _T("\");\n")); - + if (parOutput.empty()) + fout.Attach(stdout); + else + fout.Open(parOutput, wxT("wt")); + + for (ExtractedStrings::const_iterator i = str.begin(); i != str.end(); ++i) + { + wxString s; + + s.Printf("#line %d \"%s\"\n", i->lineNo, i->filename); + fout.Write(s); + fout.Write("_(\"" + i->str + "\");\n"); + } + if (!parOutput) fout.Detach(); } -wxArrayString XmlResApp::FindStrings() +ExtractedStrings XmlResApp::FindStrings() { - wxArrayString arr, a2; + ExtractedStrings arr, a2; - for (size_t i = 0; i < parFiles.Count(); i++) + for (size_t i = 0; i < parFiles.GetCount(); 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]); retCode = 1; continue; } - a2 = FindStrings(doc.GetRoot()); + a2 = FindStrings(parFiles[i], doc.GetRoot()); + WX_APPEND_ARRAY(arr, a2); } - + return arr; } @@ -602,7 +895,7 @@ static wxString ConvertText(const wxString& str) else str2 << wxT('&') << *dt; } - else + else { switch (*dt) { @@ -614,7 +907,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; @@ -626,19 +919,20 @@ static wxString ConvertText(const wxString& str) } -wxArrayString XmlResApp::FindStrings(wxXmlNode *node) +ExtractedStrings +XmlResApp::FindStrings(const wxString& filename, wxXmlNode *node) { - wxArrayString arr; + ExtractedStrings arr; 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... ( @@ -654,16 +948,28 @@ wxArrayString XmlResApp::FindStrings(wxXmlNode *node) )) // ...and known to contain translatable string { - arr.Add(ConvertText(n->GetContent())); + if (!flagGettext || + node->GetAttribute(_T("translate"), _T("1")) != _T("0")) + { + arr.push_back + ( + ExtractedString + ( + ConvertText(n->GetContent()), + filename, + n->GetLineNumber() + ) + ); + } } - + // subnodes: if (n->GetType() == wxXML_ELEMENT_NODE) { - wxArrayString a2 = FindStrings(n); + ExtractedStrings a2 = FindStrings(filename, n); WX_APPEND_ARRAY(arr, a2); } - + n = n->GetNext(); } return arr;