aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected display problems when restoring nodes

Browse Source 
Changes casting styles

--HG--
branch : XML Editor
This commit is contained in:
Patrick Proy 2014-05-19 08:04:33 +02:00
parent 99818c3d28
commit bb3e8e58bb
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/app/dialogs/app/dialogpatternxmledit.cpp
View File

@ -154,18 +154,12 @@ bool DialogPatternXmlEdit::DeleteNodeAndSons(VXMLTreeElement * currentNode, bool
QList<VXMLTreeElement*> stack; QList<VXMLTreeElement*> stack;
VXMLTreeElement * currentNodeStack; VXMLTreeElement * currentNodeStack;
// First undo all changes on sons
stack << currentNode; stack << currentNode;
while (stack.isEmpty() == false) while (stack.isEmpty() == false)
{ {
//pop first element //pop first element
currentNodeStack=stack.takeFirst(); currentNodeStack=stack.takeFirst();
if (onlydeactivate==true)
{
currentNodeStack->SetSetlectable(false);
QFont textfont=currentNodeStack->font();
textfont.setStrikeOut(true);
currentNodeStack->setFont(textfont);
}
// clear all changes made in son node and not on current or it will loop // clear all changes made in son node and not on current or it will loop
if (currentNodeStack != currentNode) if (currentNodeStack != currentNode)
{ {
@ -189,6 +183,29 @@ bool DialogPatternXmlEdit::DeleteNodeAndSons(VXMLTreeElement * currentNode, bool
} }
//stack.removeFirst(); //stack.removeFirst();
} }
// Next set strike font on all
if (onlydeactivate==true)
{
stack << currentNode;
while (stack.isEmpty() == false)
{
//pop first element
currentNodeStack=stack.takeFirst();
currentNodeStack->SetSetlectable(false);
QFont textfont=currentNodeStack->font();
textfont.setStrikeOut(true);
currentNodeStack->setFont(textfont);
// add sons to stack
int index=currentNodeStack->rowCount();
while (index > 0)
{
stack << static_cast<VXMLTreeElement *> (currentNodeStack->child(index-1));
index--;
}
}
}
currentNode->SetSetlectable(true); currentNode->SetSetlectable(true);
if (onlydeactivate==false) if (onlydeactivate==false)
@ -836,12 +853,10 @@ void DialogPatternXmlEdit::ElementClicked ( const QModelIndex & index )
{ {
// Get item (function returns parent of clicked item) // Get item (function returns parent of clicked item)
//TODO warning: use of old-style cast [-Wold-style-cast] VXMLTreeElement *item = static_cast<VXMLTreeElement *> (index.internalPointer());
VXMLTreeElement *item = (VXMLTreeElement *)index.internalPointer();
// Get child specified by index row/column // Get child specified by index row/column
//TODO warning: use of old-style cast [-Wold-style-cast] VXMLTreeElement * item2 = static_cast<VXMLTreeElement *> (item->child(index.row(), index.column()));
VXMLTreeElement * item2 = (VXMLTreeElement *) item->child(index.row(), index.column());
// Clear all data and disable buttons // Clear all data and disable buttons
this->ClearEditData(); this->ClearEditData();