X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b8b8c49b5438a5516ffea6fa73d4015d183f53d6..482635118a139c87757b2228768c7b4056de82eb:/utils/wxrc/wxrc.cpp?ds=sidebyside diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp index dd50078300..708b8476e4 100644 --- a/utils/wxrc/wxrc.cpp +++ b/utils/wxrc/wxrc.cpp @@ -1,14 +1,14 @@ ///////////////////////////////////////////////////////////////////////////// // 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 ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma implementation #pragma interface #endif @@ -20,39 +20,150 @@ #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" -#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" +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; + 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->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(); + } + } -class XmlResApp : public wxApp -{ public: + XRCWndClassData(const wxString& className,const wxString& parentClassName, const wxXmlNode* node) : + m_className(className) , m_parentClassName(parentClassName) + { + BrowseXmlNode(node->GetChildren()); + } -#if wxUSE_GUI - bool OnInit(); -#else + 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;iLoadObject(this,NULL,_T(\"") + + m_className + + _T("\"), _T(\"") + + m_parentClassName + + _T("\"));\n")); + for(i=0;iGetChildren(); + 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 + "/" + internalName); + + doc.Save(parOutputPath + wxFILE_SEP_PATH + internalName); flist.Add(internalName); } - + return flist; } +// Does 'node' contain filename information at all? +static bool NodeContainsFilename(wxXmlNode *node) +{ + // Any bitmaps: + if (node->GetName() == _T("bitmap")) + return true; + + if (node->GetName() == _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; + + // wxBitmap or wxIcon toplevel resources: + if (node->GetName() == _T("object")) + { + wxString klass = node->GetPropVal(_T("class"), wxEmptyString); + if (klass == _T("wxBitmap") || klass == _T("wxIcon")) + return true; + } + + return false; +} // find all files mentioned in structure, e.g. filename void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxString& inputPath) { - wxXmlNode *n = node; - if (n == NULL) return; - n = n->GetChildren(); - + // Is 'node' XML node element? + if (node == NULL) return; + if (node->GetType() != wxXML_ELEMENT_NODE) return; + + bool containsFilename = NodeContainsFilename(node); + + wxXmlNode *n = node->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_CDATA_SECTION_NODE) && - // ...it is textnode... - ((node/*not n!*/->GetName() == "bitmap") || - (node/*not n!*/->GetName() == "url"))) - // ...and known to contain filename + if (containsFilename && + (n->GetType() == wxXML_TEXT_NODE || + n->GetType() == wxXML_CDATA_SECTION_NODE)) { wxString fullname; - if (wxIsAbsolutePath(n->GetContent()) || inputPath == "") fullname = n->GetContent(); - else fullname = inputPath + "/" + n->GetContent(); + if (wxIsAbsolutePath(n->GetContent()) || inputPath.empty()) + fullname = n->GetContent(); + else + fullname = inputPath + wxFILE_SEP_PATH + n->GetContent(); + + if (flagVerbose) + wxPrintf(_T("adding ") + fullname + _T("...\n")); - if (flagVerbose) - wxPrintf("adding " + fullname + "...\n"); - wxString filename = GetInternalFileName(n->GetContent(), flist); n->SetContent(filename); - flist.Add(filename); + if (flist.Index(filename) == wxNOT_FOUND) + flist.Add(filename); wxFileInputStream sin(fullname); - wxFileOutputStream sout(parOutputPath + "/" + filename); + wxFileOutputStream sout(parOutputPath + wxFILE_SEP_PATH + filename); sin.Read(sout); // copy the stream } - + // subnodes: if (n->GetType() == wxXML_ELEMENT_NODE) FindFilesInXML(n, flist, inputPath); - + n = n->GetNext(); } } @@ -296,7 +466,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++) - wxRemoveFile(parOutputPath + "/" + flist[i]); + wxRemoveFile(parOutputPath + wxFILE_SEP_PATH + flist[i]); } @@ -304,19 +474,24 @@ 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] + " "; + files += flist[i] + _T(" "); files.RemoveLast(); - - if (flagVerbose) - wxPrintf("compressing " + parOutput + "...\n"); - if (wxExecute("zip -9 -j " + wxString(flagVerbose ? "" : "-q ") + - parOutput + " " + files, TRUE) == -1) + 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); + wxSetWorkingDirectory(cwd); + if (execres == -1) { - wxLogError("Unable to execute zip program. Make sure it is in the path."); - wxLogError("You can download it at http://www.cdrom.com/pub/infozip/"); + wxLogError(_T("Unable to execute zip program. Make sure it is in the path.")); + wxLogError(_T("You can download it at http://www.cdrom.com/pub/infozip/")); retCode = 1; return; } @@ -324,124 +499,149 @@ 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(); - - snum.Printf("%i", num); - output.Printf("static size_t xml_res_size_" + snum + " = %i;\n", lng); - output += "static unsigned char xml_res_file_" + snum + "[] = {\n"; + wxFFile file(filename, wxT("rb")); + wxFileOffset offset = file.Length(); + wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") ); + wxASSERT_MSG( offset == wxFileOffset(size_t(offset)) , wxT("Huge file not supported") ); + size_t lng = (size_t)offset; + + 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("%i", buffer[i]); - if (i != 0) output << ','; + tmp.Printf(_T("%i"), buffer[i]); + if (i != 0) output << _T(','); if (linelng > 70) { linelng = 0; - output << "\n"; + output << _T("\n"); } output << tmp; linelng += tmp.Length()+1; } - + delete[] buffer; - - output += "};\n\n"; - + + 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) - wxPrintf("creating C++ source file " + parOutput + "...\n"); - - 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\ -#ifndef WX_PRECOMP\n\ - #include \n\ -#endif\n\ -\ -#include \n\ -#include \n\ -#include \n\ -#include \n\ -\n"); + 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("") +_T("#include \n") +_T("#include \n") +_T("#include \n") +_T("#include \n") +_T("\n")); for (i = 0; i < flist.Count(); i++) - file.Write(FileToCppArray(flist[i], i)); - - file.Write("\ -void " + parFuncname + "()\n\ -{\n\ -\n\ - // Check for memory FS. If not present, load the handler:\n\ - {\n\ - wxMemoryFSHandler::AddFile(\"XRC_resource/dummy_file\", \"dummy one\");\n\ - wxFileSystem fsys;\n\ - wxFSFile *f = fsys.OpenFile(\"memory:XRC_resource/dummy_file\");\n\ - wxMemoryFSHandler::RemoveFile(\"XRC_resource/dummy_file\");\n\ - if (f) delete f;\n\ - else wxFileSystem::AddHandler(new wxMemoryFSHandler);\n\ - }\n\ -\n"); + file.Write( + FileToCppArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i)); + + file.Write(_T("") +_T("void ") + parFuncname + wxT("()\n") +_T("{\n") +_T("\n") +_T(" // Check for memory FS. If not present, load the handler:\n") +_T(" {\n") +_T(" wxMemoryFSHandler::AddFile(wxT(\"XRC_resource/dummy_file\"), wxT(\"dummy one\"));\n") +_T(" wxFileSystem fsys;\n") +_T(" wxFSFile *f = fsys.OpenFile(wxT(\"memory:XRC_resource/dummy_file\"));\n") +_T(" wxMemoryFSHandler::RemoveFile(wxT(\"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++) { wxString s; - s.Printf(" wxMemoryFSHandler::AddFile(\"XRC_resource/" + flist[i] + - "\", xml_res_file_%i, xml_res_size_%i);\n", i, i); + s.Printf(_T(" wxMemoryFSHandler::AddFile(wxT(\"XRC_resource/") + flist[i] + + _T("\"), xml_res_file_%i, xml_res_size_%i);\n"), i, i); file.Write(s); } for (i = 0; i < parFiles.Count(); i++) { - file.Write(" wxXmlResource::Get()->Load(\"memory:XRC_resource/" + - GetInternalFileName(parFiles[i], flist) + "\");\n"); + file.Write(_T(" wxXmlResource::Get()->Load(wxT(\"memory:XRC_resource/") + + GetInternalFileName(parFiles[i], flist) + _T("\"));\n")); } - - file.Write("}\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= 0 , wxT("Invalid file length") ); + wxASSERT_MSG( offset == wxFileOffset(size_t(offset)) , wxT("Huge file not supported") ); + size_t lng = (size_t)offset; + + snum.Printf(_T("%i"), num); + 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]; @@ -450,57 +650,81 @@ static wxString FileToPythonArray(wxString filename, int num) tmp = (wxChar)c; linelng = 0; } - else if (c < 32 || c > 127) - tmp.Printf("\\x%02x", c); + else if (c < 32 || c > 127 || c == '\'') + tmp.Printf(_T("\\x%02x"), c); else if (c == '\\') - tmp = "\\\\"; + tmp = _T("\\\\"); else tmp = (wxChar)c; if (linelng > 70) { linelng = 0; - output << "\\\n"; + output << _T("\\\n"); } output << tmp; linelng += tmp.Length(); } - + delete[] buffer; - - output += "\"\"\"\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) - wxPrintf("creating Python source file " + parOutput + "...\n"); - + if (flagVerbose) + wxPrintf(_T("creating Python source file ") + parOutput + _T("...\n")); + file.Write( - "#\n" - "# This file was automatically generated by wxrc, do not edit by hand.\n" - "#\n\n" - "from wxPython.wx import *\n" - "from wxPython.xrc import *\n\n" + _T("#\n") + _T("# This file was automatically generated by wxrc, do not edit by hand.\n") + _T("#\n\n") + _T("import wx\n") + _T("import wx.xrc\n\n") ); - - file.Write("def " + parFuncname + "():\n"); + + file.Write(_T("def ") + parFuncname + _T("():\n")); for (i = 0; i < flist.Count(); i++) - file.Write(FileToPythonArray(flist[i], 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(" 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")); } @@ -508,14 +732,16 @@ void XmlResApp::MakePackagePython(const wxArrayString& flist) void XmlResApp::OutputGettext() { wxArrayString str = FindStrings(); - + wxFFile fout; - if (!parOutput) fout.Attach(stdout); - else fout.Open(parOutput, _T("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")); - + fout.Write(_T("_(\"") + str[i] + _T("\");\n")); + if (!parOutput) fout.Detach(); } @@ -527,20 +753,20 @@ wxArrayString XmlResApp::FindStrings() for (size_t i = 0; i < parFiles.Count(); i++) { - if (flagVerbose) - wxPrintf("processing " + parFiles[i] + "...\n"); + if (flagVerbose) + wxPrintf(_T("processing ") + parFiles[i] + _T("...\n")); - wxXmlDocument doc; + wxXmlDocument doc; if (!doc.Load(parFiles[i])) { - wxLogError("Error parsing file " + parFiles[i]); + wxLogError(_T("Error parsing file ") + parFiles[i]); retCode = 1; continue; } a2 = FindStrings(doc.GetRoot()); WX_APPEND_ARRAY(arr, a2); } - + return arr; } @@ -560,13 +786,21 @@ static wxString ConvertText(const wxString& str) else str2 << wxT('&') << *dt; } - else + else { switch (*dt) { case wxT('\n') : str2 << wxT("\\n"); break; case wxT('\t') : str2 << wxT("\\t"); break; case wxT('\r') : str2 << wxT("\\r"); break; + case wxT('\\') : if ((*(dt+1) != 'n') && + (*(dt+1) != 't') && + (*(dt+1) != 'r')) + str2 << wxT("\\\\"); + else + str2 << wxT("\\"); + break; + case wxT('"') : str2 << wxT("\\\""); break; default : str2 << *dt; break; } } @@ -583,12 +817,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... ( @@ -599,20 +833,25 @@ wxArrayString XmlResApp::FindStrings(wxXmlNode *node) node/*not n!*/->GetName() == _T("longhelp") || node/*not n!*/->GetName() == _T("tooltip") || node/*not n!*/->GetName() == _T("htmlcode") || - node/*not n!*/->GetName() == _T("title") + node/*not n!*/->GetName() == _T("title") || + node/*not n!*/->GetName() == _T("item") )) // ...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;