frodovdr/vdr-plugin-skindesigner
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git synced 2023-10-19 15:58:31 +00:00
Code Issues Releases Wiki Activity

added currentschedule viewelement in displaymenumain

Browse Source
This commit is contained in:
louis
2014-12-12 17:52:16 +01:00
parent e746d28750
commit 84756db208
8 changed files with 143 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libtemplate/templateview.c
View File

@@ -1030,6 +1030,7 @@ void cTemplateViewMenu::SetViewElements(void) {
viewElementsAllowed.insert("systemload");
viewElementsAllowed.insert("timers");
viewElementsAllowed.insert("devices");
viewElementsAllowed.insert("currentschedule");
viewElementsAllowed.insert("scrollbar");
viewElementsAllowed.insert("detailheader");
viewElementsAllowed.insert("tablabels");
@@ -1108,6 +1109,9 @@ string cTemplateViewMenu::GetViewElementName(eViewElement ve) {
case veTimers:
name = "Timers";
break;
case veCurrentSchedule:
name = "Current Schedule";
break;
case veDevices:
name = "Devices";
break;
@@ -1217,6 +1221,8 @@ void cTemplateViewMenu::AddPixmap(string sViewElement, cTemplatePixmap *pix, vec
ve = veSystemLoad;
} else if (!sViewElement.compare("timers")) {
ve = veTimers;
} else if (!sViewElement.compare("currentschedule")) {
ve = veCurrentSchedule;
} else if (!sViewElement.compare("devices")) {
ve = veDevices;
} else if (!sViewElement.compare("scrollbar")) {
@@ -1238,6 +1244,9 @@ void cTemplateViewMenu::AddPixmap(string sViewElement, cTemplatePixmap *pix, vec
if (hit == viewElements.end()) {
cTemplateViewElement *viewElement = new cTemplateViewElement();
viewElement->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 {

1
libtemplate/templateviewelement.h
View File

@@ -44,6 +44,7 @@ enum eViewElement {
veDiscUsage,
veSystemLoad,
veTimers,
veCurrentSchedule,
veMenuItem,
veMenuCurrentItemDetail,
veScrollbar,

2
libtemplate/xmlparser.c
View File

@@ -514,7 +514,9 @@ bool cXmlParser::ParseSubView(xmlNodePtr node) {
}
if (subView->ValidViewElement((const char*)childNode->name)) {
xmlAttrPtr attr = childNode->properties;
vector<pair<string, string> > attribs;
ParseAttributes(attr, childNode, attribs);
ParseViewElement(childNode->name, childNode->xmlChildrenNode, attribs, subView);
} else if (subView->ValidViewList((const char*)childNode->name)) {
ParseViewList(childNode, subView);