diff --git a/HISTORY b/HISTORY index bdf1086..a9f7ac2 100644 --- a/HISTORY +++ b/HISTORY @@ -111,4 +111,5 @@ Version 0.0.8 Version 0.1.0 - fixed display of color buttons in detailed views -- fixed possible Nullpointer access in displaymenurootview \ No newline at end of file +- fixed possible Nullpointer access in displaymenurootview +- added currentschedule viewelement in displaymenumain \ No newline at end of file diff --git a/dtd/displaymenu.dtd b/dtd/displaymenu.dtd index 4b93809..2a3da3f 100644 --- a/dtd/displaymenu.dtd +++ b/dtd/displaymenu.dtd @@ -60,6 +60,11 @@ debug CDATA #IMPLIED > + + + + discusage | devices | systemload | currentschedule | menuitems)*> SetParameters(viewElementattributes); + if (viewElement->DebugTokens()) { + dsyslog("skindesigner: activating token debugging for view element %s", sViewElement.c_str()); + } viewElement->AddPixmap(pix); viewElements.insert(pair< eViewElement, cTemplateViewElement*>(ve, viewElement)); } else { diff --git a/libtemplate/templateviewelement.h b/libtemplate/templateviewelement.h index 6d148e7..a2bd05a 100644 --- a/libtemplate/templateviewelement.h +++ b/libtemplate/templateviewelement.h @@ -44,6 +44,7 @@ enum eViewElement { veDiscUsage, veSystemLoad, veTimers, + veCurrentSchedule, veMenuItem, veMenuCurrentItemDetail, veScrollbar, diff --git a/libtemplate/xmlparser.c b/libtemplate/xmlparser.c index 8931f2f..ce39dcc 100644 --- a/libtemplate/xmlparser.c +++ b/libtemplate/xmlparser.c @@ -514,7 +514,9 @@ bool cXmlParser::ParseSubView(xmlNodePtr node) { } if (subView->ValidViewElement((const char*)childNode->name)) { + xmlAttrPtr attr = childNode->properties; vector > attribs; + ParseAttributes(attr, childNode, attribs); ParseViewElement(childNode->name, childNode->xmlChildrenNode, attribs, subView); } else if (subView->ValidViewList((const char*)childNode->name)) { ParseViewList(childNode, subView); diff --git a/skinskeleton/xmlfiles/displaymenumain.xml b/skinskeleton/xmlfiles/displaymenumain.xml index 0ad253d..d6d0173 100644 --- a/skinskeleton/xmlfiles/displaymenumain.xml +++ b/skinskeleton/xmlfiles/displaymenumain.xml @@ -57,6 +57,28 @@ + + + +