Revert Martin pull request for now, and return to last 7e9fd8df9 commit

This commit is contained in:
Laurent Trinques
2020-06-11 13:19:30 +02:00
parent bf2e02273e
commit 3e1740cee0
33 changed files with 473 additions and 1026 deletions

View File

@@ -489,7 +489,6 @@ bool StyleEditor::setPart(CustomElementPart *new_part) {
if (CustomElementGraphicPart *part_graphic = dynamic_cast<CustomElementGraphicPart *>(new_part))
{
part = part_graphic;
m_cep_list.append(part_graphic);
updateForm();
return(true);
}
@@ -539,10 +538,6 @@ CustomElementPart *StyleEditor::currentPart() const {
return(part);
}
QList<CustomElementPart*> StyleEditor::currentParts() const {
return m_cep_list;
}
/**
* @brief StyleEditor::isStyleEditable
* @param cep_list
@@ -553,7 +548,7 @@ bool StyleEditor::isStyleEditable(QList<CustomElementPart *> cep_list)
QStringList str;
str << "arc" << "ellipse" << "line" << "polygon" << "rect";
for (CustomElementPart *cep: cep_list)
foreach (CustomElementPart *cep, cep_list)
if (!str.contains(cep -> xmlName()))
return false;