Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added custom properties to style definitions and style sheets

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2012-04-24 11:22:18 +00:00
parent ee1787872d
commit c6182d489c
6 changed files with 95 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
include/wx/richtext/richtextstyles.h
View File

@@ -101,11 +101,27 @@ public:
/// Gets the style combined with the base style
virtual wxRichTextAttr GetStyleMergedWithBase(const wxRichTextStyleSheet* sheet) const;
/**
Sets the definition's properties.
*/
wxRichTextProperties& GetProperties() { return m_properties; }
/**
Returns the definition's properties.
*/
const wxRichTextProperties& GetProperties() const { return m_properties; }
/**
Returns the definition's properties.
*/
void SetProperties(const wxRichTextProperties& props) { m_properties = props; }
protected:
wxString m_name;
wxString m_baseStyle;
wxString m_description;
wxRichTextAttr m_style;
wxString m_name;
wxString m_baseStyle;
wxString m_description;
wxRichTextAttr m_style;
wxRichTextProperties m_properties;
};
/*!
@@ -402,6 +418,21 @@ public:
void SetDescription(const wxString& descr) { m_description = descr; }
const wxString& GetDescription() const { return m_description; }
/**
Sets the definition's properties.
*/
wxRichTextProperties& GetProperties() { return m_properties; }
/**
Returns the definition's properties.
*/
const wxRichTextProperties& GetProperties() const { return m_properties; }
/**
Returns the definition's properties.
*/
void SetProperties(const wxRichTextProperties& props) { m_properties = props; }
/// Implementation
/// Add a definition to one of the style lists
@@ -425,6 +456,7 @@ protected:
wxRichTextStyleSheet* m_previousSheet;
wxRichTextStyleSheet* m_nextSheet;
wxRichTextProperties m_properties;
};
#if wxUSE_HTML

1
include/wx/richtext/richtextxml.h
View File

@@ -69,6 +69,7 @@ public:
bool ImportXML(wxRichTextBuffer* buffer, wxRichTextObject* obj, wxXmlNode* node);
bool ImportStyleDefinition(wxRichTextStyleSheet* sheet, wxXmlNode* node);
bool ImportProperties(wxRichTextObject* obj, wxXmlNode* node);
bool ImportProperties(wxRichTextProperties& properties, wxXmlNode* node);
/// Import style parameters
bool ImportStyle(wxRichTextAttr& attr, wxXmlNode* node, bool isPara = false);

4
interface/wx/richtext/richtextbuffer.h
View File

@@ -2377,7 +2377,7 @@ public:
wxRichTextAttr& GetAttributes() { return m_attributes; }
/**
Sets the object's properties.
Returns the object's properties.
*/
wxRichTextProperties& GetProperties() { return m_properties; }
@@ -2387,7 +2387,7 @@ public:
const wxRichTextProperties& GetProperties() const { return m_properties; }
/**
Returns the object's properties.
Sets the object's properties.
*/
void SetProperties(const wxRichTextProperties& props) { m_properties = props; }

30
interface/wx/richtext/richtextstyles.h
View File

@@ -179,6 +179,21 @@ public:
Sets the attributes for this style.
*/
void SetStyle(const wxTextAttr& style);
/**
Returns the definition's properties.
*/
wxRichTextProperties& GetProperties();
/**
Returns the definition's properties.
*/
const wxRichTextProperties& GetProperties() const;
/**
Sets the definition's properties.
*/
void SetProperties(const wxRichTextProperties& props);
};
@@ -662,5 +677,20 @@ public:
Sets the style sheet's name.
*/
void SetName(const wxString& name);
/**
Returns the sheet's properties.
*/
wxRichTextProperties& GetProperties();
/**
Returns the sheet's properties.
*/
const wxRichTextProperties& GetProperties() const;
/**
Sets the sheet's properties.
*/
void SetProperties(const wxRichTextProperties& props);
};

4
src/richtext/richtextstyles.cpp
View File

@@ -47,11 +47,12 @@ void wxRichTextStyleDefinition::Copy(const wxRichTextStyleDefinition& def)
m_baseStyle = def.m_baseStyle;
m_style = def.m_style;
m_description = def.m_description;
m_properties = def.m_properties;
}
bool wxRichTextStyleDefinition::Eq(const wxRichTextStyleDefinition& def) const
{
return (m_name == def.m_name && m_baseStyle == def.m_baseStyle && m_style == def.m_style);
return (m_name == def.m_name && m_baseStyle == def.m_baseStyle && m_style == def.m_style && m_properties == def.m_properties);
}
/// Gets the style combined with the base style
@@ -523,6 +524,7 @@ void wxRichTextStyleSheet::Copy(const wxRichTextStyleSheet& sheet)
SetName(sheet.GetName());
SetDescription(sheet.GetDescription());
m_properties = sheet.m_properties;
}
/// Equality

22
src/richtext/richtextxml.cpp
View File

@@ -207,6 +207,11 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxRichTextObject*
}
bool wxRichTextXMLHandler::ImportProperties(wxRichTextObject* obj, wxXmlNode* node)
{
return ImportProperties(obj->GetProperties(), node);
}
bool wxRichTextXMLHandler::ImportProperties(wxRichTextProperties& properties, wxXmlNode* node)
{
wxXmlNode* child = node->GetChildren();
while (child)
@@ -225,7 +230,7 @@ bool wxRichTextXMLHandler::ImportProperties(wxRichTextObject* obj, wxXmlNode* no
wxVariant var = MakePropertyFromString(name, value, type);
if (!var.IsNull())
{
obj->GetProperties().SetProperty(var);
properties.SetProperty(var);
}
}
propertyChild = propertyChild->GetNext();
@@ -262,6 +267,8 @@ bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wx
child = child->GetNext();
}
ImportProperties(def->GetProperties(), node);
sheet->AddCharacterStyle(def);
}
else if (styleType == wxT("paragraphstyle"))
@@ -284,6 +291,8 @@ bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wx
child = child->GetNext();
}
ImportProperties(def->GetProperties(), node);
sheet->AddParagraphStyle(def);
}
else if (styleType == wxT("boxstyle"))
@@ -304,6 +313,8 @@ bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wx
child = child->GetNext();
}
ImportProperties(def->GetProperties(), node);
sheet->AddBoxStyle(def);
}
else if (styleType == wxT("liststyle"))
@@ -339,6 +350,8 @@ bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wx
child = child->GetNext();
}
ImportProperties(def->GetProperties(), node);
sheet->AddListStyle(def);
}
@@ -835,6 +848,8 @@ bool wxRichTextXMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
wxRichTextBoxStyleDefinition* def = buffer->GetStyleSheet()->GetBoxStyle(i);
ExportStyleDefinition(styleSheetNode, def);
}
WriteProperties(styleSheetNode, buffer->GetStyleSheet()->GetProperties());
}
bool success = ExportXML(rootNode, *buffer);
#if wxRICHTEXT_USE_OUTPUT_TIMINGS
@@ -910,6 +925,8 @@ bool wxRichTextXMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
ExportStyleDefinition(stream, def, level + 1);
}
WriteProperties(stream, buffer->GetStyleSheet()->GetProperties(), level);
OutputIndentation(stream, level);
OutputString(stream, wxT("</stylesheet>"));
}
@@ -1373,6 +1390,8 @@ bool wxRichTextXMLHandler::ExportStyleDefinition(wxXmlNode* parent, wxRichTextSt
AddAttributes(styleNode, def->GetStyle(), true);
}
WriteProperties(defNode, def->GetProperties());
return true;
}
@@ -2532,6 +2551,7 @@ bool wxRichTextParagraphLayoutBox::ImportFromXML(wxRichTextBuffer* buffer, wxXml
child2 = child2->GetNext();
}
handler->ImportProperties(sheet->GetProperties(), child);
// Notify that styles have changed. If this is vetoed by the app,
// the new sheet will be deleted. If it is not vetoed, the