added customtokens view element in displaymenumain, added automatic determination of custom int tokens

This commit is contained in:
louis
2014-12-19 15:39:21 +01:00
parent a443d53e85
commit b0fd460403
10 changed files with 61 additions and 13 deletions

View File

@@ -539,8 +539,8 @@ void cDisplayChannelView::DrawCustomTokens(void) {
}
if (!tmplView)
return;
map < string, string > stringTokens = tmplView->GetCustomTokens();
map < string, int > intTokens;
map < string, string > stringTokens = tmplView->GetCustomStringTokens();
map < string, int > intTokens = tmplView->GetCustomIntTokens();
DrawViewElement(veCustomTokens, &stringTokens, &intTokens);
}

View File

@@ -230,6 +230,7 @@ void cDisplayMenuMainView::DrawStaticViewElements(void) {
DrawTimers();
DrawDiscUsage();
DrawCurrentSchedule();
DrawCustomTokens();
}
bool cDisplayMenuMainView::DrawDynamicViewElements(void) {
@@ -501,6 +502,17 @@ void cDisplayMenuMainView::DrawCurrentSchedule(void) {
DrawViewElement(veCurrentSchedule, &stringTokens, &intTokens);
}
void cDisplayMenuMainView::DrawCustomTokens(void) {
if (!ViewElementImplemented(veCustomTokens)) {
return;
}
if (!tmplView)
return;
map < string, string > stringTokens = tmplView->GetCustomStringTokens();
map < string, int > intTokens = tmplView->GetCustomIntTokens();
DrawViewElement(veCustomTokens, &stringTokens, &intTokens);
}
/************************************************************************
* cDisplayMenuSchedulesView
************************************************************************/

View File

@@ -39,6 +39,7 @@ private:
bool DrawLoad(void);
bool DrawDevices(void);
void DrawCurrentSchedule(void);
void DrawCustomTokens(void);
public:
cDisplayMenuMainView(cTemplateView *tmplView, bool menuInit);
virtual ~cDisplayMenuMainView();