1 files changed, 15 insertions, 121 deletions
diff --git a/views/displayviewelements.c b/views/displayviewelements.c
index 7f88990..5f337a3 100644
--- a/views/displayviewelements.c
+++ b/views/displayviewelements.c
@@ -7,8 +7,8 @@ cViewElementDevices::cViewElementDevices(bool light, cTemplateViewElement *tmplV
 
 bool cViewElementDevices::Render(void) {
     ClearTokens();
-    map < string, vector< map< string, string > > > deviceLoopTokens;
-    vector< map< string, string > > devices;
+    map < string, vector<stringmap> > deviceLoopTokens;
+    vector<stringmap> devices;
 
     if (init)
         InitDevices();
@@ -27,71 +27,6 @@ bool cViewElementDevices::Render(void) {
 
 /********************************************************************************************************************/
 
-cViewElementSignal::cViewElementSignal(cTemplateViewElement *tmplViewElement) : cViewElement(tmplViewElement) {
-}
-
-bool cViewElementSignal::Render(void) {
-    ClearTokens();
-    bool changed = SetSignal(intTokens);
-    if (!changed)
-        return false;
-    ClearViewElement(veSignalQuality);
-    DrawViewElement(veSignalQuality, &stringTokens, &intTokens);
-    return true;
-}
-
-/********************************************************************************************************************/
-
-cViewElementWeather::cViewElementWeather(cTemplateViewElement *tmplViewElement) : cViewElement(tmplViewElement) {
-}
-
-bool cViewElementWeather::Render(void) {
-    ClearTokens();
-    if (!SetCurrentWeatherTokens(stringTokens, intTokens)){
-        ClearViewElement(veCurrentWeather);
-        return false;
-    }
-    ClearViewElement(veCurrentWeather);
-    DrawViewElement(veCurrentWeather, &stringTokens, &intTokens);
-    return true;
-}
-
-/********************************************************************************************************************/
-
-cViewElementDate::cViewElementDate(cTemplateViewElement *tmplViewElement) : cViewElement(tmplViewElement) {
-    init = true;
-}
-
-bool cViewElementDate::Render(void) {
-    ClearTokens();
-    if (!SetDate(init, stringTokens, intTokens)) {
-        return false;
-    }
-    init = false;
-    ClearViewElement(veDateTime);
-    DrawViewElement(veDateTime, &stringTokens, &intTokens);
-    return true;
-}
-
-/********************************************************************************************************************/
-
-cViewElementTime::cViewElementTime(cTemplateViewElement *tmplViewElement) : cViewElement(tmplViewElement) {
-    init = true;
-}
-
-bool cViewElementTime::Render(void) {
-    ClearTokens();
-    if (!SetTime(init, stringTokens, intTokens)) {
-        return false;
-    }    
-    init = false;
-    ClearViewElement(veTime);
-    DrawViewElement(veTime, &stringTokens, &intTokens);
-    return true;
-}
-
-/********************************************************************************************************************/
-
 cViewElementScraperContent::cViewElementScraperContent(const cEvent *event, ScraperContentType type, cTemplateViewElement *tmplViewElement) : cViewElement(tmplViewElement) {
     this->event = event;
     this->type = type;
@@ -161,70 +96,29 @@ bool cViewElementLastRecordings::Render(void) {
 
 /********************************************************************************************************************/
 
-cViewElementDiscUsage::cViewElementDiscUsage(cTemplateViewElement *tmplViewElement) : cViewElement(tmplViewElement) {
-}
-
-bool cViewElementDiscUsage::Render(void) {
-    ClearTokens();
-    SetDiscUsage(stringTokens, intTokens);
-
-    ClearViewElement(veDiscUsage);
-    DrawViewElement(veDiscUsage, &stringTokens, &intTokens);
-    return true;
-}
-
-/********************************************************************************************************************/
-
-cViewElementSystemLoad::cViewElementSystemLoad(cTemplateViewElement *tmplViewElement) : cViewElement(tmplViewElement) {
-}
-
-bool cViewElementSystemLoad::Render(void) {
-    ClearTokens();
-    if (!SetSystemLoad(stringTokens, intTokens))
-        return false;
-    ClearViewElement(veSystemLoad);
-    DrawViewElement(veSystemLoad, &stringTokens, &intTokens);
-    return true;
-}
-
-/********************************************************************************************************************/
-
-cViewElementSystemMemory::cViewElementSystemMemory(cTemplateViewElement *tmplViewElement) : cViewElement(tmplViewElement) {
-}
-
-bool cViewElementSystemMemory::Render(void) {
-    ClearTokens();
-    if (!SetSystemMemory(stringTokens, intTokens))
-        return false;
-    ClearViewElement(veSystemMemory);
-    DrawViewElement(veSystemMemory, &stringTokens, &intTokens);
-    return true;
-}
-
-/********************************************************************************************************************/
-
-cViewElementTemperature::cViewElementTemperature(cTemplateViewElement *tmplViewElement) : cViewElement(tmplViewElement) {
+cViewElementCurrentSchedule::cViewElementCurrentSchedule(cTemplateViewElement *tmplViewElement, string currentRecording) : cViewElement(tmplViewElement) {
+    this->currentRecording = currentRecording;
 }
 
-bool cViewElementTemperature::Render(void) {
+bool cViewElementCurrentSchedule::Render(void) {
     ClearTokens();
-    if (!SetSystemTemperatures(stringTokens, intTokens))
-        return false;
-    ClearViewElement(veTemperatures);
-    DrawViewElement(veTemperatures, &stringTokens, &intTokens);
+    SetCurrentSchedule(currentRecording, stringTokens, intTokens);
+    ClearViewElement(veCurrentSchedule);
+    DrawViewElement(veCurrentSchedule, &stringTokens, &intTokens);
     return true;
 }
 
 /********************************************************************************************************************/
 
-cViewElementCurrentSchedule::cViewElementCurrentSchedule(cTemplateViewElement *tmplViewElement, string currentRecording) : cViewElement(tmplViewElement) {
-    this->currentRecording = currentRecording;
+cViewElementMenuHeader::cViewElementMenuHeader(cTemplateViewElement *tmplViewElement, eMenuCategory cat, string menuTitle) : cViewElement(tmplViewElement) {
+    this->cat = cat;
+    this->menuTitle = menuTitle;
 }
 
-bool cViewElementCurrentSchedule::Render(void) {
+bool cViewElementMenuHeader::Render(void) {
     ClearTokens();
-    SetCurrentSchedule(currentRecording, stringTokens, intTokens);
-    ClearViewElement(veCurrentSchedule);
-    DrawViewElement(veCurrentSchedule, &stringTokens, &intTokens);
+    SetMenuHeader(cat, menuTitle, stringTokens, intTokens);
+    ClearViewElement(veHeader);
+    DrawViewElement(veHeader, &stringTokens, &intTokens);
     return true;
 }