added viewelement <sortmode> in displaymenu to display the sort mode of the currently displayed menu

This commit is contained in:
louis
2015-03-31 16:08:42 +02:00
parent 43422fac91
commit 203754e204
13 changed files with 175 additions and 19 deletions

View File

@@ -1123,17 +1123,6 @@ cTemplateViewMenu::cTemplateViewMenu(void) {
attributes.insert("scaletvheight");
funcsAllowed.insert(pair< string, set<string> >(subViewName, attributes));
//definition of allowed parameters for timerlist viewlist
attributes.clear();
attributes.insert("x");
attributes.insert("y");
attributes.insert("width");
attributes.insert("height");
attributes.insert("orientation");
attributes.insert("align");
attributes.insert("numlistelements");
funcsAllowed.insert(pair< string, set<string> >("timerlist", attributes));
//definition of allowed parameters for menuitems viewlist
attributes.clear();
attributes.insert("x");
@@ -1209,6 +1198,7 @@ void cTemplateViewMenu::SetViewElements(void) {
viewElementsAllowed.insert("header");
viewElementsAllowed.insert("colorbuttons");
viewElementsAllowed.insert("message");
viewElementsAllowed.insert("sortmode");
viewElementsAllowed.insert("discusage");
viewElementsAllowed.insert("systemload");
viewElementsAllowed.insert("systemmemory");
@@ -1290,6 +1280,9 @@ string cTemplateViewMenu::GetViewElementName(eViewElement ve) {
case veMessage:
name = "Message";
break;
case veSortMode:
name = "Sort Mode";
break;
case veDiscUsage:
name = "Disc Usage";
break;
@@ -1419,6 +1412,8 @@ void cTemplateViewMenu::AddPixmap(string sViewElement, cTemplatePixmap *pix, vec
ve = veButtons;
} else if (!sViewElement.compare("message")) {
ve = veMessage;
} else if (!sViewElement.compare("sortmode")) {
ve = veSortMode;
} else if (!sViewElement.compare("discusage")) {
ve = veDiscUsage;
} else if (!sViewElement.compare("systemload")) {

View File

@@ -25,6 +25,7 @@ enum eViewElement {
veDateTime,
veTime,
veMessage,
veSortMode,
veDevices,
veCurrentWeather,
veCustomTokens,