Moved the check for page scrolling with the wheel into wxMouseEvent so

[wxWidgets.git] / contrib / utils / wxrc / wxrc.cpp

diff --git a/contrib/utils/wxrc/wxrc.cpp b/contrib/utils/wxrc/wxrc.cpp
index 9acaeef5e462b1cce142a8a9336f6543dd5116b2..38b5ac59fc62ddcbe7a2c35f6d4a3dcebc1f995a 100644 (file)
--- a/contrib/utils/wxrc/wxrc.cpp
+++ b/contrib/utils/wxrc/wxrc.cpp
@@ -28,7 +28,6 @@
 
 #include "wx/cmdline.h"
 #include "wx/xrc/xml.h"
 
 #include "wx/cmdline.h"
 #include "wx/xrc/xml.h"

-#include "wx/xrc/xmlio.h"

 #include "wx/ffile.h"
 #include "wx/wfstream.h"
 
 #include "wx/ffile.h"
 #include "wx/wfstream.h"
 


@@ -59,6 +58,7 @@ private:
     wxArrayString PrepareTempFiles();
     void FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxString& inputPath);
 
     wxArrayString PrepareTempFiles();
     void FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxString& inputPath);
 

+    wxString GetInternalFileName(const wxString& name, const wxArrayString& flist);

     void DeleteTempFiles(const wxArrayString& flist);
     void MakePackageZIP(const wxArrayString& flist);
     void MakePackageCPP(const wxArrayString& flist);
     void DeleteTempFiles(const wxArrayString& flist);
     void MakePackageZIP(const wxArrayString& flist);
     void MakePackageCPP(const wxArrayString& flist);


@@ -67,7 +67,7 @@ private:
     wxArrayString FindStrings();
     wxArrayString FindStrings(wxXmlNode *node);
             
     wxArrayString FindStrings();
     wxArrayString FindStrings(wxXmlNode *node);
             

-    bool flagVerbose, flagCPP, flagCompress, flagGettext;
+    bool flagVerbose, flagCPP, flagGettext;

     wxString parOutput, parFuncname, parOutputPath;
     wxArrayString parFiles;
     int retCode;
     wxString parOutput, parFuncname, parOutputPath;
     wxArrayString parFiles;
     int retCode;


@@ -83,29 +83,30 @@ int XmlResApp::OnRun()
 {
     static const wxCmdLineEntryDesc cmdLineDesc[] =
     {
 {
     static const wxCmdLineEntryDesc cmdLineDesc[] =
     {

-        { wxCMD_LINE_SWITCH, "h", "help",  "show help message" },
+        { 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, "c", "cpp-code",  "output C++ source rather than .rsc file" },
         { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" },
         { wxCMD_LINE_SWITCH, "c", "cpp-code",  "output C++ source rather than .rsc file" },

-        { wxCMD_LINE_SWITCH, "u", "uncompressed",  "do not compress .xml files (C++ only)" },
-        { wxCMD_LINE_SWITCH, "g", "gettext",  "output .po catalog (to stdout or file if -o used)" },
+        { wxCMD_LINE_SWITCH, "g", "gettext",  "output list of translatable strings (to stdout or file if -o used)" },

         { wxCMD_LINE_OPTION, "n", "function",  "C++ function name (with -c) [InitXmlResource]" },
         { wxCMD_LINE_OPTION, "o", "output",  "output file [resource.xrs/cpp]" },
         { wxCMD_LINE_OPTION, "n", "function",  "C++ function name (with -c) [InitXmlResource]" },
         { wxCMD_LINE_OPTION, "o", "output",  "output file [resource.xrs/cpp]" },

+#if 0 // not yet implemented

         { wxCMD_LINE_OPTION, "l", "list-of-handlers",  "output list of neccessary handlers to this file" },
         { wxCMD_LINE_OPTION, "l", "list-of-handlers",  "output list of neccessary handlers to this file" },

-
+#endif

         { wxCMD_LINE_PARAM,  NULL, NULL, "input file(s)",
         { wxCMD_LINE_PARAM,  NULL, NULL, "input file(s)",

-            wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE },
+              wxCMD_LINE_VAL_STRING, 
+              wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_OPTION_MANDATORY },

 
         { wxCMD_LINE_NONE }
     };
 
 
         { wxCMD_LINE_NONE }
     };
 

-#if wxUSE_GUI
+#if wxUSE_GUI && !defined(__WXMSW__)

     // VS: I need reasonable output to console from wxCmdLineParser
     // VS: I need reasonable output to console from wxCmdLineParser

+    //     - temporary, will hopefully be fixed in future in wxWin

     wxLog::SetTimestamp(NULL);
     delete wxLog::SetActiveTarget(new wxLogStderr);
 #endif
 
     wxLog::SetTimestamp(NULL);
     delete wxLog::SetActiveTarget(new wxLogStderr);
 #endif
 

-    wxXmlDocument::AddHandler(new wxXmlIOHandlerBinZ);
-

     wxCmdLineParser parser(cmdLineDesc, argc, argv);
 
     switch (parser.Parse())
     wxCmdLineParser parser(cmdLineDesc, argc, argv);
 
     switch (parser.Parse())


@@ -146,7 +147,6 @@ void XmlResApp::ParseParams(const wxCmdLineParser& cmdline)
     flagGettext = cmdline.Found("g");
     flagVerbose = cmdline.Found("v");
     flagCPP = cmdline.Found("c");
     flagGettext = cmdline.Found("g");
     flagVerbose = cmdline.Found("v");
     flagCPP = cmdline.Found("c");

-    flagCompress = flagCPP && !cmdline.Found("u");

 
     if (!cmdline.Found("o", &parOutput)) 
     {
 
     if (!cmdline.Found("o", &parOutput)) 
     {


@@ -186,6 +186,28 @@ void XmlResApp::CompileRes()
 }
 
 
 }
 
 

+wxString XmlResApp::GetInternalFileName(const wxString& name, const wxArrayString& flist)
+{
+    wxString name2 = name;
+    name2.Replace(":", "_");
+    name2.Replace("/", "_");
+    name2.Replace("\\", "_");
+    name2.Replace("*", "_");
+    name2.Replace("?", "_");
+    
+    wxString s = wxFileNameFromPath(parOutput) + "$" + name2;
+
+    if (wxFileExists(s) && flist.Index(s) == wxNOT_FOUND)
+    {        
+        for (int i = 0;; i++)
+        {
+            s.Printf(wxFileNameFromPath(parOutput) + "$%03i-" + name2, i);
+            if (!wxFileExists(s) || flist.Index(s) != wxNOT_FOUND)
+                break;
+        }
+    }
+    return s;
+}

 
 wxArrayString XmlResApp::PrepareTempFiles()
 {
 
 wxArrayString XmlResApp::PrepareTempFiles()
 {


@@ -210,8 +232,10 @@ wxArrayString XmlResApp::PrepareTempFiles()
 
         FindFilesInXML(doc.GetRoot(), flist, path);
 
 
         FindFilesInXML(doc.GetRoot(), flist, path);
 

-        doc.Save(parOutputPath + "/" + name + ".xrc", flagCompress ? wxXML_IO_BINZ : wxXML_IO_BIN);
-        flist.Add(name + ".xrc");
+        wxString internalName = GetInternalFileName(parFiles[i], flist);
+        
+        doc.Save(parOutputPath + "/" + internalName);
+        flist.Add(internalName);

     }
     
     return flist;
     }
     
     return flist;


@@ -233,22 +257,19 @@ void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxSt
             (n->GetType() == wxXML_TEXT_NODE || 
             n->GetType() == wxXML_CDATA_SECTION_NODE) &&
             // ...it is textnode...
             (n->GetType() == wxXML_TEXT_NODE || 
             n->GetType() == wxXML_CDATA_SECTION_NODE) &&
             // ...it is textnode...

-            (node/*not n!*/->GetName() == "bitmap"))
+            ((node/*not n!*/->GetName() == "bitmap") ||
+             (node/*not n!*/->GetName() == "url")))

             // ...and known to contain filename
         {
             wxString fullname;
             // ...and known to contain filename
         {
             wxString fullname;

-            wxString filename = n->GetContent();
-            if (wxIsAbsolutePath(n->GetContent())) fullname = n->GetContent();
+            if (wxIsAbsolutePath(n->GetContent()) || inputPath == "") fullname = n->GetContent();

             else fullname = inputPath + "/" + n->GetContent();
             else fullname = inputPath + "/" + n->GetContent();

+
+            if (flagVerbose) 
+                wxPrintf("adding     " + fullname +  "...\n");

             
             

-            filename.Replace("/", "_");
-            filename.Replace("\\", "_");
-            filename.Replace("*", "_");
-            filename.Replace("?", "_");
+            wxString filename = GetInternalFileName(n->GetContent(), flist);

             n->SetContent(filename);
             n->SetContent(filename);

-            
-            if (flagVerbose) 
-                wxPrintf("adding " + filename +  "...\n");

 
             flist.Add(filename);
 
 
             flist.Add(filename);
 


@@ -346,20 +367,20 @@ void XmlResApp::MakePackageCPP(const wxArrayString& flist)
         wxPrintf("creating C++ source file " + parOutput +  "...\n");
     
     file.Write("\
         wxPrintf("creating C++ source file " + parOutput +  "...\n");
     
     file.Write("\

-#include \"wx/wxprec.h\"\n\
+#include <wx/wxprec.h>\n\

 \n\
 #ifdef __BORLANDC__\n\
     #pragma hdrstop\n\
 #endif\n\
 \n\
 #ifndef WX_PRECOMP\n\
 \n\
 #ifdef __BORLANDC__\n\
     #pragma hdrstop\n\
 #endif\n\
 \n\
 #ifndef WX_PRECOMP\n\

-    #include \"wx/wx.h\"\n\
+    #include <wx/wx.h>\n\

 #endif\n\
 \
 #endif\n\
 \

-#include \"wx/filesys.h\"\n\
-#include \"wx/fs_mem.h\"\n\
-#include \"wx/xrc/xmlres.h\"\n\
-#include \"wx/xrc/xh_all.h\"\n\
+#include <wx/filesys.h>\n\
+#include <wx/fs_mem.h>\n\
+#include <wx/xrc/xmlres.h>\n\
+#include <wx/xrc/xh_all.h>\n\

 \n");
 
     for (i = 0; i < flist.Count(); i++)
 \n");
 
     for (i = 0; i < flist.Count(); i++)


@@ -371,10 +392,10 @@ void " + parFuncname + "()\n\
 \n\
     // Check for memory FS. If not present, load the handler:\n\
     {\n\
 \n\
     // Check for memory FS. If not present, load the handler:\n\
     {\n\

-        wxMemoryFSHandler::AddFile(\"xml_resource/dummy_file\", \"dummy one\");\n\
+        wxMemoryFSHandler::AddFile(\"XRC_resource/dummy_file\", \"dummy one\");\n\

         wxFileSystem fsys;\n\
         wxFileSystem fsys;\n\

-        wxFSFile *f = fsys.OpenFile(\"memory:xml_resource/dummy_file\");\n\
-        wxMemoryFSHandler::RemoveFile(\"xml_resource/dummy_file\");\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\
         if (f) delete f;\n\
         else wxFileSystem::AddHandler(new wxMemoryFSHandler);\n\
     }\n\


@@ -383,20 +404,18 @@ void " + parFuncname + "()\n\
     for (i = 0; i < flist.Count(); i++)
     {
         wxString s;
     for (i = 0; i < flist.Count(); i++)
     {
         wxString s;

-        s.Printf("    wxMemoryFSHandler::AddFile(\"xml_resource/" + flist[i] +
+        s.Printf("    wxMemoryFSHandler::AddFile(\"XRC_resource/" + flist[i] +

                  "\", xml_res_file_%i, xml_res_size_%i);\n", i, i);
         file.Write(s);
     }
 
     for (i = 0; i < parFiles.Count(); i++)
     {
                  "\", xml_res_file_%i, xml_res_size_%i);\n", i, i);
         file.Write(s);
     }
 
     for (i = 0; i < parFiles.Count(); i++)
     {

-        wxString name, ext, path;
-        wxSplitPath(parFiles[i], &path, &name, &ext);
-        file.Write("    wxXmlResource::Get()->Load(\"memory:xml_resource/" + 
-                   name + ".xrc" + "\");\n");
+        file.Write("    wxXmlResource::Get()->Load(\"memory:XRC_resource/" + 
+                   GetInternalFileName(parFiles[i], flist) + "\");\n");

     }
     
     }
     

-    file.Write("\n}\n");
+    file.Write("}\n");

 
 
 }
 
 
 }


@@ -412,7 +431,7 @@ void XmlResApp::OutputGettext()
     else fout.Open(parOutput, _T("wt"));
     
     for (size_t i = 0; i < str.GetCount(); i++)
     else fout.Open(parOutput, _T("wt"));
     
     for (size_t i = 0; i < str.GetCount(); i++)

-        fout.Write(_T("msgid \"") + str[i] + _T("\"\nmsgstr \"\"\n\n"));
+        fout.Write(_T("_(\"") + str[i] + _T("\")\n"));

     
     if (!parOutput) fout.Detach();
 }
     
     if (!parOutput) fout.Detach();
 }


@@ -444,6 +463,36 @@ wxArrayString XmlResApp::FindStrings()
 
 
 
 
 
 

+static wxString ConvertText(const wxString& str)
+{
+    wxString str2;
+    const wxChar *dt;
+
+    for (dt = str.c_str(); *dt; dt++)
+    {
+        if (*dt == wxT('_'))
+        {
+            if ( *(++dt) == wxT('_') )
+                str2 << wxT('_');
+            else
+                str2 << wxT('&') << *dt;
+        }
+        else 
+        {
+            switch (*dt)
+            {
+                case wxT('\n') : str2 << wxT("\\n"); break;
+                case wxT('\t') : str2 << wxT("\\t"); break;
+                case wxT('\r') : str2 << wxT("\\r"); break;
+                default        : str2 << *dt; break;
+            }
+        }
+    }
+
+    return str2;
+}
+
+

 wxArrayString XmlResApp::FindStrings(wxXmlNode *node)
 {
     wxArrayString arr;
 wxArrayString XmlResApp::FindStrings(wxXmlNode *node)
 {
     wxArrayString arr;


@@ -469,9 +518,9 @@ wxArrayString XmlResApp::FindStrings(wxXmlNode *node)
                 node/*not n!*/->GetName() == _T("htmlcode") ||
                 node/*not n!*/->GetName() == _T("title")
             ))
                 node/*not n!*/->GetName() == _T("htmlcode") ||
                 node/*not n!*/->GetName() == _T("title")
             ))

-            // ...and known to contain filename
+            // ...and known to contain translatable string

         {
         {

-            arr.Add(n->GetContent());
+            arr.Add(ConvertText(n->GetContent()));

         }
         
         // subnodes:
         }
         
         // subnodes: