#include "wx/wx.h"
#include "wx/xml/xml.h"
-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xmlres.h"
#include "wx/splitter.h"
#include "wx/config.h"
#include "wx/dir.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
{
public:
EditorTreeCtrl(wxWindow *parent, int id, EditorFrame *frame)
: wxTreeCtrl(parent, id), m_EdFrame(frame) {}
-
+
private:
EditorFrame *m_EdFrame;
-
+
void OnRightClick(wxMouseEvent &event)
{
- wxTreeItemId item =
+ wxTreeItemId item =
m_EdFrame->m_TreeCtrl->HitTest(event.GetPosition());
if (item.IsOk())
{
END_EVENT_TABLE()
-enum
+enum
{
ID_PREVIEW = wxID_HIGHEST + 100,
ID_NEW,
ID_SAVEAS,
ID_DELETE_NODE,
ID_EXIT,
- ID_TREE,
-
+ ID_TREE,
+
ID_CUT,
ID_PASTE_SYBLING,
ID_PASTE_CHILD,
ID_COPY,
ID_NEWDIALOG,
+ ID_NEWFRAME,
ID_NEWPANEL,
ID_NEWMENU,
ID_NEWMENUBAR,
- ID_NEWTOOLBAR,
- ID_NEWNODE = wxID_HIGHEST + 10000, // safely out of XMLID range :)
+ ID_NEWTOOLBAR,
+ ID_NEWNODE = wxID_HIGHEST + 10000, // safely out of XRCID range :)
ID_NEWSYBNODE = ID_NEWNODE + 20000
};
EditorFrame *EditorFrame::ms_Instance = NULL;
EditorFrame::EditorFrame(wxFrame *parent, const wxString& filename)
- : wxFrame(parent, -1, filename + _("- wxWindows resources editor"))
+ : wxFrame(parent, wxID_ANY, filename + _("- wxWidgets resources editor"))
{
ms_Instance = this;
m_Clipboard = NULL;
- m_Modified = FALSE;
-
+ m_Modified = false;
+
wxConfigBase *cfg = wxConfigBase::Get();
-
- SetSize(wxRect(wxPoint(cfg->Read("editor_x", -1), cfg->Read("editor_y", -1)),
- wxSize(cfg->Read("editor_w", 400), cfg->Read("editor_h", 400))));
+
+ SetSize(wxRect(wxPoint(cfg->Read(_T("editor_x"), wxDefaultCoord), cfg->Read(_T("editor_y"), wxDefaultCoord)),
+ wxSize(cfg->Read(_T("editor_w"), 400), cfg->Read(_T("editor_h"), 400))));
m_SelectedNode = NULL;
m_Resource = NULL;
m_FileName = wxEmptyString;
wxMenu *menuFile = new wxMenu;
- menuFile->Append(ID_NEW, "&New");
- menuFile->Append(ID_OPEN, "&Open\tCtrl-O");
- menuFile->Append(ID_SAVE, "&Save\tCtrl-S");
- menuFile->Append(ID_SAVEAS, "Save &as...");
+ menuFile->Append(ID_NEW, _T("&New"));
+ menuFile->Append(ID_OPEN, _T("&Open\tCtrl-O"));
+ menuFile->Append(ID_SAVE, _T("&Save\tCtrl-S"));
+ menuFile->Append(ID_SAVEAS, _T("Save &as..."));
menuFile->AppendSeparator();
- menuFile->Append(ID_EXIT, "E&xit\tAlt-X");
+ menuFile->Append(ID_EXIT, _T("E&xit\tAlt-X"));
wxMenu *menuEdit = new wxMenu;
- menuEdit->Append(ID_CUT, "Cut\tCtrl-X");
- menuEdit->Append(ID_COPY, "Copy\tCtrl-C");
- menuEdit->Append(ID_PASTE_SYBLING, "Paste as sybling\tCtrl-V");
- menuEdit->Append(ID_PASTE_CHILD, "Paste as child");
+ menuEdit->Append(ID_CUT, _T("Cut\tCtrl-X"));
+ menuEdit->Append(ID_COPY, _T("Copy\tCtrl-C"));
+ menuEdit->Append(ID_PASTE_SYBLING, _T("Paste as sybling\tCtrl-V"));
+ menuEdit->Append(ID_PASTE_CHILD, _T("Paste as child"));
menuEdit->AppendSeparator();
- menuEdit->Append(ID_DELETE_NODE, "Delete");
+ menuEdit->Append(ID_DELETE_NODE, _T("Delete"));
+
+ menuEdit->Enable(ID_PASTE_SYBLING, false);
+ menuEdit->Enable(ID_PASTE_CHILD, false);
- menuEdit->Enable(ID_PASTE_SYBLING, FALSE);
- menuEdit->Enable(ID_PASTE_CHILD, FALSE);
-
wxMenuBar *menuBar = new wxMenuBar();
- menuBar->Append(menuFile, "&File");
- menuBar->Append(menuEdit, "&Edit");
+ menuBar->Append(menuFile, _T("&File"));
+ menuBar->Append(menuEdit, _T("&Edit"));
SetMenuBar(menuBar);
-
+
// Create toolbar:
wxToolBar *toolBar = CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT);
toolBar->SetMargins(2, 2);
toolBar->SetToolBitmapSize(wxSize(24, 24));
toolBar -> AddTool(ID_EXIT, wxBITMAP(close), wxNullBitmap,
- FALSE, -1, -1, (wxObject *) NULL,
+ false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,
_("Quit the editor"));
toolBar -> AddTool(ID_OPEN, wxBITMAP(open), wxNullBitmap,
- FALSE, -1, -1, (wxObject *) NULL,
- _("Open XML resource file"));
+ false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,
+ _("Open XML resource file"));
toolBar -> AddTool(ID_SAVE, wxBITMAP(save), wxNullBitmap,
- FALSE, -1, -1, (wxObject *) NULL,
+ false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,
_("Save XML file"));
toolBar -> AddTool(ID_PREVIEW, wxBITMAP(preview), wxNullBitmap,
- FALSE, -1, -1, (wxObject *) NULL,
- _("Preview"));
+ false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,
+ _("Preview"));
toolBar -> Realize();
wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
-
+
// Create tree control:
m_TreeCtrl = new EditorTreeCtrl(this, ID_TREE, this);
wxImageList *imgList = new wxImageList(16, 16);
m_TreeCtrl->AssignImageList(imgList);
sizer->Add(m_TreeCtrl, 1, wxEXPAND);
- SetAutoLayout(TRUE);
SetSizer(sizer);
// Load file:
PropertiesFrame::Get()->Close();
wxConfigBase *cfg = wxConfigBase::Get();
-
+
cfg->Write(_T("editor_x"), (long)GetPosition().x);
cfg->Write(_T("editor_y"), (long)GetPosition().y);
cfg->Write(_T("editor_w"), (long)GetSize().x);
if (!AskToSave()) return;
delete m_Resource;
-
- m_FileName = "";
- m_Resource = new wxXmlDocument;
- m_Modified = FALSE;
-
- if (!m_Resource->Load(filename))
+
+ // create new resource in order to handle version differences properly
+ PreviewFrame::Get()->ResetResource();
+
+ m_FileName = wxEmptyString;
+ m_Resource = new wxXmlRcEditDocument;
+ m_Modified = false;
+
+ if (!m_Resource->Load(filename, wxLocale::GetSystemEncodingName()))
{
delete m_Resource;
m_Resource = NULL;
NewFile();
- wxLogError("Error parsing " + filename);
+ wxLogError(_T("Error parsing ") + filename);
}
else
{
m_FileName = filename;
+
+ // Upgrades old versions
+ m_Resource->Upgrade();
RefreshTree();
}
RefreshTitle();
{
m_FileName = filename;
+ // save it:
if (!m_Resource->Save(filename))
wxLogError(_("Error saving ") + filename);
else
- m_Modified = FALSE;
+ m_Modified = false;
RefreshTitle();
}
void EditorFrame::NewFile()
-{
+{
if (!AskToSave()) return;
delete m_Resource;
-
- m_FileName = "";
- m_Resource = new wxXmlDocument;
+
+ m_FileName = wxEmptyString;
+ m_Resource = new wxXmlRcEditDocument;
m_Resource->SetRoot(new wxXmlNode(wxXML_ELEMENT_NODE, _("resource")));
-
- m_Modified = FALSE;
+
+ m_Resource->SetFileEncoding(_T("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();
}
wxString s;
if (m_Modified) s << _T("* ");
s << _("wxrcedit");
- if (!m_FileName)
+ if (m_FileName != wxEmptyString)
s << _T(" - ") << wxFileNameFromPath(m_FileName);
SetTitle(s);
}
void EditorFrame::RefreshTree()
{
wxXmlNode *sel = m_SelectedNode;
-
- m_TreeCtrl->DeleteAllItems();
- wxTreeItemId root = m_TreeCtrl->AddRoot("Resource: " + wxFileNameFromPath(m_FileName), 5, 5);
- wxXmlNode *n = m_Resource->GetRoot()->GetChildren();
+ m_TreeCtrl->DeleteAllItems();
+
+ wxTreeItemId root = m_TreeCtrl->AddRoot(_T("Resource: ") + wxFileNameFromPath(m_FileName), 5, 5);
+
+ wxXmlNode *n = m_Resource->GetRoot()->GetChildren();
while (n)
{
if (n->GetType() == wxXML_ELEMENT_NODE)
static void RecursivelyExpand(wxTreeCtrl *t, wxTreeItemId item)
{
t->Expand(item);
- long cookie;
+ void* cookie;
wxTreeItemId id = t->GetFirstChild(item, cookie);
while (id.IsOk())
{
wxTreeItemId item;
XmlTreeData *dt;
wxXmlNode *nd;
- long cookie;
-
+ void* cookie;
+
item = m_TreeCtrl->GetFirstChild(*root, cookie);
while (item.IsOk())
{
dt = (XmlTreeData*)(m_TreeCtrl->GetItemData(item));
nd = (dt) ? dt->Node : NULL;
- if (nd == node)
+ if (nd == node)
{
RecursivelyExpand(m_TreeCtrl, *root);
m_TreeCtrl->SelectItem(item);
m_TreeCtrl->EnsureVisible(item);
- return TRUE;
+ return true;
}
- if (m_TreeCtrl->ItemHasChildren(item) && SelectNode(node, &item))
- return TRUE;
+ if (m_TreeCtrl->ItemHasChildren(item) && SelectNode(node, &item))
+ return true;
item = m_TreeCtrl->GetNextChild(*root, cookie);
}
- return FALSE;
+ return false;
}
wxTreeItemId EditorFrame::CreateTreeNode(wxTreeCtrl *treectrl, wxTreeItemId parent, wxXmlNode *node)
{
- if (!node)
+ if (!node)
{
wxTreeItemId invalid;
return invalid;
if (change_type & CHANGED_TREE_SELECTED)
{
wxTreeItemId sel = m_TreeCtrl->GetSelection();
- m_TreeCtrl->SetItemText(sel,
+ m_TreeCtrl->SetItemText(sel,
NodeHandler::Find(m_SelectedNode)->GetTreeString(m_SelectedNode));
}
int icon = NodeHandler::Find(m_SelectedNode)->GetTreeIcon(m_SelectedNode);
m_TreeCtrl->SetItemImage(sel, icon);
}
-
+
if (!m_Modified)
{
- m_Modified = TRUE;
+ m_Modified = true;
RefreshTitle();
}
-
+
PreviewFrame::Get()->MakeDirty();
}
void EditorFrame::OnTreeSel(wxTreeEvent& event)
{
XmlTreeData *dt = (XmlTreeData*)(m_TreeCtrl->GetItemData(event.GetItem()));
- wxXmlNode *node = (dt) ? dt->Node : NULL;
-
+ wxXmlNode *node = (dt) ? dt->Node : NULL;
+
m_SelectedNode = 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)
{
- 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());
- PreviewFrame::Get()->Preview(node);
+ PreviewFrame::Get()->Preview(node,m_Resource);
}
}
void EditorFrame::OnToolbar(wxCommandEvent& event)
{
- switch (event.GetId())
+ switch (event.GetId())
{
case ID_PREVIEW :
{
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;
}
case ID_EXIT :
- Close(TRUE);
+ Close(true);
break;
case ID_NEW :
case ID_OPEN :
{
wxString cwd = wxGetCwd(); // workaround for 2.2
- wxString name = wxFileSelector(_("Open XML resource"), _T(""), _T(""), _T(""), _("XML resources (*.xrc)|*.xrc"), wxOPEN | wxFILE_MUST_EXIST);
+ wxString name = wxFileSelector(_("Open XML resource"), wxEmptyString, wxEmptyString, wxEmptyString, _("XML resources (*.xrc)|*.xrc"), wxOPEN | wxFILE_MUST_EXIST);
wxSetWorkingDirectory(cwd);
if (!name.IsEmpty())
LoadFile(name);
}
case ID_SAVE :
- if (m_FileName != "") { SaveFile(m_FileName); break;}
+ if (m_FileName != wxEmptyString) { SaveFile(m_FileName); break;}
// else go to SAVEAS
case ID_SAVEAS :
{
wxString cwd = wxGetCwd(); // workaround for 2.2
- wxString name = wxFileSelector(_("Save as"), _T(""), m_FileName, _T(""), _("XML resources (*.xrc)|*.xrc"), wxSAVE | wxOVERWRITE_PROMPT);
+ wxString name = wxFileSelector(_("Save as"), wxEmptyString, m_FileName, wxEmptyString, _("XML resources (*.xrc)|*.xrc"), wxSAVE | wxOVERWRITE_PROMPT);
wxSetWorkingDirectory(cwd);
if (!name.IsEmpty())
SaveFile((m_FileName = name));
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);
{
if (event.GetId() >= ID_NEWSYBNODE)
{
- XmlTreeData *pardt =
+ 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())
{
wxTreeItemId root = m_TreeCtrl->GetSelection();
SelectNode(node, &root);
}
-
+
else
{
wxString name;
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_NEWTOOLBAR : name = _T("wxToolBar"); break;
default : return; // never occurs
}
-
+
wxXmlNode *node = new wxXmlNode(wxXML_ELEMENT_NODE, _T("object"));
node->AddProperty(_T("class"), name);
m_Resource->GetRoot()->AddChild(node);
void EditorFrame::OnRightClickTree(wxPoint pos)
{
wxMenu *popup = new wxMenu;
-
+
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_NEWTOOLBAR, _("New wxToolBar"));
}
-
+
else
- {
+ {
bool has_children;
{
- wxArrayString& arr =
+ wxArrayString& arr =
NodeHandler::Find(NodeHandler::Find(m_SelectedNode)->GetRealNode(m_SelectedNode))->
GetChildTypes();
{
news2->Append(i + ID_NEWNODE, arr[i]);
#ifdef __WXGTK__ // doesn't support Break
- if (i % 20 == 19)
+ if (i % 20 == 19)
{
wxMenu *m = new wxMenu;
news2->Append(ID_NEWNODE+arr.GetCount(), _("More..."), m);
}
- XmlTreeData *pardt =
+ 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;
- wxArrayString& arr =
+ wxArrayString& arr =
NodeHandler::Find(NodeHandler::Find(nd)->GetRealNode(nd))->
GetChildTypes();
{
news2->Append(i + ID_NEWSYBNODE, arr[i]);
#ifdef __WXGTK__ // doesn't support Break
- if (i % 20 == 19)
+ if (i % 20 == 19)
{
wxMenu *m = new wxMenu;
news2->Append(ID_NEWSYBNODE+arr.GetCount(), _("More..."), m);
popup->Enable(ID_PASTE_SYBLING, m_Clipboard != NULL);
popup->Enable(ID_PASTE_CHILD, has_children && m_Clipboard != NULL);
}
-
+
m_TreeCtrl->PopupMenu(popup, pos);
delete popup;
}
case ID_CUT:
delete m_Clipboard;
m_Clipboard = new wxXmlNode(*m_SelectedNode);
- GetMenuBar()->Enable(ID_PASTE_SYBLING, TRUE);
- GetMenuBar()->Enable(ID_PASTE_CHILD, TRUE);
+ GetMenuBar()->Enable(ID_PASTE_SYBLING, true);
+ GetMenuBar()->Enable(ID_PASTE_CHILD, true);
if (event.GetId() == ID_CUT) DeleteSelectedNode();
break;
-
+
case ID_PASTE_SYBLING:
{
- XmlTreeData *pardt =
+ 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())
{
}
}
break;
-
+
case ID_PASTE_CHILD:
wxXmlNode *realnode = NodeHandler::Find(m_SelectedNode)->GetRealNode(m_SelectedNode);
NodeHandler *hnd = NodeHandler::Find(realnode);
bool EditorFrame::AskToSave()
// asks the user to save current document (if modified)
- // returns FALSE if user cancelled the action, TRUE of he choosed
+ // returns false if user cancelled the action, true of he choosed
// 'yes' or 'no'
{
- if (!m_Modified) return TRUE;
-
- int res = wxMessageBox(_("File modified. Do you want to save changes?"), _("Save changes"),
+ if (!m_Modified) return true;
+
+ int res = wxMessageBox(_("File modified. Do you want to save changes?"), _("Save changes"),
wxYES_NO | wxCANCEL | wxCENTRE | wxICON_QUESTION);
if (res == wxYES)
SaveFile(m_FileName);
projects / wxWidgets.git / blobdiff