test undividable words

[wxWidgets.git] / contrib / utils / wxrcedit / editor.cpp

diff --git a/contrib/utils/wxrcedit/editor.cpp b/contrib/utils/wxrcedit/editor.cpp
index 383462d1c8fcd7a4cc0bf0e78b0475b8a42b9b90..d24f9b932a41c1e3a808f3a5e0cb8a7358cf6dc2 100644 (file)
--- a/contrib/utils/wxrcedit/editor.cpp
+++ b/contrib/utils/wxrcedit/editor.cpp
@@ -19,8 +19,8 @@
 #endif
 
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"

-#include "wx/xml/xml.h"
-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xml.h"
+#include "wx/xrc/xmlres.h"

 #include "wx/splitter.h"
 #include "wx/config.h"
 #include "wx/dir.h"
 #include "wx/splitter.h"
 #include "wx/config.h"
 #include "wx/dir.h"


@@ -35,6 +35,66 @@
 #include "propframe.h"
 
 
 #include "propframe.h"
 
 

+void wxXmlRcEditDocument::UpgradeNodeValue(wxXmlNode *node)
+{
+    wxXmlNode *n = node;
+    if (n == NULL) return;
+    n = n->GetChildren();
+
+    while (n)
+    {
+        if (n->GetType() == wxXML_TEXT_NODE ||
+            n->GetType() == wxXML_CDATA_SECTION_NODE)
+        {
+            wxString str1 = n->GetContent();
+            const wxChar *dt;
+
+            for (dt = str1.c_str(); *dt; dt++)
+            {
+                // Remap amp_char to &, map double amp_char to amp_char (for things
+                // like "&File..." -- this is illegal in XML, so we use "_File..."):
+                if (*dt == '$')
+                {
+                    if ( *(++dt) != '$' )
+                        str1[size_t(dt-str1.c_str()-1)] = '_';
+                }
+            }
+            n->SetContent(str1);
+        }
+        n = n->GetNext();
+    }
+}
+
+void wxXmlRcEditDocument::UpgradeNode(wxXmlNode *node)
+{
+    if (node)
+    {
+        UpgradeNodeValue(node);
+        UpgradeNode(node->GetNext());
+        UpgradeNode(node->GetChildren());
+    }
+}
+
+void wxXmlRcEditDocument::Upgrade()
+{
+    int v1,v2,v3,v4;
+    long version;
+    wxXmlNode *node = GetRoot();
+    wxString verstr = wxT("0.0.0.0");
+    node->GetPropVal(wxT("version"),verstr);
+    if (wxSscanf(verstr.c_str(), wxT("%i.%i.%i.%i"),
+        &v1, &v2, &v3, &v4) == 4)
+        version = v1*256*256*256+v2*256*256+v3*256+v4;
+    else
+        version = 0;
+    if (!version)
+    {
+        UpgradeNode(node);
+    }
+    node->DeleteProperty(wxT("version"));
+    node->AddProperty(wxT("version"), WX_XMLRES_CURRENT_VERSION_STRING);
+}
+

 
 class EditorTreeCtrl : public wxTreeCtrl
 {
 
 class EditorTreeCtrl : public wxTreeCtrl
 {


@@ -81,11 +141,12 @@ enum
     ID_COPY,
 
     ID_NEWDIALOG,
     ID_COPY,
 
     ID_NEWDIALOG,

+       ID_NEWFRAME,

     ID_NEWPANEL,
     ID_NEWMENU,
     ID_NEWMENUBAR,
     ID_NEWTOOLBAR,   
     ID_NEWPANEL,
     ID_NEWMENU,
     ID_NEWMENUBAR,
     ID_NEWTOOLBAR,   

-    ID_NEWNODE = wxID_HIGHEST + 10000, // safely out of XMLID range :)
+    ID_NEWNODE = wxID_HIGHEST + 10000, // safely out of XRCID range :)

     ID_NEWSYBNODE = ID_NEWNODE + 20000
 };
 
     ID_NEWSYBNODE = ID_NEWNODE + 20000
 };
 


@@ -230,11 +291,14 @@ void EditorFrame::LoadFile(const wxString& filename)
 
     delete m_Resource;
     
 
     delete m_Resource;
     

+     // create new resource in order to handle version differences properly
+    PreviewFrame::Get()->ResetResource();
+    

     m_FileName = "";
     m_FileName = "";

-    m_Resource = new wxXmlDocument;
+    m_Resource = new wxXmlRcEditDocument;

     m_Modified = FALSE;
     
     m_Modified = FALSE;
     

-    if (!m_Resource->Load(filename))
+    if (!m_Resource->Load(filename,  wxLocale::GetSystemEncodingName()))

     {
         delete m_Resource;
         m_Resource = NULL;
     {
         delete m_Resource;
         m_Resource = NULL;


@@ -244,6 +308,9 @@ void EditorFrame::LoadFile(const wxString& filename)
     else
     {
         m_FileName = filename;
     else
     {
         m_FileName = filename;

+
+        // Upgrades old versions
+        m_Resource->Upgrade();

         RefreshTree();
     }
     RefreshTitle();
         RefreshTree();
     }
     RefreshTitle();


@@ -254,7 +321,8 @@ void EditorFrame::LoadFile(const wxString& filename)
 void EditorFrame::SaveFile(const wxString& filename)
 {
     m_FileName = filename;
 void EditorFrame::SaveFile(const wxString& filename)
 {
     m_FileName = filename;

-
+    
+    // save it:

     if (!m_Resource->Save(filename))
         wxLogError(_("Error saving ") + filename);
     else
     if (!m_Resource->Save(filename))
         wxLogError(_("Error saving ") + filename);
     else


@@ -272,9 +340,17 @@ void EditorFrame::NewFile()
     delete m_Resource;
     
     m_FileName = "";
     delete m_Resource;
     
     m_FileName = "";

-    m_Resource = new wxXmlDocument;
+    m_Resource = new wxXmlRcEditDocument;

     m_Resource->SetRoot(new wxXmlNode(wxXML_ELEMENT_NODE, _("resource")));
     m_Resource->SetRoot(new wxXmlNode(wxXML_ELEMENT_NODE, _("resource")));

+       
+       m_Resource->SetFileEncoding("utf-8");
+#if !wxUSE_UNICODE
+    m_Resource->SetEncoding(wxLocale::GetSystemEncodingName());
+#endif

     
     

+       m_Resource->GetRoot()->AddProperty(_T("version"),
+                                       WX_XMLRES_CURRENT_VERSION_STRING);
+

     m_Modified = FALSE;
     RefreshTree();
     RefreshTitle();
     m_Modified = FALSE;
     RefreshTree();
     RefreshTitle();


@@ -287,7 +363,7 @@ void EditorFrame::RefreshTitle()
     wxString s;
     if (m_Modified) s << _T("* ");
     s << _("wxrcedit");
     wxString s;
     if (m_Modified) s << _T("* ");
     s << _("wxrcedit");

-    if (!m_FileName)
+    if (m_FileName != "")

         s << _T(" - ") << wxFileNameFromPath(m_FileName);
     SetTitle(s);
 }
         s << _T(" - ") << wxFileNameFromPath(m_FileName);
     SetTitle(s);
 }


@@ -299,6 +375,7 @@ void EditorFrame::RefreshTree()
     wxXmlNode *sel = m_SelectedNode;
     
     m_TreeCtrl->DeleteAllItems(); 
     wxXmlNode *sel = m_SelectedNode;
     
     m_TreeCtrl->DeleteAllItems(); 

+

     wxTreeItemId root = m_TreeCtrl->AddRoot("Resource: " + wxFileNameFromPath(m_FileName), 5, 5);
 
     wxXmlNode *n = m_Resource->GetRoot()->GetChildren();  
     wxTreeItemId root = m_TreeCtrl->AddRoot("Resource: " + wxFileNameFromPath(m_FileName), 5, 5);
 
     wxXmlNode *n = m_Resource->GetRoot()->GetChildren();  


@@ -415,19 +492,19 @@ void EditorFrame::OnTreeSel(wxTreeEvent& event)
     if (node)
         PropertiesFrame::Get()->ShowProps(node);
 
     if (node)
         PropertiesFrame::Get()->ShowProps(node);
 

-    if (m_TreeCtrl->GetParent(event.GetItem()) == m_TreeCtrl->GetRootItem())
+    if (m_TreeCtrl->GetItemParent(event.GetItem()) == m_TreeCtrl->GetRootItem())

     {
         wxTreeItemId it = event.GetOldItem();
 
         if (it.IsOk() && m_TreeCtrl->GetRootItem() != it)
         {
     {
         wxTreeItemId it = event.GetOldItem();
 
         if (it.IsOk() && m_TreeCtrl->GetRootItem() != it)
         {

-            while (m_TreeCtrl->GetParent(it) != m_TreeCtrl->GetRootItem())
-                it = m_TreeCtrl->GetParent(it);
+            while (m_TreeCtrl->GetItemParent(it) != m_TreeCtrl->GetRootItem())
+                it = m_TreeCtrl->GetItemParent(it);

             m_TreeCtrl->Collapse(it);
         }
         RecursivelyExpand(m_TreeCtrl, event.GetItem());
 
             m_TreeCtrl->Collapse(it);
         }
         RecursivelyExpand(m_TreeCtrl, event.GetItem());
 

-        PreviewFrame::Get()->Preview(node);
+        PreviewFrame::Get()->Preview(node,m_Resource);

     }
 }
 
     }
 }
 


@@ -441,7 +518,7 @@ void EditorFrame::OnToolbar(wxCommandEvent& event)
             {
             XmlTreeData* dt = (XmlTreeData*)m_TreeCtrl->GetItemData(m_TreeCtrl->GetSelection());;
             if (dt != NULL && dt->Node != NULL)
             {
             XmlTreeData* dt = (XmlTreeData*)m_TreeCtrl->GetItemData(m_TreeCtrl->GetSelection());;
             if (dt != NULL && dt->Node != NULL)

-                PreviewFrame::Get()->Preview(dt->Node);
+                PreviewFrame::Get()->Preview(dt->Node, m_Resource);

             break;
             }
 
             break;
             }
 


@@ -490,7 +567,7 @@ void EditorFrame::OnToolbar(wxCommandEvent& event)
 void EditorFrame::DeleteSelectedNode()
 {
     XmlTreeData *dt = (XmlTreeData*)
 void EditorFrame::DeleteSelectedNode()
 {
     XmlTreeData *dt = (XmlTreeData*)

-            (m_TreeCtrl->GetItemData(m_TreeCtrl->GetParent(m_TreeCtrl->GetSelection())));
+            (m_TreeCtrl->GetItemData(m_TreeCtrl->GetItemParent(m_TreeCtrl->GetSelection())));

     wxXmlNode *n = (dt) ? dt->Node : NULL;
 
     m_SelectedNode->GetParent()->RemoveChild(m_SelectedNode);
     wxXmlNode *n = (dt) ? dt->Node : NULL;
 
     m_SelectedNode->GetParent()->RemoveChild(m_SelectedNode);


@@ -506,7 +583,7 @@ void EditorFrame::OnNewNode(wxCommandEvent& event)
     {
         XmlTreeData *pardt = 
             (XmlTreeData*)(m_TreeCtrl->GetItemData(
     {
         XmlTreeData *pardt = 
             (XmlTreeData*)(m_TreeCtrl->GetItemData(

-                m_TreeCtrl->GetParent(m_TreeCtrl->GetSelection())));
+                m_TreeCtrl->GetItemParent(m_TreeCtrl->GetSelection())));

 
         if (pardt && pardt->Node && pardt->Node != m_Resource->GetRoot())
         {
 
         if (pardt && pardt->Node && pardt->Node != m_Resource->GetRoot())
         {


@@ -546,6 +623,7 @@ void EditorFrame::OnNewNode(wxCommandEvent& event)
         switch (event.GetId())
         {
             case ID_NEWDIALOG : name = _T("wxDialog"); break;
         switch (event.GetId())
         {
             case ID_NEWDIALOG : name = _T("wxDialog"); break;

+                       case ID_NEWFRAME : name = _T("wxFrame"); break;

             case ID_NEWPANEL : name = _T("wxPanel"); break;
             case ID_NEWMENU : name = _T("wxMenu"); break;
             case ID_NEWMENUBAR : name = _T("wxMenuBar"); break;
             case ID_NEWPANEL : name = _T("wxPanel"); break;
             case ID_NEWMENU : name = _T("wxMenu"); break;
             case ID_NEWMENUBAR : name = _T("wxMenuBar"); break;


@@ -570,6 +648,7 @@ void EditorFrame::OnRightClickTree(wxPoint pos)
     if (m_SelectedNode == NULL || m_SelectedNode == m_Resource->GetRoot())
     {
         popup->Append(ID_NEWDIALOG, _("New wxDialog"));
     if (m_SelectedNode == NULL || m_SelectedNode == m_Resource->GetRoot())
     {
         popup->Append(ID_NEWDIALOG, _("New wxDialog"));

+               popup->Append(ID_NEWFRAME, _("New wxFrame"));

         popup->Append(ID_NEWPANEL, _("New wxPanel"));
         popup->Append(ID_NEWMENU, _("New wxMenu"));
         popup->Append(ID_NEWMENUBAR, _("New wxMenuBar"));
         popup->Append(ID_NEWPANEL, _("New wxPanel"));
         popup->Append(ID_NEWMENU, _("New wxMenu"));
         popup->Append(ID_NEWMENUBAR, _("New wxMenuBar"));


@@ -610,7 +689,7 @@ void EditorFrame::OnRightClickTree(wxPoint pos)
 
         XmlTreeData *pardt = 
             (XmlTreeData*)(m_TreeCtrl->GetItemData(
 
         XmlTreeData *pardt = 
             (XmlTreeData*)(m_TreeCtrl->GetItemData(

-                m_TreeCtrl->GetParent(m_TreeCtrl->GetSelection())));
+                m_TreeCtrl->GetItemParent(m_TreeCtrl->GetSelection())));

         if (pardt && pardt->Node && pardt->Node != m_Resource->GetRoot())
         {
             wxXmlNode *nd = pardt->Node;
         if (pardt && pardt->Node && pardt->Node != m_Resource->GetRoot())
         {
             wxXmlNode *nd = pardt->Node;


@@ -675,7 +754,7 @@ void EditorFrame::OnClipboardAction(wxCommandEvent& event)
             {
             XmlTreeData *pardt = 
                 (XmlTreeData*)(m_TreeCtrl->GetItemData(
             {
             XmlTreeData *pardt = 
                 (XmlTreeData*)(m_TreeCtrl->GetItemData(

-                    m_TreeCtrl->GetParent(m_TreeCtrl->GetSelection())));
+                    m_TreeCtrl->GetItemParent(m_TreeCtrl->GetSelection())));

 
             if (pardt && pardt->Node && pardt->Node != m_Resource->GetRoot())
             {
 
             if (pardt && pardt->Node && pardt->Node != m_Resource->GetRoot())
             {