introduced cViewElement

1 files changed, 1 insertions, 166 deletions

diff --git a/views/displaymenuitemcurrentview.c b/views/displaymenuitemcurrentview.c
index 4f1994b..48f1459 100644
--- a/views/displaymenuitemcurrentview.c
+++ b/views/displaymenuitemcurrentview.c
@@ -5,13 +5,10 @@
 #include "displaymenuitemcurrentview.h"
 
 
-cDisplayMenuItemCurrentView::cDisplayMenuItemCurrentView(cTemplateViewElement *tmplCurrent) : cView(tmplCurrent) {
-    delay = tmplItem->GetNumericParameter(ptDelay);
-    SetFadeTime(tmplItem->GetNumericParameter(ptFadeTime));
+cDisplayMenuItemCurrentView::cDisplayMenuItemCurrentView(cTemplateViewElement *tmplCurrent) : cViewElement(tmplCurrent) {
 }
 
 cDisplayMenuItemCurrentView::~cDisplayMenuItemCurrentView() {
-    CancelSave();
 }
 
 void cDisplayMenuItemCurrentView::SetPosMenuItem(cRect &pos) {
@@ -65,13 +62,6 @@ cDisplayMenuItemCurrentMainView::cDisplayMenuItemCurrentMainView(cTemplateViewEl
     this->icon = icon;
 }
 
-cDisplayMenuItemCurrentMainView::~cDisplayMenuItemCurrentMainView() {
-}
-
-void cDisplayMenuItemCurrentMainView::Prepare(void) {
-}
-
-
 void cDisplayMenuItemCurrentMainView::Render(void) {
     stringTokens.insert(pair<string,string>("number", number));
     stringTokens.insert(pair<string,string>("label", label));
@@ -80,26 +70,6 @@ void cDisplayMenuItemCurrentMainView::Render(void) {
     DrawViewElement(veMenuCurrentItemDetail, &stringTokens, &intTokens);
 }
 
-void cDisplayMenuItemCurrentMainView::Clear(void) {
-    
-}
-
-void cDisplayMenuItemCurrentMainView::Action(void) {
-    SetInitFinished();
-    DoSleep(delay);
-    Render();
-    FadeIn();
-    DoFlush();
-    if (scrolling) {
-        DoSleep(scrollDelay);
-        if (scrollOrientation == orHorizontal) {
-            ScrollHorizontal(scrollingPix, scrollDelay, scrollSpeed, scrollMode);
-        } else {
-            ScrollVertical(scrollingPix, scrollDelay, scrollSpeed);
-        }
-    }
-}
-
 /*************************************************************
 * cDisplayMenuItemCurrentSchedulesView
 *************************************************************/
@@ -113,13 +83,6 @@ cDisplayMenuItemCurrentSchedulesView::cDisplayMenuItemCurrentSchedulesView(cTemp
     this->isEpgSearchFav = isEpgSearchFav;
 }
 
-cDisplayMenuItemCurrentSchedulesView::~cDisplayMenuItemCurrentSchedulesView() {
-}
-
-void cDisplayMenuItemCurrentSchedulesView::Prepare(void) {
-}
-
-
 void cDisplayMenuItemCurrentSchedulesView::Render(void) {
     intTokens.insert(pair<string,int>("whatson", (cat == mcSchedule)&&(!isEpgSearchFav) ? true: false));
     intTokens.insert(pair<string,int>("whatsonnow", (cat == mcScheduleNow) ? true: false));
@@ -184,26 +147,6 @@ void cDisplayMenuItemCurrentSchedulesView::Render(void) {
     DrawViewElement(veMenuCurrentItemDetail, &stringTokens, &intTokens, &loopTokens);
 }
 
-void cDisplayMenuItemCurrentSchedulesView::Clear(void) {
-    
-}
-
-void cDisplayMenuItemCurrentSchedulesView::Action(void) {
-    SetInitFinished();
-    DoSleep(delay);
-    Render();
-    FadeIn();
-    DoFlush();
-    if (scrolling) {
-        DoSleep(scrollDelay);
-        if (scrollOrientation == orHorizontal) {
-            ScrollHorizontal(scrollingPix, scrollDelay, scrollSpeed, scrollMode);
-        } else {
-            ScrollVertical(scrollingPix, scrollDelay, scrollSpeed);
-        }
-    }
-}
-
 void cDisplayMenuItemCurrentSchedulesView::ReadSchedules(vector< map<string,string> > *schedulesTokens) {
     if (!event)
         return;
@@ -236,13 +179,6 @@ cDisplayMenuItemCurrentChannelView::cDisplayMenuItemCurrentChannelView(cTemplate
     this->channel = channel;
 }
 
-cDisplayMenuItemCurrentChannelView::~cDisplayMenuItemCurrentChannelView() {
-}
-
-void cDisplayMenuItemCurrentChannelView::Prepare(void) {
-}
-
-
 void cDisplayMenuItemCurrentChannelView::Render(void) {
     if (!channel)
         return;
@@ -342,26 +278,6 @@ void cDisplayMenuItemCurrentChannelView::Render(void) {
     DrawViewElement(veMenuCurrentItemDetail, &stringTokens, &intTokens, &loopTokens);
 }
 
-void cDisplayMenuItemCurrentChannelView::Clear(void) {
-    
-}
-
-void cDisplayMenuItemCurrentChannelView::Action(void) {
-    SetInitFinished();
-    DoSleep(delay);
-    Render();
-    FadeIn();
-    DoFlush();
-    if (scrolling) {
-        DoSleep(scrollDelay);
-        if (scrollOrientation == orHorizontal) {
-            ScrollHorizontal(scrollingPix, scrollDelay, scrollSpeed, scrollMode);
-        } else {
-            ScrollVertical(scrollingPix, scrollDelay, scrollSpeed);
-        }
-    }
-}
-
 void cDisplayMenuItemCurrentChannelView::ReadSchedules(vector< map<string,string> > *schedulesTokens) {
     cSchedulesLock schedulesLock;
     const cSchedules *schedules = cSchedules::Schedules(schedulesLock);
@@ -398,13 +314,6 @@ cDisplayMenuItemCurrentTimerView::cDisplayMenuItemCurrentTimerView(cTemplateView
     this->timer = timer;
 }
 
-cDisplayMenuItemCurrentTimerView::~cDisplayMenuItemCurrentTimerView() {
-}
-
-void cDisplayMenuItemCurrentTimerView::Prepare(void) {
-}
-
-
 void cDisplayMenuItemCurrentTimerView::Render(void) {
     if (!timer)
         return;
@@ -491,26 +400,6 @@ void cDisplayMenuItemCurrentTimerView::Render(void) {
     DrawViewElement(veMenuCurrentItemDetail, &stringTokens, &intTokens);
 }
 
-void cDisplayMenuItemCurrentTimerView::Clear(void) {
-    
-}
-
-void cDisplayMenuItemCurrentTimerView::Action(void) {
-    SetInitFinished();
-    DoSleep(delay);
-    Render();
-    FadeIn();
-    DoFlush();
-    if (scrolling) {
-        DoSleep(scrollDelay);
-        if (scrollOrientation == orHorizontal) {
-            ScrollHorizontal(scrollingPix, scrollDelay, scrollSpeed, scrollMode);
-        } else {
-            ScrollVertical(scrollingPix, scrollDelay, scrollSpeed);
-        }
-    }
-}
-
 /*************************************************************
 * cDisplayMenuItemCurrentRecordingView
 *************************************************************/
@@ -523,13 +412,6 @@ cDisplayMenuItemCurrentRecordingView::cDisplayMenuItemCurrentRecordingView(cTemp
     this->newRecs = newRecs;
 }
 
-cDisplayMenuItemCurrentRecordingView::~cDisplayMenuItemCurrentRecordingView() {
-}
-
-void cDisplayMenuItemCurrentRecordingView::Prepare(void) {
-}
-
-
 void cDisplayMenuItemCurrentRecordingView::Render(void) {
     if (!recording)
         return;
@@ -658,26 +540,6 @@ void cDisplayMenuItemCurrentRecordingView::Render(void) {
     DrawViewElement(veMenuCurrentItemDetail, &stringTokens, &intTokens, &loopTokens);
 }
 
-void cDisplayMenuItemCurrentRecordingView::Clear(void) {
-    
-}
-
-void cDisplayMenuItemCurrentRecordingView::Action(void) {
-    SetInitFinished();
-    DoSleep(delay);
-    Render();
-    FadeIn();
-    DoFlush();
-    if (scrolling) {
-        DoSleep(scrollDelay);
-        if (scrollOrientation == orHorizontal) {
-            ScrollHorizontal(scrollingPix, scrollDelay, scrollSpeed, scrollMode);
-        } else {
-            ScrollVertical(scrollingPix, scrollDelay, scrollSpeed);
-        }
-    }
-}
-
 /*************************************************************
 * cDisplayMenuItemCurrentPluginView
 *************************************************************/
@@ -691,34 +553,7 @@ cDisplayMenuItemCurrentPluginView::cDisplayMenuItemCurrentPluginView(cTemplateVi
     loopTokens = pluginLoopTokens;
 }
 
-cDisplayMenuItemCurrentPluginView::~cDisplayMenuItemCurrentPluginView() {
-}
-
-void cDisplayMenuItemCurrentPluginView::Prepare(void) {
-}
-
-
 void cDisplayMenuItemCurrentPluginView::Render(void) {
     SetTokensPosMenuItem();
     DrawViewElement(veMenuCurrentItemDetail, &stringTokens, &intTokens, &loopTokens);
 }
-
-void cDisplayMenuItemCurrentPluginView::Clear(void) {
-    
-}
-
-void cDisplayMenuItemCurrentPluginView::Action(void) {
-    SetInitFinished();
-    DoSleep(delay);
-    Render();
-    FadeIn();
-    DoFlush();
-    if (scrolling) {
-        DoSleep(scrollDelay);
-        if (scrollOrientation == orHorizontal) {
-            ScrollHorizontal(scrollingPix, scrollDelay, scrollSpeed, scrollMode);
-        } else {
-            ScrollVertical(scrollingPix, scrollDelay, scrollSpeed);
-        }
-    }
-}