diff --git a/coreengine/definitions.h b/coreengine/definitions.h index 61a52d6..ffc4efb 100644 --- a/coreengine/definitions.h +++ b/coreengine/definitions.h @@ -62,6 +62,7 @@ enum class eVeDisplayMenu { header, datetime, time, + vdrstatus, sortmode, colorbuttons, message, diff --git a/coreengine/viewdisplaymenu.c b/coreengine/viewdisplaymenu.c index 44f2ce4..11bc269 100644 --- a/coreengine/viewdisplaymenu.c +++ b/coreengine/viewdisplaymenu.c @@ -108,6 +108,7 @@ void cViewMenu::SetViewElements(void) { viewElementNames.insert(pair("header", (int)eVeDisplayMenu::header)); viewElementNames.insert(pair("datetime", (int)eVeDisplayMenu::datetime)); viewElementNames.insert(pair("time", (int)eVeDisplayMenu::time)); + viewElementNames.insert(pair("vdrstatus", (int)eVeDisplayMenu::vdrstatus)); viewElementNames.insert(pair("colorbuttons", (int)eVeDisplayMenu::colorbuttons)); viewElementNames.insert(pair("message", (int)eVeDisplayMenu::message)); viewElementNames.insert(pair("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(viewElement); break; + case eVeDisplayMenu::vdrstatus: + if (!vdrstatus) + vdrstatus = dynamic_cast(viewElement); + break; case eVeDisplayMenu::message: if (!message) message = dynamic_cast(viewElement); @@ -735,6 +741,10 @@ void cSubView::SetViewElementHorizontal(eVeDisplayMenu ve, cViewElement *viewEle if (!time) time = dynamic_cast(viewElement); break; + case eVeDisplayMenu::vdrstatus: + if (!vdrstatus) + vdrstatus = dynamic_cast(viewElement); + break; case eVeDisplayMenu::message: if (!message) message = dynamic_cast(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(viewElements[(int)eVeDisplayMenu::time]); + if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::vdrstatus]) + vdrstatus = dynamic_cast(viewElementsHorizontal[(int)eVeDisplayMenu::vdrstatus]); + else if (viewElements[(int)eVeDisplayMenu::message]) + vdrstatus = dynamic_cast(viewElements[(int)eVeDisplayMenu::vdrstatus]); + if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::message]) message = dynamic_cast(viewElementsHorizontal[(int)eVeDisplayMenu::message]); else if (viewElements[(int)eVeDisplayMenu::message]) @@ -986,6 +1007,7 @@ void cSubView::SetViewElements(void) { viewElementNames.insert(pair("background", (int)eVeDisplayMenu::background)); viewElementNames.insert(pair("header", (int)eVeDisplayMenu::header)); viewElementNames.insert(pair("datetime", (int)eVeDisplayMenu::datetime)); + viewElementNames.insert(pair("vdrstatus", (int)eVeDisplayMenu::vdrstatus)); viewElementNames.insert(pair("time", (int)eVeDisplayMenu::time)); viewElementNames.insert(pair("colorbuttons", (int)eVeDisplayMenu::colorbuttons)); viewElementNames.insert(pair("message", (int)eVeDisplayMenu::message)); @@ -1059,7 +1081,7 @@ cViewMenuMain::cViewMenuMain(const char *name) : cSubView(name) { load = NULL; memory = NULL; vdrstats = NULL; - vdrstatus = NULL; +// vdrstatus = NULL; temperatures = NULL; currentSchedule = NULL; lastRecordings = NULL; @@ -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) { diff --git a/coreengine/viewdisplaymenu.h b/coreengine/viewdisplaymenu.h index c20f3c0..ddaf0ab 100644 --- a/coreengine/viewdisplaymenu.h +++ b/coreengine/viewdisplaymenu.h @@ -120,6 +120,7 @@ protected: cVeDmHeader *header; cVeDateTime *datetime; cVeTime *time; + cVeDmVdrstatus *vdrstatus; cVeMessage *message; cVeDmSortmode *sortmode; cVeDmColorbuttons *colorbuttons; @@ -188,7 +189,7 @@ private: cVeDmSystemload *load; cVeDmSystemmemory *memory; cVeDmVdrstatistics *vdrstats; - cVeDmVdrstatus *vdrstatus; +// cVeDmVdrstatus *vdrstatus; cVeDmTemperatures *temperatures; cVeDmCurrentschedule *currentSchedule; cVeDmLastrecordings *lastRecordings; diff --git a/dtd/displaymenu.dtd b/dtd/displaymenu.dtd index 0c36848..4773625 100644 --- a/dtd/displaymenu.dtd +++ b/dtd/displaymenu.dtd @@ -2,7 +2,7 @@ -