devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Theme Editor: Fixed code generation with new CONDITIONAL elements

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26753 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Robert Bieber 2010-06-10 21:52:53 +00:00
parent 4b77e82d67
commit 66d9ab289f
1 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

38
utils/themeeditor/parsetreenode.cpp
View file

@ -104,8 +104,6 @@ QString ParseTreeNode::genCode() const
{ {
case VIEWPORT: case VIEWPORT:
if(children[0]->element->type == TAG)
buffer.append(TAGSYM);
buffer.append(children[0]->genCode()); buffer.append(children[0]->genCode());
if(children[0]->element->type == TAG) if(children[0]->element->type == TAG)
buffer.append('\n'); buffer.append('\n');
@ -116,16 +114,13 @@ QString ParseTreeNode::genCode() const
case LINE: case LINE:
for(int i = 0; i < children.count(); i++) for(int i = 0; i < children.count(); i++)
{ {
/*
Adding a % in case of tag, because the tag rendering code
doesn't insert its own
*/
if(children[i]->element->type == TAG)
buffer.append(TAGSYM);
buffer.append(children[i]->genCode()); buffer.append(children[i]->genCode());
} }
if(openConditionals == 0) if(openConditionals == 0
&& !(parent && parent->element->type == SUBLINES))
{
buffer.append('\n'); buffer.append('\n');
}
break; break;
case SUBLINES: case SUBLINES:
@ -135,19 +130,32 @@ QString ParseTreeNode::genCode() const
if(i != children.count() - 1) if(i != children.count() - 1)
buffer.append(MULTILINESYM); buffer.append(MULTILINESYM);
} }
buffer.append('\n'); if(openConditionals == 0)
buffer.append('\n');
break; break;
case CONDITIONAL: case CONDITIONAL:
openConditionals++; openConditionals++;
/* Inserts a %?, the tag renderer doesn't deal with the TAGSYM */
/* Inserting the tag part */
buffer.append(TAGSYM); buffer.append(TAGSYM);
buffer.append(CONDITIONSYM); buffer.append(CONDITIONSYM);
buffer.append(children[0]->genCode()); buffer.append(element->tag->name);
if(element->params_count > 0)
{
buffer.append(ARGLISTOPENSYM);
for(int i = 0; i < element->params_count; i++)
{
buffer.append(children[i]->genCode());
if( i != element->params_count - 1)
buffer.append(ARGLISTSEPERATESYM);
buffer.append(ARGLISTCLOSESYM);
}
}
/* Inserting the sublines */ /* Inserting the sublines */
buffer.append(ENUMLISTOPENSYM); buffer.append(ENUMLISTOPENSYM);
for(int i = 1; i < children.count(); i++) for(int i = element->params_count; i < children.count(); i++)
{ {
buffer.append(children[i]->genCode()); buffer.append(children[i]->genCode());
if(i != children.count() - 1) if(i != children.count() - 1)
@ -158,9 +166,7 @@ QString ParseTreeNode::genCode() const
break; break;
case TAG: case TAG:
/* When generating code, we DO NOT insert the leading TAGSYM, leave buffer.append(TAGSYM);
* the calling functions to handle that
*/
buffer.append(element->tag->name); buffer.append(element->tag->name);
if(element->params_count > 0) if(element->params_count > 0)