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

3 files changed, 15 insertions, 2 deletions

diff --git a/views/displaychannelview.c b/views/displaychannelview.c
index 9a85ab4..8c2b90c 100644
--- a/views/displaychannelview.c
+++ b/views/displaychannelview.c
@@ -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);
 }
 
diff --git a/views/displaymenuview.c b/views/displaymenuview.c
index 69337c9..5f9b0b8 100644
--- a/views/displaymenuview.c
+++ b/views/displaymenuview.c
@@ -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
 ************************************************************************/
diff --git a/views/displaymenuview.h b/views/displaymenuview.h
index dbed6b6..04bc986 100644
--- a/views/displaymenuview.h
+++ b/views/displaymenuview.h
@@ -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();