Merge branch 'pbiering/vdrstatus-displaymenu'

1 files changed, 27 insertions, 0 deletions

diff --git a/coreengine/viewdisplaymenu.c b/coreengine/viewdisplaymenu.c
index 44f2ce4..c87370e 100644
--- a/coreengine/viewdisplaymenu.c
+++ b/coreengine/viewdisplaymenu.c
@@ -108,6 +108,7 @@ void cViewMenu::SetViewElements(void) {
     viewElementNames.insert(pair<string, int>("header", (int)eVeDisplayMenu::header));
     viewElementNames.insert(pair<string, int>("datetime", (int)eVeDisplayMenu::datetime));
     viewElementNames.insert(pair<string, int>("time", (int)eVeDisplayMenu::time));
+    viewElementNames.insert(pair<string, int>("vdrstatus", (int)eVeDisplayMenu::vdrstatus));
     viewElementNames.insert(pair<string, int>("colorbuttons", (int)eVeDisplayMenu::colorbuttons));
     viewElementNames.insert(pair<string, int>("message", (int)eVeDisplayMenu::message));
     viewElementNames.insert(pair<string, int>("scrollbar", (int)eVeDisplayMenu::scrollbar));
@@ -629,6 +630,7 @@ cSubView::cSubView(const char *name) {
     header = NULL;
     datetime = NULL;
     time = NULL;
+    vdrstatus = NULL;
     message = NULL;
     sortmode = NULL;
     colorbuttons = NULL;
@@ -693,6 +695,10 @@ void cSubView::SetViewElement(eVeDisplayMenu ve, cViewElement *viewElement) {
             if (!time)
                 time = dynamic_cast<cVeTime*>(viewElement);
             break;
+        case eVeDisplayMenu::vdrstatus:
+            if (!vdrstatus)
+                vdrstatus = dynamic_cast<cVeDmVdrstatus*>(viewElement);
+            break;
         case eVeDisplayMenu::message:
             if (!message)
                 message = dynamic_cast<cVeMessage*>(viewElement);
@@ -735,6 +741,10 @@ void cSubView::SetViewElementHorizontal(eVeDisplayMenu ve, cViewElement *viewEle
             if (!time)
                 time = dynamic_cast<cVeTime*>(viewElement);
             break;
+        case eVeDisplayMenu::vdrstatus:
+            if (!vdrstatus)
+                vdrstatus = dynamic_cast<cVeDmVdrstatus*>(viewElement);
+            break;
         case eVeDisplayMenu::message:
             if (!message)
                 message = dynamic_cast<cVeMessage*>(viewElement);
@@ -866,6 +876,7 @@ void cSubView::Clear(void) {
     if (background)   background->Hide();
     if (datetime)     datetime->Hide();
     if (time)         time->Hide();
+    if (vdrstatus)    vdrstatus->Hide();
     if (header)       header->Hide();
     if (colorbuttons) colorbuttons->Hide();
     if (scrollbar)    scrollbar->Hide();
@@ -902,6 +913,11 @@ void cSubView::DrawDynamicVEs(void) {
             time->Render();
         }
     }
+    if (vdrstatus) {
+        vdrstatus->Show();
+        if (vdrstatus->Parse())
+            vdrstatus->Render();
+    }
 }
 
 void cSubView::DrawList(void) {
@@ -949,6 +965,11 @@ void cSubView::SetViewElementObjects(void) {
     else if (viewElements[(int)eVeDisplayMenu::time])
         time = dynamic_cast<cVeTime*>(viewElements[(int)eVeDisplayMenu::time]);
 
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::vdrstatus])
+        vdrstatus = dynamic_cast<cVeDmVdrstatus*>(viewElementsHorizontal[(int)eVeDisplayMenu::vdrstatus]);
+    else if (viewElements[(int)eVeDisplayMenu::vdrstatus])
+        vdrstatus = dynamic_cast<cVeDmVdrstatus*>(viewElements[(int)eVeDisplayMenu::vdrstatus]);
+
     if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::message])
         message = dynamic_cast<cVeMessage*>(viewElementsHorizontal[(int)eVeDisplayMenu::message]);
     else if (viewElements[(int)eVeDisplayMenu::message])
@@ -986,6 +1007,7 @@ void cSubView::SetViewElements(void) {
     viewElementNames.insert(pair<string, int>("background", (int)eVeDisplayMenu::background));
     viewElementNames.insert(pair<string, int>("header", (int)eVeDisplayMenu::header));
     viewElementNames.insert(pair<string, int>("datetime", (int)eVeDisplayMenu::datetime));
+    viewElementNames.insert(pair<string, int>("vdrstatus", (int)eVeDisplayMenu::vdrstatus));
     viewElementNames.insert(pair<string, int>("time", (int)eVeDisplayMenu::time));
     viewElementNames.insert(pair<string, int>("colorbuttons", (int)eVeDisplayMenu::colorbuttons));
     viewElementNames.insert(pair<string, int>("message", (int)eVeDisplayMenu::message));
@@ -1625,6 +1647,11 @@ void cViewMenuDetail::DrawDynamicVEs(void) {
         if (time->Parse())
             time->Render();
     }
+    if (vdrstatus) {
+        vdrstatus->Show();
+        if (vdrstatus->Parse())
+            vdrstatus->Render();
+    }
 }
 
 void cViewMenuDetail::DrawDetailedView(void) {