fixed line breaks

52 files changed, 20190 insertions, 20190 deletions

diff --git a/coreengine/animation.c b/coreengine/animation.c
index 59f4388..a5f6caf 100644
--- a/coreengine/animation.c
+++ b/coreengine/animation.c
@@ -1,347 +1,347 @@
-#include "animation.h"

-#include <math.h>

-

-/******************************************************************

-* cAnimation

-******************************************************************/

-cAnimation::cAnimation(cScrollable *scrollable) : cThread("scroller") {

-    this->scrollable = scrollable;

-    this->detachable = NULL;

-    this->fadable = NULL;

-    this->shiftable = NULL;

-    this->blinkable = NULL;

-    waitOnWakeup = false;

-    doAnimation = true;

-    modeIn = false;

-    blinkFunc = -1;

-}

-

-cAnimation::cAnimation(cDetachable *detachable, bool wait, bool animation) : cThread("detached") {

-    this->scrollable = NULL;

-    this->detachable = detachable;

-    this->fadable = NULL;

-    this->shiftable = NULL;

-    this->blinkable = NULL;

-    waitOnWakeup = wait;

-    doAnimation = animation;

-    modeIn = false;

-    blinkFunc = -1;

-}

-

-cAnimation::cAnimation(cFadable *fadable, bool fadein) : cThread("fadable") {

-    this->scrollable = NULL;

-    this->detachable = NULL;

-    this->fadable = fadable;

-    this->shiftable = NULL;

-    this->blinkable = NULL;

-    waitOnWakeup = false;

-    doAnimation = true;

-    modeIn = fadein;

-    blinkFunc = -1;

-}

-

-cAnimation::cAnimation(cShiftable *shiftable, cPoint &start, cPoint &end, bool shiftin) : cThread("shiftable") {

-    this->scrollable = NULL;

-    this->detachable = NULL;

-    this->fadable = NULL;

-    this->shiftable = shiftable;

-    this->blinkable = NULL;

-    waitOnWakeup = false;

-    doAnimation = true;

-    modeIn = shiftin;

-    shiftstart = start;

-    shiftend = end;

-    blinkFunc = -1;

-}

-

-cAnimation::cAnimation(cBlinkable *blinkable, int func) : cThread("blinking") {

-    this->scrollable = NULL;

-    this->detachable = NULL;

-    this->fadable = NULL;

-    this->shiftable = NULL;

-    this->blinkable = blinkable;

-    waitOnWakeup = false;

-    doAnimation = true;

-    modeIn = false;

-    blinkFunc = func;

-}

-

-cAnimation::~cAnimation(void) {

-    sleepWait.Signal();

-    Cancel(2);

-}

-

-void cAnimation::WakeUp(void) {

-    sleepWait.Signal();

-}

-

-void cAnimation::Stop(bool deletePixmaps) { 

-    sleepWait.Signal();

-    Cancel(2);

-    if (scrollable && deletePixmaps)

-        scrollable->StopScrolling();

-}

-

-void cAnimation::Action(void) {

-    if (scrollable) {

-        Scroll();

-    } else if (detachable) {

-        Detach();

-    } else if (fadable) {

-        Fade();

-    } else if (shiftable) {

-        Shift();

-    } else if (blinkable) {

-        Blink();

-    }

-}

-

-void cAnimation::Sleep(int duration) {

-    //sleep should wake up itself, so no infinit wait allowed

-    if (duration <= 0)

-        return;

-    sleepWait.Wait(duration);

-}

-

-void cAnimation::Wait(void) {

-    //wait has to be waked up from outside

-    sleepWait.Wait(0);

-}

-

-void cAnimation::Scroll(void) {

-    int delay = scrollable->ScrollDelay();

-    Sleep(delay);

-    if (!Running()) return;    

-    

-    eOrientation orientation = scrollable->ScrollOrientation();

-    int scrollTotal = 0;

-    if (orientation == eOrientation::horizontal) {

-        scrollTotal = scrollable->ScrollWidth();

-    } else if (orientation == eOrientation::vertical) {

-        scrollTotal = scrollable->ScrollHeight();

-    }

-

-    eScrollMode mode = scrollable->ScrollMode();

-    bool carriageReturn = (mode == eScrollMode::carriagereturn) ? true : false;

-    

-    eScrollSpeed speed = scrollable->ScrollSpeed();

-    int frameTime = 30;

-    if (speed == eScrollSpeed::slow)

-        frameTime = 50;

-    else if (speed == eScrollSpeed::medium)

-        frameTime = 30;

-    else if (speed == eScrollSpeed::fast)

-        frameTime = 15;

-

-    if (!Running()) return;    

-    

-    scrollable->StartScrolling();

-    

-    int drawPortX = 0;

-    int drawPortY = 0;

-    int scrollDelta = 1;

-

-    bool doSleep = false;

-    while (Running()) {

-        if (doSleep) {

-            Sleep(delay);

-            doSleep = false;

-        }

-        if (!Running()) return;

-        uint64_t now = cTimeMs::Now();

-        

-        cPoint drawPortPoint(0,0);

-        if (orientation == eOrientation::horizontal) {

-

-            drawPortX -= scrollDelta;

-            if (abs(drawPortX) > scrollTotal) {

-                Sleep(delay);

-                if (carriageReturn) {

-                    drawPortX = 0;

-                    doSleep = true;

-                } else {

-                    scrollDelta *= -1;

-                    drawPortX -= scrollDelta;

-                }

-            }            

-            drawPortPoint.SetX(drawPortX);

-

-        } else if (orientation == eOrientation::vertical) {

-

-            drawPortY -= scrollDelta;

-            if (abs(drawPortY) > scrollTotal) {

-                Sleep(delay);

-                drawPortY = 0;

-                doSleep = true;

-            } 

-            drawPortPoint.SetY(drawPortY);

-

-        }

-        

-        if (!Running()) return;

-        scrollable->SetDrawPort(drawPortPoint);

-

-        if (!Running()) return;

-        scrollable->Flush();

-

-        if (orientation == eOrientation::horizontal && !carriageReturn && (drawPortX == 0)) {

-            scrollDelta *= -1;

-            doSleep = true;

-        }

-

-        int delta = cTimeMs::Now() - now;

-        if (delta < frameTime)

-            Sleep(frameTime - delta);

-    }

-}

-

-void cAnimation::Detach(void) {

-    if (waitOnWakeup) {

-        Wait();

-        int delay = 100 + detachable->Delay();

-        Sleep(delay);        

-    } else {

-        int delay = detachable->Delay();

-        Sleep(delay);

-    }

-    if (!Running()) return;

-    detachable->ParseDetached();

-    if (!Running()) return;

-    detachable->RenderDetached();

-    if (!Running()) return;

-    detachable->Flush();

-    if (!Running()) return;

-    if (doAnimation) {

-        detachable->StartAnimation();        

-    }

-}

-

-void cAnimation::Fade(void) {

-    int fadetime = fadable->FadeTime();

-    int frametime = 1000 / FPS;

-    int step = 100.0f / ((double)fadetime / (double)frametime);

-    uint64_t start = cTimeMs::Now();

-    int transparency = 0;

-    if (modeIn) {

-        transparency = 100 - step;

-    } else {

-        transparency = step;

-    }

-    //wait configured delay if not already done by detacher

-    if (!fadable->Detached()) {

-        int delay = fadable->Delay();

-        if (delay > 0)

-            Sleep(delay);

-    }

-    while (Running() || !modeIn) {

-        uint64_t now = cTimeMs::Now();

-        if (Running() || !modeIn)

-            fadable->SetTransparency(transparency, !modeIn);

-        if (Running() || !modeIn)

-            fadable->Flush();

-        int delta = cTimeMs::Now() - now;

-        if ((Running()  || !modeIn) && (delta < frametime)) {

-            Sleep(frametime - delta);

-        }

-        if ((int)(now - start) > fadetime) {

-            if ((Running() && modeIn) && transparency > 0) {

-                fadable->SetTransparency(0);

-                fadable->Flush();

-            } else if (!modeIn && transparency < 100) {

-                fadable->SetTransparency(100, true);

-                fadable->Flush();                

-            } 

-            break;

-        }

-        if (modeIn) {

-            transparency -= step;

-            if (transparency < 0)

-                transparency = 0;

-        } else {

-            transparency += step;

-            if (transparency > 100)

-                transparency = 100;            

-        }

-    }

-}

-

-void cAnimation::Shift(void) {

-    int shifttime = shiftable->ShiftTime();

-    eShiftMode mode = (eShiftMode)shiftable->ShiftMode();

-    //in shiftmode slowedDown shifting is done starting with slowratio % faster

-    //at start. Then speed reduces linear to (100 - slowratio)% at end

-    //for me 60 is a nice value :-) 

-    int slowRatio = 60;

-

-    int frametime = 1000 / FPS;

-    int steps = (double)shifttime / (double)frametime;

-    int stepXLinear = 0;

-    int stepYLinear = 0;

-    if (shiftstart.X() == shiftend.X()) {

-        stepYLinear = (shiftend.Y() - shiftstart.Y()) / steps;

-    } else if (shiftstart.Y() == shiftend.Y()) {

-        stepXLinear = (shiftend.X() - shiftstart.X()) / steps;

-    } else {

-        stepXLinear = (shiftend.X() - shiftstart.X()) / steps;

-        stepYLinear = (shiftend.Y() - shiftstart.Y()) / steps;        

-    }

-    int stepX = stepXLinear;

-    int stepY = stepYLinear;

-

-    cPoint pos;

-    if (modeIn)

-        pos = shiftstart;

-    else

-        pos = shiftend;

-

-    //wait configured delay if not already done by detacher

-    if (!shiftable->Detached()) {

-        int delay = shiftable->Delay();

-        if (delay > 0)

-            Sleep(delay);

-    }

-    uint64_t start = cTimeMs::Now();

-    while (Running() || !modeIn) {

-        uint64_t now = cTimeMs::Now();

-        if (Running() || !modeIn)

-            shiftable->SetPosition(pos, shiftend);

-        if (Running() || !modeIn)

-            shiftable->Flush();

-        int delta = cTimeMs::Now() - now;

-        if ((Running()  || !modeIn) && (delta < frametime)) {

-            cCondWait::SleepMs(frametime - delta);

-        }

-        if ((int)(now - start) > shifttime) {

-            if ((Running() && modeIn) && pos != shiftend) {

-                shiftable->SetPosition(shiftend, shiftend);

-                shiftable->Flush();

-            }

-            break;

-        }

-        if (mode == eShiftMode::slowedDown) {

-            double t = (double)(now - start) / (double)shifttime;

-            double factor = 1.0f + (double)slowRatio / 100.0f - 2.0f * ((double)slowRatio / 100.0f) * t;

-            stepX = stepXLinear * factor;

-            stepY = stepYLinear * factor;

-        }

-        if (modeIn) {

-            pos.Set(pos.X() + stepX, pos.Y() + stepY);

-        } else {

-            pos.Set(pos.X() - stepX, pos.Y() - stepY);

-        }

-    }

-

-}

-

-void cAnimation::Blink(void) {

-    int freq = blinkable->BlinkFreq(blinkFunc);

-    bool blinkOn = false;

-    while (Running()) {

-        Sleep(freq);

-        if (Running()) {

-            blinkable->DoBlink(blinkFunc, blinkOn);

-            blinkable->Flush();  

-        }

-        blinkOn = !blinkOn;

-    }

-}

+#include "animation.h"
+#include <math.h>
+
+/******************************************************************
+* cAnimation
+******************************************************************/
+cAnimation::cAnimation(cScrollable *scrollable) : cThread("scroller") {
+    this->scrollable = scrollable;
+    this->detachable = NULL;
+    this->fadable = NULL;
+    this->shiftable = NULL;
+    this->blinkable = NULL;
+    waitOnWakeup = false;
+    doAnimation = true;
+    modeIn = false;
+    blinkFunc = -1;
+}
+
+cAnimation::cAnimation(cDetachable *detachable, bool wait, bool animation) : cThread("detached") {
+    this->scrollable = NULL;
+    this->detachable = detachable;
+    this->fadable = NULL;
+    this->shiftable = NULL;
+    this->blinkable = NULL;
+    waitOnWakeup = wait;
+    doAnimation = animation;
+    modeIn = false;
+    blinkFunc = -1;
+}
+
+cAnimation::cAnimation(cFadable *fadable, bool fadein) : cThread("fadable") {
+    this->scrollable = NULL;
+    this->detachable = NULL;
+    this->fadable = fadable;
+    this->shiftable = NULL;
+    this->blinkable = NULL;
+    waitOnWakeup = false;
+    doAnimation = true;
+    modeIn = fadein;
+    blinkFunc = -1;
+}
+
+cAnimation::cAnimation(cShiftable *shiftable, cPoint &start, cPoint &end, bool shiftin) : cThread("shiftable") {
+    this->scrollable = NULL;
+    this->detachable = NULL;
+    this->fadable = NULL;
+    this->shiftable = shiftable;
+    this->blinkable = NULL;
+    waitOnWakeup = false;
+    doAnimation = true;
+    modeIn = shiftin;
+    shiftstart = start;
+    shiftend = end;
+    blinkFunc = -1;
+}
+
+cAnimation::cAnimation(cBlinkable *blinkable, int func) : cThread("blinking") {
+    this->scrollable = NULL;
+    this->detachable = NULL;
+    this->fadable = NULL;
+    this->shiftable = NULL;
+    this->blinkable = blinkable;
+    waitOnWakeup = false;
+    doAnimation = true;
+    modeIn = false;
+    blinkFunc = func;
+}
+
+cAnimation::~cAnimation(void) {
+    sleepWait.Signal();
+    Cancel(2);
+}
+
+void cAnimation::WakeUp(void) {
+    sleepWait.Signal();
+}
+
+void cAnimation::Stop(bool deletePixmaps) { 
+    sleepWait.Signal();
+    Cancel(2);
+    if (scrollable && deletePixmaps)
+        scrollable->StopScrolling();
+}
+
+void cAnimation::Action(void) {
+    if (scrollable) {
+        Scroll();
+    } else if (detachable) {
+        Detach();
+    } else if (fadable) {
+        Fade();
+    } else if (shiftable) {
+        Shift();
+    } else if (blinkable) {
+        Blink();
+    }
+}
+
+void cAnimation::Sleep(int duration) {
+    //sleep should wake up itself, so no infinit wait allowed
+    if (duration <= 0)
+        return;
+    sleepWait.Wait(duration);
+}
+
+void cAnimation::Wait(void) {
+    //wait has to be waked up from outside
+    sleepWait.Wait(0);
+}
+
+void cAnimation::Scroll(void) {
+    int delay = scrollable->ScrollDelay();
+    Sleep(delay);
+    if (!Running()) return;    
+    
+    eOrientation orientation = scrollable->ScrollOrientation();
+    int scrollTotal = 0;
+    if (orientation == eOrientation::horizontal) {
+        scrollTotal = scrollable->ScrollWidth();
+    } else if (orientation == eOrientation::vertical) {
+        scrollTotal = scrollable->ScrollHeight();
+    }
+
+    eScrollMode mode = scrollable->ScrollMode();
+    bool carriageReturn = (mode == eScrollMode::carriagereturn) ? true : false;
+    
+    eScrollSpeed speed = scrollable->ScrollSpeed();
+    int frameTime = 30;
+    if (speed == eScrollSpeed::slow)
+        frameTime = 50;
+    else if (speed == eScrollSpeed::medium)
+        frameTime = 30;
+    else if (speed == eScrollSpeed::fast)
+        frameTime = 15;
+
+    if (!Running()) return;    
+    
+    scrollable->StartScrolling();
+    
+    int drawPortX = 0;
+    int drawPortY = 0;
+    int scrollDelta = 1;
+
+    bool doSleep = false;
+    while (Running()) {
+        if (doSleep) {
+            Sleep(delay);
+            doSleep = false;
+        }
+        if (!Running()) return;
+        uint64_t now = cTimeMs::Now();
+        
+        cPoint drawPortPoint(0,0);
+        if (orientation == eOrientation::horizontal) {
+
+            drawPortX -= scrollDelta;
+            if (abs(drawPortX) > scrollTotal) {
+                Sleep(delay);
+                if (carriageReturn) {
+                    drawPortX = 0;
+                    doSleep = true;
+                } else {
+                    scrollDelta *= -1;
+                    drawPortX -= scrollDelta;
+                }
+            }            
+            drawPortPoint.SetX(drawPortX);
+
+        } else if (orientation == eOrientation::vertical) {
+
+            drawPortY -= scrollDelta;
+            if (abs(drawPortY) > scrollTotal) {
+                Sleep(delay);
+                drawPortY = 0;
+                doSleep = true;
+            } 
+            drawPortPoint.SetY(drawPortY);
+
+        }
+        
+        if (!Running()) return;
+        scrollable->SetDrawPort(drawPortPoint);
+
+        if (!Running()) return;
+        scrollable->Flush();
+
+        if (orientation == eOrientation::horizontal && !carriageReturn && (drawPortX == 0)) {
+            scrollDelta *= -1;
+            doSleep = true;
+        }
+
+        int delta = cTimeMs::Now() - now;
+        if (delta < frameTime)
+            Sleep(frameTime - delta);
+    }
+}
+
+void cAnimation::Detach(void) {
+    if (waitOnWakeup) {
+        Wait();
+        int delay = 100 + detachable->Delay();
+        Sleep(delay);        
+    } else {
+        int delay = detachable->Delay();
+        Sleep(delay);
+    }
+    if (!Running()) return;
+    detachable->ParseDetached();
+    if (!Running()) return;
+    detachable->RenderDetached();
+    if (!Running()) return;
+    detachable->Flush();
+    if (!Running()) return;
+    if (doAnimation) {
+        detachable->StartAnimation();        
+    }
+}
+
+void cAnimation::Fade(void) {
+    int fadetime = fadable->FadeTime();
+    int frametime = 1000 / FPS;
+    int step = 100.0f / ((double)fadetime / (double)frametime);
+    uint64_t start = cTimeMs::Now();
+    int transparency = 0;
+    if (modeIn) {
+        transparency = 100 - step;
+    } else {
+        transparency = step;
+    }
+    //wait configured delay if not already done by detacher
+    if (!fadable->Detached()) {
+        int delay = fadable->Delay();
+        if (delay > 0)
+            Sleep(delay);
+    }
+    while (Running() || !modeIn) {
+        uint64_t now = cTimeMs::Now();
+        if (Running() || !modeIn)
+            fadable->SetTransparency(transparency, !modeIn);
+        if (Running() || !modeIn)
+            fadable->Flush();
+        int delta = cTimeMs::Now() - now;
+        if ((Running()  || !modeIn) && (delta < frametime)) {
+            Sleep(frametime - delta);
+        }
+        if ((int)(now - start) > fadetime) {
+            if ((Running() && modeIn) && transparency > 0) {
+                fadable->SetTransparency(0);
+                fadable->Flush();
+            } else if (!modeIn && transparency < 100) {
+                fadable->SetTransparency(100, true);
+                fadable->Flush();                
+            } 
+            break;
+        }
+        if (modeIn) {
+            transparency -= step;
+            if (transparency < 0)
+                transparency = 0;
+        } else {
+            transparency += step;
+            if (transparency > 100)
+                transparency = 100;            
+        }
+    }
+}
+
+void cAnimation::Shift(void) {
+    int shifttime = shiftable->ShiftTime();
+    eShiftMode mode = (eShiftMode)shiftable->ShiftMode();
+    //in shiftmode slowedDown shifting is done starting with slowratio % faster
+    //at start. Then speed reduces linear to (100 - slowratio)% at end
+    //for me 60 is a nice value :-) 
+    int slowRatio = 60;
+
+    int frametime = 1000 / FPS;
+    int steps = (double)shifttime / (double)frametime;
+    int stepXLinear = 0;
+    int stepYLinear = 0;
+    if (shiftstart.X() == shiftend.X()) {
+        stepYLinear = (shiftend.Y() - shiftstart.Y()) / steps;
+    } else if (shiftstart.Y() == shiftend.Y()) {
+        stepXLinear = (shiftend.X() - shiftstart.X()) / steps;
+    } else {
+        stepXLinear = (shiftend.X() - shiftstart.X()) / steps;
+        stepYLinear = (shiftend.Y() - shiftstart.Y()) / steps;        
+    }
+    int stepX = stepXLinear;
+    int stepY = stepYLinear;
+
+    cPoint pos;
+    if (modeIn)
+        pos = shiftstart;
+    else
+        pos = shiftend;
+
+    //wait configured delay if not already done by detacher
+    if (!shiftable->Detached()) {
+        int delay = shiftable->Delay();
+        if (delay > 0)
+            Sleep(delay);
+    }
+    uint64_t start = cTimeMs::Now();
+    while (Running() || !modeIn) {
+        uint64_t now = cTimeMs::Now();
+        if (Running() || !modeIn)
+            shiftable->SetPosition(pos, shiftend);
+        if (Running() || !modeIn)
+            shiftable->Flush();
+        int delta = cTimeMs::Now() - now;
+        if ((Running()  || !modeIn) && (delta < frametime)) {
+            cCondWait::SleepMs(frametime - delta);
+        }
+        if ((int)(now - start) > shifttime) {
+            if ((Running() && modeIn) && pos != shiftend) {
+                shiftable->SetPosition(shiftend, shiftend);
+                shiftable->Flush();
+            }
+            break;
+        }
+        if (mode == eShiftMode::slowedDown) {
+            double t = (double)(now - start) / (double)shifttime;
+            double factor = 1.0f + (double)slowRatio / 100.0f - 2.0f * ((double)slowRatio / 100.0f) * t;
+            stepX = stepXLinear * factor;
+            stepY = stepYLinear * factor;
+        }
+        if (modeIn) {
+            pos.Set(pos.X() + stepX, pos.Y() + stepY);
+        } else {
+            pos.Set(pos.X() - stepX, pos.Y() - stepY);
+        }
+    }
+
+}
+
+void cAnimation::Blink(void) {
+    int freq = blinkable->BlinkFreq(blinkFunc);
+    bool blinkOn = false;
+    while (Running()) {
+        Sleep(freq);
+        if (Running()) {
+            blinkable->DoBlink(blinkFunc, blinkOn);
+            blinkable->Flush();  
+        }
+        blinkOn = !blinkOn;
+    }
+}
diff --git a/coreengine/animation.h b/coreengine/animation.h
index 64f17ad..c4ed792 100644
--- a/coreengine/animation.h
+++ b/coreengine/animation.h
@@ -1,126 +1,126 @@
-#ifndef __ANIMATION_H

-#define __ANIMATION_H

-

-#include <vdr/skins.h>

-#include <vdr/thread.h>

-#include "definitions.h"

-

-#define FPS 50

-

-/******************************************************************

-* cScrollable

-******************************************************************/

-class cScrollable {

-protected:

-    cScrollable(void) {};

-    ~cScrollable(void) {};

-public:

-    virtual int ScrollDelay(void) = 0;

-    virtual int ScrollWidth(void) = 0;

-    virtual int ScrollHeight(void) = 0;

-    virtual eScrollMode ScrollMode(void) = 0;

-    virtual eScrollSpeed ScrollSpeed(void) = 0;

-    virtual eOrientation ScrollOrientation(void) = 0;

-    virtual void StartScrolling(void) = 0;

-    virtual void StopScrolling(void) = 0;

-    virtual void SetDrawPort(cPoint &point) = 0;

-    virtual void Flush(void) = 0;

-};

-

-/******************************************************************

-* cDetachable

-******************************************************************/

-class cDetachable {

-protected:

-    cDetachable(void) {};

-    ~cDetachable(void) {};

-public:

-    virtual int Delay(void) = 0;

-    virtual void ParseDetached(void) = 0;

-    virtual void RenderDetached(void) = 0;

-    virtual void StartAnimation(void) = 0;

-    virtual void Flush(void) = 0;

-};

-

-/******************************************************************

-* cFadable

-******************************************************************/

-class cFadable {

-protected:

-    cFadable(void) {};

-    ~cFadable(void) {};

-public:

-    virtual bool Detached(void) = 0;

-    virtual int Delay(void) = 0;

-    virtual int FadeTime(void) = 0;

-    virtual void SetTransparency(int transparency, bool force = false) = 0;

-    virtual void Flush(void) = 0;

-};

-

-/******************************************************************

-* cShiftable

-******************************************************************/

-class cShiftable {

-protected:

-    cShiftable(void) {};

-    ~cShiftable(void) {};

-public:

-    virtual bool Detached(void) = 0;

-    virtual int Delay(void) = 0;

-    virtual int ShiftTime(void) = 0;

-    virtual int ShiftMode(void) = 0;

-    virtual void SetPosition(cPoint &position, cPoint &reference, bool force = false) = 0;

-    virtual void Flush(void) = 0;

-};

-

-/******************************************************************

-* cBlinkable

-******************************************************************/

-class cBlinkable {

-protected:

-    cBlinkable(void) {};

-    ~cBlinkable(void) {};

-public:

-    virtual int BlinkFreq(int func) = 0;

-    virtual void DoBlink(int func, bool on) = 0;

-    virtual void Flush(void) = 0;

-};

-

-/******************************************************************

-* cAnimation

-******************************************************************/

-class cAnimation : public cThread, public cListObject {

-private:

-    cCondWait sleepWait;

-    cScrollable *scrollable;

-    cDetachable *detachable;

-    cFadable    *fadable;

-    cShiftable  *shiftable;

-    cBlinkable  *blinkable;

-    bool waitOnWakeup;

-    bool doAnimation;

-    bool modeIn;

-    int blinkFunc;

-    cPoint shiftstart;

-    cPoint shiftend;

-    void Sleep(int duration);

-    void Wait(void);

-    void Scroll(void);

-    void Detach(void);    

-    void Blink(void);

-protected:

-    virtual void Action(void);

-public:

-    cAnimation(cScrollable *scrollable);

-    cAnimation(cDetachable *detachable, bool wait, bool animation);

-    cAnimation(cFadable    *fadable, bool fadein);

-    cAnimation(cShiftable  *shiftable, cPoint &start, cPoint &end, bool shiftin);

-    cAnimation(cBlinkable  *blinkable, int func);

-    ~cAnimation(void);

-    void WakeUp(void);

-    void Fade(void);

-    void Shift(void);

-    void Stop(bool deletePixmaps);

-};

-

+#ifndef __ANIMATION_H
+#define __ANIMATION_H
+
+#include <vdr/skins.h>
+#include <vdr/thread.h>
+#include "definitions.h"
+
+#define FPS 50
+
+/******************************************************************
+* cScrollable
+******************************************************************/
+class cScrollable {
+protected:
+    cScrollable(void) {};
+    ~cScrollable(void) {};
+public:
+    virtual int ScrollDelay(void) = 0;
+    virtual int ScrollWidth(void) = 0;
+    virtual int ScrollHeight(void) = 0;
+    virtual eScrollMode ScrollMode(void) = 0;
+    virtual eScrollSpeed ScrollSpeed(void) = 0;
+    virtual eOrientation ScrollOrientation(void) = 0;
+    virtual void StartScrolling(void) = 0;
+    virtual void StopScrolling(void) = 0;
+    virtual void SetDrawPort(cPoint &point) = 0;
+    virtual void Flush(void) = 0;
+};
+
+/******************************************************************
+* cDetachable
+******************************************************************/
+class cDetachable {
+protected:
+    cDetachable(void) {};
+    ~cDetachable(void) {};
+public:
+    virtual int Delay(void) = 0;
+    virtual void ParseDetached(void) = 0;
+    virtual void RenderDetached(void) = 0;
+    virtual void StartAnimation(void) = 0;
+    virtual void Flush(void) = 0;
+};
+
+/******************************************************************
+* cFadable
+******************************************************************/
+class cFadable {
+protected:
+    cFadable(void) {};
+    ~cFadable(void) {};
+public:
+    virtual bool Detached(void) = 0;
+    virtual int Delay(void) = 0;
+    virtual int FadeTime(void) = 0;
+    virtual void SetTransparency(int transparency, bool force = false) = 0;
+    virtual void Flush(void) = 0;
+};
+
+/******************************************************************
+* cShiftable
+******************************************************************/
+class cShiftable {
+protected:
+    cShiftable(void) {};
+    ~cShiftable(void) {};
+public:
+    virtual bool Detached(void) = 0;
+    virtual int Delay(void) = 0;
+    virtual int ShiftTime(void) = 0;
+    virtual int ShiftMode(void) = 0;
+    virtual void SetPosition(cPoint &position, cPoint &reference, bool force = false) = 0;
+    virtual void Flush(void) = 0;
+};
+
+/******************************************************************
+* cBlinkable
+******************************************************************/
+class cBlinkable {
+protected:
+    cBlinkable(void) {};
+    ~cBlinkable(void) {};
+public:
+    virtual int BlinkFreq(int func) = 0;
+    virtual void DoBlink(int func, bool on) = 0;
+    virtual void Flush(void) = 0;
+};
+
+/******************************************************************
+* cAnimation
+******************************************************************/
+class cAnimation : public cThread, public cListObject {
+private:
+    cCondWait sleepWait;
+    cScrollable *scrollable;
+    cDetachable *detachable;
+    cFadable    *fadable;
+    cShiftable  *shiftable;
+    cBlinkable  *blinkable;
+    bool waitOnWakeup;
+    bool doAnimation;
+    bool modeIn;
+    int blinkFunc;
+    cPoint shiftstart;
+    cPoint shiftend;
+    void Sleep(int duration);
+    void Wait(void);
+    void Scroll(void);
+    void Detach(void);    
+    void Blink(void);
+protected:
+    virtual void Action(void);
+public:
+    cAnimation(cScrollable *scrollable);
+    cAnimation(cDetachable *detachable, bool wait, bool animation);
+    cAnimation(cFadable    *fadable, bool fadein);
+    cAnimation(cShiftable  *shiftable, cPoint &start, cPoint &end, bool shiftin);
+    cAnimation(cBlinkable  *blinkable, int func);
+    ~cAnimation(void);
+    void WakeUp(void);
+    void Fade(void);
+    void Shift(void);
+    void Stop(bool deletePixmaps);
+};
+
 #endif //__ANIMATION_H
\ No newline at end of file
diff --git a/coreengine/area.c b/coreengine/area.c
index b961fd8..283e44c 100644
--- a/coreengine/area.c
+++ b/coreengine/area.c
@@ -1,767 +1,767 @@
-#include "area.h"

-#include "../config.h"

-

-/******************************************************************

-* cAreaNode

-******************************************************************/

-cAreaNode::cAreaNode(void) {

-    globals = NULL;

-    isTab = false;

-    activeTab = false;

-}

-

-cAreaNode::~cAreaNode(void) {

-}

-

-void cAreaNode::SetContainer(int x, int y, int width, int height) {

-    container.SetX(x);

-    container.SetY(y);

-    container.SetWidth(width);

-    container.SetHeight(height);

-}

-

-/******************************************************************

-* cArea

-******************************************************************/

-cArea::cArea(void) {

-    sdOsd = NULL;

-    init = true;

-    isBackgroundArea = false;

-    attribs = new cAreaAttribs((int)eAreaAttribs::count);

-    scrolling = false;

-    isScrolling = false;

-    scrollFunc = NULL;

-    blinking = false;

-    areaContainer = NULL;

-    pix = NULL;

-}

-

-cArea::cArea(const cArea &other) {

-    sdOsd = other.sdOsd;

-    init = true;

-    isBackgroundArea = false;

-    pix = NULL;

-    globals = other.globals;

-    attribs = new cAreaAttribs(*other.attribs);

-    //area container is set from outside during cloning of areacontainer

-    areaContainer = NULL;

-    //scrolling is set from outside by ScrollFunc(), see below

-    scrolling = other.scrolling;

-    isScrolling = false;

-    blinking = false;

-    scrollFunc = NULL;

-

-    for (cFunction *func = other.functions.First(); func; func = other.functions.Next(func)) {

-        if (cFuncFill *f = dynamic_cast<cFuncFill*>(func)) {

-            cFuncFill *fFill = new cFuncFill(*f);

-            fFill->SetOwner(this);

-            functions.Add(fFill);

-        } else if (cFuncDrawRectangle *f = dynamic_cast<cFuncDrawRectangle*>(func)) {

-            cFuncDrawRectangle *fDrawRect = new cFuncDrawRectangle(*f);

-            fDrawRect->SetOwner(this);

-            functions.Add(fDrawRect);

-        } else if (cFuncDrawEllipse *f = dynamic_cast<cFuncDrawEllipse*>(func)) {

-            cFuncDrawEllipse *fDrawEllipse = new cFuncDrawEllipse(*f);

-            fDrawEllipse->SetOwner(this);

-            functions.Add(fDrawEllipse);

-        } else if (cFuncDrawSlope *f = dynamic_cast<cFuncDrawSlope*>(func)) {

-            cFuncDrawSlope *fDrawSlope = new cFuncDrawSlope(*f);

-            fDrawSlope->SetOwner(this);

-            functions.Add(fDrawSlope);

-        } else if (cFuncDrawText *f = dynamic_cast<cFuncDrawText*>(func)) {

-            cFuncDrawText *fDrawText = new cFuncDrawText(*f);

-            fDrawText->SetOwner(this);

-            functions.Add(fDrawText);

-        } else if (cFuncDrawTextVertical *f = dynamic_cast<cFuncDrawTextVertical*>(func)) {

-            cFuncDrawTextVertical *fDrawTextVertical = new cFuncDrawTextVertical(*f);

-            fDrawTextVertical->SetOwner(this);

-            functions.Add(fDrawTextVertical);

-        } else if (cFuncDrawTextBox *f = dynamic_cast<cFuncDrawTextBox*>(func)) {

-            cFuncDrawTextBox *fDrawTextBox = new cFuncDrawTextBox(*f);

-            fDrawTextBox->SetOwner(this);

-            functions.Add(fDrawTextBox);

-        } else if (cFuncDrawImage *f = dynamic_cast<cFuncDrawImage*>(func)) {

-            cFuncDrawImage *fDrawImage = new cFuncDrawImage(*f);

-            fDrawImage->SetOwner(this);

-            functions.Add(fDrawImage);

-        } else {

-            esyslog("skindesigner: ERROR: unknown function in area cloning!!!");

-        }

-    }

-    

-    //func references have to be set from outside if already cached clone is wanted

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        f->CacheFuncReferences();

-    }

-    if (scrolling) {

-        SetScrollFunc();

-    }

-}

-

-cArea::~cArea(void) {

-    StopBlinkers();

-    delete attribs;

-}

-

-void cArea::SetGlobals(cGlobals *globals) {

-    this->globals = globals;

-    attribs->SetGlobals(globals);

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        f->SetGlobals(globals);

-    }

-}

-

-void cArea::SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer) {

-    attribs->SetTokenContainer(tokenContainer);

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        f->SetTokenContainer(tokenContainer);

-    }

-}

-

-void cArea::SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer) {

-    attribs->SetTokenContainerDeep(tokenContainer);

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        f->SetTokenContainerDeep(tokenContainer);

-    }

-}

-

-void cArea::SetAttributes(vector<stringpair> &attributes) {

-    attribs->Set(attributes); 

-}

-

-bool cArea::ValidFunction(const char *func) {

-    if (!strcmp(func, "fill")) return true;

-    if (!strcmp(func, "drawtext")) return true;

-    if (!strcmp(func, "drawtextbox")) return true;

-    if (!strcmp(func, "drawtextvertical")) return true;

-    if (!strcmp(func, "drawimage")) return true;

-    if (!strcmp(func, "drawrectangle")) return true;

-    if (!strcmp(func, "drawellipse")) return true;

-    if (!strcmp(func, "drawslope")) return true;

-    esyslog("skindesigner: unknown function \"%s\"", func);

-    return false;

-}

-

-cFunction *cArea::AddFunction(const char *name, vector<stringpair> attribs, cFuncLoop *loopFunc) {

-    cFunction *f = NULL;

-    if (!strcmp(name, "fill")) {

-        f = new cFuncFill(this, (int)eFillAttribs::count);

-    } else if (!strcmp(name, "drawrectangle")) {

-        f = new cFuncDrawRectangle(this, (int)eDrawRectangleAttribs::count);

-    } else if (!strcmp(name, "drawellipse")) {

-        f = new cFuncDrawEllipse(this, (int)eDrawEllipseAttribs::count);

-    } else if (!strcmp(name, "drawslope")) {

-        f = new cFuncDrawSlope(this, (int)eDrawSlopeAttribs::count);

-    } else if (!strcmp(name, "drawtext")) {

-        f = new cFuncDrawText(this, (int)eDrawTextAttribs::count);        

-    } else if (!strcmp(name, "drawtextvertical")) {

-        f = new cFuncDrawTextVertical(this, (int)eDrawTextAttribs::count);        

-    } else if (!strcmp(name, "drawtextbox")) {

-        f = new cFuncDrawTextBox(this, (int)eDrawTextBoxAttribs::count);        

-    } else if (!strcmp(name, "drawimage")) {

-        f = new cFuncDrawImage(this, (int)eDrawImageAttribs::count);        

-    } else if (!strcmp(name, "loop")) {

-        f = new cFuncLoop(this, (int)eLoopAttribs::count);

-    }

-    if (!f) {

-        esyslog("skindesigner: TODO: function \"%s\" not implemented", name);

-        return NULL;

-    }

-    f->Set(attribs);

-    if (!loopFunc)

-        functions.Add(f);

-    else

-        loopFunc->AddFunction(f);

-    return f;

-}

-

-cFunction *cArea::GetFunction(const char *name) {

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        const char *funcName = f->Name();

-        if (funcName && !strcmp(funcName, name)) {

-            return f;

-        }

-        cFuncLoop *loopFunc = dynamic_cast<cFuncLoop*>(f);

-        if (loopFunc) {

-            cFunction *lf = loopFunc->GetFunction(name);

-            if (lf)

-                return lf;

-        }

-    }

-    if (!areaContainer)

-        return NULL;

-    return areaContainer->GetFunction(name);

-}

-

-void cArea::SetX(int x) {

-    attribs->SetX(x);

-}

-

-void cArea::SetY(int y) {

-    attribs->SetY(y);

-}

-

-void cArea::SetWidth(int width) {

-    attribs->SetWidth(width);

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        f->SetContainer(0, 0, attribs->Width(), attribs->Height());

-    }

-}

-

-void cArea::SetHeight(int height) {

-    attribs->SetHeight(height);

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        f->SetContainer(0, 0, attribs->Width(), attribs->Height());

-    }

-}

-

-void cArea::Cache(void) {

-    attribs->SetContainer(container.X(), container.Y(), container.Width(), container.Height());

-    attribs->Cache();

-    attribs->CheckDynamic();

-    isBackgroundArea = attribs->BackgroundArea();

-

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        if (!attribs->Dynamic()) {

-            f->SetContainer(0, 0, attribs->Width(), attribs->Height());

-        } else {

-            f->SetContainer(0, 0, -1, -1);            

-        }

-        f->Cache();

-    }

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        f->CacheFuncReferences();

-    }

-    if (scrolling) {

-        SetScrollFunc();

-    }

-}

-

-void cArea::Close(void) {

-    StopBlinkers();

-    if (pix) {

-        sdOsd->DestroyPixmap(pix);

-        pix = NULL;

-    }

-    init = true;

-}

-

-void cArea::Clear(void) {

-    if (!init && isBackgroundArea) {

-        return;

-    }

-    if (pix) {

-        pix->Fill(clrTransparent);

-    }

-}

-

-void cArea::Hide(void) {

-    StopBlinkers();

-    if (pix) {

-        pix->SetLayer(-1);

-    }

-}

-

-void cArea::Show(void) {

-    StartBlinkers();

-    if (pix) {

-        pix->SetLayer(attribs->Layer());

-    }

-}

-

-void cArea::Render(void) {

-    if (attribs->DoDebug())

-        Debug();

-

-    if (init) {

-        InitFunctions();

-        init = false;    

-    }

-

-    if (!isScrolling && scrollFunc && attribs->Orientation() == (int)eOrientation::horizontal) {

-        scrollFunc->Scrolling(false);

-    } else if (isScrolling && scrollFunc && attribs->Orientation() == (int)eOrientation::horizontal) {

-        scrollFunc->Scrolling(true);

-    }

-

-    if (!pix) {

-        if (!IsTab())

-            CreatePixmap();

-        else {

-            int overlap = ScrollHeight();

-            if (overlap > 0) {

-                cRect drawport;

-                drawport.SetX(0);

-                drawport.SetY(0);

-                drawport.SetWidth(attribs->Width());

-                drawport.SetHeight(overlap + attribs->Height());

-                CreatePixmap(drawport);

-            } else {

-                CreatePixmap();

-            }

-        }

-    }

-

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        if (f->DoDebug())

-            f->Debug();

-        if (!f->DoExecute())

-            continue;

-        if (pix) {

-            f->Render(pix);

-        }

-    }

-

-    StartBlinkers();

-}

-

-bool cArea::Execute(void) { 

-    return attribs->DoExecute(); 

-}

-

-void cArea::SetTransparency(int transparency, bool absolute) {

-    if (transparency < 0 || transparency > 100)

-        return;

-    int alpha = (100 - transparency)*255/100;

-    if (!absolute) {

-        int pixTransparency = attribs->Transparency();

-        if (pixTransparency > 0) {

-            alpha = (100 - pixTransparency) * alpha / 100;            

-        }

-    }

-    if (pix) {

-        pix->SetAlpha(alpha);

-    }

-}

-

-bool cArea::Scrolling(void) { 

-    if (!scrolling)

-        return false;

-    if (!Execute())

-        return false;

-    if (ScrollOrientation() == eOrientation::horizontal) {

-        if (!scrollFunc)

-            return false;

-        if (scrollFunc->X() + scrollFunc->FuncWidth() > attribs->Width())

-            return true;

-    } else if (ScrollOrientation() == eOrientation::vertical) {

-        int maxHeight = 0;

-        for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-            int funcHeight = f->FuncY() + f->FuncHeight();

-            if (funcHeight > maxHeight)

-                maxHeight = funcHeight;

-        }

-        if (maxHeight > attribs->Height())

-            return true;

-    }

-    return false;

-}

-

-int cArea::ScrollWidth(void) {

-    if (!scrollFunc)

-        return 0;

-    return scrollFunc->X() + scrollFunc->FuncWidth() + 10 - attribs->Width();

-}

-

-int cArea::ScrollHeight(void) {

-    int maxHeight = 0;

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        if (!f->DoExecute())

-            continue;

-        int funcHeight = f->FuncY() + f->FuncHeight();

-        if (funcHeight > maxHeight)

-            maxHeight = funcHeight;

-    }

-    return maxHeight - attribs->Height();

-}

-  

-int cArea::ScrollDelay(void) { 

-    return attribs->Delay(); 

-}

-

-eScrollMode cArea::ScrollMode(void) {

-    return (eScrollMode)attribs->Mode(); 

-}

-

-eScrollSpeed cArea::ScrollSpeed(void) {

-    return (eScrollSpeed)attribs->ScrollSpeed();

-}

-

-eOrientation cArea::ScrollOrientation(void) {

-    return (eOrientation)attribs->Orientation();

-}

-

-void cArea::StartScrolling(void) {

-    cRect drawport;

-    drawport.SetX(0);

-    drawport.SetY(0);

-    if (ScrollOrientation() == eOrientation::horizontal) {

-        drawport.SetWidth(ScrollWidth() + attribs->Width());

-        drawport.SetHeight(attribs->Height());

-    } else if (ScrollOrientation() == eOrientation::vertical) {

-        drawport.SetWidth(attribs->Width());

-        drawport.SetHeight(ScrollHeight() + attribs->Height() + 10);

-    }

-    isScrolling = true;

-    CreatePixmap(drawport);

-    Render();

-}

-

-void cArea::StopScrolling(void) {

-    isScrolling = false;

-    if (pix && !(pix->ViewPort().Size() == pix->DrawPort().Size())) {

-        sdOsd->DestroyPixmap(pix);

-        pix = NULL;        

-    }

-}

-

-void cArea::SetViewPort(cRect &vp) {

-    if (!pix)

-        return;

-    pix->SetViewPort(vp);

-}

-

-void cArea::SetPosition(cPoint &pos, cPoint &ref) {

-    if (!pix)

-        return;

-    int x = (attribs->X() - ref.X()) + pos.X();

-    int y = (attribs->Y() - ref.Y()) + pos.Y();

-    pix->SetViewPort(cRect(x, y, pix->ViewPort().Width(), pix->ViewPort().Height()));

-}

-

-void cArea::SetDrawPort(cPoint &point) {

-    if (!pix)

-        return;

-    pix->SetDrawPortPoint(point);

-}

-

-cRect cArea::ViewPort(void) {

-    if (!pix)

-        return cRect::Null;

-    cRect vp = pix->ViewPort();

-    return vp;

-}

-

-cRect cArea::CoveringArea(void) {

-    return ViewPort();

-}

-

-cRect cArea::DrawPort(void) {

-    if (!pix)

-        return cRect::Null;

-    cRect dp = pix->DrawPort();

-    return dp;

-}

-

-int cArea::BlinkFreq(int func) {

-    cFunction *blinkFunc = functions.Get(func);

-    if (!blinkFunc)

-        return -1;

-    return blinkFunc->BlinkFreq();

-}

-

-void cArea::DoBlink(int func, bool on) {

-    cFunction *blinker = functions.Get(func);

-    if (!blinker)

-        return;

-    if (on) {

-        if (pix) {

-            blinker->Render(pix);

-        }

-    } else {

-        cRect blinkRect = cRect(blinker->GetX((eAlign)blinker->Align(), 0, 0), 

-                                blinker->GetY((eAlign)blinker->Valign(), 0, 0), 

-                                blinker->FuncWidth(), 

-                                blinker->FuncHeight());

-        if (pix) {

-            pix->DrawRectangle(blinkRect, clrTransparent);

-        }

-    }

-}

-

-void cArea::Debug(bool full) {

-    esyslog("skindesigner:    --> area");

-    esyslog("skindesigner:    container %d %d %dx%d", container.X(), container.Y(), container.Width(), container.Height());

-    attribs->Debug();

-    if (!full)

-        return;

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        f->Debug();

-    }

-}

-

-void cArea::Flush(void) {

-    sdOsd->Flush();

-}

-/******************************************************************

-* Private Functions

-******************************************************************/

-void cArea::InitFunctions(void) {

-    if (!attribs->Dynamic())

-        return;

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        f->SetContainer(0, 0, attribs->Width(), attribs->Height());

-    }

-}

-

-void cArea::CreatePixmap(cRect drawPort) {

-    if (pix) {

-        sdOsd->DestroyPixmap(pix);

-        pix = NULL;

-    }

-    if (attribs->Width() <=0 || attribs->Height() <= 0) {

-        return;

-    }

-

-    int layer = attribs->Layer();

-    cRect viewPort(attribs->X(), attribs->Y(), attribs->Width(), attribs->Height());

-    pix = sdOsd->CreatePixmap(layer, viewPort, drawPort);

-    if (pix)

-        pix->Clear();

-

-    int pixTransparency = attribs->Transparency();

-    if (pixTransparency > 0) {

-        SetTransparency(pixTransparency, true);

-    }

-}

-

-void cArea::SetScrollFunc(void) {

-    //if area has only one function, take this anyway

-    if (functions.Count() == 1) {

-        scrollFunc = functions.First();

-        return;

-    }

-    //else use scrollelement name

-    const char *scrollFuncName = attribs->GetScrollElement();

-    if (!scrollFuncName)

-        return;

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        if (!f->Name())

-            continue;

-        if (!strcmp(f->Name(), scrollFuncName)) {

-            scrollFunc = f;

-            return;

-        }

-    }

-}

-

-void cArea::StartBlinkers(void) {

-    if (blinking)

-        return;

-    blinking = true;

-    int func = 0;

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        if (!f->DoExecute()) {

-            func++;

-            continue;

-        }

-        if (f->Blinking()) {

-            cAnimation *blink = new cAnimation((cBlinkable*)this, func);

-            blinkers.Add(blink);

-            blink->Start();

-        }

-        func++;

-    }

-}

-

-void cArea::StopBlinkers(void) {

-    blinking = false;

-    blinkers.Clear();

-}

-

-/******************************************************************

-* cAreaContainer

-******************************************************************/

-cAreaContainer::cAreaContainer(void) {

-    attribs = new cAreaContainerAttribs((int)eAreaContainerAttribs::count);

-}

-

-cAreaContainer::cAreaContainer(const cAreaContainer &other) {

-    globals = other.globals;

-    attribs = new cAreaContainerAttribs(*other.attribs);

-    for (cArea *area = other.areas.First(); area; area = other.areas.Next(area)) {

-        cArea *a = new cArea(*area);

-        a->SetAreaContainer(this);

-        areas.Add(a);

-    }

-}

-

-cAreaContainer::~cAreaContainer(void) {

-    delete attribs;

-}

-    

-void cAreaContainer::SetAttributes(vector<stringpair> &attributes) {

-    attribs->Set(attributes); 

-}

-

-void cAreaContainer::SetGlobals(cGlobals *globals) {

-    this->globals = globals;

-    attribs->SetGlobals(globals);

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        area->SetGlobals(globals);

-    }

-}

-

-void cAreaContainer::SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer) {

-    attribs->SetTokenContainer(tokenContainer);

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        area->SetTokenContainer(tokenContainer);

-    }

-}

-

-void cAreaContainer::SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer) {

-    attribs->SetTokenContainerDeep(tokenContainer);

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        area->SetTokenContainerDeep(tokenContainer);

-    }

-}

-

-void cAreaContainer::AddArea(cArea *area) {

-    area->SetAreaContainer(this);

-    areas.Add(area);

-}

-

-cFunction *cAreaContainer::GetFunction(const char *name) {

-    cFunction *fRef = NULL;

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        fRef = area->GetFunction(name);

-        if (fRef)

-            return fRef;

-    }

-    return NULL;

-}

-

-void cAreaContainer::SetX(int x) {

-    attribs->SetX(x);

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        area->SetX(x);

-    }

-}

-

-void cAreaContainer::SetY(int y) {

-    attribs->SetY(y);

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        area->SetY(y);

-    }

-}

-

-void cAreaContainer::SetWidth(int width) {

-    attribs->SetWidth(width);

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        area->SetWidth(width);

-    }

-}

-

-void cAreaContainer::SetHeight(int height) {

-    attribs->SetHeight(height);

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        area->SetHeight(height);

-    }

-}

-

-void cAreaContainer::Cache(void) {

-    attribs->SetContainer(container.X(), container.Y(), container.Width(), container.Height());

-    attribs->Cache();

-    int x = attribs->X() > -1 ? attribs->X() : container.X();

-    int y = attribs->Y() > -1 ? attribs->Y() : container.Y();

-    int width = attribs->Width() > -1 ? attribs->Width() : container.Width();

-    int height = attribs->Height() > -1 ? attribs->Height() : container.Height();

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        area->SetContainer(x, y, width, height);

-        if (attribs->Width() > -1) {

-            area->SetWidth(width);

-        }

-        if (attribs->Height() > -1) {

-            area->SetHeight(height);

-        }

-        area->Cache();

-    }

-}

-

-void cAreaContainer::Close(void) {

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        area->Close();

-    }

-}

-

-void cAreaContainer::Clear(void) {

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        area->Clear();

-    }

-}

-

-void cAreaContainer::Hide(void) {

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        area->Hide();

-    }

-}

-

-void cAreaContainer::Show(void) {

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        area->Show();

-    }

-}

-

-void cAreaContainer::Render(void) {

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        if (area->Execute())

-            area->Render();

-    }

-}

-

-bool cAreaContainer::Execute(void) { 

-    return attribs->DoExecute(); 

-}

-

-void cAreaContainer::SetTransparency(int transparency, bool absolute) {

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        area->SetTransparency(transparency, absolute);

-    }

-}

-

-void cAreaContainer::SetViewPort(cRect &vp) {

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        area->SetViewPort(vp);

-    }    

-}

-

-void cAreaContainer::SetPosition(cPoint &pos, cPoint &ref) {

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        area->SetPosition(pos, ref);

-    }    

-}

-

-cRect cAreaContainer::CoveringArea(void) {

-    cRect unionArea;

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        unionArea.Combine(area->CoveringArea());

-    }

-    return unionArea;

-}

-

-bool cAreaContainer::Scrolling(void) {

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        if (area->Scrolling())

-            return true;

-    }

-    return false;

-}

-

-cArea *cAreaContainer::ScrollingArea(void) { 

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        if (area->Execute() && area->Scrolling())

-            return area;

-    }

-    return NULL;

-}

-

-void cAreaContainer::Debug(bool full) {

-    esyslog("skindesigner:    --> area container");

-    esyslog("skindesigner:    container %d %d %dx%d", container.X(), container.Y(), container.Width(), container.Height());

-    attribs->Debug();

-    if (!full)

-        return;

-    for (cArea *area = areas.First(); area; area = areas.Next(area)) {

-        area->Debug(full);

-    }

-}

+#include "area.h"
+#include "../config.h"
+
+/******************************************************************
+* cAreaNode
+******************************************************************/
+cAreaNode::cAreaNode(void) {
+    globals = NULL;
+    isTab = false;
+    activeTab = false;
+}
+
+cAreaNode::~cAreaNode(void) {
+}
+
+void cAreaNode::SetContainer(int x, int y, int width, int height) {
+    container.SetX(x);
+    container.SetY(y);
+    container.SetWidth(width);
+    container.SetHeight(height);
+}
+
+/******************************************************************
+* cArea
+******************************************************************/
+cArea::cArea(void) {
+    sdOsd = NULL;
+    init = true;
+    isBackgroundArea = false;
+    attribs = new cAreaAttribs((int)eAreaAttribs::count);
+    scrolling = false;
+    isScrolling = false;
+    scrollFunc = NULL;
+    blinking = false;
+    areaContainer = NULL;
+    pix = NULL;
+}
+
+cArea::cArea(const cArea &other) {
+    sdOsd = other.sdOsd;
+    init = true;
+    isBackgroundArea = false;
+    pix = NULL;
+    globals = other.globals;
+    attribs = new cAreaAttribs(*other.attribs);
+    //area container is set from outside during cloning of areacontainer
+    areaContainer = NULL;
+    //scrolling is set from outside by ScrollFunc(), see below
+    scrolling = other.scrolling;
+    isScrolling = false;
+    blinking = false;
+    scrollFunc = NULL;
+
+    for (cFunction *func = other.functions.First(); func; func = other.functions.Next(func)) {
+        if (cFuncFill *f = dynamic_cast<cFuncFill*>(func)) {
+            cFuncFill *fFill = new cFuncFill(*f);
+            fFill->SetOwner(this);
+            functions.Add(fFill);
+        } else if (cFuncDrawRectangle *f = dynamic_cast<cFuncDrawRectangle*>(func)) {
+            cFuncDrawRectangle *fDrawRect = new cFuncDrawRectangle(*f);
+            fDrawRect->SetOwner(this);
+            functions.Add(fDrawRect);
+        } else if (cFuncDrawEllipse *f = dynamic_cast<cFuncDrawEllipse*>(func)) {
+            cFuncDrawEllipse *fDrawEllipse = new cFuncDrawEllipse(*f);
+            fDrawEllipse->SetOwner(this);
+            functions.Add(fDrawEllipse);
+        } else if (cFuncDrawSlope *f = dynamic_cast<cFuncDrawSlope*>(func)) {
+            cFuncDrawSlope *fDrawSlope = new cFuncDrawSlope(*f);
+            fDrawSlope->SetOwner(this);
+            functions.Add(fDrawSlope);
+        } else if (cFuncDrawText *f = dynamic_cast<cFuncDrawText*>(func)) {
+            cFuncDrawText *fDrawText = new cFuncDrawText(*f);
+            fDrawText->SetOwner(this);
+            functions.Add(fDrawText);
+        } else if (cFuncDrawTextVertical *f = dynamic_cast<cFuncDrawTextVertical*>(func)) {
+            cFuncDrawTextVertical *fDrawTextVertical = new cFuncDrawTextVertical(*f);
+            fDrawTextVertical->SetOwner(this);
+            functions.Add(fDrawTextVertical);
+        } else if (cFuncDrawTextBox *f = dynamic_cast<cFuncDrawTextBox*>(func)) {
+            cFuncDrawTextBox *fDrawTextBox = new cFuncDrawTextBox(*f);
+            fDrawTextBox->SetOwner(this);
+            functions.Add(fDrawTextBox);
+        } else if (cFuncDrawImage *f = dynamic_cast<cFuncDrawImage*>(func)) {
+            cFuncDrawImage *fDrawImage = new cFuncDrawImage(*f);
+            fDrawImage->SetOwner(this);
+            functions.Add(fDrawImage);
+        } else {
+            esyslog("skindesigner: ERROR: unknown function in area cloning!!!");
+        }
+    }
+    
+    //func references have to be set from outside if already cached clone is wanted
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        f->CacheFuncReferences();
+    }
+    if (scrolling) {
+        SetScrollFunc();
+    }
+}
+
+cArea::~cArea(void) {
+    StopBlinkers();
+    delete attribs;
+}
+
+void cArea::SetGlobals(cGlobals *globals) {
+    this->globals = globals;
+    attribs->SetGlobals(globals);
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        f->SetGlobals(globals);
+    }
+}
+
+void cArea::SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer) {
+    attribs->SetTokenContainer(tokenContainer);
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        f->SetTokenContainer(tokenContainer);
+    }
+}
+
+void cArea::SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer) {
+    attribs->SetTokenContainerDeep(tokenContainer);
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        f->SetTokenContainerDeep(tokenContainer);
+    }
+}
+
+void cArea::SetAttributes(vector<stringpair> &attributes) {
+    attribs->Set(attributes); 
+}
+
+bool cArea::ValidFunction(const char *func) {
+    if (!strcmp(func, "fill")) return true;
+    if (!strcmp(func, "drawtext")) return true;
+    if (!strcmp(func, "drawtextbox")) return true;
+    if (!strcmp(func, "drawtextvertical")) return true;
+    if (!strcmp(func, "drawimage")) return true;
+    if (!strcmp(func, "drawrectangle")) return true;
+    if (!strcmp(func, "drawellipse")) return true;
+    if (!strcmp(func, "drawslope")) return true;
+    esyslog("skindesigner: unknown function \"%s\"", func);
+    return false;
+}
+
+cFunction *cArea::AddFunction(const char *name, vector<stringpair> attribs, cFuncLoop *loopFunc) {
+    cFunction *f = NULL;
+    if (!strcmp(name, "fill")) {
+        f = new cFuncFill(this, (int)eFillAttribs::count);
+    } else if (!strcmp(name, "drawrectangle")) {
+        f = new cFuncDrawRectangle(this, (int)eDrawRectangleAttribs::count);
+    } else if (!strcmp(name, "drawellipse")) {
+        f = new cFuncDrawEllipse(this, (int)eDrawEllipseAttribs::count);
+    } else if (!strcmp(name, "drawslope")) {
+        f = new cFuncDrawSlope(this, (int)eDrawSlopeAttribs::count);
+    } else if (!strcmp(name, "drawtext")) {
+        f = new cFuncDrawText(this, (int)eDrawTextAttribs::count);        
+    } else if (!strcmp(name, "drawtextvertical")) {
+        f = new cFuncDrawTextVertical(this, (int)eDrawTextAttribs::count);        
+    } else if (!strcmp(name, "drawtextbox")) {
+        f = new cFuncDrawTextBox(this, (int)eDrawTextBoxAttribs::count);        
+    } else if (!strcmp(name, "drawimage")) {
+        f = new cFuncDrawImage(this, (int)eDrawImageAttribs::count);        
+    } else if (!strcmp(name, "loop")) {
+        f = new cFuncLoop(this, (int)eLoopAttribs::count);
+    }
+    if (!f) {
+        esyslog("skindesigner: TODO: function \"%s\" not implemented", name);
+        return NULL;
+    }
+    f->Set(attribs);
+    if (!loopFunc)
+        functions.Add(f);
+    else
+        loopFunc->AddFunction(f);
+    return f;
+}
+
+cFunction *cArea::GetFunction(const char *name) {
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        const char *funcName = f->Name();
+        if (funcName && !strcmp(funcName, name)) {
+            return f;
+        }
+        cFuncLoop *loopFunc = dynamic_cast<cFuncLoop*>(f);
+        if (loopFunc) {
+            cFunction *lf = loopFunc->GetFunction(name);
+            if (lf)
+                return lf;
+        }
+    }
+    if (!areaContainer)
+        return NULL;
+    return areaContainer->GetFunction(name);
+}
+
+void cArea::SetX(int x) {
+    attribs->SetX(x);
+}
+
+void cArea::SetY(int y) {
+    attribs->SetY(y);
+}
+
+void cArea::SetWidth(int width) {
+    attribs->SetWidth(width);
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        f->SetContainer(0, 0, attribs->Width(), attribs->Height());
+    }
+}
+
+void cArea::SetHeight(int height) {
+    attribs->SetHeight(height);
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        f->SetContainer(0, 0, attribs->Width(), attribs->Height());
+    }
+}
+
+void cArea::Cache(void) {
+    attribs->SetContainer(container.X(), container.Y(), container.Width(), container.Height());
+    attribs->Cache();
+    attribs->CheckDynamic();
+    isBackgroundArea = attribs->BackgroundArea();
+
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        if (!attribs->Dynamic()) {
+            f->SetContainer(0, 0, attribs->Width(), attribs->Height());
+        } else {
+            f->SetContainer(0, 0, -1, -1);            
+        }
+        f->Cache();
+    }
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        f->CacheFuncReferences();
+    }
+    if (scrolling) {
+        SetScrollFunc();
+    }
+}
+
+void cArea::Close(void) {
+    StopBlinkers();
+    if (pix) {
+        sdOsd->DestroyPixmap(pix);
+        pix = NULL;
+    }
+    init = true;
+}
+
+void cArea::Clear(void) {
+    if (!init && isBackgroundArea) {
+        return;
+    }
+    if (pix) {
+        pix->Fill(clrTransparent);
+    }
+}
+
+void cArea::Hide(void) {
+    StopBlinkers();
+    if (pix) {
+        pix->SetLayer(-1);
+    }
+}
+
+void cArea::Show(void) {
+    StartBlinkers();
+    if (pix) {
+        pix->SetLayer(attribs->Layer());
+    }
+}
+
+void cArea::Render(void) {
+    if (attribs->DoDebug())
+        Debug();
+
+    if (init) {
+        InitFunctions();
+        init = false;    
+    }
+
+    if (!isScrolling && scrollFunc && attribs->Orientation() == (int)eOrientation::horizontal) {
+        scrollFunc->Scrolling(false);
+    } else if (isScrolling && scrollFunc && attribs->Orientation() == (int)eOrientation::horizontal) {
+        scrollFunc->Scrolling(true);
+    }
+
+    if (!pix) {
+        if (!IsTab())
+            CreatePixmap();
+        else {
+            int overlap = ScrollHeight();
+            if (overlap > 0) {
+                cRect drawport;
+                drawport.SetX(0);
+                drawport.SetY(0);
+                drawport.SetWidth(attribs->Width());
+                drawport.SetHeight(overlap + attribs->Height());
+                CreatePixmap(drawport);
+            } else {
+                CreatePixmap();
+            }
+        }
+    }
+
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        if (f->DoDebug())
+            f->Debug();
+        if (!f->DoExecute())
+            continue;
+        if (pix) {
+            f->Render(pix);
+        }
+    }
+
+    StartBlinkers();
+}
+
+bool cArea::Execute(void) { 
+    return attribs->DoExecute(); 
+}
+
+void cArea::SetTransparency(int transparency, bool absolute) {
+    if (transparency < 0 || transparency > 100)
+        return;
+    int alpha = (100 - transparency)*255/100;
+    if (!absolute) {
+        int pixTransparency = attribs->Transparency();
+        if (pixTransparency > 0) {
+            alpha = (100 - pixTransparency) * alpha / 100;            
+        }
+    }
+    if (pix) {
+        pix->SetAlpha(alpha);
+    }
+}
+
+bool cArea::Scrolling(void) { 
+    if (!scrolling)
+        return false;
+    if (!Execute())
+        return false;
+    if (ScrollOrientation() == eOrientation::horizontal) {
+        if (!scrollFunc)
+            return false;
+        if (scrollFunc->X() + scrollFunc->FuncWidth() > attribs->Width())
+            return true;
+    } else if (ScrollOrientation() == eOrientation::vertical) {
+        int maxHeight = 0;
+        for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+            int funcHeight = f->FuncY() + f->FuncHeight();
+            if (funcHeight > maxHeight)
+                maxHeight = funcHeight;
+        }
+        if (maxHeight > attribs->Height())
+            return true;
+    }
+    return false;
+}
+
+int cArea::ScrollWidth(void) {
+    if (!scrollFunc)
+        return 0;
+    return scrollFunc->X() + scrollFunc->FuncWidth() + 10 - attribs->Width();
+}
+
+int cArea::ScrollHeight(void) {
+    int maxHeight = 0;
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        if (!f->DoExecute())
+            continue;
+        int funcHeight = f->FuncY() + f->FuncHeight();
+        if (funcHeight > maxHeight)
+            maxHeight = funcHeight;
+    }
+    return maxHeight - attribs->Height();
+}
+  
+int cArea::ScrollDelay(void) { 
+    return attribs->Delay(); 
+}
+
+eScrollMode cArea::ScrollMode(void) {
+    return (eScrollMode)attribs->Mode(); 
+}
+
+eScrollSpeed cArea::ScrollSpeed(void) {
+    return (eScrollSpeed)attribs->ScrollSpeed();
+}
+
+eOrientation cArea::ScrollOrientation(void) {
+    return (eOrientation)attribs->Orientation();
+}
+
+void cArea::StartScrolling(void) {
+    cRect drawport;
+    drawport.SetX(0);
+    drawport.SetY(0);
+    if (ScrollOrientation() == eOrientation::horizontal) {
+        drawport.SetWidth(ScrollWidth() + attribs->Width());
+        drawport.SetHeight(attribs->Height());
+    } else if (ScrollOrientation() == eOrientation::vertical) {
+        drawport.SetWidth(attribs->Width());
+        drawport.SetHeight(ScrollHeight() + attribs->Height() + 10);
+    }
+    isScrolling = true;
+    CreatePixmap(drawport);
+    Render();
+}
+
+void cArea::StopScrolling(void) {
+    isScrolling = false;
+    if (pix && !(pix->ViewPort().Size() == pix->DrawPort().Size())) {
+        sdOsd->DestroyPixmap(pix);
+        pix = NULL;        
+    }
+}
+
+void cArea::SetViewPort(cRect &vp) {
+    if (!pix)
+        return;
+    pix->SetViewPort(vp);
+}
+
+void cArea::SetPosition(cPoint &pos, cPoint &ref) {
+    if (!pix)
+        return;
+    int x = (attribs->X() - ref.X()) + pos.X();
+    int y = (attribs->Y() - ref.Y()) + pos.Y();
+    pix->SetViewPort(cRect(x, y, pix->ViewPort().Width(), pix->ViewPort().Height()));
+}
+
+void cArea::SetDrawPort(cPoint &point) {
+    if (!pix)
+        return;
+    pix->SetDrawPortPoint(point);
+}
+
+cRect cArea::ViewPort(void) {
+    if (!pix)
+        return cRect::Null;
+    cRect vp = pix->ViewPort();
+    return vp;
+}
+
+cRect cArea::CoveringArea(void) {
+    return ViewPort();
+}
+
+cRect cArea::DrawPort(void) {
+    if (!pix)
+        return cRect::Null;
+    cRect dp = pix->DrawPort();
+    return dp;
+}
+
+int cArea::BlinkFreq(int func) {
+    cFunction *blinkFunc = functions.Get(func);
+    if (!blinkFunc)
+        return -1;
+    return blinkFunc->BlinkFreq();
+}
+
+void cArea::DoBlink(int func, bool on) {
+    cFunction *blinker = functions.Get(func);
+    if (!blinker)
+        return;
+    if (on) {
+        if (pix) {
+            blinker->Render(pix);
+        }
+    } else {
+        cRect blinkRect = cRect(blinker->GetX((eAlign)blinker->Align(), 0, 0), 
+                                blinker->GetY((eAlign)blinker->Valign(), 0, 0), 
+                                blinker->FuncWidth(), 
+                                blinker->FuncHeight());
+        if (pix) {
+            pix->DrawRectangle(blinkRect, clrTransparent);
+        }
+    }
+}
+
+void cArea::Debug(bool full) {
+    esyslog("skindesigner:    --> area");
+    esyslog("skindesigner:    container %d %d %dx%d", container.X(), container.Y(), container.Width(), container.Height());
+    attribs->Debug();
+    if (!full)
+        return;
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        f->Debug();
+    }
+}
+
+void cArea::Flush(void) {
+    sdOsd->Flush();
+}
+/******************************************************************
+* Private Functions
+******************************************************************/
+void cArea::InitFunctions(void) {
+    if (!attribs->Dynamic())
+        return;
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        f->SetContainer(0, 0, attribs->Width(), attribs->Height());
+    }
+}
+
+void cArea::CreatePixmap(cRect drawPort) {
+    if (pix) {
+        sdOsd->DestroyPixmap(pix);
+        pix = NULL;
+    }
+    if (attribs->Width() <=0 || attribs->Height() <= 0) {
+        return;
+    }
+
+    int layer = attribs->Layer();
+    cRect viewPort(attribs->X(), attribs->Y(), attribs->Width(), attribs->Height());
+    pix = sdOsd->CreatePixmap(layer, viewPort, drawPort);
+    if (pix)
+        pix->Clear();
+
+    int pixTransparency = attribs->Transparency();
+    if (pixTransparency > 0) {
+        SetTransparency(pixTransparency, true);
+    }
+}
+
+void cArea::SetScrollFunc(void) {
+    //if area has only one function, take this anyway
+    if (functions.Count() == 1) {
+        scrollFunc = functions.First();
+        return;
+    }
+    //else use scrollelement name
+    const char *scrollFuncName = attribs->GetScrollElement();
+    if (!scrollFuncName)
+        return;
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        if (!f->Name())
+            continue;
+        if (!strcmp(f->Name(), scrollFuncName)) {
+            scrollFunc = f;
+            return;
+        }
+    }
+}
+
+void cArea::StartBlinkers(void) {
+    if (blinking)
+        return;
+    blinking = true;
+    int func = 0;
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        if (!f->DoExecute()) {
+            func++;
+            continue;
+        }
+        if (f->Blinking()) {
+            cAnimation *blink = new cAnimation((cBlinkable*)this, func);
+            blinkers.Add(blink);
+            blink->Start();
+        }
+        func++;
+    }
+}
+
+void cArea::StopBlinkers(void) {
+    blinking = false;
+    blinkers.Clear();
+}
+
+/******************************************************************
+* cAreaContainer
+******************************************************************/
+cAreaContainer::cAreaContainer(void) {
+    attribs = new cAreaContainerAttribs((int)eAreaContainerAttribs::count);
+}
+
+cAreaContainer::cAreaContainer(const cAreaContainer &other) {
+    globals = other.globals;
+    attribs = new cAreaContainerAttribs(*other.attribs);
+    for (cArea *area = other.areas.First(); area; area = other.areas.Next(area)) {
+        cArea *a = new cArea(*area);
+        a->SetAreaContainer(this);
+        areas.Add(a);
+    }
+}
+
+cAreaContainer::~cAreaContainer(void) {
+    delete attribs;
+}
+    
+void cAreaContainer::SetAttributes(vector<stringpair> &attributes) {
+    attribs->Set(attributes); 
+}
+
+void cAreaContainer::SetGlobals(cGlobals *globals) {
+    this->globals = globals;
+    attribs->SetGlobals(globals);
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        area->SetGlobals(globals);
+    }
+}
+
+void cAreaContainer::SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer) {
+    attribs->SetTokenContainer(tokenContainer);
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        area->SetTokenContainer(tokenContainer);
+    }
+}
+
+void cAreaContainer::SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer) {
+    attribs->SetTokenContainerDeep(tokenContainer);
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        area->SetTokenContainerDeep(tokenContainer);
+    }
+}
+
+void cAreaContainer::AddArea(cArea *area) {
+    area->SetAreaContainer(this);
+    areas.Add(area);
+}
+
+cFunction *cAreaContainer::GetFunction(const char *name) {
+    cFunction *fRef = NULL;
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        fRef = area->GetFunction(name);
+        if (fRef)
+            return fRef;
+    }
+    return NULL;
+}
+
+void cAreaContainer::SetX(int x) {
+    attribs->SetX(x);
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        area->SetX(x);
+    }
+}
+
+void cAreaContainer::SetY(int y) {
+    attribs->SetY(y);
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        area->SetY(y);
+    }
+}
+
+void cAreaContainer::SetWidth(int width) {
+    attribs->SetWidth(width);
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        area->SetWidth(width);
+    }
+}
+
+void cAreaContainer::SetHeight(int height) {
+    attribs->SetHeight(height);
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        area->SetHeight(height);
+    }
+}
+
+void cAreaContainer::Cache(void) {
+    attribs->SetContainer(container.X(), container.Y(), container.Width(), container.Height());
+    attribs->Cache();
+    int x = attribs->X() > -1 ? attribs->X() : container.X();
+    int y = attribs->Y() > -1 ? attribs->Y() : container.Y();
+    int width = attribs->Width() > -1 ? attribs->Width() : container.Width();
+    int height = attribs->Height() > -1 ? attribs->Height() : container.Height();
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        area->SetContainer(x, y, width, height);
+        if (attribs->Width() > -1) {
+            area->SetWidth(width);
+        }
+        if (attribs->Height() > -1) {
+            area->SetHeight(height);
+        }
+        area->Cache();
+    }
+}
+
+void cAreaContainer::Close(void) {
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        area->Close();
+    }
+}
+
+void cAreaContainer::Clear(void) {
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        area->Clear();
+    }
+}
+
+void cAreaContainer::Hide(void) {
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        area->Hide();
+    }
+}
+
+void cAreaContainer::Show(void) {
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        area->Show();
+    }
+}
+
+void cAreaContainer::Render(void) {
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        if (area->Execute())
+            area->Render();
+    }
+}
+
+bool cAreaContainer::Execute(void) { 
+    return attribs->DoExecute(); 
+}
+
+void cAreaContainer::SetTransparency(int transparency, bool absolute) {
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        area->SetTransparency(transparency, absolute);
+    }
+}
+
+void cAreaContainer::SetViewPort(cRect &vp) {
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        area->SetViewPort(vp);
+    }    
+}
+
+void cAreaContainer::SetPosition(cPoint &pos, cPoint &ref) {
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        area->SetPosition(pos, ref);
+    }    
+}
+
+cRect cAreaContainer::CoveringArea(void) {
+    cRect unionArea;
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        unionArea.Combine(area->CoveringArea());
+    }
+    return unionArea;
+}
+
+bool cAreaContainer::Scrolling(void) {
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        if (area->Scrolling())
+            return true;
+    }
+    return false;
+}
+
+cArea *cAreaContainer::ScrollingArea(void) { 
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        if (area->Execute() && area->Scrolling())
+            return area;
+    }
+    return NULL;
+}
+
+void cAreaContainer::Debug(bool full) {
+    esyslog("skindesigner:    --> area container");
+    esyslog("skindesigner:    container %d %d %dx%d", container.X(), container.Y(), container.Width(), container.Height());
+    attribs->Debug();
+    if (!full)
+        return;
+    for (cArea *area = areas.First(); area; area = areas.Next(area)) {
+        area->Debug(full);
+    }
+}
diff --git a/coreengine/area.h b/coreengine/area.h
index e77b946..5f3a8e9 100644
--- a/coreengine/area.h
+++ b/coreengine/area.h
@@ -1,178 +1,178 @@
-#ifndef __TEMPLATEAREA_H

-#define __TEMPLATEAREA_H

-

-#include <iostream>

-#include <stdio.h>

-#include <stdlib.h>

-#include <stdint.h>

-

-#include "osdwrapper.h"

-#include "definitions.h"

-#include "globals.h"

-#include "../libskindesignerapi/tokencontainer.h"

-#include "attributes.h"

-#include "functions.h"

-#include "animation.h"

-

-class cArea;

-/******************************************************************

-* cAreaNode

-******************************************************************/

-class cAreaNode : public cListObject {

-protected:

-    cGlobals *globals;

-    cRect container;

-    bool isTab;

-    bool activeTab;

-public:

-    cAreaNode(void);

-    virtual ~cAreaNode(void);

-    virtual void SetGlobals(cGlobals *globals) {};

-    virtual void SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer) {};

-    virtual void SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer) {};

-    void SetContainer(int x, int y, int width, int height);

-    virtual void SetAttributes(vector<stringpair> &attributes) {};

-    virtual void SetX(int x) {};

-    virtual void SetY(int y) {};

-    virtual void SetWidth(int width) {};

-    virtual void SetHeight(int height) {};

-    void SetTab(void) { isTab = true; };

-    bool IsTab(void) { return isTab; };

-    void SetActiveTab(bool active) { activeTab = active; };

-    bool ActiveTab(void) { return activeTab; };

-    virtual int GetWidth(void) { return 0; };

-    virtual void Cache(void) {};

-    virtual void Close(void) {};

-    virtual void Clear(void) {};

-    virtual void Hide(void) {};

-    virtual void Show(void) {};

-    virtual void Render(void) {};

-    virtual bool Execute(void) { return true; };

-    virtual void SetTransparency(int transparency, bool absolute = false) {};

-    virtual void SetViewPort(cRect &vp) {};

-    virtual void SetPosition(cPoint &pos, cPoint &ref) {};

-    virtual cRect CoveringArea(void) { return cRect::Null; };

-    virtual bool Scrolling(void) { return false; };

-    virtual cArea *ScrollingArea(void) { return NULL; };

-    virtual cFunction *GetFunction(const char *name) { return NULL; };

-    virtual const char *Name(void) { return NULL; };

-    virtual bool BackgroundArea(void) { return false; };

-    virtual void Debug(bool full = false) {};

-};

-

-class cAreaContainer;

-/******************************************************************

-* cArea

-******************************************************************/

-class cArea : public cAreaNode, public cScrollable, public cBlinkable {

-private:

-    cSdOsd *sdOsd;

-    bool init;

-    bool isBackgroundArea;

-    cPixmap *pix;

-    cAreaAttribs *attribs;

-    cAreaContainer *areaContainer;

-    cList<cFunction> functions;

-    bool scrolling;

-    bool isScrolling;

-    cFunction *scrollFunc;

-    cList<cAnimation> blinkers;

-    bool blinking;

-    void InitFunctions(void);

-    void CreatePixmap(cRect drawPort = cRect::Null);

-    void SetScrollFunc(void);

-    void StartBlinkers(void);

-    void StopBlinkers(void);

-public:

-    cArea(void);

-    cArea(const cArea &other);

-    virtual ~cArea(void);

-    void SetOsd(cSdOsd *osd) { sdOsd = osd; };

-    void SetGlobals(cGlobals *globals);

-    void SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer);

-    void SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer);

-    void SetAttributes(vector<stringpair> &attributes);

-    void SetScrolling(void) { scrolling = true; };

-    void SetAreaContainer(cAreaContainer *ac) { areaContainer = ac; };

-    bool ValidFunction(const char *func);

-    cFunction *AddFunction(const char *name, vector<stringpair> attribs, cFuncLoop *loopFunc = NULL);

-    cFunction *GetFunction(const char *name);

-    void SetX(int x);

-    void SetY(int y);

-    void SetWidth(int width);

-    void SetHeight(int height);

-    void Cache(void);

-    int GetWidth(void) { return attribs->Width(); };

-    void Close(void);

-    void Clear(void);

-    void Hide(void);

-    void Show(void);

-    void Render(void);

-    bool Execute(void);

-    void SetTransparency(int transparency, bool absolute = false);

-    cRect CoveringArea(void);

-    //Scrollable

-    bool Scrolling(void);

-    int ScrollWidth(void);

-    int ScrollHeight(void);

-    int ScrollDelay(void);

-    eScrollMode ScrollMode(void);

-    eScrollSpeed ScrollSpeed(void);

-    eOrientation ScrollOrientation(void);

-    cArea *ScrollingArea(void) { return this; };

-    void StartScrolling(void);

-    void StopScrolling(void);

-    cRect ViewPort(void);

-    void SetDrawPort(cPoint &point);

-    void SetViewPort(cRect &vp);

-    void SetPosition(cPoint &pos, cPoint &ref);

-    cRect DrawPort(void);

-    int ScrollStep(void) { return attribs->ScrollStep(); };

-    //Blinkable

-    int BlinkFreq(int func);

-    void DoBlink(int func, bool on);

-    //Common

-    const char *Name(void) { return attribs->Name(); };

-    bool BackgroundArea(void) { return attribs->BackgroundArea(); };

-    void Flush(void);

-    void Debug(bool full = false);

-};

-

-/******************************************************************

-* cAreaContainer

-******************************************************************/

-class cAreaContainer : public cAreaNode {

-private:

-    cAreaContainerAttribs *attribs;

-    cList<cArea> areas;

-public:

-    cAreaContainer(void);

-    cAreaContainer(const cAreaContainer &other);

-    virtual ~cAreaContainer(void);

-    void SetGlobals(cGlobals *globals);

-    void SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer);

-    void SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer);

-    void SetAttributes(vector<stringpair> &attributes);

-    void AddArea(cArea *area);

-    cFunction *GetFunction(const char *name);

-    void SetX(int x);

-    void SetY(int y);

-    void SetWidth(int width);

-    void SetHeight(int height);

-    void Cache(void);

-    void Close(void);

-    void Clear(void);

-    void Hide(void);

-    void Show(void);

-    void Render(void);

-    bool Execute(void);

-    void SetTransparency(int transparency, bool absolute = false);

-    void SetViewPort(cRect &vp);

-    void SetPosition(cPoint &pos, cPoint &ref);

-    cRect CoveringArea(void);

-    bool Scrolling(void);

-    cArea *ScrollingArea(void);

-    void Debug(bool full = false);

-};

-

+#ifndef __TEMPLATEAREA_H
+#define __TEMPLATEAREA_H
+
+#include <iostream>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+#include "osdwrapper.h"
+#include "definitions.h"
+#include "globals.h"
+#include "../libskindesignerapi/tokencontainer.h"
+#include "attributes.h"
+#include "functions.h"
+#include "animation.h"
+
+class cArea;
+/******************************************************************
+* cAreaNode
+******************************************************************/
+class cAreaNode : public cListObject {
+protected:
+    cGlobals *globals;
+    cRect container;
+    bool isTab;
+    bool activeTab;
+public:
+    cAreaNode(void);
+    virtual ~cAreaNode(void);
+    virtual void SetGlobals(cGlobals *globals) {};
+    virtual void SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer) {};
+    virtual void SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer) {};
+    void SetContainer(int x, int y, int width, int height);
+    virtual void SetAttributes(vector<stringpair> &attributes) {};
+    virtual void SetX(int x) {};
+    virtual void SetY(int y) {};
+    virtual void SetWidth(int width) {};
+    virtual void SetHeight(int height) {};
+    void SetTab(void) { isTab = true; };
+    bool IsTab(void) { return isTab; };
+    void SetActiveTab(bool active) { activeTab = active; };
+    bool ActiveTab(void) { return activeTab; };
+    virtual int GetWidth(void) { return 0; };
+    virtual void Cache(void) {};
+    virtual void Close(void) {};
+    virtual void Clear(void) {};
+    virtual void Hide(void) {};
+    virtual void Show(void) {};
+    virtual void Render(void) {};
+    virtual bool Execute(void) { return true; };
+    virtual void SetTransparency(int transparency, bool absolute = false) {};
+    virtual void SetViewPort(cRect &vp) {};
+    virtual void SetPosition(cPoint &pos, cPoint &ref) {};
+    virtual cRect CoveringArea(void) { return cRect::Null; };
+    virtual bool Scrolling(void) { return false; };
+    virtual cArea *ScrollingArea(void) { return NULL; };
+    virtual cFunction *GetFunction(const char *name) { return NULL; };
+    virtual const char *Name(void) { return NULL; };
+    virtual bool BackgroundArea(void) { return false; };
+    virtual void Debug(bool full = false) {};
+};
+
+class cAreaContainer;
+/******************************************************************
+* cArea
+******************************************************************/
+class cArea : public cAreaNode, public cScrollable, public cBlinkable {
+private:
+    cSdOsd *sdOsd;
+    bool init;
+    bool isBackgroundArea;
+    cPixmap *pix;
+    cAreaAttribs *attribs;
+    cAreaContainer *areaContainer;
+    cList<cFunction> functions;
+    bool scrolling;
+    bool isScrolling;
+    cFunction *scrollFunc;
+    cList<cAnimation> blinkers;
+    bool blinking;
+    void InitFunctions(void);
+    void CreatePixmap(cRect drawPort = cRect::Null);
+    void SetScrollFunc(void);
+    void StartBlinkers(void);
+    void StopBlinkers(void);
+public:
+    cArea(void);
+    cArea(const cArea &other);
+    virtual ~cArea(void);
+    void SetOsd(cSdOsd *osd) { sdOsd = osd; };
+    void SetGlobals(cGlobals *globals);
+    void SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer);
+    void SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer);
+    void SetAttributes(vector<stringpair> &attributes);
+    void SetScrolling(void) { scrolling = true; };
+    void SetAreaContainer(cAreaContainer *ac) { areaContainer = ac; };
+    bool ValidFunction(const char *func);
+    cFunction *AddFunction(const char *name, vector<stringpair> attribs, cFuncLoop *loopFunc = NULL);
+    cFunction *GetFunction(const char *name);
+    void SetX(int x);
+    void SetY(int y);
+    void SetWidth(int width);
+    void SetHeight(int height);
+    void Cache(void);
+    int GetWidth(void) { return attribs->Width(); };
+    void Close(void);
+    void Clear(void);
+    void Hide(void);
+    void Show(void);
+    void Render(void);
+    bool Execute(void);
+    void SetTransparency(int transparency, bool absolute = false);
+    cRect CoveringArea(void);
+    //Scrollable
+    bool Scrolling(void);
+    int ScrollWidth(void);
+    int ScrollHeight(void);
+    int ScrollDelay(void);
+    eScrollMode ScrollMode(void);
+    eScrollSpeed ScrollSpeed(void);
+    eOrientation ScrollOrientation(void);
+    cArea *ScrollingArea(void) { return this; };
+    void StartScrolling(void);
+    void StopScrolling(void);
+    cRect ViewPort(void);
+    void SetDrawPort(cPoint &point);
+    void SetViewPort(cRect &vp);
+    void SetPosition(cPoint &pos, cPoint &ref);
+    cRect DrawPort(void);
+    int ScrollStep(void) { return attribs->ScrollStep(); };
+    //Blinkable
+    int BlinkFreq(int func);
+    void DoBlink(int func, bool on);
+    //Common
+    const char *Name(void) { return attribs->Name(); };
+    bool BackgroundArea(void) { return attribs->BackgroundArea(); };
+    void Flush(void);
+    void Debug(bool full = false);
+};
+
+/******************************************************************
+* cAreaContainer
+******************************************************************/
+class cAreaContainer : public cAreaNode {
+private:
+    cAreaContainerAttribs *attribs;
+    cList<cArea> areas;
+public:
+    cAreaContainer(void);
+    cAreaContainer(const cAreaContainer &other);
+    virtual ~cAreaContainer(void);
+    void SetGlobals(cGlobals *globals);
+    void SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer);
+    void SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer);
+    void SetAttributes(vector<stringpair> &attributes);
+    void AddArea(cArea *area);
+    cFunction *GetFunction(const char *name);
+    void SetX(int x);
+    void SetY(int y);
+    void SetWidth(int width);
+    void SetHeight(int height);
+    void Cache(void);
+    void Close(void);
+    void Clear(void);
+    void Hide(void);
+    void Show(void);
+    void Render(void);
+    bool Execute(void);
+    void SetTransparency(int transparency, bool absolute = false);
+    void SetViewPort(cRect &vp);
+    void SetPosition(cPoint &pos, cPoint &ref);
+    cRect CoveringArea(void);
+    bool Scrolling(void);
+    cArea *ScrollingArea(void);
+    void Debug(bool full = false);
+};
+
 #endif //__TEMPLATEAREA_H
\ No newline at end of file
diff --git a/coreengine/attribute.c b/coreengine/attribute.c
index 06ea17e..d92cb9b 100644
--- a/coreengine/attribute.c
+++ b/coreengine/attribute.c
@@ -1,478 +1,478 @@
-#include "attribute.h"

-#include "../config.h"

-

-/***************************************************************************

-* cAttributes

-***************************************************************************/

-cAttributes::cAttributes(int numAttributes) {

-    globals = NULL;

-    tokenContainer = NULL;

-    numAttribs = (int)eCommonAttribs::count + numAttributes;

-    attribs = new int[numAttribs];

-    for (int i=0; i < numAttribs; i++)

-        attribs[i] = ATTR_UNKNOWN;

-    attribCtors = new cNumericExpr*[numAttribs];

-    for (int i=0; i < numAttribs; i++)

-        attribCtors[i] = NULL;

-    cond = NULL;

-    SetCommonAttributesDefs();

-}

-

-cAttributes::cAttributes(const cAttributes &other) : cAttributes(other.numAttribs - (int)eCommonAttribs::count){

-    globals = other.globals;

-    for (int i=0; i < numAttribs; i++) {

-        attribs[i] = other.attribs[i];

-        if (other.attribCtors[i]) {

-            attribCtors[i] = new cNumericExpr(*other.attribCtors[i]);

-            attribCtors[i]->SetContainer(&container);    

-        }

-    }

-    cond = NULL;

-    if (other.cond) {

-        cond = new cCondition(*other.cond);

-    }

-    attribIDs = other.attribIDs;

-    attribNames = other.attribNames;

-}

-

-cAttributes::~cAttributes(void) {

-    delete[] attribs;

-    for (int i=0; i < numAttribs; i++) {

-        delete attribCtors[i];

-    }

-    delete[] attribCtors;

-    delete cond;

-}

-

-void cAttributes::SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer) {

-    this->tokenContainer = tokenContainer;

-}

-

-void cAttributes::SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer) {

-    this->tokenContainer = tokenContainer;

-    if (cond) {

-        cond->SetTokenContainer(tokenContainer);

-    }

-    for (int i=0; i < numAttribs; i++) {

-        if (!attribCtors[i])

-            continue;

-        attribCtors[i]->SetTokenContainer(tokenContainer);

-    }

-}

-

-void cAttributes::SetContainer(int x, int y, int width, int height) {

-    container.SetX(x);

-    container.SetY(y);

-    container.SetWidth(width);

-    container.SetHeight(height);

-}

-

-void cAttributes::SetX(int x) {

-    attribs[(int)eCommonAttribs::x] = x;

-}

-

-void cAttributes::SetY(int y) {

-    attribs[(int)eCommonAttribs::y] = y;

-}

-

-void cAttributes::SetWidth(int width) {

-    attribs[(int)eCommonAttribs::width] = width;

-}

-

-void cAttributes::SetHeight(int height) {

-    attribs[(int)eCommonAttribs::height] = height;

-}

-

-void cAttributes::Cache(void) {

-    if (cond) {

-        cond->SetGlobals(globals);

-        cond->SetTokenContainer(tokenContainer);

-        cond->Prepare();

-    }

-    for (int i=0; i < numAttribs; i++) {

-        if (!attribCtors[i])

-            continue;

-        attribCtors[i]->SetContainer(&container);

-        attribCtors[i]->SetGlobals(globals);

-        attribCtors[i]->SetTokenContainer(tokenContainer);

-        if (attribCtors[i]->CacheStatic()) {

-            int val = attribCtors[i]->GetValue();

-            attribs[i] = val;

-            delete attribCtors[i];

-            attribCtors[i] = NULL;

-        } else {

-            attribCtors[i]->PrepareTokens();

-        }

-    }

-}

-

-int cAttributes::GetValue(int id) {

-    if (!attribCtors[id + (int)eCommonAttribs::count])

-        return attribs[(int)id + (int)eCommonAttribs::count];

-    return attribCtors[id + (int)eCommonAttribs::count]->Calculate();

-}

-

-

-int cAttributes::X(void) { 

-    int x = 0;

-    if (!attribCtors[(int)eCommonAttribs::x])

-        x = attribs[(int)eCommonAttribs::x];

-    else

-        x = attribCtors[(int)eCommonAttribs::x]->Calculate();

-    x += container.X();

-    return x;

-}

-

-int cAttributes::Y(void) { 

-    int y = 0;

-    if (!attribCtors[(int)eCommonAttribs::y])

-        y = attribs[(int)eCommonAttribs::y];

-    else

-        y = attribCtors[(int)eCommonAttribs::y]->Calculate();

-    y += container.Y();

-    return y;

-}

-

-int cAttributes::Width(void) {

-    if (!attribCtors[(int)eCommonAttribs::width])

-        return attribs[(int)eCommonAttribs::width];

-    return attribCtors[(int)eCommonAttribs::width]->Calculate();

-}

-

-int cAttributes::Height(void) { 

-    if (!attribCtors[(int)eCommonAttribs::height])

-        return attribs[(int)eCommonAttribs::height];

-    return attribCtors[(int)eCommonAttribs::height]->Calculate();

-}

-

-bool cAttributes::DoExecute(void) {

-    if (!cond)

-        return true;

-    return cond->True();

-}

-

-

-void cAttributes::Debug(void) {

-    esyslog("skindesigner:            container %d %d %dx%d", container.X(), container.Y(), container.Width(), container.Height());

-    for (int i=0; i < numAttribs; i++) {

-        if (attribs[i] != ATTR_UNKNOWN) {

-            if (i == (int)eCommonAttribs::debug)

-                continue;

-            const char *attName = "attribute";

-            if (i < (int)eCommonAttribs::count)

-                attName = CommonAttributeName(i);

-            else

-                attName = AttributeName(i - (int)eCommonAttribs::count);

-            dsyslog("skindesigner:            fixed Value %s = %d", attName, attribs[i]);

-        }

-        if (attribCtors[i]) {

-            const char *attName = "attribute";

-            if (i < (int)eCommonAttribs::count)

-                attName = CommonAttributeName(i);

-            else

-                attName = AttributeName(i - (int)eCommonAttribs::count);

-            dsyslog("skindesigner:            %s constructor:", attName);

-            attribCtors[i]->Debug();

-        }

-    }

-    if (cond) {

-        cond->Debug();

-    }

-}

-

-/***************************************************************************

-* Protected Functions

-***************************************************************************/

-int cAttributes::CommonAttributeId(const char *att) {

-    if (!strcmp(att, "condition"))

-        return ATTR_COND;

-    map<string, int>::iterator hit = commonAttribIDs.find(att);

-    if (hit != commonAttribIDs.end())

-        return hit->second;

-    return ATTR_UNKNOWN;

-}

-

-const char *cAttributes::CommonAttributeName(int id) {

-    if (id < 0 || id >= (int)eCommonAttribs::count)

-        return "";

-    map<int, string>::iterator hit = commonAttribNames.find(id);

-    if (hit != commonAttribNames.end())

-        return hit->second.c_str();

-    return "";

-}

-

-int cAttributes::AttributeId(const char *att) {

-    int id = CommonAttributeId(att);

-    if (id != ATTR_UNKNOWN)

-        return id;

-    map<string, int>::iterator hit = attribIDs.find(att);

-    if (hit != attribIDs.end())

-        id = (int)hit->second + (int)eCommonAttribs::count;

-    return id;

-}

-

-const char *cAttributes::AttributeName(int id) {

-    map<int, string>::iterator hit = attribNames.find(id);

-    if (hit != attribNames.end())

-        return hit->second.c_str();

-    return "";    

-}

-

-bool cAttributes::SetCommon(int id, const char *val) {

-    if (id == ATTR_COND) {

-        cond = new cCondition(val);

-        return true;

-    }

-    if (id == (int)eCommonAttribs::debug) {

-        SetBool(id, val);

-        return true;    

-    } else if (id == (int)eCommonAttribs::x || id == (int)eCommonAttribs::width) {

-        attribCtors[id] = new cNumericExpr(val);

-        return true;

-    } else if (id == (int)eCommonAttribs::y || id == (int)eCommonAttribs::height) {

-        attribCtors[id] = new cNumericExpr(val);

-        attribCtors[id]->SetVertical();

-        return true;

-    }

-    return false;

-}

-

-bool cAttributes::IdEqual(int id, int compId) {

-    if (compId + (int)eCommonAttribs::count == id)

-        return true;

-    return false;

-}

-

-

-void cAttributes::SetBool(int id, const char *val) {

-    if (!strcmp(val, "true")) {

-        attribs[id] = 1;

-    } else {

-        attribs[id] = 0;

-    }

-}

-

-void cAttributes::SetViewElementMode(int id, const char *val) {

-    eViewElementMode mode = eViewElementMode::regular;

-    if (!strcmp(val, "light"))

-        mode = eViewElementMode::light;

-    attribs[id] = (int)mode;

-}

-

-void cAttributes::SetShiftType(int id, const char *val) {

-    eShiftType shiftType = eShiftType::none;

-    if (!strcmp(val, "left"))

-        shiftType = eShiftType::left;

-    else if (!strcmp(val, "right"))

-        shiftType = eShiftType::right;

-    else if (!strcmp(val, "top"))

-        shiftType = eShiftType::top;

-    else if (!strcmp(val, "bottom"))

-        shiftType = eShiftType::bottom;

-    else {

-        esyslog("skindesigner: unknown shift type \"%s\"", val);

-        return;

-    }

-    attribs[id] = (int)shiftType;

-}

-

-void cAttributes::SetShiftMode(int id, const char *val) {

-    eShiftMode shiftMode = eShiftMode::linear;

-    if (!strcmp(val, "slowed"))

-        shiftMode = eShiftMode::slowedDown;

-    attribs[id] = (int)shiftMode;

-}

-

-void cAttributes::SetScrollMode(int id, const char *val) {

-    eScrollMode mode = eScrollMode::none;

-    if (!strcmp(val, "forthandback"))

-        mode = eScrollMode::forthandback;

-    else if (!strcmp(val, "carriagereturn"))

-        mode = eScrollMode::carriagereturn;

-    attribs[id] = (int)mode;

-}

-

-void cAttributes::SetScrollSpeed(int id, const char *val) {

-    eScrollSpeed speed = eScrollSpeed::medium;

-    if (!strcmp(val, "slow"))

-        speed = eScrollSpeed::slow;

-    else if (!strcmp(val, "fast"))

-        speed = eScrollSpeed::fast;

-    else if (!strcmp(val, "medium"))

-        speed = eScrollSpeed::medium;

-    attribs[id] = (int)speed;

-}

-

-void cAttributes::SetOrientation(int id, const char *val) {

-    eOrientation orientation = eOrientation::none;

-    if (!strcmp(val, "horizontal"))

-        orientation = eOrientation::horizontal;

-    else if (!strcmp(val, "vertical"))

-        orientation = eOrientation::vertical;

-    else if (!strcmp(val, "absolute"))

-        orientation = eOrientation::absolute;

-    attribs[id] = (int)orientation;

-}

-

-void cAttributes::SetAlign(int id, const char *val) {

-    eAlign align = eAlign::left;

-    if (!strcmp(val, "center")) {

-        align = eAlign::center;

-    } else if (!strcmp(val, "right")) {

-        align = eAlign::right;

-    } else if (!strcmp(val, "top")) {

-        align = eAlign::top;

-    } else if (!strcmp(val, "bottom")) {

-        align = eAlign::bottom;

-    } else if (!strcmp(val, "left")) {

-        align = eAlign::left;

-    }

-    attribs[id] = (int)align;

-}

-

-void cAttributes::SetDirection(int id, const char *val) {

-    eDirection direction = eDirection::none;

-    if (!strcmp(val, "bottomup"))

-        direction = eDirection::bottomup;

-    else if (!strcmp(val, "topdown"))

-        direction = eDirection::topdown;

-    attribs[id] = (int)direction;

-}

-

-/***************************************************************************

-* Private Functions

-***************************************************************************/

-void cAttributes::SetCommonAttributesDefs(void) {

-    commonAttribIDs.insert(pair<string, int>("x", (int)eCommonAttribs::x));

-    commonAttribIDs.insert(pair<string, int>("y", (int)eCommonAttribs::y));

-    commonAttribIDs.insert(pair<string, int>("width", (int)eCommonAttribs::width));

-    commonAttribIDs.insert(pair<string, int>("height", (int)eCommonAttribs::height));

-    commonAttribIDs.insert(pair<string, int>("debug", (int)eCommonAttribs::debug));

-    commonAttribNames.insert(pair<int, string>((int)eCommonAttribs::x, "x"));

-    commonAttribNames.insert(pair<int, string>((int)eCommonAttribs::y, "y"));

-    commonAttribNames.insert(pair<int, string>((int)eCommonAttribs::width, "width"));

-    commonAttribNames.insert(pair<int, string>((int)eCommonAttribs::height, "height"));

-    commonAttribNames.insert(pair<int, string>((int)eCommonAttribs::debug, "debug"));

-}

-

-/***************************************************************************

-* cFunction

-***************************************************************************/

-cFunction::cFunction(cArea *owner, int numAttributes) : cAttributes(numAttributes) {

-    funcType = "Unknown";

-    owningArea = owner;

-    color = NULL;

-    name = NULL;

-    scrolling = false;

-}

-

-cFunction::cFunction(const cFunction &other) : cAttributes(other) {

-    funcType = other.funcType;

-    owningArea = NULL;

-    color = NULL;

-    if (other.color)

-        color = new cColor(*other.color);

-    name = NULL;

-    if (other.name)

-        name = strdup(other.name);

-    scrolling = other.scrolling;

-}

-

-cFunction::~cFunction(void) {

-    delete color;

-    free(name);

-}

-

-void cFunction::SetLoopInfo(cLoopInfo *loopInfo) {

-    for (int i=0; i < numAttribs; i++) {

-        if (!attribCtors[i])

-            continue;

-        attribCtors[i]->SetLoopInfo(loopInfo);

-    }

-    if (cond)

-        cond->SetLoopInfo(loopInfo);

-}

-

-void cFunction::Cache(void) {

-    if (color) {

-        color->SetGlobals(globals);

-        color->Cache();

-    }

-    cAttributes::Cache();

-}

-

-void cFunction::CacheFuncReferences(void) {

-    for (int i=0; i < numAttribs; i++) {

-        if (!attribCtors[i])

-            continue;

-        vector<cFactor*> refFactors = attribCtors[i]->GetRefFactors();

-        for (vector<cFactor*>::iterator it = refFactors.begin(); it != refFactors.end(); it++) {

-            cFactor *f = *it;

-            if (!f->funcRefName)

-                continue;

-            cFunction *fRef = owningArea->GetFunction(f->funcRefName);

-            if (fRef) {

-                f->funcRef = fRef;

-            }

-        }

-    }

-}

-

-int cFunction::GetX(eAlign align, int x0, int colWidth) {

-    int containerWidth = colWidth > 0 ? colWidth : container.Width();

-    int x = x0 + X();

-    if (align == eAlign::right) {

-        x = x0 + containerWidth - FuncWidth();

-    } else if (align == eAlign::center) {

-        x = x0 + (containerWidth - FuncWidth()) / 2;

-    }

-    return x;

-}

-

-int cFunction::GetY(eAlign valign, int y0, int rowHeight) {

-    int containerHeight = rowHeight > 0 ? rowHeight : container.Height();

-    int y = y0 + Y();

-    if (valign == eAlign::bottom) {

-        y = y0 + containerHeight - FuncHeight();

-    } else if (valign == eAlign::center) {

-        y = y0 + (containerHeight - FuncHeight()) / 2;

-    }

-    return y;

-}

-

-void cFunction::Debug(void) {

-    esyslog("skindesigner:        ---> Function %s", funcType);

-    cAttributes::Debug();

-    if (name) {

-        esyslog("skindesigner:            name %s", name);

-    }

-    if (color) {

-        color->Debug();

-    }

-}

-

-/***************************************************************************

-* Protected Functions

-***************************************************************************/

-

-void cFunction::SetColor(const char *val) {

-    color = new cColor(val);

-}

-

-void cFunction::SetAnimType(int id, const char *val) {

-    eAnimType animType = eAnimType::none;

-    if (!strcmp(val, "blink"))

-        animType = eAnimType::blink;

-    else if (!strcmp(val, "animated"))

-        animType = eAnimType::animated;

-    attribs[id] = (int)animType; 

-}

-

-void cFunction::SetOverflow(int id, const char *val) {

-    eOverflowType overflowType = eOverflowType::none;

-    if (!strcmp(val, "linewrap"))

-        overflowType = eOverflowType::wrap;

-    else if (!strcmp(val, "cut"))

-        overflowType = eOverflowType::cut;

-    attribs[id] = (int)overflowType;

-}

+#include "attribute.h"
+#include "../config.h"
+
+/***************************************************************************
+* cAttributes
+***************************************************************************/
+cAttributes::cAttributes(int numAttributes) {
+    globals = NULL;
+    tokenContainer = NULL;
+    numAttribs = (int)eCommonAttribs::count + numAttributes;
+    attribs = new int[numAttribs];
+    for (int i=0; i < numAttribs; i++)
+        attribs[i] = ATTR_UNKNOWN;
+    attribCtors = new cNumericExpr*[numAttribs];
+    for (int i=0; i < numAttribs; i++)
+        attribCtors[i] = NULL;
+    cond = NULL;
+    SetCommonAttributesDefs();
+}
+
+cAttributes::cAttributes(const cAttributes &other) : cAttributes(other.numAttribs - (int)eCommonAttribs::count){
+    globals = other.globals;
+    for (int i=0; i < numAttribs; i++) {
+        attribs[i] = other.attribs[i];
+        if (other.attribCtors[i]) {
+            attribCtors[i] = new cNumericExpr(*other.attribCtors[i]);
+            attribCtors[i]->SetContainer(&container);    
+        }
+    }
+    cond = NULL;
+    if (other.cond) {
+        cond = new cCondition(*other.cond);
+    }
+    attribIDs = other.attribIDs;
+    attribNames = other.attribNames;
+}
+
+cAttributes::~cAttributes(void) {
+    delete[] attribs;
+    for (int i=0; i < numAttribs; i++) {
+        delete attribCtors[i];
+    }
+    delete[] attribCtors;
+    delete cond;
+}
+
+void cAttributes::SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer) {
+    this->tokenContainer = tokenContainer;
+}
+
+void cAttributes::SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer) {
+    this->tokenContainer = tokenContainer;
+    if (cond) {
+        cond->SetTokenContainer(tokenContainer);
+    }
+    for (int i=0; i < numAttribs; i++) {
+        if (!attribCtors[i])
+            continue;
+        attribCtors[i]->SetTokenContainer(tokenContainer);
+    }
+}
+
+void cAttributes::SetContainer(int x, int y, int width, int height) {
+    container.SetX(x);
+    container.SetY(y);
+    container.SetWidth(width);
+    container.SetHeight(height);
+}
+
+void cAttributes::SetX(int x) {
+    attribs[(int)eCommonAttribs::x] = x;
+}
+
+void cAttributes::SetY(int y) {
+    attribs[(int)eCommonAttribs::y] = y;
+}
+
+void cAttributes::SetWidth(int width) {
+    attribs[(int)eCommonAttribs::width] = width;
+}
+
+void cAttributes::SetHeight(int height) {
+    attribs[(int)eCommonAttribs::height] = height;
+}
+
+void cAttributes::Cache(void) {
+    if (cond) {
+        cond->SetGlobals(globals);
+        cond->SetTokenContainer(tokenContainer);
+        cond->Prepare();
+    }
+    for (int i=0; i < numAttribs; i++) {
+        if (!attribCtors[i])
+            continue;
+        attribCtors[i]->SetContainer(&container);
+        attribCtors[i]->SetGlobals(globals);
+        attribCtors[i]->SetTokenContainer(tokenContainer);
+        if (attribCtors[i]->CacheStatic()) {
+            int val = attribCtors[i]->GetValue();
+            attribs[i] = val;
+            delete attribCtors[i];
+            attribCtors[i] = NULL;
+        } else {
+            attribCtors[i]->PrepareTokens();
+        }
+    }
+}
+
+int cAttributes::GetValue(int id) {
+    if (!attribCtors[id + (int)eCommonAttribs::count])
+        return attribs[(int)id + (int)eCommonAttribs::count];
+    return attribCtors[id + (int)eCommonAttribs::count]->Calculate();
+}
+
+
+int cAttributes::X(void) { 
+    int x = 0;
+    if (!attribCtors[(int)eCommonAttribs::x])
+        x = attribs[(int)eCommonAttribs::x];
+    else
+        x = attribCtors[(int)eCommonAttribs::x]->Calculate();
+    x += container.X();
+    return x;
+}
+
+int cAttributes::Y(void) { 
+    int y = 0;
+    if (!attribCtors[(int)eCommonAttribs::y])
+        y = attribs[(int)eCommonAttribs::y];
+    else
+        y = attribCtors[(int)eCommonAttribs::y]->Calculate();
+    y += container.Y();
+    return y;
+}
+
+int cAttributes::Width(void) {
+    if (!attribCtors[(int)eCommonAttribs::width])
+        return attribs[(int)eCommonAttribs::width];
+    return attribCtors[(int)eCommonAttribs::width]->Calculate();
+}
+
+int cAttributes::Height(void) { 
+    if (!attribCtors[(int)eCommonAttribs::height])
+        return attribs[(int)eCommonAttribs::height];
+    return attribCtors[(int)eCommonAttribs::height]->Calculate();
+}
+
+bool cAttributes::DoExecute(void) {
+    if (!cond)
+        return true;
+    return cond->True();
+}
+
+
+void cAttributes::Debug(void) {
+    esyslog("skindesigner:            container %d %d %dx%d", container.X(), container.Y(), container.Width(), container.Height());
+    for (int i=0; i < numAttribs; i++) {
+        if (attribs[i] != ATTR_UNKNOWN) {
+            if (i == (int)eCommonAttribs::debug)
+                continue;
+            const char *attName = "attribute";
+            if (i < (int)eCommonAttribs::count)
+                attName = CommonAttributeName(i);
+            else
+                attName = AttributeName(i - (int)eCommonAttribs::count);
+            dsyslog("skindesigner:            fixed Value %s = %d", attName, attribs[i]);
+        }
+        if (attribCtors[i]) {
+            const char *attName = "attribute";
+            if (i < (int)eCommonAttribs::count)
+                attName = CommonAttributeName(i);
+            else
+                attName = AttributeName(i - (int)eCommonAttribs::count);
+            dsyslog("skindesigner:            %s constructor:", attName);
+            attribCtors[i]->Debug();
+        }
+    }
+    if (cond) {
+        cond->Debug();
+    }
+}
+
+/***************************************************************************
+* Protected Functions
+***************************************************************************/
+int cAttributes::CommonAttributeId(const char *att) {
+    if (!strcmp(att, "condition"))
+        return ATTR_COND;
+    map<string, int>::iterator hit = commonAttribIDs.find(att);
+    if (hit != commonAttribIDs.end())
+        return hit->second;
+    return ATTR_UNKNOWN;
+}
+
+const char *cAttributes::CommonAttributeName(int id) {
+    if (id < 0 || id >= (int)eCommonAttribs::count)
+        return "";
+    map<int, string>::iterator hit = commonAttribNames.find(id);
+    if (hit != commonAttribNames.end())
+        return hit->second.c_str();
+    return "";
+}
+
+int cAttributes::AttributeId(const char *att) {
+    int id = CommonAttributeId(att);
+    if (id != ATTR_UNKNOWN)
+        return id;
+    map<string, int>::iterator hit = attribIDs.find(att);
+    if (hit != attribIDs.end())
+        id = (int)hit->second + (int)eCommonAttribs::count;
+    return id;
+}
+
+const char *cAttributes::AttributeName(int id) {
+    map<int, string>::iterator hit = attribNames.find(id);
+    if (hit != attribNames.end())
+        return hit->second.c_str();
+    return "";    
+}
+
+bool cAttributes::SetCommon(int id, const char *val) {
+    if (id == ATTR_COND) {
+        cond = new cCondition(val);
+        return true;
+    }
+    if (id == (int)eCommonAttribs::debug) {
+        SetBool(id, val);
+        return true;    
+    } else if (id == (int)eCommonAttribs::x || id == (int)eCommonAttribs::width) {
+        attribCtors[id] = new cNumericExpr(val);
+        return true;
+    } else if (id == (int)eCommonAttribs::y || id == (int)eCommonAttribs::height) {
+        attribCtors[id] = new cNumericExpr(val);
+        attribCtors[id]->SetVertical();
+        return true;
+    }
+    return false;
+}
+
+bool cAttributes::IdEqual(int id, int compId) {
+    if (compId + (int)eCommonAttribs::count == id)
+        return true;
+    return false;
+}
+
+
+void cAttributes::SetBool(int id, const char *val) {
+    if (!strcmp(val, "true")) {
+        attribs[id] = 1;
+    } else {
+        attribs[id] = 0;
+    }
+}
+
+void cAttributes::SetViewElementMode(int id, const char *val) {
+    eViewElementMode mode = eViewElementMode::regular;
+    if (!strcmp(val, "light"))
+        mode = eViewElementMode::light;
+    attribs[id] = (int)mode;
+}
+
+void cAttributes::SetShiftType(int id, const char *val) {
+    eShiftType shiftType = eShiftType::none;
+    if (!strcmp(val, "left"))
+        shiftType = eShiftType::left;
+    else if (!strcmp(val, "right"))
+        shiftType = eShiftType::right;
+    else if (!strcmp(val, "top"))
+        shiftType = eShiftType::top;
+    else if (!strcmp(val, "bottom"))
+        shiftType = eShiftType::bottom;
+    else {
+        esyslog("skindesigner: unknown shift type \"%s\"", val);
+        return;
+    }
+    attribs[id] = (int)shiftType;
+}
+
+void cAttributes::SetShiftMode(int id, const char *val) {
+    eShiftMode shiftMode = eShiftMode::linear;
+    if (!strcmp(val, "slowed"))
+        shiftMode = eShiftMode::slowedDown;
+    attribs[id] = (int)shiftMode;
+}
+
+void cAttributes::SetScrollMode(int id, const char *val) {
+    eScrollMode mode = eScrollMode::none;
+    if (!strcmp(val, "forthandback"))
+        mode = eScrollMode::forthandback;
+    else if (!strcmp(val, "carriagereturn"))
+        mode = eScrollMode::carriagereturn;
+    attribs[id] = (int)mode;
+}
+
+void cAttributes::SetScrollSpeed(int id, const char *val) {
+    eScrollSpeed speed = eScrollSpeed::medium;
+    if (!strcmp(val, "slow"))
+        speed = eScrollSpeed::slow;
+    else if (!strcmp(val, "fast"))
+        speed = eScrollSpeed::fast;
+    else if (!strcmp(val, "medium"))
+        speed = eScrollSpeed::medium;
+    attribs[id] = (int)speed;
+}
+
+void cAttributes::SetOrientation(int id, const char *val) {
+    eOrientation orientation = eOrientation::none;
+    if (!strcmp(val, "horizontal"))
+        orientation = eOrientation::horizontal;
+    else if (!strcmp(val, "vertical"))
+        orientation = eOrientation::vertical;
+    else if (!strcmp(val, "absolute"))
+        orientation = eOrientation::absolute;
+    attribs[id] = (int)orientation;
+}
+
+void cAttributes::SetAlign(int id, const char *val) {
+    eAlign align = eAlign::left;
+    if (!strcmp(val, "center")) {
+        align = eAlign::center;
+    } else if (!strcmp(val, "right")) {
+        align = eAlign::right;
+    } else if (!strcmp(val, "top")) {
+        align = eAlign::top;
+    } else if (!strcmp(val, "bottom")) {
+        align = eAlign::bottom;
+    } else if (!strcmp(val, "left")) {
+        align = eAlign::left;
+    }
+    attribs[id] = (int)align;
+}
+
+void cAttributes::SetDirection(int id, const char *val) {
+    eDirection direction = eDirection::none;
+    if (!strcmp(val, "bottomup"))
+        direction = eDirection::bottomup;
+    else if (!strcmp(val, "topdown"))
+        direction = eDirection::topdown;
+    attribs[id] = (int)direction;
+}
+
+/***************************************************************************
+* Private Functions
+***************************************************************************/
+void cAttributes::SetCommonAttributesDefs(void) {
+    commonAttribIDs.insert(pair<string, int>("x", (int)eCommonAttribs::x));
+    commonAttribIDs.insert(pair<string, int>("y", (int)eCommonAttribs::y));
+    commonAttribIDs.insert(pair<string, int>("width", (int)eCommonAttribs::width));
+    commonAttribIDs.insert(pair<string, int>("height", (int)eCommonAttribs::height));
+    commonAttribIDs.insert(pair<string, int>("debug", (int)eCommonAttribs::debug));
+    commonAttribNames.insert(pair<int, string>((int)eCommonAttribs::x, "x"));
+    commonAttribNames.insert(pair<int, string>((int)eCommonAttribs::y, "y"));
+    commonAttribNames.insert(pair<int, string>((int)eCommonAttribs::width, "width"));
+    commonAttribNames.insert(pair<int, string>((int)eCommonAttribs::height, "height"));
+    commonAttribNames.insert(pair<int, string>((int)eCommonAttribs::debug, "debug"));
+}
+
+/***************************************************************************
+* cFunction
+***************************************************************************/
+cFunction::cFunction(cArea *owner, int numAttributes) : cAttributes(numAttributes) {
+    funcType = "Unknown";
+    owningArea = owner;
+    color = NULL;
+    name = NULL;
+    scrolling = false;
+}
+
+cFunction::cFunction(const cFunction &other) : cAttributes(other) {
+    funcType = other.funcType;
+    owningArea = NULL;
+    color = NULL;
+    if (other.color)
+        color = new cColor(*other.color);
+    name = NULL;
+    if (other.name)
+        name = strdup(other.name);
+    scrolling = other.scrolling;
+}
+
+cFunction::~cFunction(void) {
+    delete color;
+    free(name);
+}
+
+void cFunction::SetLoopInfo(cLoopInfo *loopInfo) {
+    for (int i=0; i < numAttribs; i++) {
+        if (!attribCtors[i])
+            continue;
+        attribCtors[i]->SetLoopInfo(loopInfo);
+    }
+    if (cond)
+        cond->SetLoopInfo(loopInfo);
+}
+
+void cFunction::Cache(void) {
+    if (color) {
+        color->SetGlobals(globals);
+        color->Cache();
+    }
+    cAttributes::Cache();
+}
+
+void cFunction::CacheFuncReferences(void) {
+    for (int i=0; i < numAttribs; i++) {
+        if (!attribCtors[i])
+            continue;
+        vector<cFactor*> refFactors = attribCtors[i]->GetRefFactors();
+        for (vector<cFactor*>::iterator it = refFactors.begin(); it != refFactors.end(); it++) {
+            cFactor *f = *it;
+            if (!f->funcRefName)
+                continue;
+            cFunction *fRef = owningArea->GetFunction(f->funcRefName);
+            if (fRef) {
+                f->funcRef = fRef;
+            }
+        }
+    }
+}
+
+int cFunction::GetX(eAlign align, int x0, int colWidth) {
+    int containerWidth = colWidth > 0 ? colWidth : container.Width();
+    int x = x0 + X();
+    if (align == eAlign::right) {
+        x = x0 + containerWidth - FuncWidth();
+    } else if (align == eAlign::center) {
+        x = x0 + (containerWidth - FuncWidth()) / 2;
+    }
+    return x;
+}
+
+int cFunction::GetY(eAlign valign, int y0, int rowHeight) {
+    int containerHeight = rowHeight > 0 ? rowHeight : container.Height();
+    int y = y0 + Y();
+    if (valign == eAlign::bottom) {
+        y = y0 + containerHeight - FuncHeight();
+    } else if (valign == eAlign::center) {
+        y = y0 + (containerHeight - FuncHeight()) / 2;
+    }
+    return y;
+}
+
+void cFunction::Debug(void) {
+    esyslog("skindesigner:        ---> Function %s", funcType);
+    cAttributes::Debug();
+    if (name) {
+        esyslog("skindesigner:            name %s", name);
+    }
+    if (color) {
+        color->Debug();
+    }
+}
+
+/***************************************************************************
+* Protected Functions
+***************************************************************************/
+
+void cFunction::SetColor(const char *val) {
+    color = new cColor(val);
+}
+
+void cFunction::SetAnimType(int id, const char *val) {
+    eAnimType animType = eAnimType::none;
+    if (!strcmp(val, "blink"))
+        animType = eAnimType::blink;
+    else if (!strcmp(val, "animated"))
+        animType = eAnimType::animated;
+    attribs[id] = (int)animType; 
+}
+
+void cFunction::SetOverflow(int id, const char *val) {
+    eOverflowType overflowType = eOverflowType::none;
+    if (!strcmp(val, "linewrap"))
+        overflowType = eOverflowType::wrap;
+    else if (!strcmp(val, "cut"))
+        overflowType = eOverflowType::cut;
+    attribs[id] = (int)overflowType;
+}
diff --git a/coreengine/attribute.h b/coreengine/attribute.h
index e9da37e..f0ec6f8 100644
--- a/coreengine/attribute.h
+++ b/coreengine/attribute.h
@@ -1,126 +1,126 @@
-#ifndef __ATTRIBUTE_H

-#define __ATTRIBUTE_H

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string>

-#include <map>

-#include <vector>

-#include <vdr/skins.h>

-#include "globals.h"

-#include "../libskindesignerapi/tokencontainer.h"

-#include "definitions.h"

-#include "complextypes.h"

-

-class cArea;

-/******************************************************************

-* cAttributes

-******************************************************************/

-class cAttributes {

-private:

-    map<string, int> commonAttribIDs;

-    map<int, string> commonAttribNames;

-    void SetCommonAttributesDefs(void);

-protected:

-    cGlobals *globals;

-    skindesignerapi::cTokenContainer *tokenContainer;

-    cRect container;

-    int numAttribs;

-    int *attribs;

-    cNumericExpr **attribCtors;

-    cCondition *cond;

-    map<string, int> attribIDs;

-    map<int, string> attribNames;

-    int CommonAttributeId(const char *att);

-    const char *CommonAttributeName(int id);

-    int AttributeId(const char *att);

-    const char *AttributeName(int id);

-    bool SetCommon(int id, const char *val);

-    virtual bool IdEqual(int id, int compId);

-    void SetBool(int id, const char *val);

-    void SetViewElementMode(int id, const char *val);

-    void SetShiftType(int id, const char *val);

-    void SetShiftMode(int id, const char *val);

-    void SetScrollMode(int id, const char *val);

-    void SetScrollSpeed(int id, const char *val);

-    void SetOrientation(int id, const char *val);

-    void SetDirection(int id, const char *val);

-    void SetAlign(int id, const char *val);

-public:

-    cAttributes(int numAttributes);

-    cAttributes(const cAttributes &other);

-    virtual ~cAttributes(void);

-    void SetGlobals(cGlobals *globals) { this->globals = globals; };

-    void SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer);

-    virtual void SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer);

-    virtual void SetContainer(int x, int y, int width, int height);

-    virtual void Set(vector<stringpair> &attributes) {};

-    void SetX(int width);

-    void SetY(int height);

-    void SetWidth(int width);

-    void SetHeight(int height);

-    virtual void Cache(void);

-    int GetValue(int id);

-    int X(void);

-    int Y(void);

-    int Width(void);

-    int Height(void);

-    int DoDebug(void) { return attribs[(int)eCommonAttribs::debug] == 1 ? true : false; };

-    bool DoExecute(void);

-    virtual void Debug(void);

-};

-/******************************************************************

-* cLoopInfo

-******************************************************************/

-class cLoopInfo {

-public:

-    int colWidth;

-    int rowHeight;

-    int index;

-    int row;

-    cLoopInfo(void) {

-        colWidth = 0;

-        rowHeight = 0;

-        index = 0;

-        row = 0;

-    };

-};

-/******************************************************************

-* cFunction

-******************************************************************/

-class cFunction : public cAttributes, public cListObject {

-private:

-    cArea *owningArea;

-protected:

-    const char *funcType;

-    cColor *color;

-    char *name;

-    bool scrolling;

-    void SetColor(const char *val);

-    void SetAnimType(int id, const char *val);

-    void SetOverflow(int id, const char *val);

-public:

-    cFunction(cArea *owner, int numAttributes);

-    cFunction(const cFunction &other);

-    virtual ~cFunction(void);

-    virtual void SetLoopInfo(cLoopInfo *loopInfo);

-    void SetOwner(cArea *owner) { owningArea = owner; };

-    const char *Name(void) { return name; };

-    virtual void Cache(void);

-    void CacheFuncReferences(void);

-    void Scrolling(bool scrolling) { this->scrolling = scrolling; };

-    virtual void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0) {};

-    virtual int FuncX(void) { return X(); };

-    virtual int FuncY(void) { return Y(); };

-    virtual int FuncWidth(void) { return Width(); };

-    virtual int FuncHeight(void) { return Height(); };

-    virtual int Align(void) { return (int)eAlign::left; };

-    virtual int Valign(void) { return (int)eAlign::top; };

-    int GetX(eAlign align, int x0, int colWidth);

-    int GetY(eAlign valign, int y0, int rowHeight);

-    virtual bool Blinking(void) { return false; };

-    virtual int BlinkFreq(void) { return -1; };

-    virtual void Debug(void);

-};

-

+#ifndef __ATTRIBUTE_H
+#define __ATTRIBUTE_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string>
+#include <map>
+#include <vector>
+#include <vdr/skins.h>
+#include "globals.h"
+#include "../libskindesignerapi/tokencontainer.h"
+#include "definitions.h"
+#include "complextypes.h"
+
+class cArea;
+/******************************************************************
+* cAttributes
+******************************************************************/
+class cAttributes {
+private:
+    map<string, int> commonAttribIDs;
+    map<int, string> commonAttribNames;
+    void SetCommonAttributesDefs(void);
+protected:
+    cGlobals *globals;
+    skindesignerapi::cTokenContainer *tokenContainer;
+    cRect container;
+    int numAttribs;
+    int *attribs;
+    cNumericExpr **attribCtors;
+    cCondition *cond;
+    map<string, int> attribIDs;
+    map<int, string> attribNames;
+    int CommonAttributeId(const char *att);
+    const char *CommonAttributeName(int id);
+    int AttributeId(const char *att);
+    const char *AttributeName(int id);
+    bool SetCommon(int id, const char *val);
+    virtual bool IdEqual(int id, int compId);
+    void SetBool(int id, const char *val);
+    void SetViewElementMode(int id, const char *val);
+    void SetShiftType(int id, const char *val);
+    void SetShiftMode(int id, const char *val);
+    void SetScrollMode(int id, const char *val);
+    void SetScrollSpeed(int id, const char *val);
+    void SetOrientation(int id, const char *val);
+    void SetDirection(int id, const char *val);
+    void SetAlign(int id, const char *val);
+public:
+    cAttributes(int numAttributes);
+    cAttributes(const cAttributes &other);
+    virtual ~cAttributes(void);
+    void SetGlobals(cGlobals *globals) { this->globals = globals; };
+    void SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer);
+    virtual void SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer);
+    virtual void SetContainer(int x, int y, int width, int height);
+    virtual void Set(vector<stringpair> &attributes) {};
+    void SetX(int width);
+    void SetY(int height);
+    void SetWidth(int width);
+    void SetHeight(int height);
+    virtual void Cache(void);
+    int GetValue(int id);
+    int X(void);
+    int Y(void);
+    int Width(void);
+    int Height(void);
+    int DoDebug(void) { return attribs[(int)eCommonAttribs::debug] == 1 ? true : false; };
+    bool DoExecute(void);
+    virtual void Debug(void);
+};
+/******************************************************************
+* cLoopInfo
+******************************************************************/
+class cLoopInfo {
+public:
+    int colWidth;
+    int rowHeight;
+    int index;
+    int row;
+    cLoopInfo(void) {
+        colWidth = 0;
+        rowHeight = 0;
+        index = 0;
+        row = 0;
+    };
+};
+/******************************************************************
+* cFunction
+******************************************************************/
+class cFunction : public cAttributes, public cListObject {
+private:
+    cArea *owningArea;
+protected:
+    const char *funcType;
+    cColor *color;
+    char *name;
+    bool scrolling;
+    void SetColor(const char *val);
+    void SetAnimType(int id, const char *val);
+    void SetOverflow(int id, const char *val);
+public:
+    cFunction(cArea *owner, int numAttributes);
+    cFunction(const cFunction &other);
+    virtual ~cFunction(void);
+    virtual void SetLoopInfo(cLoopInfo *loopInfo);
+    void SetOwner(cArea *owner) { owningArea = owner; };
+    const char *Name(void) { return name; };
+    virtual void Cache(void);
+    void CacheFuncReferences(void);
+    void Scrolling(bool scrolling) { this->scrolling = scrolling; };
+    virtual void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0) {};
+    virtual int FuncX(void) { return X(); };
+    virtual int FuncY(void) { return Y(); };
+    virtual int FuncWidth(void) { return Width(); };
+    virtual int FuncHeight(void) { return Height(); };
+    virtual int Align(void) { return (int)eAlign::left; };
+    virtual int Valign(void) { return (int)eAlign::top; };
+    int GetX(eAlign align, int x0, int colWidth);
+    int GetY(eAlign valign, int y0, int rowHeight);
+    virtual bool Blinking(void) { return false; };
+    virtual int BlinkFreq(void) { return -1; };
+    virtual void Debug(void);
+};
+
 #endif //__ATTRIBUTE_H
\ No newline at end of file
diff --git a/coreengine/attributes.c b/coreengine/attributes.c
index 97387d4..8e71c1a 100644
--- a/coreengine/attributes.c
+++ b/coreengine/attributes.c
@@ -1,447 +1,447 @@
-#include "attributes.h"

-#include "../config.h"

-

-/***************************************************************************

-* cViewAttribs

-***************************************************************************/

-cViewAttribs::cViewAttribs(int numAttributes) : cAttributes(numAttributes) {

-    orientation = NULL;

-    SetAttributesDefs();

-}

-

-cViewAttribs::~cViewAttribs(void) {

-    delete orientation;

-}

-

-void cViewAttribs::Set(vector<stringpair> &attributes) {

-    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {

-        const char *attName = (*att).first.c_str();

-        const char *attVal = (*att).second.c_str();

-        int id = AttributeId(attName);

-        if (id == ATTR_UNKNOWN) {

-            esyslog("skindesigner: unknown view attribute \"%s\" = \"%s\"", attName, attVal);

-            continue;

-        }

-        if (SetCommon(id, attVal))

-            continue;

-        if (IdEqual(id, (int)eViewAttribs::shifttype)) {

-            SetShiftType(id, attVal);

-        } else if (IdEqual(id, (int)eViewAttribs::shiftmode)) {

-            SetShiftMode(id, attVal);

-        } else if (IdEqual(id, (int)eViewAttribs::orientation)) {

-            SetOrientationDynamic(id, attVal);

-        } else if (IdEqual(id, (int)eViewAttribs::hideroot)) {

-            SetBool(id, attVal);

-        } else {

-            attribCtors[id] = new cNumericExpr(attVal);

-            if ( (id == (int)eViewAttribs::starty + (int)eCommonAttribs::count) ||

-                 (id == (int)eViewAttribs::scaletvy + (int)eCommonAttribs::count) ||

-                 (id == (int)eViewAttribs::scaletvheight + (int)eCommonAttribs::count) ) {

-                attribCtors[id]->SetVertical();                

-            }

-        }   

-    }

-}

-

-void cViewAttribs::SetAttributesDefs(void) {

-    attribIDs.insert(pair<string, int>("fadetime", (int)eViewAttribs::fadetime));

-    attribIDs.insert(pair<string, int>("shifttime", (int)eViewAttribs::shifttime));

-    attribIDs.insert(pair<string, int>("shifttype", (int)eViewAttribs::shifttype));

-    attribIDs.insert(pair<string, int>("shiftmode", (int)eViewAttribs::shiftmode));

-    attribIDs.insert(pair<string, int>("startx", (int)eViewAttribs::startx));

-    attribIDs.insert(pair<string, int>("starty", (int)eViewAttribs::starty));

-    attribIDs.insert(pair<string, int>("scaletvx", (int)eViewAttribs::scaletvx));

-    attribIDs.insert(pair<string, int>("scaletvy", (int)eViewAttribs::scaletvy));

-    attribIDs.insert(pair<string, int>("scaletvwidth", (int)eViewAttribs::scaletvwidth));

-    attribIDs.insert(pair<string, int>("scaletvheight", (int)eViewAttribs::scaletvheight));

-    attribIDs.insert(pair<string, int>("orientation", (int)eViewAttribs::orientation));

-    attribIDs.insert(pair<string, int>("debuggrid", (int)eViewAttribs::debuggrid));

-    attribIDs.insert(pair<string, int>("hideroot", (int)eViewAttribs::hideroot));

-    attribNames.insert(pair<int, string>((int)eViewAttribs::fadetime, "fadetime"));

-    attribNames.insert(pair<int, string>((int)eViewAttribs::shifttime, "shifttime"));

-    attribNames.insert(pair<int, string>((int)eViewAttribs::shifttype, "shifttype"));

-    attribNames.insert(pair<int, string>((int)eViewAttribs::shiftmode, "shiftmode"));

-    attribNames.insert(pair<int, string>((int)eViewAttribs::startx, "startx"));

-    attribNames.insert(pair<int, string>((int)eViewAttribs::starty, "starty"));

-    attribNames.insert(pair<int, string>((int)eViewAttribs::scaletvx, "scaletvx"));

-    attribNames.insert(pair<int, string>((int)eViewAttribs::scaletvy, "scaletvy"));

-    attribNames.insert(pair<int, string>((int)eViewAttribs::scaletvwidth, "scaletvwidth"));

-    attribNames.insert(pair<int, string>((int)eViewAttribs::scaletvheight, "scaletvheight"));

-    attribNames.insert(pair<int, string>((int)eViewAttribs::orientation, "orientation"));

-    attribNames.insert(pair<int, string>((int)eViewAttribs::debuggrid, "debuggrid"));

-    attribNames.insert(pair<int, string>((int)eViewAttribs::hideroot, "hideroot"));

-}

-

-void cViewAttribs::Cache(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    cAttributes::Cache();

-    if (orientation) {

-        orientation->SetGlobals(globals);

-        orientation->SetTokenContainer(tokenContainer);

-        orientation->Cache();

-        char *res = orientation->DeterminateText();

-        if (res) {

-            SetOrientation((int)eViewAttribs::orientation + (int)eCommonAttribs::count, res);

-        }

-        free(res);

-    }

-}

-

-void cViewAttribs::Debug(void) {

-    esyslog("skindesigner:        --> View Attribs");

-    cAttributes::Debug();

-}

-

-eOrientation cViewAttribs::Orientation(void) {

-    int orientation = GetValue((int)eViewAttribs::orientation);

-    if (orientation == -1)

-        return eOrientation::vertical;

-    if (orientation == (int)eOrientation::none)

-        return eOrientation::vertical;

-    return (eOrientation)orientation;

-}

-

-cRect cViewAttribs::TvFrame(void) {

-    int frameX = GetValue((int)eViewAttribs::scaletvx);

-    int frameY = GetValue((int)eViewAttribs::scaletvy);

-    int frameWidth = GetValue((int)eViewAttribs::scaletvwidth);

-    int frameHeight = GetValue((int)eViewAttribs::scaletvheight);

-    if (frameX < 0 || frameY < 0 || frameWidth <= 0 || frameHeight <= 0)

-        return cRect::Null;

-    frameX += cOsd::OsdLeft();

-    frameY += cOsd::OsdTop();

-    return cRect(frameX, frameY, frameWidth, frameHeight);

-}

-

-void cViewAttribs::SetOrientationDynamic(int id, const char *val) {

-    if (strchr(val, '{') && strchr(val, '}')) {

-        orientation = new cTextExpr(val);

-    } else {

-        SetOrientation(id, val);

-    }

-}

-

-/***************************************************************************

-* cViewElementAttribs

-***************************************************************************/

-cViewElementAttribs::cViewElementAttribs(int numAttributes) : cAttributes(numAttributes) {

-    name = NULL;

-    SetAttributesDefs();

-}

-

-cViewElementAttribs::cViewElementAttribs(const cViewElementAttribs &other) : cAttributes(other) {

-    name = NULL;

-}

-

-cViewElementAttribs::~cViewElementAttribs(void) {

-    free(name);

-}

-

-void cViewElementAttribs::Set(vector<stringpair> &attributes) {

-    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {

-        const char *attName = (*att).first.c_str();

-        const char *attVal = (*att).second.c_str();

-        int id = AttributeId(attName);

-        if (id == ATTR_UNKNOWN) {

-            esyslog("skindesigner: unknown view element attribute \"%s\" = \"%s\"", attName, attVal);

-            continue;

-        }

-        if (SetCommon(id, attVal))

-            continue;

-        if (IdEqual(id, (int)eViewElementAttribs::mode)) {

-            SetViewElementMode(id, attVal);

-        } else if (IdEqual(id, (int)eViewElementAttribs::shifttype)) {

-            SetShiftType(id, attVal);

-        } else if (IdEqual(id, (int)eViewElementAttribs::shiftmode)) {

-            SetShiftMode(id, attVal);

-        } else if (IdEqual(id, (int)eViewElementAttribs::orientation)) {

-            SetOrientation(id, attVal);

-        } else if (IdEqual(id, (int)eViewElementAttribs::name)) {

-            name = strdup(attVal);

-        } else {

-            attribCtors[id] = new cNumericExpr(attVal);

-            if (id == (int)eViewElementAttribs::starty + (int)eCommonAttribs::count) {

-                attribCtors[id]->SetVertical();                

-            }

-        }

-    }

-}

-

-void cViewElementAttribs::SetAttributesDefs(void) {

-    attribIDs.insert(pair<string, int>("delay", (int)eViewElementAttribs::delay));

-    attribIDs.insert(pair<string, int>("fadetime", (int)eViewElementAttribs::fadetime));

-    attribIDs.insert(pair<string, int>("shifttime", (int)eViewElementAttribs::shifttime));

-    attribIDs.insert(pair<string, int>("shifttype", (int)eViewElementAttribs::shifttype));

-    attribIDs.insert(pair<string, int>("shiftmode", (int)eViewElementAttribs::shiftmode));

-    attribIDs.insert(pair<string, int>("startx", (int)eViewElementAttribs::startx));

-    attribIDs.insert(pair<string, int>("starty", (int)eViewElementAttribs::starty));

-    attribIDs.insert(pair<string, int>("orientation", (int)eViewElementAttribs::orientation));

-    attribIDs.insert(pair<string, int>("mode", (int)eViewElementAttribs::mode));

-    attribIDs.insert(pair<string, int>("name", (int)eViewElementAttribs::name));

-    attribNames.insert(pair<int, string>((int)eViewElementAttribs::delay, "delay"));

-    attribNames.insert(pair<int, string>((int)eViewElementAttribs::fadetime, "fadetime"));

-    attribNames.insert(pair<int, string>((int)eViewElementAttribs::shifttime, "shifttime"));

-    attribNames.insert(pair<int, string>((int)eViewElementAttribs::shifttype, "shifttype"));

-    attribNames.insert(pair<int, string>((int)eViewElementAttribs::shiftmode, "shiftmode"));

-    attribNames.insert(pair<int, string>((int)eViewElementAttribs::startx, "startx"));

-    attribNames.insert(pair<int, string>((int)eViewElementAttribs::starty, "starty"));

-    attribNames.insert(pair<int, string>((int)eViewElementAttribs::orientation, "orientation"));

-    attribNames.insert(pair<int, string>((int)eViewElementAttribs::mode, "mode"));

-    attribNames.insert(pair<int, string>((int)eViewElementAttribs::name, "name"));

-}

-

-eOrientation cViewElementAttribs::Orientation(void) {

-    int orientation = GetValue((int)eViewElementAttribs::orientation);

-    if (orientation == -1)

-        return eOrientation::vertical;

-    if (orientation == (int)eOrientation::none)

-        return eOrientation::vertical;

-    return (eOrientation)orientation;

-}

-

-void cViewElementAttribs::Debug(void) {

-    esyslog("skindesigner:   ---> View Element Attribs");

-    cAttributes::Debug();

-}

-

-/***************************************************************************

-* cViewListAttribs

-***************************************************************************/

-cViewListAttribs::cViewListAttribs(int numAttributes) : cAttributes(numAttributes) {

-    determinateFont = NULL;

-    SetAttributesDefs();

-}

-

-cViewListAttribs::~cViewListAttribs(void) {

-    free(determinateFont);

-}

-

-void cViewListAttribs::Set(vector<stringpair> &attributes) {

-    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {

-        const char *attName = (*att).first.c_str();

-        const char *attVal = (*att).second.c_str();

-        int id = AttributeId(attName);

-        if (id == ATTR_UNKNOWN) {

-            esyslog("skindesigner: unknown view list attribute \"%s\" = \"%s\"", attName, attVal);

-            continue;

-        }

-        if (SetCommon(id, attVal))

-            continue;

-        if (IdEqual(id, (int)eViewListAttribs::align)) {

-            SetAlign(id, attVal);

-        } else if (IdEqual(id, (int)eViewListAttribs::determinatefont)) {

-            determinateFont = strdup(attVal);

-        } else if (IdEqual(id, (int)eViewListAttribs::orientation)) {

-            SetOrientation(id, attVal);

-        } else {

-            attribCtors[id] = new cNumericExpr(attVal);

-        }

-    }

-}

-

-int cViewListAttribs::NumListElements(void) { 

-    return GetValue((int)eViewListAttribs::numlistelements); 

-}

-

-int cViewListAttribs::MenuItemWidth(void) {

-    return GetValue((int)eViewListAttribs::menuitemwidth); 

-}

-

-const char *cViewListAttribs::DeterminateFont(void) {

-    return determinateFont; 

-}

-

-eAlign cViewListAttribs::Align(void) { 

-    int align = GetValue((int)eViewListAttribs::align);

-    if (align < 0)

-        return eAlign::top;

-    return (eAlign)align; 

-}

-

-eOrientation cViewListAttribs::Orientation(void) {

-    int orientation = GetValue((int)eViewListAttribs::orientation);

-    if (orientation < 0)

-        return eOrientation::vertical;

-    return (eOrientation)orientation; 

-}

-

-void cViewListAttribs::SetAttributesDefs(void) {

-    attribIDs.insert(pair<string, int>("align", (int)eViewListAttribs::align));

-    attribIDs.insert(pair<string, int>("menuitemwidth", (int)eViewListAttribs::menuitemwidth));

-    attribIDs.insert(pair<string, int>("determinatefont", (int)eViewListAttribs::determinatefont));

-    attribIDs.insert(pair<string, int>("numlistelements", (int)eViewListAttribs::numlistelements));

-    attribIDs.insert(pair<string, int>("orientation", (int)eViewListAttribs::orientation));

-    attribIDs.insert(pair<string, int>("condition", (int)eViewListAttribs::condition));

-    attribNames.insert(pair<int, string>((int)eViewListAttribs::align, "align"));

-    attribNames.insert(pair<int, string>((int)eViewListAttribs::menuitemwidth, "menuitemwidth"));

-    attribNames.insert(pair<int, string>((int)eViewListAttribs::determinatefont, "determinatefont"));

-    attribNames.insert(pair<int, string>((int)eViewListAttribs::numlistelements, "numlistelements"));

-    attribNames.insert(pair<int, string>((int)eViewListAttribs::orientation, "orientation"));

-    attribNames.insert(pair<int, string>((int)eViewListAttribs::condition, "condition"));

-}

-

-void cViewListAttribs::Debug(void) {

-    esyslog("skindesigner:   ---> View List Attribs");

-    esyslog("skindesigner:        DeterminateFont %s", determinateFont);

-    cAttributes::Debug();

-}

-

-/***************************************************************************

-* cAreaAttribs

-***************************************************************************/

-cAreaAttribs::cAreaAttribs(int numAttributes) : cAttributes(numAttributes) {

-    name = NULL;

-    scrollElement = NULL;

-    dynamic = false;

-    SetAttributesDefs();

-}

-

-cAreaAttribs::cAreaAttribs(const cAreaAttribs &other) : cAttributes(other) {

-    name = NULL;

-    if (other.name)

-        name = new cTextExpr(*other.name);

-    scrollElement = NULL;

-    if (other.scrollElement)

-        scrollElement = strdup(other.scrollElement);

-    dynamic = false;

-}

-

-cAreaAttribs::~cAreaAttribs(void) {

-    delete name;

-    free(scrollElement);

-}

-

-void cAreaAttribs::Set(vector<stringpair> &attributes) {

-    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {

-        const char *attName = (*att).first.c_str();

-        const char *attVal = (*att).second.c_str();

-        int id = AttributeId(attName);

-        if (id == ATTR_UNKNOWN) {

-            esyslog("skindesigner: unknown area attribute \"%s\" = \"%s\"", attName, attVal);

-            continue;

-        }

-        if (SetCommon(id, attVal))

-            continue;

-        if (IdEqual(id, (int)eAreaAttribs::scrollelement)) {

-            scrollElement = strdup(attVal);

-        } else if (IdEqual(id, (int)eAreaAttribs::mode)) {

-            SetScrollMode(id, attVal);

-        } else if (IdEqual(id, (int)eAreaAttribs::orientation)) {

-            SetOrientation(id, attVal);

-        } else if (IdEqual(id, (int)eAreaAttribs::scrollspeed)) {

-            SetScrollSpeed(id, attVal);

-        } else if (IdEqual(id, (int)eAreaAttribs::background)) {

-            SetBool(id, attVal);

-        } else if (IdEqual(id, (int)eAreaAttribs::name)) {

-            name = new cTextExpr(attVal);

-        } else {

-            attribCtors[id] = new cNumericExpr(attVal);    

-        }

-    }

-}

-

-int cAreaAttribs::Layer(void) {

-    if (GetValue((int)eAreaAttribs::layer) > 0) {

-        return GetValue((int)eAreaAttribs::layer);

-    }

-    return 1;

-}

-

-bool cAreaAttribs::BackgroundArea(void) {

-    int isBackground = GetValue((int)eAreaAttribs::background);

-    if (isBackground == 1)

-        return true;

-    return false; 

-}

-

-void cAreaAttribs::CheckDynamic(void) {

-    for (int i = (int)eCommonAttribs::x; i <= (int)eCommonAttribs::height; ++i ) {

-        if (attribCtors[i] && attribCtors[i]->Dynamic()) {

-            dynamic = true;

-            return;

-        }

-    }

-}

-

-const char *cAreaAttribs::Name(void) { 

-    if (name)

-        return name->DeterminateText(); 

-    return NULL;

-}

-

-void cAreaAttribs::SetAttributesDefs(void) {

-    attribIDs.insert(pair<string, int>("layer", (int)eAreaAttribs::layer));

-    attribIDs.insert(pair<string, int>("transparency", (int)eAreaAttribs::transparency));

-    attribIDs.insert(pair<string, int>("mode", (int)eAreaAttribs::mode));

-    attribIDs.insert(pair<string, int>("orientation", (int)eAreaAttribs::orientation));

-    attribIDs.insert(pair<string, int>("scrollelement", (int)eAreaAttribs::scrollelement));

-    attribIDs.insert(pair<string, int>("scrollspeed", (int)eAreaAttribs::scrollspeed));

-    attribIDs.insert(pair<string, int>("delay", (int)eAreaAttribs::delay));

-    attribIDs.insert(pair<string, int>("background", (int)eAreaAttribs::background));

-    attribIDs.insert(pair<string, int>("name", (int)eAreaAttribs::name));

-    attribIDs.insert(pair<string, int>("scrollheight", (int)eAreaAttribs::scrollheight));

-    attribNames.insert(pair<int, string>((int)eAreaAttribs::layer, "layer"));

-    attribNames.insert(pair<int, string>((int)eAreaAttribs::transparency, "transparency"));

-    attribNames.insert(pair<int, string>((int)eAreaAttribs::mode, "mode"));

-    attribNames.insert(pair<int, string>((int)eAreaAttribs::orientation, "orientation"));

-    attribNames.insert(pair<int, string>((int)eAreaAttribs::scrollelement, "scrollelement"));

-    attribNames.insert(pair<int, string>((int)eAreaAttribs::scrollspeed, "scrollspeed"));

-    attribNames.insert(pair<int, string>((int)eAreaAttribs::delay, "delay"));

-    attribNames.insert(pair<int, string>((int)eAreaAttribs::background, "background"));

-    attribNames.insert(pair<int, string>((int)eAreaAttribs::name, "name"));

-    attribNames.insert(pair<int, string>((int)eAreaAttribs::scrollheight, "scrollheight"));

-}

-

-void cAreaAttribs::Cache(void) {

-    cAttributes::Cache();

-    if (name) {

-        name->SetGlobals(globals);

-        name->SetTokenContainer(tokenContainer);

-        name->Cache();

-    }

-}

-

-void cAreaAttribs::Debug(void) {

-    if (!name) {

-        esyslog("skindesigner:        ---> Area Attribs");

-    } else {

-        esyslog("skindesigner:        ---> Tab %s Attribs", name->DeterminateText());        

-    }

-    cAttributes::Debug();

-}

-

-/***************************************************************************

-* cAreaContainerAttribs

-***************************************************************************/

-cAreaContainerAttribs::cAreaContainerAttribs(int numAttributes) : cAttributes(numAttributes) {

-    SetAttributesDefs();

-}

-

-cAreaContainerAttribs::cAreaContainerAttribs(const cAreaContainerAttribs &other) : cAttributes(other) {

-}

-

-cAreaContainerAttribs::~cAreaContainerAttribs(void) {

-}

-

-void cAreaContainerAttribs::Set(vector<stringpair> &attributes) {

-    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {

-        const char *attName = (*att).first.c_str();

-        const char *attVal = (*att).second.c_str();

-        int id = AttributeId(attName);

-        if (id == ATTR_UNKNOWN) {

-            esyslog("skindesigner: unknown area container attribute \"%s\" = \"%s\"", attName, attVal);

-            continue;

-        }

-        if (SetCommon(id, attVal))

-            continue;

-    }

-}

-

-void cAreaContainerAttribs::SetAttributesDefs(void) {

-}

-

-void cAreaContainerAttribs::Debug(void) {

-    esyslog("skindesigner:            ---> Area Container Attribs");

-    cAttributes::Debug();

-}

-

+#include "attributes.h"
+#include "../config.h"
+
+/***************************************************************************
+* cViewAttribs
+***************************************************************************/
+cViewAttribs::cViewAttribs(int numAttributes) : cAttributes(numAttributes) {
+    orientation = NULL;
+    SetAttributesDefs();
+}
+
+cViewAttribs::~cViewAttribs(void) {
+    delete orientation;
+}
+
+void cViewAttribs::Set(vector<stringpair> &attributes) {
+    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {
+        const char *attName = (*att).first.c_str();
+        const char *attVal = (*att).second.c_str();
+        int id = AttributeId(attName);
+        if (id == ATTR_UNKNOWN) {
+            esyslog("skindesigner: unknown view attribute \"%s\" = \"%s\"", attName, attVal);
+            continue;
+        }
+        if (SetCommon(id, attVal))
+            continue;
+        if (IdEqual(id, (int)eViewAttribs::shifttype)) {
+            SetShiftType(id, attVal);
+        } else if (IdEqual(id, (int)eViewAttribs::shiftmode)) {
+            SetShiftMode(id, attVal);
+        } else if (IdEqual(id, (int)eViewAttribs::orientation)) {
+            SetOrientationDynamic(id, attVal);
+        } else if (IdEqual(id, (int)eViewAttribs::hideroot)) {
+            SetBool(id, attVal);
+        } else {
+            attribCtors[id] = new cNumericExpr(attVal);
+            if ( (id == (int)eViewAttribs::starty + (int)eCommonAttribs::count) ||
+                 (id == (int)eViewAttribs::scaletvy + (int)eCommonAttribs::count) ||
+                 (id == (int)eViewAttribs::scaletvheight + (int)eCommonAttribs::count) ) {
+                attribCtors[id]->SetVertical();                
+            }
+        }   
+    }
+}
+
+void cViewAttribs::SetAttributesDefs(void) {
+    attribIDs.insert(pair<string, int>("fadetime", (int)eViewAttribs::fadetime));
+    attribIDs.insert(pair<string, int>("shifttime", (int)eViewAttribs::shifttime));
+    attribIDs.insert(pair<string, int>("shifttype", (int)eViewAttribs::shifttype));
+    attribIDs.insert(pair<string, int>("shiftmode", (int)eViewAttribs::shiftmode));
+    attribIDs.insert(pair<string, int>("startx", (int)eViewAttribs::startx));
+    attribIDs.insert(pair<string, int>("starty", (int)eViewAttribs::starty));
+    attribIDs.insert(pair<string, int>("scaletvx", (int)eViewAttribs::scaletvx));
+    attribIDs.insert(pair<string, int>("scaletvy", (int)eViewAttribs::scaletvy));
+    attribIDs.insert(pair<string, int>("scaletvwidth", (int)eViewAttribs::scaletvwidth));
+    attribIDs.insert(pair<string, int>("scaletvheight", (int)eViewAttribs::scaletvheight));
+    attribIDs.insert(pair<string, int>("orientation", (int)eViewAttribs::orientation));
+    attribIDs.insert(pair<string, int>("debuggrid", (int)eViewAttribs::debuggrid));
+    attribIDs.insert(pair<string, int>("hideroot", (int)eViewAttribs::hideroot));
+    attribNames.insert(pair<int, string>((int)eViewAttribs::fadetime, "fadetime"));
+    attribNames.insert(pair<int, string>((int)eViewAttribs::shifttime, "shifttime"));
+    attribNames.insert(pair<int, string>((int)eViewAttribs::shifttype, "shifttype"));
+    attribNames.insert(pair<int, string>((int)eViewAttribs::shiftmode, "shiftmode"));
+    attribNames.insert(pair<int, string>((int)eViewAttribs::startx, "startx"));
+    attribNames.insert(pair<int, string>((int)eViewAttribs::starty, "starty"));
+    attribNames.insert(pair<int, string>((int)eViewAttribs::scaletvx, "scaletvx"));
+    attribNames.insert(pair<int, string>((int)eViewAttribs::scaletvy, "scaletvy"));
+    attribNames.insert(pair<int, string>((int)eViewAttribs::scaletvwidth, "scaletvwidth"));
+    attribNames.insert(pair<int, string>((int)eViewAttribs::scaletvheight, "scaletvheight"));
+    attribNames.insert(pair<int, string>((int)eViewAttribs::orientation, "orientation"));
+    attribNames.insert(pair<int, string>((int)eViewAttribs::debuggrid, "debuggrid"));
+    attribNames.insert(pair<int, string>((int)eViewAttribs::hideroot, "hideroot"));
+}
+
+void cViewAttribs::Cache(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    cAttributes::Cache();
+    if (orientation) {
+        orientation->SetGlobals(globals);
+        orientation->SetTokenContainer(tokenContainer);
+        orientation->Cache();
+        char *res = orientation->DeterminateText();
+        if (res) {
+            SetOrientation((int)eViewAttribs::orientation + (int)eCommonAttribs::count, res);
+        }
+        free(res);
+    }
+}
+
+void cViewAttribs::Debug(void) {
+    esyslog("skindesigner:        --> View Attribs");
+    cAttributes::Debug();
+}
+
+eOrientation cViewAttribs::Orientation(void) {
+    int orientation = GetValue((int)eViewAttribs::orientation);
+    if (orientation == -1)
+        return eOrientation::vertical;
+    if (orientation == (int)eOrientation::none)
+        return eOrientation::vertical;
+    return (eOrientation)orientation;
+}
+
+cRect cViewAttribs::TvFrame(void) {
+    int frameX = GetValue((int)eViewAttribs::scaletvx);
+    int frameY = GetValue((int)eViewAttribs::scaletvy);
+    int frameWidth = GetValue((int)eViewAttribs::scaletvwidth);
+    int frameHeight = GetValue((int)eViewAttribs::scaletvheight);
+    if (frameX < 0 || frameY < 0 || frameWidth <= 0 || frameHeight <= 0)
+        return cRect::Null;
+    frameX += cOsd::OsdLeft();
+    frameY += cOsd::OsdTop();
+    return cRect(frameX, frameY, frameWidth, frameHeight);
+}
+
+void cViewAttribs::SetOrientationDynamic(int id, const char *val) {
+    if (strchr(val, '{') && strchr(val, '}')) {
+        orientation = new cTextExpr(val);
+    } else {
+        SetOrientation(id, val);
+    }
+}
+
+/***************************************************************************
+* cViewElementAttribs
+***************************************************************************/
+cViewElementAttribs::cViewElementAttribs(int numAttributes) : cAttributes(numAttributes) {
+    name = NULL;
+    SetAttributesDefs();
+}
+
+cViewElementAttribs::cViewElementAttribs(const cViewElementAttribs &other) : cAttributes(other) {
+    name = NULL;
+}
+
+cViewElementAttribs::~cViewElementAttribs(void) {
+    free(name);
+}
+
+void cViewElementAttribs::Set(vector<stringpair> &attributes) {
+    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {
+        const char *attName = (*att).first.c_str();
+        const char *attVal = (*att).second.c_str();
+        int id = AttributeId(attName);
+        if (id == ATTR_UNKNOWN) {
+            esyslog("skindesigner: unknown view element attribute \"%s\" = \"%s\"", attName, attVal);
+            continue;
+        }
+        if (SetCommon(id, attVal))
+            continue;
+        if (IdEqual(id, (int)eViewElementAttribs::mode)) {
+            SetViewElementMode(id, attVal);
+        } else if (IdEqual(id, (int)eViewElementAttribs::shifttype)) {
+            SetShiftType(id, attVal);
+        } else if (IdEqual(id, (int)eViewElementAttribs::shiftmode)) {
+            SetShiftMode(id, attVal);
+        } else if (IdEqual(id, (int)eViewElementAttribs::orientation)) {
+            SetOrientation(id, attVal);
+        } else if (IdEqual(id, (int)eViewElementAttribs::name)) {
+            name = strdup(attVal);
+        } else {
+            attribCtors[id] = new cNumericExpr(attVal);
+            if (id == (int)eViewElementAttribs::starty + (int)eCommonAttribs::count) {
+                attribCtors[id]->SetVertical();                
+            }
+        }
+    }
+}
+
+void cViewElementAttribs::SetAttributesDefs(void) {
+    attribIDs.insert(pair<string, int>("delay", (int)eViewElementAttribs::delay));
+    attribIDs.insert(pair<string, int>("fadetime", (int)eViewElementAttribs::fadetime));
+    attribIDs.insert(pair<string, int>("shifttime", (int)eViewElementAttribs::shifttime));
+    attribIDs.insert(pair<string, int>("shifttype", (int)eViewElementAttribs::shifttype));
+    attribIDs.insert(pair<string, int>("shiftmode", (int)eViewElementAttribs::shiftmode));
+    attribIDs.insert(pair<string, int>("startx", (int)eViewElementAttribs::startx));
+    attribIDs.insert(pair<string, int>("starty", (int)eViewElementAttribs::starty));
+    attribIDs.insert(pair<string, int>("orientation", (int)eViewElementAttribs::orientation));
+    attribIDs.insert(pair<string, int>("mode", (int)eViewElementAttribs::mode));
+    attribIDs.insert(pair<string, int>("name", (int)eViewElementAttribs::name));
+    attribNames.insert(pair<int, string>((int)eViewElementAttribs::delay, "delay"));
+    attribNames.insert(pair<int, string>((int)eViewElementAttribs::fadetime, "fadetime"));
+    attribNames.insert(pair<int, string>((int)eViewElementAttribs::shifttime, "shifttime"));
+    attribNames.insert(pair<int, string>((int)eViewElementAttribs::shifttype, "shifttype"));
+    attribNames.insert(pair<int, string>((int)eViewElementAttribs::shiftmode, "shiftmode"));
+    attribNames.insert(pair<int, string>((int)eViewElementAttribs::startx, "startx"));
+    attribNames.insert(pair<int, string>((int)eViewElementAttribs::starty, "starty"));
+    attribNames.insert(pair<int, string>((int)eViewElementAttribs::orientation, "orientation"));
+    attribNames.insert(pair<int, string>((int)eViewElementAttribs::mode, "mode"));
+    attribNames.insert(pair<int, string>((int)eViewElementAttribs::name, "name"));
+}
+
+eOrientation cViewElementAttribs::Orientation(void) {
+    int orientation = GetValue((int)eViewElementAttribs::orientation);
+    if (orientation == -1)
+        return eOrientation::vertical;
+    if (orientation == (int)eOrientation::none)
+        return eOrientation::vertical;
+    return (eOrientation)orientation;
+}
+
+void cViewElementAttribs::Debug(void) {
+    esyslog("skindesigner:   ---> View Element Attribs");
+    cAttributes::Debug();
+}
+
+/***************************************************************************
+* cViewListAttribs
+***************************************************************************/
+cViewListAttribs::cViewListAttribs(int numAttributes) : cAttributes(numAttributes) {
+    determinateFont = NULL;
+    SetAttributesDefs();
+}
+
+cViewListAttribs::~cViewListAttribs(void) {
+    free(determinateFont);
+}
+
+void cViewListAttribs::Set(vector<stringpair> &attributes) {
+    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {
+        const char *attName = (*att).first.c_str();
+        const char *attVal = (*att).second.c_str();
+        int id = AttributeId(attName);
+        if (id == ATTR_UNKNOWN) {
+            esyslog("skindesigner: unknown view list attribute \"%s\" = \"%s\"", attName, attVal);
+            continue;
+        }
+        if (SetCommon(id, attVal))
+            continue;
+        if (IdEqual(id, (int)eViewListAttribs::align)) {
+            SetAlign(id, attVal);
+        } else if (IdEqual(id, (int)eViewListAttribs::determinatefont)) {
+            determinateFont = strdup(attVal);
+        } else if (IdEqual(id, (int)eViewListAttribs::orientation)) {
+            SetOrientation(id, attVal);
+        } else {
+            attribCtors[id] = new cNumericExpr(attVal);
+        }
+    }
+}
+
+int cViewListAttribs::NumListElements(void) { 
+    return GetValue((int)eViewListAttribs::numlistelements); 
+}
+
+int cViewListAttribs::MenuItemWidth(void) {
+    return GetValue((int)eViewListAttribs::menuitemwidth); 
+}
+
+const char *cViewListAttribs::DeterminateFont(void) {
+    return determinateFont; 
+}
+
+eAlign cViewListAttribs::Align(void) { 
+    int align = GetValue((int)eViewListAttribs::align);
+    if (align < 0)
+        return eAlign::top;
+    return (eAlign)align; 
+}
+
+eOrientation cViewListAttribs::Orientation(void) {
+    int orientation = GetValue((int)eViewListAttribs::orientation);
+    if (orientation < 0)
+        return eOrientation::vertical;
+    return (eOrientation)orientation; 
+}
+
+void cViewListAttribs::SetAttributesDefs(void) {
+    attribIDs.insert(pair<string, int>("align", (int)eViewListAttribs::align));
+    attribIDs.insert(pair<string, int>("menuitemwidth", (int)eViewListAttribs::menuitemwidth));
+    attribIDs.insert(pair<string, int>("determinatefont", (int)eViewListAttribs::determinatefont));
+    attribIDs.insert(pair<string, int>("numlistelements", (int)eViewListAttribs::numlistelements));
+    attribIDs.insert(pair<string, int>("orientation", (int)eViewListAttribs::orientation));
+    attribIDs.insert(pair<string, int>("condition", (int)eViewListAttribs::condition));
+    attribNames.insert(pair<int, string>((int)eViewListAttribs::align, "align"));
+    attribNames.insert(pair<int, string>((int)eViewListAttribs::menuitemwidth, "menuitemwidth"));
+    attribNames.insert(pair<int, string>((int)eViewListAttribs::determinatefont, "determinatefont"));
+    attribNames.insert(pair<int, string>((int)eViewListAttribs::numlistelements, "numlistelements"));
+    attribNames.insert(pair<int, string>((int)eViewListAttribs::orientation, "orientation"));
+    attribNames.insert(pair<int, string>((int)eViewListAttribs::condition, "condition"));
+}
+
+void cViewListAttribs::Debug(void) {
+    esyslog("skindesigner:   ---> View List Attribs");
+    esyslog("skindesigner:        DeterminateFont %s", determinateFont);
+    cAttributes::Debug();
+}
+
+/***************************************************************************
+* cAreaAttribs
+***************************************************************************/
+cAreaAttribs::cAreaAttribs(int numAttributes) : cAttributes(numAttributes) {
+    name = NULL;
+    scrollElement = NULL;
+    dynamic = false;
+    SetAttributesDefs();
+}
+
+cAreaAttribs::cAreaAttribs(const cAreaAttribs &other) : cAttributes(other) {
+    name = NULL;
+    if (other.name)
+        name = new cTextExpr(*other.name);
+    scrollElement = NULL;
+    if (other.scrollElement)
+        scrollElement = strdup(other.scrollElement);
+    dynamic = false;
+}
+
+cAreaAttribs::~cAreaAttribs(void) {
+    delete name;
+    free(scrollElement);
+}
+
+void cAreaAttribs::Set(vector<stringpair> &attributes) {
+    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {
+        const char *attName = (*att).first.c_str();
+        const char *attVal = (*att).second.c_str();
+        int id = AttributeId(attName);
+        if (id == ATTR_UNKNOWN) {
+            esyslog("skindesigner: unknown area attribute \"%s\" = \"%s\"", attName, attVal);
+            continue;
+        }
+        if (SetCommon(id, attVal))
+            continue;
+        if (IdEqual(id, (int)eAreaAttribs::scrollelement)) {
+            scrollElement = strdup(attVal);
+        } else if (IdEqual(id, (int)eAreaAttribs::mode)) {
+            SetScrollMode(id, attVal);
+        } else if (IdEqual(id, (int)eAreaAttribs::orientation)) {
+            SetOrientation(id, attVal);
+        } else if (IdEqual(id, (int)eAreaAttribs::scrollspeed)) {
+            SetScrollSpeed(id, attVal);
+        } else if (IdEqual(id, (int)eAreaAttribs::background)) {
+            SetBool(id, attVal);
+        } else if (IdEqual(id, (int)eAreaAttribs::name)) {
+            name = new cTextExpr(attVal);
+        } else {
+            attribCtors[id] = new cNumericExpr(attVal);    
+        }
+    }
+}
+
+int cAreaAttribs::Layer(void) {
+    if (GetValue((int)eAreaAttribs::layer) > 0) {
+        return GetValue((int)eAreaAttribs::layer);
+    }
+    return 1;
+}
+
+bool cAreaAttribs::BackgroundArea(void) {
+    int isBackground = GetValue((int)eAreaAttribs::background);
+    if (isBackground == 1)
+        return true;
+    return false; 
+}
+
+void cAreaAttribs::CheckDynamic(void) {
+    for (int i = (int)eCommonAttribs::x; i <= (int)eCommonAttribs::height; ++i ) {
+        if (attribCtors[i] && attribCtors[i]->Dynamic()) {
+            dynamic = true;
+            return;
+        }
+    }
+}
+
+const char *cAreaAttribs::Name(void) { 
+    if (name)
+        return name->DeterminateText(); 
+    return NULL;
+}
+
+void cAreaAttribs::SetAttributesDefs(void) {
+    attribIDs.insert(pair<string, int>("layer", (int)eAreaAttribs::layer));
+    attribIDs.insert(pair<string, int>("transparency", (int)eAreaAttribs::transparency));
+    attribIDs.insert(pair<string, int>("mode", (int)eAreaAttribs::mode));
+    attribIDs.insert(pair<string, int>("orientation", (int)eAreaAttribs::orientation));
+    attribIDs.insert(pair<string, int>("scrollelement", (int)eAreaAttribs::scrollelement));
+    attribIDs.insert(pair<string, int>("scrollspeed", (int)eAreaAttribs::scrollspeed));
+    attribIDs.insert(pair<string, int>("delay", (int)eAreaAttribs::delay));
+    attribIDs.insert(pair<string, int>("background", (int)eAreaAttribs::background));
+    attribIDs.insert(pair<string, int>("name", (int)eAreaAttribs::name));
+    attribIDs.insert(pair<string, int>("scrollheight", (int)eAreaAttribs::scrollheight));
+    attribNames.insert(pair<int, string>((int)eAreaAttribs::layer, "layer"));
+    attribNames.insert(pair<int, string>((int)eAreaAttribs::transparency, "transparency"));
+    attribNames.insert(pair<int, string>((int)eAreaAttribs::mode, "mode"));
+    attribNames.insert(pair<int, string>((int)eAreaAttribs::orientation, "orientation"));
+    attribNames.insert(pair<int, string>((int)eAreaAttribs::scrollelement, "scrollelement"));
+    attribNames.insert(pair<int, string>((int)eAreaAttribs::scrollspeed, "scrollspeed"));
+    attribNames.insert(pair<int, string>((int)eAreaAttribs::delay, "delay"));
+    attribNames.insert(pair<int, string>((int)eAreaAttribs::background, "background"));
+    attribNames.insert(pair<int, string>((int)eAreaAttribs::name, "name"));
+    attribNames.insert(pair<int, string>((int)eAreaAttribs::scrollheight, "scrollheight"));
+}
+
+void cAreaAttribs::Cache(void) {
+    cAttributes::Cache();
+    if (name) {
+        name->SetGlobals(globals);
+        name->SetTokenContainer(tokenContainer);
+        name->Cache();
+    }
+}
+
+void cAreaAttribs::Debug(void) {
+    if (!name) {
+        esyslog("skindesigner:        ---> Area Attribs");
+    } else {
+        esyslog("skindesigner:        ---> Tab %s Attribs", name->DeterminateText());        
+    }
+    cAttributes::Debug();
+}
+
+/***************************************************************************
+* cAreaContainerAttribs
+***************************************************************************/
+cAreaContainerAttribs::cAreaContainerAttribs(int numAttributes) : cAttributes(numAttributes) {
+    SetAttributesDefs();
+}
+
+cAreaContainerAttribs::cAreaContainerAttribs(const cAreaContainerAttribs &other) : cAttributes(other) {
+}
+
+cAreaContainerAttribs::~cAreaContainerAttribs(void) {
+}
+
+void cAreaContainerAttribs::Set(vector<stringpair> &attributes) {
+    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {
+        const char *attName = (*att).first.c_str();
+        const char *attVal = (*att).second.c_str();
+        int id = AttributeId(attName);
+        if (id == ATTR_UNKNOWN) {
+            esyslog("skindesigner: unknown area container attribute \"%s\" = \"%s\"", attName, attVal);
+            continue;
+        }
+        if (SetCommon(id, attVal))
+            continue;
+    }
+}
+
+void cAreaContainerAttribs::SetAttributesDefs(void) {
+}
+
+void cAreaContainerAttribs::Debug(void) {
+    esyslog("skindesigner:            ---> Area Container Attribs");
+    cAttributes::Debug();
+}
+
diff --git a/coreengine/attributes.h b/coreengine/attributes.h
index 5280db7..1af17ef 100644
--- a/coreengine/attributes.h
+++ b/coreengine/attributes.h
@@ -1,111 +1,111 @@
-#ifndef __ATTRIBUTES_H

-#define __ATTRIBUTES_H

-

-#include "attribute.h"

-/******************************************************************

-* cViewAttribs

-******************************************************************/

-class cViewAttribs : public cAttributes {

-private:

-    cTextExpr *orientation;

-    void SetAttributesDefs(void);

-    void SetOrientationDynamic(int id, const char *val);

-public:

-    cViewAttribs(int numAttributes);

-    virtual ~cViewAttribs(void);

-    void Set(vector<stringpair> &attributes);

-    eOrientation Orientation(void);

-    int FadeTime(void) { return GetValue((int)eViewAttribs::fadetime); };

-    int ShiftTime(void) { return GetValue((int)eViewAttribs::shifttime); };

-    cPoint ShiftStartpoint(void) { return cPoint(GetValue((int)eViewAttribs::startx), GetValue((int)eViewAttribs::starty)); };

-    int ShiftType(void) { return GetValue((int)eViewAttribs::shifttype); };

-    int ShiftMode(void) { return GetValue((int)eViewAttribs::shiftmode); };

-    cRect TvFrame(void);

-    void Cache(void);

-    void Debug(void);

-};

-/******************************************************************

-* cViewElementAttribs

-******************************************************************/

-class cViewElementAttribs : public cAttributes {

-private:

-    char *name;

-    void SetAttributesDefs(void);

-public:

-    cViewElementAttribs(int numAttributes);

-    cViewElementAttribs(const cViewElementAttribs &other);

-    virtual ~cViewElementAttribs(void);

-    void Set(vector<stringpair> &attributes);

-    int Mode(void) { return GetValue((int)eViewElementAttribs::mode); };

-    int Delay(void) { return GetValue((int)eViewElementAttribs::delay); };

-    eOrientation Orientation(void);

-    int FadeTime(void) { return GetValue((int)eViewElementAttribs::fadetime); };

-    int ShiftTime(void) { return GetValue((int)eViewElementAttribs::shifttime); };

-    cPoint ShiftStartpoint(void) { return cPoint(GetValue((int)eViewElementAttribs::startx), GetValue((int)eViewElementAttribs::starty)); };

-    int ShiftType(void) { return GetValue((int)eViewElementAttribs::shifttype); };

-    int ShiftMode(void) { return GetValue((int)eViewElementAttribs::shiftmode); };

-    const char *Name(void) { return name; };

-    void Debug(void);

-};

-/******************************************************************

-* cViewListAttribs

-******************************************************************/

-class cViewListAttribs : public cAttributes {

-private:

-    char *determinateFont;

-    void SetAttributesDefs(void);

-public:

-    cViewListAttribs(int numAttributes);

-    virtual ~cViewListAttribs(void);

-    void Set(vector<stringpair> &attributes);

-    int NumListElements(void);

-    int MenuItemWidth(void);

-    const char *DeterminateFont(void);

-    eAlign Align(void);

-    eOrientation Orientation(void);

-    void Debug(void);

-};

-/******************************************************************

-* cAreaAttribs

-******************************************************************/

-class cAreaAttribs : public cAttributes {

-private:

-    cTextExpr *name;

-    char *scrollElement;

-    void SetAttributesDefs(void);

-    bool dynamic;

-public:

-    cAreaAttribs(int numAttributes);

-    cAreaAttribs(const cAreaAttribs &other);

-    virtual ~cAreaAttribs(void);

-    void Set(vector<stringpair> &attributes);

-    const char *GetScrollElement(void) { return scrollElement; };

-    int Orientation(void) { return GetValue((int)eAreaAttribs::orientation); };

-    int Delay(void) { return GetValue((int)eAreaAttribs::delay); };

-    int Mode(void) { return GetValue((int)eAreaAttribs::mode); };

-    int ScrollSpeed(void) { return GetValue((int)eAreaAttribs::scrollspeed); };

-    int Transparency(void) { return GetValue((int)eAreaAttribs::transparency); };    

-    int Layer(void);

-    int ScrollStep(void) { return GetValue((int)eAreaAttribs::scrollheight); };

-    bool BackgroundArea(void);

-    const char *Name(void);

-    void CheckDynamic(void);

-    bool Dynamic(void) {return dynamic; };

-    void Cache(void);

-    void Debug(void);

-};

-/******************************************************************

-* cAreaContainerAttribs

-******************************************************************/

-class cAreaContainerAttribs : public cAttributes {

-private:

-    void SetAttributesDefs(void);

-public:

-    cAreaContainerAttribs(int numAttributes);

-    cAreaContainerAttribs(const cAreaContainerAttribs &other);

-    virtual ~cAreaContainerAttribs(void);

-    void Set(vector<stringpair> &attributes);

-    void Debug(void);

-};

-

+#ifndef __ATTRIBUTES_H
+#define __ATTRIBUTES_H
+
+#include "attribute.h"
+/******************************************************************
+* cViewAttribs
+******************************************************************/
+class cViewAttribs : public cAttributes {
+private:
+    cTextExpr *orientation;
+    void SetAttributesDefs(void);
+    void SetOrientationDynamic(int id, const char *val);
+public:
+    cViewAttribs(int numAttributes);
+    virtual ~cViewAttribs(void);
+    void Set(vector<stringpair> &attributes);
+    eOrientation Orientation(void);
+    int FadeTime(void) { return GetValue((int)eViewAttribs::fadetime); };
+    int ShiftTime(void) { return GetValue((int)eViewAttribs::shifttime); };
+    cPoint ShiftStartpoint(void) { return cPoint(GetValue((int)eViewAttribs::startx), GetValue((int)eViewAttribs::starty)); };
+    int ShiftType(void) { return GetValue((int)eViewAttribs::shifttype); };
+    int ShiftMode(void) { return GetValue((int)eViewAttribs::shiftmode); };
+    cRect TvFrame(void);
+    void Cache(void);
+    void Debug(void);
+};
+/******************************************************************
+* cViewElementAttribs
+******************************************************************/
+class cViewElementAttribs : public cAttributes {
+private:
+    char *name;
+    void SetAttributesDefs(void);
+public:
+    cViewElementAttribs(int numAttributes);
+    cViewElementAttribs(const cViewElementAttribs &other);
+    virtual ~cViewElementAttribs(void);
+    void Set(vector<stringpair> &attributes);
+    int Mode(void) { return GetValue((int)eViewElementAttribs::mode); };
+    int Delay(void) { return GetValue((int)eViewElementAttribs::delay); };
+    eOrientation Orientation(void);
+    int FadeTime(void) { return GetValue((int)eViewElementAttribs::fadetime); };
+    int ShiftTime(void) { return GetValue((int)eViewElementAttribs::shifttime); };
+    cPoint ShiftStartpoint(void) { return cPoint(GetValue((int)eViewElementAttribs::startx), GetValue((int)eViewElementAttribs::starty)); };
+    int ShiftType(void) { return GetValue((int)eViewElementAttribs::shifttype); };
+    int ShiftMode(void) { return GetValue((int)eViewElementAttribs::shiftmode); };
+    const char *Name(void) { return name; };
+    void Debug(void);
+};
+/******************************************************************
+* cViewListAttribs
+******************************************************************/
+class cViewListAttribs : public cAttributes {
+private:
+    char *determinateFont;
+    void SetAttributesDefs(void);
+public:
+    cViewListAttribs(int numAttributes);
+    virtual ~cViewListAttribs(void);
+    void Set(vector<stringpair> &attributes);
+    int NumListElements(void);
+    int MenuItemWidth(void);
+    const char *DeterminateFont(void);
+    eAlign Align(void);
+    eOrientation Orientation(void);
+    void Debug(void);
+};
+/******************************************************************
+* cAreaAttribs
+******************************************************************/
+class cAreaAttribs : public cAttributes {
+private:
+    cTextExpr *name;
+    char *scrollElement;
+    void SetAttributesDefs(void);
+    bool dynamic;
+public:
+    cAreaAttribs(int numAttributes);
+    cAreaAttribs(const cAreaAttribs &other);
+    virtual ~cAreaAttribs(void);
+    void Set(vector<stringpair> &attributes);
+    const char *GetScrollElement(void) { return scrollElement; };
+    int Orientation(void) { return GetValue((int)eAreaAttribs::orientation); };
+    int Delay(void) { return GetValue((int)eAreaAttribs::delay); };
+    int Mode(void) { return GetValue((int)eAreaAttribs::mode); };
+    int ScrollSpeed(void) { return GetValue((int)eAreaAttribs::scrollspeed); };
+    int Transparency(void) { return GetValue((int)eAreaAttribs::transparency); };    
+    int Layer(void);
+    int ScrollStep(void) { return GetValue((int)eAreaAttribs::scrollheight); };
+    bool BackgroundArea(void);
+    const char *Name(void);
+    void CheckDynamic(void);
+    bool Dynamic(void) {return dynamic; };
+    void Cache(void);
+    void Debug(void);
+};
+/******************************************************************
+* cAreaContainerAttribs
+******************************************************************/
+class cAreaContainerAttribs : public cAttributes {
+private:
+    void SetAttributesDefs(void);
+public:
+    cAreaContainerAttribs(int numAttributes);
+    cAreaContainerAttribs(const cAreaContainerAttribs &other);
+    virtual ~cAreaContainerAttribs(void);
+    void Set(vector<stringpair> &attributes);
+    void Debug(void);
+};
+
 #endif //__ATTRIBUTES_H
\ No newline at end of file
diff --git a/coreengine/complextypes.c b/coreengine/complextypes.c
index c48dbec..c6e5940 100644
--- a/coreengine/complextypes.c
+++ b/coreengine/complextypes.c
@@ -1,1607 +1,1607 @@
-#include "complextypes.h"

-#include "../config.h"

-

-/******************************************************************

-* helpers

-******************************************************************/

-char *RemoveSpace(char *e) {

-    if (!e)

-        return e;

-    int numSpaces = 0;

-    int exprLen = strlen(e);

-    for (int i = 0; i < exprLen; ++i) {

-        if (isspace(e[i]))

-            ++numSpaces;

-    }

-    if (numSpaces == 0)

-        return e;

-

-    char *replaced = (char*)malloc(exprLen - numSpaces + 1);

-    replaced[exprLen - numSpaces] = '\0';

-    int j = 0;

-    for (int i = 0; i < exprLen; ++i) {

-        if (!isspace(e[i])){

-            replaced[j++] = e[i];

-        }

-    }

-    free(e);

-    return replaced;

-}

-

-void ReplaceDecimalpoint(char *e) {

-    int size = (int)strlen(e);

-    for ( int i = 0; i < size; ++i ) {

-       if (e[i] == '.')

-           e[i] = config.decPoint;

-    }

-}

-

-void ReplaceStart(char *e, int num) {

-    int size = (int)strlen(e);

-    if (size <= num)

-        return;

-    for ( int i = 0; i < size; ++i ) {

-       if (i < size - num)

-           e[i] = e[i+num];

-       else e[i] = 0;

-    }

-}

-

-void ReplaceEnd(char *e, int num) {

-    int size = (int)strlen(e) - 1;

-    if (size <= num)

-        return;

-    for ( int i = size; i > size-num; --i ) {

-        e[i] = 0;

-    }

-}

-/******************************************************************

-* cCond

-******************************************************************/

-cCond::cCond(const char *expression) {

-    this->expr = strdup(expression);

-    operation = eCondOp::tAnd;

-    type = eCondType::token;

-    constant = false;

-    isTrue = false;

-    tokenIndex = -1;

-    compareValue = -1;

-    compareStrValue = NULL;

-}

-

-cCond::cCond(const cCond &other) {

-    expr = strdup(other.expr);

-    operation = other.operation;

-    type = other.type;

-    constant = other.constant;

-    tokenType = other.tokenType;

-    isTrue = other.isTrue;

-    tokenIndex = other.tokenIndex;

-    compareValue = other.compareValue;

-    compareStrValue = NULL;

-    if (other.compareStrValue)

-        compareStrValue = strdup(other.compareStrValue);

-}

-

-cCond::~cCond(void) { 

-    free(expr); 

-    free(compareStrValue);

-}

-

-void cCond::Debug(void) {

-    esyslog("skindesigner:              cond %s, operation %s, type %d", expr, 

-                                                            (operation == eCondOp::tAnd) ? "++" : "||",

-                                                            (int)type);

-    if (constant)

-        esyslog("skindesigner:              constant cond: %s", isTrue ? "TRUE" : "FALSE");

-    if (tokenIndex >= 0)

-        esyslog("skindesigner:              token index: %d", tokenIndex);

-    if (compareValue >= 0)

-        esyslog("skindesigner:              compare value: %d", compareValue);

-    if (compareStrValue)

-        esyslog("skindesigner:              compare string value: %d", compareStrValue);

-}

-

-/******************************************************************

-* cCondition

-******************************************************************/

-cCondition::cCondition(const char *expression) {

-    expr = strdup(expression);

-    globals = NULL;

-    tokenContainer = NULL;

-    loopInfo = NULL;

-}

-

-cCondition::cCondition(const cCondition &other) {

-    expr = strdup(other.expr);

-    globals = NULL;

-    tokenContainer = NULL;

-    loopInfo = NULL;

-    for (cCond *cond = other.conds.First(); cond; cond = other.conds.Next(cond))

-        conds.Add(new cCond(*cond));

-}

-

-cCondition::~cCondition(void) {

-    free(expr);

-}

-

-void cCondition::Prepare(void) {

-    expr = RemoveSpace(expr);

-    Tokenize();

-    PrepareTokens();

-}

-

-bool cCondition::True(void) {

-    if (conds.Count() == 0)

-        return true;

-    bool ok = true;

-    for (cCond *c = conds.First(); c; c = conds.Next(c)) {

-        bool condTrue = true;

-        //evaluate condition

-        if (c->constant) 

-        {

-            condTrue = c->isTrue;

-        } 

-        else if (c->type == eCondType::token) 

-        {

-            if (c->tokenType == eCondTokenType::inttoken) {

-                int tokenVal = tokenContainer->IntToken(c->tokenIndex);

-                condTrue = (tokenVal > 0) ? true : false;                

-            } else if (c->tokenType == eCondTokenType::stringtoken) {

-                char *tokenVal = tokenContainer->StringToken(c->tokenIndex);

-                if (tokenVal)

-                    condTrue = (!strcmp(tokenVal, "1")) ? true : false;

-            } else if (c->tokenType == eCondTokenType::looptoken) {

-                if (loopInfo && loopInfo->row >= 0) {

-                    char *tokenVal = tokenContainer->LoopToken(loopInfo->index, loopInfo->row, c->tokenIndex);

-                    if (tokenVal)

-                        condTrue = (!strcmp(tokenVal, "1")) ? true : false;

-                }

-            }

-

-        } 

-        else if (c->type == eCondType::negtoken) 

-        {

-            if (c->tokenType == eCondTokenType::inttoken) {

-                int tokenVal = tokenContainer->IntToken(c->tokenIndex);

-                condTrue = (tokenVal > 0) ? false : true;

-            } else if (c->tokenType == eCondTokenType::stringtoken) {

-                char *tokenVal = tokenContainer->StringToken(c->tokenIndex);

-                if (tokenVal)

-                    condTrue = (!strcmp(tokenVal, "1")) ? false : true;

-            } else if (c->tokenType == eCondTokenType::looptoken) {

-                if (loopInfo && loopInfo->row >= 0) {

-                    char *tokenVal = tokenContainer->LoopToken(loopInfo->index, loopInfo->row, c->tokenIndex);

-                    if (tokenVal)

-                        condTrue = (!strcmp(tokenVal, "1")) ? false : true;

-                }

-            }

-        }

-        else if (c->type == eCondType::lowerInt || c->type == eCondType::equalInt || c->type == eCondType::greaterInt) 

-        {

-            if (c->tokenType == eCondTokenType::inttoken) {

-                int tokenVal = tokenContainer->IntToken(c->tokenIndex);

-                if (c->type == eCondType::lowerInt)

-                    condTrue = (tokenVal < c->compareValue) ? true : false;

-                else if (c->type == eCondType::equalInt)

-                    condTrue = (tokenVal == c->compareValue) ? true : false;

-                else if (c->type == eCondType::greaterInt)

-                    condTrue = (tokenVal > c->compareValue) ? true : false;

-            } else if (c->tokenType == eCondTokenType::stringtoken) {

-                char *tokenVal = tokenContainer->StringToken(c->tokenIndex);

-                if (tokenVal) {

-                    int intVal = atoi(tokenVal);

-                    if (c->type == eCondType::lowerInt)

-                        condTrue = (intVal < c->compareValue) ? true : false;

-                    else if (c->type == eCondType::equalInt)

-                        condTrue = (intVal == c->compareValue) ? true : false;

-                    else if (c->type == eCondType::greaterInt)

-                        condTrue = (intVal > c->compareValue) ? true : false;

-                }

-            } else if (c->tokenType == eCondTokenType::looptoken) {

-                if (loopInfo && loopInfo->row >= 0) {

-                    char *tokenVal = tokenContainer->LoopToken(loopInfo->index, loopInfo->row, c->tokenIndex);

-                    if (tokenVal) {

-                        int intVal = atoi(tokenVal);

-                        if (c->type == eCondType::lowerInt)

-                            condTrue = (intVal < c->compareValue) ? true : false;

-                        else if (c->type == eCondType::equalInt)

-                            condTrue = (intVal == c->compareValue) ? true : false;

-                        else if (c->type == eCondType::greaterInt)

-                            condTrue = (intVal > c->compareValue) ? true : false;

-                    }

-                }

-            }

-        }

-        else if (c->type == eCondType::isset || c->type == eCondType::empty) 

-        {

-            if (c->tokenType == eCondTokenType::stringtoken) {

-                char *tokenVal = tokenContainer->StringToken(c->tokenIndex);

-                if (tokenVal) {

-                    if (c->type == eCondType::isset)

-                        condTrue = strlen(tokenVal) > 0 ? true : false;

-                    else if (c->type == eCondType::empty)

-                        condTrue = strlen(tokenVal) == 0 ? true : false;

-                } else {

-                    if (c->type == eCondType::isset)

-                        condTrue = false;

-                    else if (c->type == eCondType::empty)

-                        condTrue = true;

-                }

-            } else if (c->tokenType == eCondTokenType::looptoken) {

-                if (loopInfo && loopInfo->row >= 0) {

-                    char *tokenVal = tokenContainer->LoopToken(loopInfo->index, loopInfo->row, c->tokenIndex);

-                    if (tokenVal) {

-                        if (c->type == eCondType::isset)

-                            condTrue = strlen(tokenVal) > 0 ? true : false;

-                        else if (c->type == eCondType::empty)

-                            condTrue = strlen(tokenVal) == 0 ? true : false;

-                    } else {

-                        if (c->type == eCondType::isset)

-                            condTrue = false;

-                        else if (c->type == eCondType::empty)

-                            condTrue = true;

-                    }

-                }

-            }

-        }

-        else if (c->type == eCondType::equalString || c->type == eCondType::notEqualString || c->type == eCondType::contains || c->type == eCondType::notContains) 

-        {

-            if (c->tokenType == eCondTokenType::stringtoken) {

-                char *tokenVal = tokenContainer->StringToken(c->tokenIndex);

-                if (tokenVal) {

-                    if (c->type == eCondType::equalString)

-                        condTrue = !strcmp(tokenVal, c->compareStrValue) ? true : false;

-                    else if (c->type == eCondType::notEqualString)

-                        condTrue = strcmp(tokenVal, c->compareStrValue) ? true : false;

-                    else if (c->type == eCondType::contains)

-                        condTrue = strstr(tokenVal, c->compareStrValue) ? true : false;

-                    else if (c->type == eCondType::notContains)

-                        condTrue = !strstr(tokenVal, c->compareStrValue) ? true : false;

-                }

-            } else if (c->tokenType == eCondTokenType::looptoken) {

-                if (loopInfo && loopInfo->row >= 0) {

-                    char *tokenVal = tokenContainer->LoopToken(loopInfo->index, loopInfo->row, c->tokenIndex);

-                    if (tokenVal) {

-                        if (c->type == eCondType::equalString)

-                            condTrue = !strcmp(tokenVal, c->compareStrValue) ? true : false;

-                        else if (c->type == eCondType::notEqualString)

-                            condTrue = strcmp(tokenVal, c->compareStrValue) ? true : false;

-                        else if (c->type == eCondType::contains)

-                            condTrue = strstr(tokenVal, c->compareStrValue) ? true : false;

-                        else if (c->type == eCondType::notContains)

-                            condTrue = !strstr(tokenVal, c->compareStrValue) ? true : false;

-                    }

-                }

-            }

-        }        //link

-        if (c->operation == eCondOp::tAnd) {

-            ok = ok && condTrue;

-        } else if (c->operation == eCondOp::tOr) {

-            ok = ok || condTrue;                

-        }

-    }

-    return ok;

-}

-

-void cCondition::Debug(void) {

-    esyslog("skindesigner:            condition \"%s\"", expr);

-    for (cCond *c = conds.First(); c; c = conds.Next(c)) {

-        c->Debug();

-    }

-    esyslog("skindesigner:            condition is %s", True() ? "TRUE" : "FALSE");

-}

-

-void cCondition::Tokenize(void) {

-    char *condition = strdup(expr);

-    char delimiter[] = "+|";

-    eCondOp operation = eCondOp::tAnd;

-

-    char *cond = strtok(condition, delimiter);

-    while (cond) {

-        eCondType type = eCondType::token;

-        if (startswith(cond, "{") && endswith(cond, "}")) {

-            type = eCondType::token;

-        } else if (startswith(cond, "not{") && endswith(cond, "}")) {

-            type = eCondType::negtoken;

-        } else if (startswith(cond, "lt({") && endswith(cond, ")")) {

-            type = eCondType::lowerInt;

-        } else if (startswith(cond, "eq({") && endswith(cond, ")")) {

-            type = eCondType::equalInt;

-        } else if (startswith(cond, "gt({") && endswith(cond, ")")) {

-            type = eCondType::greaterInt;

-        } else if (startswith(cond, "isset{") && endswith(cond, "}")) {

-            type = eCondType::isset;

-        } else if (startswith(cond, "empty{") && endswith(cond, "}")) {

-            type = eCondType::empty;

-        } else if (startswith(cond, "strequal({") && endswith(cond, ")")) {

-            type = eCondType::equalString;

-        } else if (startswith(cond, "strnotequal({") && endswith(cond, ")")) {

-            type = eCondType::notEqualString;

-        } else if (startswith(cond, "strcontains({") && endswith(cond, ")")) {

-            type = eCondType::contains;

-        } else if (startswith(cond, "strnotcontains({") && endswith(cond, ")")) {

-            type = eCondType::notContains;

-        } else {

-            esyslog("skindesigner: invalid condition term %s", cond);

-            cond = strtok(NULL, delimiter);

-            continue;

-        }

-        cCond *c = new cCond(cond);

-        c->operation = operation;

-        c->type = type;

-        conds.Add(c);

-        if (expr[cond - condition + strlen(cond)] == '+')

-            operation = eCondOp::tAnd;

-        else

-            operation = eCondOp::tOr;

-        cond = strtok(NULL, delimiter);

-    }

-    free(condition);

-}

-

-void cCondition::PrepareTokens(void) {

-    for (cCond *c = conds.First(); c; c = conds.Next(c)) {

-        switch (c->type) {

-            case eCondType::token:

-            case eCondType::negtoken:

-                SetTokenCond(c);

-                break;

-            case eCondType::lowerInt:

-            case eCondType::equalInt:

-            case eCondType::greaterInt:

-                SetIntegerCond(c);

-                break;

-            case eCondType::isset:

-            case eCondType::empty:

-                SetStringCond(c);

-                break;

-            case eCondType::equalString:

-            case eCondType::notEqualString:

-            case eCondType::contains:

-            case eCondType::notContains:

-                SetStringCompareCond(c);

-                break;

-            default:

-                break;

-        }

-    }

-}

-

-void cCondition::SetTokenCond(cCond *c) {

-    if (c->type == eCondType::negtoken) {

-        ReplaceStart(c->expr, 3);

-    }

-    //check globals

-    int result = 0;

-    string tmp = c->expr;

-    tmp = tmp.substr(1, tmp.size()-2);

-    if (globals->GetInt(tmp, result)) {

-        c->constant = true;

-        if (result == 1 && c->type == eCondType::token)

-            c->isTrue = true;

-        if (result == 0 && c->type == eCondType::negtoken)

-            c->isTrue = true;

-        return;

-    }

-    SetTokenIndex(c, c->expr);

-}

-

-void cCondition::SetIntegerCond(cCond *c) {

-    char *tokenStart = strchr(c->expr, '{');

-    char *tokenEnd = strchr(c->expr, '}');

-    if (!tokenStart || !tokenEnd)

-        return;

-    char token[200] = "";

-    strncpy(token, tokenStart, tokenEnd - tokenStart + 1);

-

-    char *condStart = strchr(c->expr, ',');

-    char *condEnd = strchr(c->expr, ')');

-    char strCond[100] = "";

-    strncpy(strCond, condStart + 1, condEnd - condStart - 1);

-    c->compareValue = atoi(strCond);

-

-    //check globals

-    int result = 0;

-    if (globals->GetInt(token, result)) {

-        c->constant = true;

-        if (c->type == eCondType::lowerInt && result < c->compareValue)

-            c->isTrue = true;

-        else if (c->type == eCondType::equalInt && result == c->compareValue)

-            c->isTrue = true;

-        else if (c->type == eCondType::greaterInt && result > c->compareValue)

-            c->isTrue = true;

-        return;

-    }

-    SetTokenIndex(c, token);

-}

-

-void cCondition::SetStringCond(cCond *c) {

-    ReplaceStart(c->expr, 5);

-    SetTokenIndex(c, c->expr);

-}

-

-void cCondition::SetStringCompareCond(cCond *c) {

-    char *tokenStart = strchr(c->expr, '{');

-    char *tokenEnd = strchr(c->expr, '}');

-    if (!tokenStart || !tokenEnd)

-        return;

-    char token[200] = "";

-    strncpy(token, tokenStart, tokenEnd - tokenStart + 1);

-

-    char *condStart = strstr(c->expr, ",'");

-    char *condEnd = strstr(c->expr, "')");

-    char strCond[100] = "";

-    strncpy(strCond, condStart + 2, condEnd - condStart - 2);

-    c->compareStrValue = strdup(strCond);

-    SetTokenIndex(c, token);

-}

-

-void cCondition::SetTokenIndex(cCond *c, const char *token) {

-    int tokenIndex = tokenContainer->IntTokenIndex(token);

-    if (tokenIndex >= 0) {

-        c->tokenIndex = tokenIndex;

-        c->tokenType = eCondTokenType::inttoken;

-        return;

-    }

-    tokenIndex = tokenContainer->StringTokenIndex(token);

-    if (tokenIndex >= 0) {

-        c->tokenIndex = tokenIndex;

-        c->tokenType = eCondTokenType::stringtoken;

-        return;

-    }

-    tokenIndex = tokenContainer->LoopTokenIndex(token);

-    if (tokenIndex >= 0) {

-        c->tokenIndex = tokenIndex;

-        c->tokenType = eCondTokenType::looptoken;

-    }

-}

-/******************************************************************

-* cSummand

-******************************************************************/

-cSummand::cSummand(const char *summand) { 

-    this->summand = strdup(summand); 

-}

-

-cSummand::cSummand(const cSummand &other) {

-    summand = NULL;

-    if (other.summand)

-        summand = strdup(other.summand);

-    positive = other.positive;

-    for (cFactor *fac = other.factors.First(); fac; fac = other.factors.Next(fac)) {

-        factors.Add(new cFactor(*fac));

-    }

-}

-

-cSummand::~cSummand(void) {

-    free(summand); 

-}

-

-void cSummand::Debug(void) {

-    esyslog("skindesigner:              summand %s, positive: %d", summand, positive);

-    for (cFactor *f = factors.First(); f; f = factors.Next(f)) {

-        const char *link = f->multiplication ? "multiplication" : "division";

-        if (f->type == eFactorType::constant)

-            esyslog("skindesigner:              constant factor %f, %s", f->constValue, link);

-        else if (f->type == eFactorType::inttoken)

-            esyslog("skindesigner:              IntToken factor, index %d, %s", f->tokenIndex, link);

-        else if (f->type == eFactorType::stringtoken)

-            esyslog("skindesigner:              StringToken factor, index %d, %s", f->tokenIndex, link);

-        else if (f->type == eFactorType::looptoken)

-            esyslog("skindesigner:              LoopToken factor, index %d, %s", f->tokenIndex, link);

-        else if (f->type == eFactorType::xref)

-            esyslog("skindesigner:              posx reference factor, %s, %p, %s, result: %f", f->funcRefName, f->funcRef, link, f->funcRef->FuncX());

-        else if (f->type == eFactorType::yref)

-            esyslog("skindesigner:              posy reference factor, %s, %p, %s, result: %f", f->funcRefName, f->funcRef, link, f->funcRef->FuncY());

-        else if (f->type == eFactorType::widthref)

-            esyslog("skindesigner:              width reference factor, %s, %p, %s, result: %f", f->funcRefName, f->funcRef, link, f->funcRef->FuncWidth());

-        else if (f->type == eFactorType::heightref)

-            esyslog("skindesigner:              height reference factor, %s, %p %s, result: %f", f->funcRefName, f->funcRef, link, f->funcRef->FuncHeight());

-        else if (f->type == eFactorType::areawidth)

-            esyslog("skindesigner:              {areawidth} factor, %s", link);

-        else if (f->type == eFactorType::areaheight)

-            esyslog("skindesigner:              {areaheight} factor, %s", link);

-        else if (f->type == eFactorType::columnwidth)

-            esyslog("skindesigner:              {columnwidth} factor, %s", link);

-        else if (f->type == eFactorType::rowheight)

-            esyslog("skindesigner:              {rowheight} factor, %s", link);

-    }

-}

-

-/******************************************************************

-* cNumericExpr

-******************************************************************/

-cNumericExpr::cNumericExpr(const char *expression) {

-    expr = strdup(expression);

-    globals = NULL;

-    container = NULL;

-    tokenContainer = NULL;

-    loopInfo = NULL;

-    horizontal = true;

-    value = 0;

-    dynamic = false;

-}

-

-cNumericExpr::cNumericExpr(const cNumericExpr &other) {

-    expr = strdup(other.expr);

-    globals = other.globals;

-    container = NULL;

-    tokenContainer = NULL;

-    loopInfo = NULL;

-    horizontal = other.horizontal;

-    value = other.value;

-    dynamic = other.dynamic;

-    for (cSummand *s = other.summands.First(); s; s = other.summands.Next(s)) {

-        summands.Add(new cSummand(*s));

-    }

-}

-

-cNumericExpr::~cNumericExpr(void) {

-    free(expr);

-}

-

-/******************************************************************

-* Public Functions

-******************************************************************/

-bool cNumericExpr::CacheStatic(void) {

-    expr = RemoveSpace(expr);

-    if (config.replaceDecPoint)

-        ReplaceDecimalpoint(expr);

-

-    //first check if expression is already an valid integer

-    if (IsNumeric(expr)) {

-        value = atoi(expr);

-        return true;

-    }

-    

-    //check if expression is a percent expression

-    if (PercentValue(expr)) {

-        return true;

-    }

-    //if areawidth or height unknown, percent values have to be replaced

-    expr = ReplacePercentValue(expr);

-    //replace {areawidth} and {areaheight}

-    if (container->Width() >= 0) {

-        //esyslog("skindesigner: replacing areawidth %s", expr);

-        expr = ReplaceTokens(expr, "{areawidth}", container->Width());

-        //esyslog("skindesigner: replaced areawidth %s", expr);

-    }

-    if (container->Height() >= 0)

-        expr = ReplaceTokens(expr, "{areaheight}", container->Height());

-

-    //replace globals

-    string tmp = expr;

-    globals->ReplaceIntVars(tmp);

-    globals->ReplaceDoubleVars(tmp);

-    free(expr);

-    expr = strdup(tmp.c_str());

-    if (IsNumeric(expr)) {

-        value = atoi(expr);

-        return true;

-    }

-    //check if all variables are eliminated

-    if (IsNumericExpression(expr)) {

-        value = EvaluateExpression(expr);

-        return true;

-    }

-    //now we have a expression with runtime variables

-    dynamic = true;

-    return false;

-}

-

-void cNumericExpr::PrepareTokens(void) {

-    CreateSummands();

-    CreateFactors();

-    ConsolidateFactors();

-    ConsolidateSummand();

-}

-

-vector<cFactor*> cNumericExpr::GetRefFactors(void) {

-    vector<cFactor*> refFactors;

-    for (cSummand *s = summands.First(); s; s = summands.Next(s)) {

-        for (cFactor* f = s->factors.First(); f; f = s->factors.Next(f)) {

-            if (f->type >= eFactorType::xref) {

-                refFactors.push_back(f);

-            }

-        }

-    }

-    return refFactors;

-}

-

-int cNumericExpr::Calculate(void) {

-    double result = 0.0f;

-    for (cSummand *s = summands.First(); s; s = summands.Next(s)) {

-        double factor = 1.0f;

-        for (cFactor *f = s->factors.First(); f; f = s->factors.Next(f)) {

-            double fac = 0.0f;

-            switch( f->type ) {

-                case eFactorType::constant:

-                    fac = f->constValue;

-                    break;

-                case eFactorType::stringtoken: {

-                    char *val = tokenContainer->StringToken(f->tokenIndex);

-                    if (val)

-                        fac = atoi(val);

-                    break; }

-                case eFactorType::inttoken:

-                    fac = tokenContainer->IntToken(f->tokenIndex);

-                    break;

-                case eFactorType::looptoken:

-                    if (loopInfo && loopInfo->row >= 0) {

-                        char *val = tokenContainer->LoopToken(loopInfo->index, loopInfo->row, f->tokenIndex);

-                        if (val)

-                            fac = atoi(val);

-                    }

-                    break;

-                case eFactorType::xref:

-                    if (f->funcRef)

-                        fac = f->funcRef->FuncX();

-                    break;

-                case eFactorType::yref:

-                    if (f->funcRef)

-                        fac = f->funcRef->FuncY();

-                    break;

-                case eFactorType::widthref:

-                    if (f->funcRef)

-                        fac = f->funcRef->FuncWidth();

-                    break;

-                case eFactorType::heightref:

-                    if (f->funcRef)

-                        fac = f->funcRef->FuncHeight();

-                    break;

-                case eFactorType::areawidth:

-                    fac = container->Width();

-                    break;

-                case eFactorType::areaheight:

-                    fac = container->Height();

-                    break;

-                case eFactorType::columnwidth:

-                    if (loopInfo)

-                        fac = loopInfo->colWidth;

-                    break;

-                case eFactorType::rowheight:

-                    if (loopInfo)

-                        fac = loopInfo->rowHeight;

-                    break;

-            }

-            if (f->multiplication)

-                factor *= fac;

-            else if (fac)

-                factor /= fac;            

-        }

-        if (s->positive)

-            result += factor;

-        else

-            result -= factor;

-    }

-    return (int)result;

-}

-

-

-void cNumericExpr::Debug(void) {

-    esyslog("skindesigner:            Numeric Expression \"%s\", Result: %d", expr, Calculate());

-    for (cSummand *s = summands.First(); s; s = summands.Next(s)) {

-        s->Debug();

-    }

-}

-

-/******************************************************************

-* Private Functions

-******************************************************************/

-bool cNumericExpr::IsNumeric(const char *e) {

-    //negativ numbers

-    if (*e == '-')

-        ++e;

-    //empty

-    if (!*e)

-        return false;

-    while (*e) {

-        if (isdigit(*e) || *e == '.' || *e == ',')

-            ++e;

-        else

-            return false;

-    }

-    return true;

-}

-

-bool cNumericExpr::IsNumericExpression(const char *e) {

-    if (!*e)

-        return false;

-    while (*e) {

-        if (isdigit(*e)  || *e == '.' || *e == ',' || *e == '+' || *e == '-' || *e == '*' || *e == '/')

-            ++e;

-        else

-            return false;

-    }

-    return true;    

-}

-

-bool cNumericExpr::PercentValue(const char *e) {

-    const char *hit = strchr(e, '%');

-    if (!hit)

-        return false;

-    char buffer[20] = "";

-    if (strlen(e) > 20)

-        return false;

-    strncpy(buffer, e, strlen(e)-1);

-    buffer[strlen(e)-1] = '\0';

-    int val = atoi(buffer);

-    bool ok = false;

-    if (horizontal && container->Width() > 0) {

-        value = container->Width() * val / 100;

-        ok = true;

-    } else if (!horizontal && container->Height() > 0){

-        value = container->Height() * val / 100;

-        ok = true;

-    }

-    return ok;

-}

-

-char *cNumericExpr::ReplacePercentValue(char *e) {

-    const char *hit = strchr(e, '%');

-    if (!hit)

-        return e;

-    char buffer[20] = "";

-    if (strlen(e) > 20)

-        return e;

-    strncpy(buffer, e, strlen(e)-1);

-    buffer[strlen(e)-1] = '\0';

-    int val = atoi(buffer);

-    double percentVal = (double)val/100.0f;

-

-    char replacement[50] = "";

-    if (horizontal) {

-        sprintf(replacement, "%.5f*{areawidth}", percentVal);

-    } else {

-        sprintf(replacement, "%.5f*{areaheight}", percentVal);        

-    }

-

-    int len = strlen(replacement) + 1;

-    char *replaced = (char*)malloc(len);

-    memset(replaced, 0, len);

-    strcpy(replaced, replacement);

-    free(expr);

-    return replaced;

-}

-

-char *cNumericExpr::ReplaceToken(char *e, const char* token, int val) {

-    char *tokenStart = strstr(e, token);

-    if (!tokenStart) {

-        return e;

-    }

-    char buffer[20] = "";

-    sprintf(buffer, "%d", val);

-    size_t newSize = strlen(e) - strlen(token) + strlen(buffer) + 1;

-    char *replaced = (char*)malloc(newSize);

-    memset(replaced, 0, newSize);

-    size_t beginning = strlen(e) - strlen(tokenStart);

-    if (beginning > 0)

-        strncpy(replaced, e, beginning);

-    strcat(replaced, buffer);

-    strcat(replaced, tokenStart + strlen(token));

-    free(e);

-    return replaced;

-}

-

-char *cNumericExpr::ReplaceTokens(char *e, const char* token, int val) {

-    if (!e)

-        return e;

-    while (true) {

-        char *tokenStart = strstr(e, token);

-        if (!tokenStart)

-            break;

-        e = ReplaceToken(e, token, val);

-    }

-    return e;

-}

-

-int cNumericExpr::EvaluateExpression(char* e) {

-    return round(ParseSummands(e));

-}

-

-double cNumericExpr::EvaluateExpressionDouble(char *e) {

-    return ParseSummands(e);

-}

-

-double cNumericExpr::ParseAtom(char*& e) {

-    // Read the number from string

-    char* end_ptr;

-    double res = strtod(e, &end_ptr);

-    // Advance the pointer and return the result

-    e = end_ptr;

-    return res;

-}

-

-// Parse multiplication and division

-double cNumericExpr::ParseFactors(char*& e) {

-    double num1 = ParseAtom(e);

-    for(;;) {

-        // Save the operation

-        char op = *e;

-        if(op != '/' && op != '*')

-            return num1;

-        e++;

-        double num2 = ParseAtom(e);

-        // Perform the saved operation

-        if(op == '/') {

-            if (num2 != 0) {

-                num1 /= num2;

-            }

-        } else

-            num1 *= num2;

-    }

-}

-

-// Parse addition and subtraction

-double cNumericExpr::ParseSummands(char*& e) {

-    double num1 = ParseFactors(e);

-    for(;;) {

-        char op = *e;

-        if(op != '-' && op != '+')

-            return num1;

-        e++;

-        double num2 = ParseFactors(e);

-        if(op == '-')

-            num1 -= num2;

-        else

-            num1 += num2;

-    }

-}

-

-void cNumericExpr::CreateSummands(void) {

-    char *sum = strdup(expr);

-    char delimiter[] = "+-";

-    bool positive = true;

-    if (sum && *sum && *sum == '-') {

-        positive = false;

-    }

-    char *summand = strtok(sum, delimiter);

-    while (summand) {

-        cSummand *s = new cSummand(summand);

-        s->positive = positive;

-        summands.Add(s);

-        //check next sign

-        if (expr[summand - sum + strlen(summand)] == '-')

-            positive = false;

-        else

-            positive = true;

-        summand = strtok(NULL, delimiter);

-    }

-    free(sum);

-}

-

-void cNumericExpr::CreateFactors(void) {

-    char delimiterFac[] = "*/";

-    for (cSummand *s = summands.First(); s; s = summands.Next(s)) {

-        char *sum = strdup(s->summand);

-        if (IsNumericExpression(sum)) {

-            cFactor *f = new cFactor();

-            f->constValue = EvaluateExpressionDouble(sum);

-            s->factors.Add(f);

-            free(sum);

-            continue;            

-        }

-        bool multiplication = true;

-        char *fac = strtok(sum, delimiterFac);

-        while (fac) {

-            cFactor *f = new cFactor();

-            if (IsNumeric(fac)) {

-                f->constValue = atof(fac);

-                f->multiplication = multiplication;

-                s->factors.Add(f);

-            } else {

-                //factor has to be a token or a function reference now

-                if (SetTokenFactor(f, fac)) {

-                    f->multiplication = multiplication;

-                    s->factors.Add(f);

-                } else if (SetReferenceFactor(f, fac)) {

-                    f->multiplication = multiplication;

-                    s->factors.Add(f);

-                } else if (SetGeometryFactor(f, fac)) { 

-                    f->multiplication = multiplication;

-                    s->factors.Add(f);

-                } else {

-                    esyslog("skindesigner: invalid factor %s in expression \"%s\"", fac, expr);

-                    delete f;

-                }

-            }

-            //check next sign

-            if (s->summand[fac - sum + strlen(fac)] == '/')

-                multiplication = false;

-            else

-                multiplication = true;

-            fac = strtok(NULL, delimiterFac);

-        }

-        free(sum);

-    }

-}

-

-bool cNumericExpr::SetTokenFactor(cFactor *f, char *tokenName) {

-    int tokenIndex = tokenContainer->IntTokenIndex(tokenName);

-    if (tokenIndex >= 0) {

-        f->tokenIndex = tokenIndex;

-        f->type = eFactorType::inttoken;

-        return true;

-    }

-    tokenIndex = tokenContainer->StringTokenIndex(tokenName);

-    if (tokenIndex >= 0) {

-        f->tokenIndex = tokenIndex;

-        f->type = eFactorType::stringtoken;

-        return true;

-    }

-    tokenIndex = tokenContainer->LoopTokenIndex(tokenName);

-    if (tokenIndex >= 0) {

-        f->tokenIndex = tokenIndex;

-        f->type = eFactorType::looptoken;

-        return true;

-    }

-    return false;

-}

-

-

-bool cNumericExpr::SetReferenceFactor(cFactor *f, char *tokenName) {

-    int start = 0;

-    if (startswith(tokenName, "{posx(") && endswith(tokenName, ")}")) {

-        start = 6;

-        f->type = eFactorType::xref;

-    } else if (startswith(tokenName, "{posy(") && endswith(tokenName, ")}")) {

-        start = 6;

-        f->type = eFactorType::yref;

-    } else if (startswith(tokenName, "{width(") && endswith(tokenName, ")}")) {

-        start = 7;

-        f->type = eFactorType::widthref;

-    } else if (startswith(tokenName, "{height(") && endswith(tokenName, ")}")) {

-        start = 8;

-        f->type = eFactorType::heightref;    

-    }

-

-    if (start == 0)

-        return false;

-

-    tokenName += start;

-    f->funcRefName = strdup(tokenName);

-    ReplaceEnd(f->funcRefName, 2);

-

-    return true;

-}

-

-bool cNumericExpr::SetGeometryFactor(cFactor *f, char *tokenName) {

-    bool ok = false;

-    if (!strcmp(tokenName, "{areawidth}")) {

-        f->type = eFactorType::areawidth;

-        ok = true;

-    } else if (!strcmp(tokenName, "{areaheight}")) {

-        f->type = eFactorType::areaheight;

-        ok = true;

-    } else if (!strcmp(tokenName, "{columnwidth}")) {

-        f->type = eFactorType::columnwidth;

-        ok = true;

-    } else if (!strcmp(tokenName, "{rowheight}")) {

-        f->type = eFactorType::rowheight;        

-        ok = true;

-    }

-    return ok;

-}

-

-void cNumericExpr::ConsolidateSummand(void) {

-    cSummand *constSummand = NULL;

-    for (cSummand *s = summands.First(); s; s = summands.Next(s)) {

-        if (s->factors.Count() == 1 && s->factors.First()->type == eFactorType::constant) {

-            if (!constSummand) {

-                constSummand = s;

-            } else {

-                if (s->positive)

-                    constSummand->factors.First()->constValue += s->factors.First()->constValue;

-                else

-                    constSummand->factors.First()->constValue -= s->factors.First()->constValue;

-                summands.Del(s);

-                s = constSummand;

-            }

-        }

-    }    

-}

-

-void cNumericExpr::ConsolidateFactors(void) {

-    for (cSummand *s = summands.First(); s; s = summands.Next(s)) {

-        cFactor *constFactor = NULL;

-        for (cFactor *f = s->factors.First(); f; f = s->factors.Next(f)) {

-            if (f->type == eFactorType::constant) {

-                if (!constFactor) {

-                    constFactor = f;

-                } else {

-                    if (f->multiplication)

-                        constFactor->constValue *= f->constValue;

-                    else 

-                        constFactor->constValue /= f->constValue;

-                    s->factors.Del(f);

-                    f = constFactor;

-                }

-            }

-        }

-    }

-}

-

-/******************************************************************

-* cColor

-******************************************************************/

-cColor::cColor(const char *expression) {

-    globals = NULL;

-    expr = strdup(expression);

-    value = 0x00;

-}

-

-cColor::cColor(const cColor &other) {

-    globals = other.globals;

-    expr = strdup(other.expr);

-    value = other.value;    

-}

-

-cColor::~cColor(void) {

-    free(expr);

-}

-

-void cColor::Cache(void) {

-    tColor colVal = 0x00;

-    string tmp = expr;

-    if (globals->GetColor(tmp, colVal)) {

-        value = colVal;

-        return;

-    }

-    if (strlen(expr) != 8)

-        return;

-    std::stringstream str;

-    str << tmp;

-    colVal = 0x00;

-    str >> std::hex >> colVal;

-    value = colVal;

-}

-

-tColor cColor::Color(void) {

-    return value;

-}

-

-void cColor::Debug(void) {

-    esyslog("skindesigner:            Color \"%s\", Value %x", expr, value);

-}

-

-/******************************************************************

-* cTextExpr

-******************************************************************/

-cTextExpr::cTextExpr(const char *expression) {

-    globals = NULL;

-    expr = strdup(expression);

-    tokenContainer = NULL;

-    loopInfo = NULL;

-}

-

-cTextExpr::cTextExpr(const cTextExpr &other) {

-    globals = other.globals;

-    expr = strdup(other.expr);

-    tokenContainer = NULL;

-    loopInfo = NULL;

-    for (cTextToken* t = other.textTokens.First(); t; t = other.textTokens.Next(t)) {

-        textTokens.Add(new cTextToken(*t));

-    }

-}

-

-cTextExpr::~cTextExpr(void) {

-    free(expr);

-}

-

-void cTextExpr::CorrectImagePath(void) {

-    //no absolute pathes allowed

-    if (!startswith(expr, "{")) {

-        esyslog("skindesigner: no absolute pathes allowed for images - %s", expr);

-    }

-    if (startswith(expr, "{ressourcedir}")) {

-        string tmp = expr;

-        tmp = tmp.replace(0, 14, *config.GetSkinRessourcePath());

-        free(expr);

-        expr = strdup(tmp.c_str());

-    }

-}

-

-

-void cTextExpr::Cache(void) {

-    Translate();

-    Tokenize();

-    PrepareTokens();

-}

-

-char *cTextExpr::DeterminateText(void) {

-    //calculate length of complete new string

-    int textLength = 0;

-    for (cTextToken* t = textTokens.First(); t; t = textTokens.Next(t)) {

-        if (t->type == eTexttokenType::constant) {

-            textLength += strlen(t->constValue);

-        } else if (t->type == eTexttokenType::stringtoken) {

-            char *str = tokenContainer->StringToken(t->tokenIndex);

-            if (str)

-                textLength += strlen(str);

-        } else if (t->type == eTexttokenType::inttoken) {

-            int value  = tokenContainer->IntToken(t->tokenIndex);

-            if (value >= 0) {

-                cString str = cString::sprintf("%d", value);

-                textLength += strlen(*str);

-            }

-        } else if (t->type == eTexttokenType::looptoken && loopInfo && loopInfo->row >= 0) {

-            char *str = tokenContainer->LoopToken(loopInfo->index, loopInfo->row, t->tokenIndex);

-            if (str)

-                textLength += strlen(str);

-        } else if (t->type == eTexttokenType::printftoken) {

-            DeterminatePrintfToken(t);

-            if (t->printfResult)

-                textLength += strlen(t->printfResult);

-        } else if (t->type == eTexttokenType::condstringtoken) {

-            char *str = tokenContainer->StringToken(t->tokenIndex);

-            if (str) {

-                textLength += strlen(str);

-                if (t->condStart)

-                    textLength += strlen(t->condStart);

-                if (t->condEnd)

-                    textLength += strlen(t->condEnd);

-            }

-        }  else if (t->type == eTexttokenType::condinttoken) {

-            int value  = tokenContainer->IntToken(t->tokenIndex);

-            if (value >= 0) {

-                cString str = cString::sprintf("%d", value);

-                textLength += strlen(*str);

-                if (t->condStart)

-                    textLength += strlen(t->condStart);

-                if (t->condEnd)

-                    textLength += strlen(t->condEnd);

-            }

-        }

-    }

-

-    if (textLength <= 0)

-        return NULL;

-

-    char *retVal = (char*)malloc(textLength+1);

-    memset(retVal, 0, textLength);

-    bool first = true;

-    for (cTextToken* t = textTokens.First(); t; t = textTokens.Next(t)) {

-        if (first) {

-            first = false;

-            if (t->type == eTexttokenType::constant) {

-                strcpy(retVal, t->constValue);

-            } else if (t->type == eTexttokenType::stringtoken) {

-                char *str = tokenContainer->StringToken(t->tokenIndex);

-                if (str)

-                    strcpy(retVal, str);

-            } else if (t->type == eTexttokenType::inttoken) {

-                int value  = tokenContainer->IntToken(t->tokenIndex);

-                if (value >= 0) {

-                    cString str = cString::sprintf("%d", value);

-                    strcpy(retVal, *str);

-                }

-            } else if (t->type == eTexttokenType::looptoken && loopInfo && loopInfo->row >= 0) {

-                char *str = tokenContainer->LoopToken(loopInfo->index, loopInfo->row, t->tokenIndex);

-                if (str)

-                    strcpy(retVal, str);

-            }  else if (t->type == eTexttokenType::printftoken) {

-                if (t->printfResult) {

-                    strcpy(retVal, t->printfResult);

-                    free(t->printfResult);

-                    t->printfResult = NULL;

-                }

-            } else if (t->type == eTexttokenType::condstringtoken) {

-                char *str = tokenContainer->StringToken(t->tokenIndex);

-                if (str) {

-                    if (t->condStart) {

-                        strcpy(retVal, t->condStart);

-                        strcat(retVal, str);

-                    } else {

-                        strcpy(retVal, str);

-                    }

-                    if (t->condEnd)

-                        strcat(retVal, t->condEnd);

-                }

-            }  else if (t->type == eTexttokenType::condinttoken) {

-                int value  = tokenContainer->IntToken(t->tokenIndex);

-                if (value >= 0) {

-                    cString str = cString::sprintf("%d", value);

-                    if (t->condStart) {

-                        strcpy(retVal, t->condStart);

-                        strcat(retVal, *str);

-                    } else {

-                        strcpy(retVal, *str);

-                    }

-                    if (t->condEnd)

-                        strcat(retVal, t->condEnd);

-                }

-            }

-        } else {

-            if (t->type == eTexttokenType::constant) {

-                strcat(retVal, t->constValue);

-            } else if (t->type == eTexttokenType::stringtoken) {

-                char *str = tokenContainer->StringToken(t->tokenIndex);

-                if (str)

-                    strcat(retVal, str);

-            } else if (t->type == eTexttokenType::inttoken) {

-                int value  = tokenContainer->IntToken(t->tokenIndex);

-                cString str = cString::sprintf("%d", value);

-                strcat(retVal, *str);

-            } else if (t->type == eTexttokenType::looptoken && loopInfo && loopInfo->row >= 0) {

-                char *str = tokenContainer->LoopToken(loopInfo->index, loopInfo->row, t->tokenIndex);

-                if (str)

-                    strcat(retVal, str);

-            }  else if (t->type == eTexttokenType::printftoken) {

-                if (t->printfResult) {

-                    strcat(retVal, t->printfResult);

-                    free(t->printfResult);

-                    t->printfResult = NULL;

-                }

-            } else if (t->type == eTexttokenType::condstringtoken) {

-                char *str = tokenContainer->StringToken(t->tokenIndex);

-                if (str) {

-                    if (t->condStart)

-                        strcat(retVal, t->condStart);

-                    strcat(retVal, str);

-                    if (t->condEnd)

-                        strcat(retVal, t->condEnd);

-                }

-            } else if (t->type == eTexttokenType::condinttoken) {

-                int value  = tokenContainer->IntToken(t->tokenIndex);

-                if (value >= 0) {

-                    cString str = cString::sprintf("%d", value);

-                    if (t->condStart)

-                        strcat(retVal, t->condStart);

-                    strcat(retVal, *str);

-                    if (t->condEnd)

-                        strcat(retVal, t->condEnd);

-                }

-            }

-        }

-    }

-    return retVal;

-}

-

-

-void cTextExpr::Debug(const char *exprName) {

-    esyslog("skindesigner:            TextExpr %s: \"%s\"", exprName, expr);

-    char *res = DeterminateText();

-    esyslog("skindesigner:            Result: \"%s\"", res);

-    free(res);

-    for (cTextToken *t = textTokens.First(); t; t = textTokens.Next(t)) {

-        if (t->type == eTexttokenType::constant)

-            esyslog("skindesigner:            constant token \"%s\"", t->constValue);

-        else if (t->type == eTexttokenType::stringtoken)

-            esyslog("skindesigner:            string token %s, index %d", t->constValue, t->tokenIndex);

-        else if (t->type == eTexttokenType::inttoken)

-            esyslog("skindesigner:            int token %s, index %d", t->constValue, t->tokenIndex);

-        else if (t->type == eTexttokenType::looptoken)

-            esyslog("skindesigner:            loop token %s, index %d", t->constValue, t->tokenIndex);

-        else if (t->type == eTexttokenType::printftoken)

-            esyslog("skindesigner:            printf token %s", t->constValue);

-        else if (t->type == eTexttokenType::condstringtoken || t->type == eTexttokenType::condinttoken)

-            esyslog("skindesigner:            conditional token %s", t->constValue);

-    }

-}

-

-void cTextExpr::Translate(void) {

-    string translated = "";

-    if (!globals->Translate(expr, translated))

-        return;

-    free(expr);

-    expr = strdup(translated.c_str());

-}

-

-void cTextExpr::Tokenize(void) {

-    char *head = expr;

-    char *tail = expr;

-    while (*tail) {

-        if (*tail == '|') {

-            char *begin = CopyTextPart(head, tail, false);

-            if (begin) {

-                cTextToken *t = new cTextToken();

-                t->constValue = begin;

-                textTokens.Add(t);

-            }

-            head = tail;

-            tail++;

-            while (*tail) {

-                if (*tail == '|') {

-                    char *token = CopyTextPart(head, tail);

-                    cTextToken *t = new cTextToken();

-                    t->type = eTexttokenType::condstringtoken;

-                    t->constValue = token;

-                    textTokens.Add(t);

-                    head = tail+1;

-                    break;

-                }

-                tail++;

-            }

-        } else if (*tail == '{') {

-            char *begin = CopyTextPart(head, tail, false);

-            if (begin) {

-                cTextToken *t = new cTextToken();

-                t->constValue = begin;

-                textTokens.Add(t);

-            }

-            head = tail;

-            tail++;

-            while (*tail) {

-                if (*tail == '}') {

-                    char *token = CopyTextPart(head, tail);

-                    cTextToken *t = new cTextToken();

-                    t->type = eTexttokenType::stringtoken;

-                    t->constValue = token;

-                    textTokens.Add(t);

-                    head = tail+1;

-                    break;

-                }

-                tail++;

-            }

-        }

-        tail++;

-    }

-    char *end = CopyTextPart(head, tail, false);

-    if (end) {

-        cTextToken *t = new cTextToken();

-        t->constValue = end;

-        textTokens.Add(t);

-    }

-}

-

-void cTextExpr::PrepareTokens(void) {

-    bool error = false;

-    for (cTextToken *t = textTokens.First(); t; t = textTokens.Next(t)) {

-        if (t->type == eTexttokenType::condstringtoken) {

-            ParseCondToken(t);

-            continue;

-        } else if (t->type != eTexttokenType::stringtoken)

-            continue;

-        if (ParsePrintfToken(t)) {

-            continue;

-        }

-        if (CheckGlobals(t)) {

-            continue;

-        }

-        int tokenIndex = tokenContainer->IntTokenIndex(t->constValue);

-        if (tokenIndex >= 0) {

-            t->tokenIndex = tokenIndex;

-            t->type = eTexttokenType::inttoken;

-            continue;

-        }

-        tokenIndex = tokenContainer->StringTokenIndex(t->constValue);

-        if (tokenIndex >= 0) {

-            t->tokenIndex = tokenIndex;

-            t->type = eTexttokenType::stringtoken;

-            continue;

-        }

-        tokenIndex = tokenContainer->LoopTokenIndex(t->constValue);

-        if (tokenIndex >= 0) {

-            t->tokenIndex = tokenIndex;

-            t->type = eTexttokenType::looptoken;

-            continue;

-        }

-        esyslog("skindesigner: invalid text token %s in expression \"%s\"", t->constValue, expr);

-        error = true;

-        break;

-    }

-    if (error) {

-        textTokens.Clear();

-    }

-}

-

-bool cTextExpr::CheckGlobals(cTextToken *t) {

-    if (!globals || !t->constValue)

-        return false;

-

-    string name = t->constValue;

-    name = name.substr(1, name.size()-2);

-    string replacement = "";

-    if (globals->GetString(name, replacement)) {

-        free(t->constValue);

-        t->constValue = strdup(replacement.c_str());

-        t->type = eTexttokenType::constant;

-        return true;

-    }

-    int numReplacement = 0;

-    if (globals->GetInt(name, numReplacement)) {

-        free(t->constValue);

-        cString repl = cString::sprintf("%d", numReplacement);

-        t->constValue = strdup(*repl);

-        t->type = eTexttokenType::constant;

-        return true;

-    }

-    return false;

-}

-

-bool cTextExpr::ParsePrintfToken(cTextToken *t) {

-    //check valid printftoken

-    char *start = strstr(t->constValue, "printf(");

-    if (!start)

-        return false;

-    char *end =  strchr(start, ')');

-    if (!end)

-        return false;

-    t->type = eTexttokenType::printftoken;

-

-    //find printf expression

-    char *startExpr = strchr(t->constValue, '\'');

-    if (!startExpr)

-        return false;

-    char *endExpr = strchr(startExpr + 1, '\'');

-    if (!endExpr)

-        return false;

-    int expLen = endExpr - startExpr - 1;

-    char buffer[100];

-    strncpy(buffer, startExpr+1, expLen);

-    buffer[expLen] = '\0';

-    t->printfExpr = strdup(buffer);

-    

-    //find variables

-    char *startVar = strchr(t->constValue, ',');

-    if (!startVar)

-        return false;

-    startVar++;

-    vector<string> varTokens;

-    char *nextVar = NULL;

-    while (nextVar = strchr(startVar, ',')) {

-        while(isspace(*startVar))

-            startVar++;

-        int varLen = nextVar - startVar;

-        buffer[0] = '{';

-        strncpy((char*)buffer + 1, startVar, varLen);

-        buffer[varLen+1] = '}';

-        buffer[varLen+2] = '\0';

-        int i = 1;

-        while(isspace(buffer[varLen-i])) {

-            buffer[varLen-i] = '}';

-            buffer[varLen-i+1] = '\0';

-            i++;

-        }

-        varTokens.push_back(buffer);

-        startVar = nextVar + 1;

-    }

-    while (isspace(*startVar))

-        startVar++;

-    if (startVar+1) {

-        int varLen = end - startVar + 1;

-        buffer[0] = '{';

-        strncpy((char*)buffer + 1, startVar, varLen);

-        buffer[varLen] = '}';

-        buffer[varLen+1] = '\0';

-        varTokens.push_back(buffer);

-    }

-    //evaluate variables

-    bool ok = true;

-    for (size_t i=0; i < varTokens.size(); i++) {

-        sPrintfInfo info;

-        int tokenIndex = tokenContainer->IntTokenIndex(varTokens[i].c_str());

-        if (tokenIndex >= 0) {

-            info.type = ePrintfVarType::inttoken;

-            info.index = tokenIndex;

-            t->printfVarIndices.push_back(info);

-            continue;

-        }

-        tokenIndex = tokenContainer->StringTokenIndex(varTokens[i].c_str());

-        if (tokenIndex >= 0) {

-            info.type = ePrintfVarType::stringtoken;

-            info.index = tokenIndex;

-            t->printfVarIndices.push_back(info);

-            continue;

-        }

-        tokenIndex = tokenContainer->LoopTokenIndex(varTokens[i].c_str());

-        if (tokenIndex >= 0) {

-            info.type = ePrintfVarType::looptoken;

-            info.index = tokenIndex;

-            t->printfVarIndices.push_back(info);

-            continue;

-        }

-        ok = false;

-    }

-    return ok;

-}

-

-void cTextExpr::DeterminatePrintfToken(cTextToken *t) {

-    int numVars = t->printfVarIndices.size();

-    vector<int> results;

-    for (int i=0; i < numVars; i++) {

-        if (t->printfVarIndices[i].type == ePrintfVarType::inttoken) {

-            results.push_back(tokenContainer->IntToken(t->printfVarIndices[i].index));

-        } else if (t->printfVarIndices[i].type == ePrintfVarType::stringtoken) {

-            if (tokenContainer->StringToken(t->printfVarIndices[i].index)) {

-                results.push_back(atoi(tokenContainer->StringToken(t->printfVarIndices[i].index)));

-            }

-        } else if (t->printfVarIndices[i].type == ePrintfVarType::looptoken  && loopInfo && loopInfo->row >= 0) {

-            if (tokenContainer->LoopToken(loopInfo->index, loopInfo->row, t->printfVarIndices[i].index)) {

-                results.push_back(atoi(tokenContainer->LoopToken(loopInfo->index, loopInfo->row, t->printfVarIndices[i].index)));                

-            }

-        }

-    }

-

-    switch (numVars) {

-        case 1:

-            t->printfResult = strdup(*cString::sprintf(t->printfExpr, results[0]));

-            break;

-        case 2:

-            t->printfResult = strdup(*cString::sprintf(t->printfExpr, results[0], results[1]));

-            break;

-        case 3:

-            t->printfResult = strdup(*cString::sprintf(t->printfExpr, results[0], results[1], results[2]));

-            break;

-        case 4:

-            t->printfResult = strdup(*cString::sprintf(t->printfExpr, results[0], results[1], results[2], results[3]));

-            break;

-        case 5:

-            t->printfResult = strdup(*cString::sprintf(t->printfExpr, results[0], results[1], results[2], results[3], results[4]));

-            break;

-        case 6:

-            t->printfResult = strdup(*cString::sprintf(t->printfExpr, results[0], results[1], results[2], results[3], results[4], results[5]));

-            break;

-        default:

-            break;

-    }

-}

-

-void cTextExpr::ParseCondToken(cTextToken *t) {

-    char *head = t->constValue;

-    char *tail = t->constValue;

-    head++;

-    tail++;

-    char *token = NULL;

-    while (*tail) {

-        if (*tail == '{') {

-            t->condStart = CopyTextPart(head, tail, false);

-            head = tail;

-            tail++;

-            while (*tail) {

-                if (*tail == '}') {

-                    token = CopyTextPart(head, tail);

-                    head = tail+1;

-                    break;

-                }

-                tail++;

-            }

-        }

-        tail++;

-    }

-    tail--;

-    t->condEnd = CopyTextPart(head, tail, false);

-    if (!token) {

-        esyslog("skindesigner: invalid conditional texttoken %s in expression \"%s\"", t->constValue, expr);

-        return;

-    }

-

-    int tokenIndex = tokenContainer->StringTokenIndex(token);

-    if (tokenIndex >= 0) {

-        t->tokenIndex = tokenIndex;

-        return;

-    }

-

-    tokenIndex = tokenContainer->IntTokenIndex(token);

-    if (tokenIndex >= 0) {

-        t->tokenIndex = tokenIndex;

-        t->type = eTexttokenType::condinttoken;

-        return;

-    }

-    esyslog("skindesigner: invalid token %s in expression\"%s\"", token, expr);

-}

-

-char *cTextExpr::CopyTextPart(char *start, char *stop, bool incLastChar) {

-    if (!start)

-        return NULL;

-    if (start >= stop)

-        return NULL;

-    char *val = NULL;

-    size_t len = 0;

-    if (stop) {

-        //defined end

-        len = stop - start + 1;

-    } else {

-        //search end of text

-        char *p = start;

-        while (*p)

-            len++; p++;

-        len++;

-    }

-    val = (char*)malloc(len+1);

-    memset(val, 0, len+1);

-    if (!incLastChar)

-        len--;

-    memcpy(val, start, len);

-    return val;

-}

+#include "complextypes.h"
+#include "../config.h"
+
+/******************************************************************
+* helpers
+******************************************************************/
+char *RemoveSpace(char *e) {
+    if (!e)
+        return e;
+    int numSpaces = 0;
+    int exprLen = strlen(e);
+    for (int i = 0; i < exprLen; ++i) {
+        if (isspace(e[i]))
+            ++numSpaces;
+    }
+    if (numSpaces == 0)
+        return e;
+
+    char *replaced = (char*)malloc(exprLen - numSpaces + 1);
+    replaced[exprLen - numSpaces] = '\0';
+    int j = 0;
+    for (int i = 0; i < exprLen; ++i) {
+        if (!isspace(e[i])){
+            replaced[j++] = e[i];
+        }
+    }
+    free(e);
+    return replaced;
+}
+
+void ReplaceDecimalpoint(char *e) {
+    int size = (int)strlen(e);
+    for ( int i = 0; i < size; ++i ) {
+       if (e[i] == '.')
+           e[i] = config.decPoint;
+    }
+}
+
+void ReplaceStart(char *e, int num) {
+    int size = (int)strlen(e);
+    if (size <= num)
+        return;
+    for ( int i = 0; i < size; ++i ) {
+       if (i < size - num)
+           e[i] = e[i+num];
+       else e[i] = 0;
+    }
+}
+
+void ReplaceEnd(char *e, int num) {
+    int size = (int)strlen(e) - 1;
+    if (size <= num)
+        return;
+    for ( int i = size; i > size-num; --i ) {
+        e[i] = 0;
+    }
+}
+/******************************************************************
+* cCond
+******************************************************************/
+cCond::cCond(const char *expression) {
+    this->expr = strdup(expression);
+    operation = eCondOp::tAnd;
+    type = eCondType::token;
+    constant = false;
+    isTrue = false;
+    tokenIndex = -1;
+    compareValue = -1;
+    compareStrValue = NULL;
+}
+
+cCond::cCond(const cCond &other) {
+    expr = strdup(other.expr);
+    operation = other.operation;
+    type = other.type;
+    constant = other.constant;
+    tokenType = other.tokenType;
+    isTrue = other.isTrue;
+    tokenIndex = other.tokenIndex;
+    compareValue = other.compareValue;
+    compareStrValue = NULL;
+    if (other.compareStrValue)
+        compareStrValue = strdup(other.compareStrValue);
+}
+
+cCond::~cCond(void) { 
+    free(expr); 
+    free(compareStrValue);
+}
+
+void cCond::Debug(void) {
+    esyslog("skindesigner:              cond %s, operation %s, type %d", expr, 
+                                                            (operation == eCondOp::tAnd) ? "++" : "||",
+                                                            (int)type);
+    if (constant)
+        esyslog("skindesigner:              constant cond: %s", isTrue ? "TRUE" : "FALSE");
+    if (tokenIndex >= 0)
+        esyslog("skindesigner:              token index: %d", tokenIndex);
+    if (compareValue >= 0)
+        esyslog("skindesigner:              compare value: %d", compareValue);
+    if (compareStrValue)
+        esyslog("skindesigner:              compare string value: %d", compareStrValue);
+}
+
+/******************************************************************
+* cCondition
+******************************************************************/
+cCondition::cCondition(const char *expression) {
+    expr = strdup(expression);
+    globals = NULL;
+    tokenContainer = NULL;
+    loopInfo = NULL;
+}
+
+cCondition::cCondition(const cCondition &other) {
+    expr = strdup(other.expr);
+    globals = NULL;
+    tokenContainer = NULL;
+    loopInfo = NULL;
+    for (cCond *cond = other.conds.First(); cond; cond = other.conds.Next(cond))
+        conds.Add(new cCond(*cond));
+}
+
+cCondition::~cCondition(void) {
+    free(expr);
+}
+
+void cCondition::Prepare(void) {
+    expr = RemoveSpace(expr);
+    Tokenize();
+    PrepareTokens();
+}
+
+bool cCondition::True(void) {
+    if (conds.Count() == 0)
+        return true;
+    bool ok = true;
+    for (cCond *c = conds.First(); c; c = conds.Next(c)) {
+        bool condTrue = true;
+        //evaluate condition
+        if (c->constant) 
+        {
+            condTrue = c->isTrue;
+        } 
+        else if (c->type == eCondType::token) 
+        {
+            if (c->tokenType == eCondTokenType::inttoken) {
+                int tokenVal = tokenContainer->IntToken(c->tokenIndex);
+                condTrue = (tokenVal > 0) ? true : false;                
+            } else if (c->tokenType == eCondTokenType::stringtoken) {
+                char *tokenVal = tokenContainer->StringToken(c->tokenIndex);
+                if (tokenVal)
+                    condTrue = (!strcmp(tokenVal, "1")) ? true : false;
+            } else if (c->tokenType == eCondTokenType::looptoken) {
+                if (loopInfo && loopInfo->row >= 0) {
+                    char *tokenVal = tokenContainer->LoopToken(loopInfo->index, loopInfo->row, c->tokenIndex);
+                    if (tokenVal)
+                        condTrue = (!strcmp(tokenVal, "1")) ? true : false;
+                }
+            }
+
+        } 
+        else if (c->type == eCondType::negtoken) 
+        {
+            if (c->tokenType == eCondTokenType::inttoken) {
+                int tokenVal = tokenContainer->IntToken(c->tokenIndex);
+                condTrue = (tokenVal > 0) ? false : true;
+            } else if (c->tokenType == eCondTokenType::stringtoken) {
+                char *tokenVal = tokenContainer->StringToken(c->tokenIndex);
+                if (tokenVal)
+                    condTrue = (!strcmp(tokenVal, "1")) ? false : true;
+            } else if (c->tokenType == eCondTokenType::looptoken) {
+                if (loopInfo && loopInfo->row >= 0) {
+                    char *tokenVal = tokenContainer->LoopToken(loopInfo->index, loopInfo->row, c->tokenIndex);
+                    if (tokenVal)
+                        condTrue = (!strcmp(tokenVal, "1")) ? false : true;
+                }
+            }
+        }
+        else if (c->type == eCondType::lowerInt || c->type == eCondType::equalInt || c->type == eCondType::greaterInt) 
+        {
+            if (c->tokenType == eCondTokenType::inttoken) {
+                int tokenVal = tokenContainer->IntToken(c->tokenIndex);
+                if (c->type == eCondType::lowerInt)
+                    condTrue = (tokenVal < c->compareValue) ? true : false;
+                else if (c->type == eCondType::equalInt)
+                    condTrue = (tokenVal == c->compareValue) ? true : false;
+                else if (c->type == eCondType::greaterInt)
+                    condTrue = (tokenVal > c->compareValue) ? true : false;
+            } else if (c->tokenType == eCondTokenType::stringtoken) {
+                char *tokenVal = tokenContainer->StringToken(c->tokenIndex);
+                if (tokenVal) {
+                    int intVal = atoi(tokenVal);
+                    if (c->type == eCondType::lowerInt)
+                        condTrue = (intVal < c->compareValue) ? true : false;
+                    else if (c->type == eCondType::equalInt)
+                        condTrue = (intVal == c->compareValue) ? true : false;
+                    else if (c->type == eCondType::greaterInt)
+                        condTrue = (intVal > c->compareValue) ? true : false;
+                }
+            } else if (c->tokenType == eCondTokenType::looptoken) {
+                if (loopInfo && loopInfo->row >= 0) {
+                    char *tokenVal = tokenContainer->LoopToken(loopInfo->index, loopInfo->row, c->tokenIndex);
+                    if (tokenVal) {
+                        int intVal = atoi(tokenVal);
+                        if (c->type == eCondType::lowerInt)
+                            condTrue = (intVal < c->compareValue) ? true : false;
+                        else if (c->type == eCondType::equalInt)
+                            condTrue = (intVal == c->compareValue) ? true : false;
+                        else if (c->type == eCondType::greaterInt)
+                            condTrue = (intVal > c->compareValue) ? true : false;
+                    }
+                }
+            }
+        }
+        else if (c->type == eCondType::isset || c->type == eCondType::empty) 
+        {
+            if (c->tokenType == eCondTokenType::stringtoken) {
+                char *tokenVal = tokenContainer->StringToken(c->tokenIndex);
+                if (tokenVal) {
+                    if (c->type == eCondType::isset)
+                        condTrue = strlen(tokenVal) > 0 ? true : false;
+                    else if (c->type == eCondType::empty)
+                        condTrue = strlen(tokenVal) == 0 ? true : false;
+                } else {
+                    if (c->type == eCondType::isset)
+                        condTrue = false;
+                    else if (c->type == eCondType::empty)
+                        condTrue = true;
+                }
+            } else if (c->tokenType == eCondTokenType::looptoken) {
+                if (loopInfo && loopInfo->row >= 0) {
+                    char *tokenVal = tokenContainer->LoopToken(loopInfo->index, loopInfo->row, c->tokenIndex);
+                    if (tokenVal) {
+                        if (c->type == eCondType::isset)
+                            condTrue = strlen(tokenVal) > 0 ? true : false;
+                        else if (c->type == eCondType::empty)
+                            condTrue = strlen(tokenVal) == 0 ? true : false;
+                    } else {
+                        if (c->type == eCondType::isset)
+                            condTrue = false;
+                        else if (c->type == eCondType::empty)
+                            condTrue = true;
+                    }
+                }
+            }
+        }
+        else if (c->type == eCondType::equalString || c->type == eCondType::notEqualString || c->type == eCondType::contains || c->type == eCondType::notContains) 
+        {
+            if (c->tokenType == eCondTokenType::stringtoken) {
+                char *tokenVal = tokenContainer->StringToken(c->tokenIndex);
+                if (tokenVal) {
+                    if (c->type == eCondType::equalString)
+                        condTrue = !strcmp(tokenVal, c->compareStrValue) ? true : false;
+                    else if (c->type == eCondType::notEqualString)
+                        condTrue = strcmp(tokenVal, c->compareStrValue) ? true : false;
+                    else if (c->type == eCondType::contains)
+                        condTrue = strstr(tokenVal, c->compareStrValue) ? true : false;
+                    else if (c->type == eCondType::notContains)
+                        condTrue = !strstr(tokenVal, c->compareStrValue) ? true : false;
+                }
+            } else if (c->tokenType == eCondTokenType::looptoken) {
+                if (loopInfo && loopInfo->row >= 0) {
+                    char *tokenVal = tokenContainer->LoopToken(loopInfo->index, loopInfo->row, c->tokenIndex);
+                    if (tokenVal) {
+                        if (c->type == eCondType::equalString)
+                            condTrue = !strcmp(tokenVal, c->compareStrValue) ? true : false;
+                        else if (c->type == eCondType::notEqualString)
+                            condTrue = strcmp(tokenVal, c->compareStrValue) ? true : false;
+                        else if (c->type == eCondType::contains)
+                            condTrue = strstr(tokenVal, c->compareStrValue) ? true : false;
+                        else if (c->type == eCondType::notContains)
+                            condTrue = !strstr(tokenVal, c->compareStrValue) ? true : false;
+                    }
+                }
+            }
+        }        //link
+        if (c->operation == eCondOp::tAnd) {
+            ok = ok && condTrue;
+        } else if (c->operation == eCondOp::tOr) {
+            ok = ok || condTrue;                
+        }
+    }
+    return ok;
+}
+
+void cCondition::Debug(void) {
+    esyslog("skindesigner:            condition \"%s\"", expr);
+    for (cCond *c = conds.First(); c; c = conds.Next(c)) {
+        c->Debug();
+    }
+    esyslog("skindesigner:            condition is %s", True() ? "TRUE" : "FALSE");
+}
+
+void cCondition::Tokenize(void) {
+    char *condition = strdup(expr);
+    char delimiter[] = "+|";
+    eCondOp operation = eCondOp::tAnd;
+
+    char *cond = strtok(condition, delimiter);
+    while (cond) {
+        eCondType type = eCondType::token;
+        if (startswith(cond, "{") && endswith(cond, "}")) {
+            type = eCondType::token;
+        } else if (startswith(cond, "not{") && endswith(cond, "}")) {
+            type = eCondType::negtoken;
+        } else if (startswith(cond, "lt({") && endswith(cond, ")")) {
+            type = eCondType::lowerInt;
+        } else if (startswith(cond, "eq({") && endswith(cond, ")")) {
+            type = eCondType::equalInt;
+        } else if (startswith(cond, "gt({") && endswith(cond, ")")) {
+            type = eCondType::greaterInt;
+        } else if (startswith(cond, "isset{") && endswith(cond, "}")) {
+            type = eCondType::isset;
+        } else if (startswith(cond, "empty{") && endswith(cond, "}")) {
+            type = eCondType::empty;
+        } else if (startswith(cond, "strequal({") && endswith(cond, ")")) {
+            type = eCondType::equalString;
+        } else if (startswith(cond, "strnotequal({") && endswith(cond, ")")) {
+            type = eCondType::notEqualString;
+        } else if (startswith(cond, "strcontains({") && endswith(cond, ")")) {
+            type = eCondType::contains;
+        } else if (startswith(cond, "strnotcontains({") && endswith(cond, ")")) {
+            type = eCondType::notContains;
+        } else {
+            esyslog("skindesigner: invalid condition term %s", cond);
+            cond = strtok(NULL, delimiter);
+            continue;
+        }
+        cCond *c = new cCond(cond);
+        c->operation = operation;
+        c->type = type;
+        conds.Add(c);
+        if (expr[cond - condition + strlen(cond)] == '+')
+            operation = eCondOp::tAnd;
+        else
+            operation = eCondOp::tOr;
+        cond = strtok(NULL, delimiter);
+    }
+    free(condition);
+}
+
+void cCondition::PrepareTokens(void) {
+    for (cCond *c = conds.First(); c; c = conds.Next(c)) {
+        switch (c->type) {
+            case eCondType::token:
+            case eCondType::negtoken:
+                SetTokenCond(c);
+                break;
+            case eCondType::lowerInt:
+            case eCondType::equalInt:
+            case eCondType::greaterInt:
+                SetIntegerCond(c);
+                break;
+            case eCondType::isset:
+            case eCondType::empty:
+                SetStringCond(c);
+                break;
+            case eCondType::equalString:
+            case eCondType::notEqualString:
+            case eCondType::contains:
+            case eCondType::notContains:
+                SetStringCompareCond(c);
+                break;
+            default:
+                break;
+        }
+    }
+}
+
+void cCondition::SetTokenCond(cCond *c) {
+    if (c->type == eCondType::negtoken) {
+        ReplaceStart(c->expr, 3);
+    }
+    //check globals
+    int result = 0;
+    string tmp = c->expr;
+    tmp = tmp.substr(1, tmp.size()-2);
+    if (globals->GetInt(tmp, result)) {
+        c->constant = true;
+        if (result == 1 && c->type == eCondType::token)
+            c->isTrue = true;
+        if (result == 0 && c->type == eCondType::negtoken)
+            c->isTrue = true;
+        return;
+    }
+    SetTokenIndex(c, c->expr);
+}
+
+void cCondition::SetIntegerCond(cCond *c) {
+    char *tokenStart = strchr(c->expr, '{');
+    char *tokenEnd = strchr(c->expr, '}');
+    if (!tokenStart || !tokenEnd)
+        return;
+    char token[200] = "";
+    strncpy(token, tokenStart, tokenEnd - tokenStart + 1);
+
+    char *condStart = strchr(c->expr, ',');
+    char *condEnd = strchr(c->expr, ')');
+    char strCond[100] = "";
+    strncpy(strCond, condStart + 1, condEnd - condStart - 1);
+    c->compareValue = atoi(strCond);
+
+    //check globals
+    int result = 0;
+    if (globals->GetInt(token, result)) {
+        c->constant = true;
+        if (c->type == eCondType::lowerInt && result < c->compareValue)
+            c->isTrue = true;
+        else if (c->type == eCondType::equalInt && result == c->compareValue)
+            c->isTrue = true;
+        else if (c->type == eCondType::greaterInt && result > c->compareValue)
+            c->isTrue = true;
+        return;
+    }
+    SetTokenIndex(c, token);
+}
+
+void cCondition::SetStringCond(cCond *c) {
+    ReplaceStart(c->expr, 5);
+    SetTokenIndex(c, c->expr);
+}
+
+void cCondition::SetStringCompareCond(cCond *c) {
+    char *tokenStart = strchr(c->expr, '{');
+    char *tokenEnd = strchr(c->expr, '}');
+    if (!tokenStart || !tokenEnd)
+        return;
+    char token[200] = "";
+    strncpy(token, tokenStart, tokenEnd - tokenStart + 1);
+
+    char *condStart = strstr(c->expr, ",'");
+    char *condEnd = strstr(c->expr, "')");
+    char strCond[100] = "";
+    strncpy(strCond, condStart + 2, condEnd - condStart - 2);
+    c->compareStrValue = strdup(strCond);
+    SetTokenIndex(c, token);
+}
+
+void cCondition::SetTokenIndex(cCond *c, const char *token) {
+    int tokenIndex = tokenContainer->IntTokenIndex(token);
+    if (tokenIndex >= 0) {
+        c->tokenIndex = tokenIndex;
+        c->tokenType = eCondTokenType::inttoken;
+        return;
+    }
+    tokenIndex = tokenContainer->StringTokenIndex(token);
+    if (tokenIndex >= 0) {
+        c->tokenIndex = tokenIndex;
+        c->tokenType = eCondTokenType::stringtoken;
+        return;
+    }
+    tokenIndex = tokenContainer->LoopTokenIndex(token);
+    if (tokenIndex >= 0) {
+        c->tokenIndex = tokenIndex;
+        c->tokenType = eCondTokenType::looptoken;
+    }
+}
+/******************************************************************
+* cSummand
+******************************************************************/
+cSummand::cSummand(const char *summand) { 
+    this->summand = strdup(summand); 
+}
+
+cSummand::cSummand(const cSummand &other) {
+    summand = NULL;
+    if (other.summand)
+        summand = strdup(other.summand);
+    positive = other.positive;
+    for (cFactor *fac = other.factors.First(); fac; fac = other.factors.Next(fac)) {
+        factors.Add(new cFactor(*fac));
+    }
+}
+
+cSummand::~cSummand(void) {
+    free(summand); 
+}
+
+void cSummand::Debug(void) {
+    esyslog("skindesigner:              summand %s, positive: %d", summand, positive);
+    for (cFactor *f = factors.First(); f; f = factors.Next(f)) {
+        const char *link = f->multiplication ? "multiplication" : "division";
+        if (f->type == eFactorType::constant)
+            esyslog("skindesigner:              constant factor %f, %s", f->constValue, link);
+        else if (f->type == eFactorType::inttoken)
+            esyslog("skindesigner:              IntToken factor, index %d, %s", f->tokenIndex, link);
+        else if (f->type == eFactorType::stringtoken)
+            esyslog("skindesigner:              StringToken factor, index %d, %s", f->tokenIndex, link);
+        else if (f->type == eFactorType::looptoken)
+            esyslog("skindesigner:              LoopToken factor, index %d, %s", f->tokenIndex, link);
+        else if (f->type == eFactorType::xref)
+            esyslog("skindesigner:              posx reference factor, %s, %p, %s, result: %f", f->funcRefName, f->funcRef, link, f->funcRef->FuncX());
+        else if (f->type == eFactorType::yref)
+            esyslog("skindesigner:              posy reference factor, %s, %p, %s, result: %f", f->funcRefName, f->funcRef, link, f->funcRef->FuncY());
+        else if (f->type == eFactorType::widthref)
+            esyslog("skindesigner:              width reference factor, %s, %p, %s, result: %f", f->funcRefName, f->funcRef, link, f->funcRef->FuncWidth());
+        else if (f->type == eFactorType::heightref)
+            esyslog("skindesigner:              height reference factor, %s, %p %s, result: %f", f->funcRefName, f->funcRef, link, f->funcRef->FuncHeight());
+        else if (f->type == eFactorType::areawidth)
+            esyslog("skindesigner:              {areawidth} factor, %s", link);
+        else if (f->type == eFactorType::areaheight)
+            esyslog("skindesigner:              {areaheight} factor, %s", link);
+        else if (f->type == eFactorType::columnwidth)
+            esyslog("skindesigner:              {columnwidth} factor, %s", link);
+        else if (f->type == eFactorType::rowheight)
+            esyslog("skindesigner:              {rowheight} factor, %s", link);
+    }
+}
+
+/******************************************************************
+* cNumericExpr
+******************************************************************/
+cNumericExpr::cNumericExpr(const char *expression) {
+    expr = strdup(expression);
+    globals = NULL;
+    container = NULL;
+    tokenContainer = NULL;
+    loopInfo = NULL;
+    horizontal = true;
+    value = 0;
+    dynamic = false;
+}
+
+cNumericExpr::cNumericExpr(const cNumericExpr &other) {
+    expr = strdup(other.expr);
+    globals = other.globals;
+    container = NULL;
+    tokenContainer = NULL;
+    loopInfo = NULL;
+    horizontal = other.horizontal;
+    value = other.value;
+    dynamic = other.dynamic;
+    for (cSummand *s = other.summands.First(); s; s = other.summands.Next(s)) {
+        summands.Add(new cSummand(*s));
+    }
+}
+
+cNumericExpr::~cNumericExpr(void) {
+    free(expr);
+}
+
+/******************************************************************
+* Public Functions
+******************************************************************/
+bool cNumericExpr::CacheStatic(void) {
+    expr = RemoveSpace(expr);
+    if (config.replaceDecPoint)
+        ReplaceDecimalpoint(expr);
+
+    //first check if expression is already an valid integer
+    if (IsNumeric(expr)) {
+        value = atoi(expr);
+        return true;
+    }
+    
+    //check if expression is a percent expression
+    if (PercentValue(expr)) {
+        return true;
+    }
+    //if areawidth or height unknown, percent values have to be replaced
+    expr = ReplacePercentValue(expr);
+    //replace {areawidth} and {areaheight}
+    if (container->Width() >= 0) {
+        //esyslog("skindesigner: replacing areawidth %s", expr);
+        expr = ReplaceTokens(expr, "{areawidth}", container->Width());
+        //esyslog("skindesigner: replaced areawidth %s", expr);
+    }
+    if (container->Height() >= 0)
+        expr = ReplaceTokens(expr, "{areaheight}", container->Height());
+
+    //replace globals
+    string tmp = expr;
+    globals->ReplaceIntVars(tmp);
+    globals->ReplaceDoubleVars(tmp);
+    free(expr);
+    expr = strdup(tmp.c_str());
+    if (IsNumeric(expr)) {
+        value = atoi(expr);
+        return true;
+    }
+    //check if all variables are eliminated
+    if (IsNumericExpression(expr)) {
+        value = EvaluateExpression(expr);
+        return true;
+    }
+    //now we have a expression with runtime variables
+    dynamic = true;
+    return false;
+}
+
+void cNumericExpr::PrepareTokens(void) {
+    CreateSummands();
+    CreateFactors();
+    ConsolidateFactors();
+    ConsolidateSummand();
+}
+
+vector<cFactor*> cNumericExpr::GetRefFactors(void) {
+    vector<cFactor*> refFactors;
+    for (cSummand *s = summands.First(); s; s = summands.Next(s)) {
+        for (cFactor* f = s->factors.First(); f; f = s->factors.Next(f)) {
+            if (f->type >= eFactorType::xref) {
+                refFactors.push_back(f);
+            }
+        }
+    }
+    return refFactors;
+}
+
+int cNumericExpr::Calculate(void) {
+    double result = 0.0f;
+    for (cSummand *s = summands.First(); s; s = summands.Next(s)) {
+        double factor = 1.0f;
+        for (cFactor *f = s->factors.First(); f; f = s->factors.Next(f)) {
+            double fac = 0.0f;
+            switch( f->type ) {
+                case eFactorType::constant:
+                    fac = f->constValue;
+                    break;
+                case eFactorType::stringtoken: {
+                    char *val = tokenContainer->StringToken(f->tokenIndex);
+                    if (val)
+                        fac = atoi(val);
+                    break; }
+                case eFactorType::inttoken:
+                    fac = tokenContainer->IntToken(f->tokenIndex);
+                    break;
+                case eFactorType::looptoken:
+                    if (loopInfo && loopInfo->row >= 0) {
+                        char *val = tokenContainer->LoopToken(loopInfo->index, loopInfo->row, f->tokenIndex);
+                        if (val)
+                            fac = atoi(val);
+                    }
+                    break;
+                case eFactorType::xref:
+                    if (f->funcRef)
+                        fac = f->funcRef->FuncX();
+                    break;
+                case eFactorType::yref:
+                    if (f->funcRef)
+                        fac = f->funcRef->FuncY();
+                    break;
+                case eFactorType::widthref:
+                    if (f->funcRef)
+                        fac = f->funcRef->FuncWidth();
+                    break;
+                case eFactorType::heightref:
+                    if (f->funcRef)
+                        fac = f->funcRef->FuncHeight();
+                    break;
+                case eFactorType::areawidth:
+                    fac = container->Width();
+                    break;
+                case eFactorType::areaheight:
+                    fac = container->Height();
+                    break;
+                case eFactorType::columnwidth:
+                    if (loopInfo)
+                        fac = loopInfo->colWidth;
+                    break;
+                case eFactorType::rowheight:
+                    if (loopInfo)
+                        fac = loopInfo->rowHeight;
+                    break;
+            }
+            if (f->multiplication)
+                factor *= fac;
+            else if (fac)
+                factor /= fac;            
+        }
+        if (s->positive)
+            result += factor;
+        else
+            result -= factor;
+    }
+    return (int)result;
+}
+
+
+void cNumericExpr::Debug(void) {
+    esyslog("skindesigner:            Numeric Expression \"%s\", Result: %d", expr, Calculate());
+    for (cSummand *s = summands.First(); s; s = summands.Next(s)) {
+        s->Debug();
+    }
+}
+
+/******************************************************************
+* Private Functions
+******************************************************************/
+bool cNumericExpr::IsNumeric(const char *e) {
+    //negativ numbers
+    if (*e == '-')
+        ++e;
+    //empty
+    if (!*e)
+        return false;
+    while (*e) {
+        if (isdigit(*e) || *e == '.' || *e == ',')
+            ++e;
+        else
+            return false;
+    }
+    return true;
+}
+
+bool cNumericExpr::IsNumericExpression(const char *e) {
+    if (!*e)
+        return false;
+    while (*e) {
+        if (isdigit(*e)  || *e == '.' || *e == ',' || *e == '+' || *e == '-' || *e == '*' || *e == '/')
+            ++e;
+        else
+            return false;
+    }
+    return true;    
+}
+
+bool cNumericExpr::PercentValue(const char *e) {
+    const char *hit = strchr(e, '%');
+    if (!hit)
+        return false;
+    char buffer[20] = "";
+    if (strlen(e) > 20)
+        return false;
+    strncpy(buffer, e, strlen(e)-1);
+    buffer[strlen(e)-1] = '\0';
+    int val = atoi(buffer);
+    bool ok = false;
+    if (horizontal && container->Width() > 0) {
+        value = container->Width() * val / 100;
+        ok = true;
+    } else if (!horizontal && container->Height() > 0){
+        value = container->Height() * val / 100;
+        ok = true;
+    }
+    return ok;
+}
+
+char *cNumericExpr::ReplacePercentValue(char *e) {
+    const char *hit = strchr(e, '%');
+    if (!hit)
+        return e;
+    char buffer[20] = "";
+    if (strlen(e) > 20)
+        return e;
+    strncpy(buffer, e, strlen(e)-1);
+    buffer[strlen(e)-1] = '\0';
+    int val = atoi(buffer);
+    double percentVal = (double)val/100.0f;
+
+    char replacement[50] = "";
+    if (horizontal) {
+        sprintf(replacement, "%.5f*{areawidth}", percentVal);
+    } else {
+        sprintf(replacement, "%.5f*{areaheight}", percentVal);        
+    }
+
+    int len = strlen(replacement) + 1;
+    char *replaced = (char*)malloc(len);
+    memset(replaced, 0, len);
+    strcpy(replaced, replacement);
+    free(expr);
+    return replaced;
+}
+
+char *cNumericExpr::ReplaceToken(char *e, const char* token, int val) {
+    char *tokenStart = strstr(e, token);
+    if (!tokenStart) {
+        return e;
+    }
+    char buffer[20] = "";
+    sprintf(buffer, "%d", val);
+    size_t newSize = strlen(e) - strlen(token) + strlen(buffer) + 1;
+    char *replaced = (char*)malloc(newSize);
+    memset(replaced, 0, newSize);
+    size_t beginning = strlen(e) - strlen(tokenStart);
+    if (beginning > 0)
+        strncpy(replaced, e, beginning);
+    strcat(replaced, buffer);
+    strcat(replaced, tokenStart + strlen(token));
+    free(e);
+    return replaced;
+}
+
+char *cNumericExpr::ReplaceTokens(char *e, const char* token, int val) {
+    if (!e)
+        return e;
+    while (true) {
+        char *tokenStart = strstr(e, token);
+        if (!tokenStart)
+            break;
+        e = ReplaceToken(e, token, val);
+    }
+    return e;
+}
+
+int cNumericExpr::EvaluateExpression(char* e) {
+    return round(ParseSummands(e));
+}
+
+double cNumericExpr::EvaluateExpressionDouble(char *e) {
+    return ParseSummands(e);
+}
+
+double cNumericExpr::ParseAtom(char*& e) {
+    // Read the number from string
+    char* end_ptr;
+    double res = strtod(e, &end_ptr);
+    // Advance the pointer and return the result
+    e = end_ptr;
+    return res;
+}
+
+// Parse multiplication and division
+double cNumericExpr::ParseFactors(char*& e) {
+    double num1 = ParseAtom(e);
+    for(;;) {
+        // Save the operation
+        char op = *e;
+        if(op != '/' && op != '*')
+            return num1;
+        e++;
+        double num2 = ParseAtom(e);
+        // Perform the saved operation
+        if(op == '/') {
+            if (num2 != 0) {
+                num1 /= num2;
+            }
+        } else
+            num1 *= num2;
+    }
+}
+
+// Parse addition and subtraction
+double cNumericExpr::ParseSummands(char*& e) {
+    double num1 = ParseFactors(e);
+    for(;;) {
+        char op = *e;
+        if(op != '-' && op != '+')
+            return num1;
+        e++;
+        double num2 = ParseFactors(e);
+        if(op == '-')
+            num1 -= num2;
+        else
+            num1 += num2;
+    }
+}
+
+void cNumericExpr::CreateSummands(void) {
+    char *sum = strdup(expr);
+    char delimiter[] = "+-";
+    bool positive = true;
+    if (sum && *sum && *sum == '-') {
+        positive = false;
+    }
+    char *summand = strtok(sum, delimiter);
+    while (summand) {
+        cSummand *s = new cSummand(summand);
+        s->positive = positive;
+        summands.Add(s);
+        //check next sign
+        if (expr[summand - sum + strlen(summand)] == '-')
+            positive = false;
+        else
+            positive = true;
+        summand = strtok(NULL, delimiter);
+    }
+    free(sum);
+}
+
+void cNumericExpr::CreateFactors(void) {
+    char delimiterFac[] = "*/";
+    for (cSummand *s = summands.First(); s; s = summands.Next(s)) {
+        char *sum = strdup(s->summand);
+        if (IsNumericExpression(sum)) {
+            cFactor *f = new cFactor();
+            f->constValue = EvaluateExpressionDouble(sum);
+            s->factors.Add(f);
+            free(sum);
+            continue;            
+        }
+        bool multiplication = true;
+        char *fac = strtok(sum, delimiterFac);
+        while (fac) {
+            cFactor *f = new cFactor();
+            if (IsNumeric(fac)) {
+                f->constValue = atof(fac);
+                f->multiplication = multiplication;
+                s->factors.Add(f);
+            } else {
+                //factor has to be a token or a function reference now
+                if (SetTokenFactor(f, fac)) {
+                    f->multiplication = multiplication;
+                    s->factors.Add(f);
+                } else if (SetReferenceFactor(f, fac)) {
+                    f->multiplication = multiplication;
+                    s->factors.Add(f);
+                } else if (SetGeometryFactor(f, fac)) { 
+                    f->multiplication = multiplication;
+                    s->factors.Add(f);
+                } else {
+                    esyslog("skindesigner: invalid factor %s in expression \"%s\"", fac, expr);
+                    delete f;
+                }
+            }
+            //check next sign
+            if (s->summand[fac - sum + strlen(fac)] == '/')
+                multiplication = false;
+            else
+                multiplication = true;
+            fac = strtok(NULL, delimiterFac);
+        }
+        free(sum);
+    }
+}
+
+bool cNumericExpr::SetTokenFactor(cFactor *f, char *tokenName) {
+    int tokenIndex = tokenContainer->IntTokenIndex(tokenName);
+    if (tokenIndex >= 0) {
+        f->tokenIndex = tokenIndex;
+        f->type = eFactorType::inttoken;
+        return true;
+    }
+    tokenIndex = tokenContainer->StringTokenIndex(tokenName);
+    if (tokenIndex >= 0) {
+        f->tokenIndex = tokenIndex;
+        f->type = eFactorType::stringtoken;
+        return true;
+    }
+    tokenIndex = tokenContainer->LoopTokenIndex(tokenName);
+    if (tokenIndex >= 0) {
+        f->tokenIndex = tokenIndex;
+        f->type = eFactorType::looptoken;
+        return true;
+    }
+    return false;
+}
+
+
+bool cNumericExpr::SetReferenceFactor(cFactor *f, char *tokenName) {
+    int start = 0;
+    if (startswith(tokenName, "{posx(") && endswith(tokenName, ")}")) {
+        start = 6;
+        f->type = eFactorType::xref;
+    } else if (startswith(tokenName, "{posy(") && endswith(tokenName, ")}")) {
+        start = 6;
+        f->type = eFactorType::yref;
+    } else if (startswith(tokenName, "{width(") && endswith(tokenName, ")}")) {
+        start = 7;
+        f->type = eFactorType::widthref;
+    } else if (startswith(tokenName, "{height(") && endswith(tokenName, ")}")) {
+        start = 8;
+        f->type = eFactorType::heightref;    
+    }
+
+    if (start == 0)
+        return false;
+
+    tokenName += start;
+    f->funcRefName = strdup(tokenName);
+    ReplaceEnd(f->funcRefName, 2);
+
+    return true;
+}
+
+bool cNumericExpr::SetGeometryFactor(cFactor *f, char *tokenName) {
+    bool ok = false;
+    if (!strcmp(tokenName, "{areawidth}")) {
+        f->type = eFactorType::areawidth;
+        ok = true;
+    } else if (!strcmp(tokenName, "{areaheight}")) {
+        f->type = eFactorType::areaheight;
+        ok = true;
+    } else if (!strcmp(tokenName, "{columnwidth}")) {
+        f->type = eFactorType::columnwidth;
+        ok = true;
+    } else if (!strcmp(tokenName, "{rowheight}")) {
+        f->type = eFactorType::rowheight;        
+        ok = true;
+    }
+    return ok;
+}
+
+void cNumericExpr::ConsolidateSummand(void) {
+    cSummand *constSummand = NULL;
+    for (cSummand *s = summands.First(); s; s = summands.Next(s)) {
+        if (s->factors.Count() == 1 && s->factors.First()->type == eFactorType::constant) {
+            if (!constSummand) {
+                constSummand = s;
+            } else {
+                if (s->positive)
+                    constSummand->factors.First()->constValue += s->factors.First()->constValue;
+                else
+                    constSummand->factors.First()->constValue -= s->factors.First()->constValue;
+                summands.Del(s);
+                s = constSummand;
+            }
+        }
+    }    
+}
+
+void cNumericExpr::ConsolidateFactors(void) {
+    for (cSummand *s = summands.First(); s; s = summands.Next(s)) {
+        cFactor *constFactor = NULL;
+        for (cFactor *f = s->factors.First(); f; f = s->factors.Next(f)) {
+            if (f->type == eFactorType::constant) {
+                if (!constFactor) {
+                    constFactor = f;
+                } else {
+                    if (f->multiplication)
+                        constFactor->constValue *= f->constValue;
+                    else 
+                        constFactor->constValue /= f->constValue;
+                    s->factors.Del(f);
+                    f = constFactor;
+                }
+            }
+        }
+    }
+}
+
+/******************************************************************
+* cColor
+******************************************************************/
+cColor::cColor(const char *expression) {
+    globals = NULL;
+    expr = strdup(expression);
+    value = 0x00;
+}
+
+cColor::cColor(const cColor &other) {
+    globals = other.globals;
+    expr = strdup(other.expr);
+    value = other.value;    
+}
+
+cColor::~cColor(void) {
+    free(expr);
+}
+
+void cColor::Cache(void) {
+    tColor colVal = 0x00;
+    string tmp = expr;
+    if (globals->GetColor(tmp, colVal)) {
+        value = colVal;
+        return;
+    }
+    if (strlen(expr) != 8)
+        return;
+    std::stringstream str;
+    str << tmp;
+    colVal = 0x00;
+    str >> std::hex >> colVal;
+    value = colVal;
+}
+
+tColor cColor::Color(void) {
+    return value;
+}
+
+void cColor::Debug(void) {
+    esyslog("skindesigner:            Color \"%s\", Value %x", expr, value);
+}
+
+/******************************************************************
+* cTextExpr
+******************************************************************/
+cTextExpr::cTextExpr(const char *expression) {
+    globals = NULL;
+    expr = strdup(expression);
+    tokenContainer = NULL;
+    loopInfo = NULL;
+}
+
+cTextExpr::cTextExpr(const cTextExpr &other) {
+    globals = other.globals;
+    expr = strdup(other.expr);
+    tokenContainer = NULL;
+    loopInfo = NULL;
+    for (cTextToken* t = other.textTokens.First(); t; t = other.textTokens.Next(t)) {
+        textTokens.Add(new cTextToken(*t));
+    }
+}
+
+cTextExpr::~cTextExpr(void) {
+    free(expr);
+}
+
+void cTextExpr::CorrectImagePath(void) {
+    //no absolute pathes allowed
+    if (!startswith(expr, "{")) {
+        esyslog("skindesigner: no absolute pathes allowed for images - %s", expr);
+    }
+    if (startswith(expr, "{ressourcedir}")) {
+        string tmp = expr;
+        tmp = tmp.replace(0, 14, *config.GetSkinRessourcePath());
+        free(expr);
+        expr = strdup(tmp.c_str());
+    }
+}
+
+
+void cTextExpr::Cache(void) {
+    Translate();
+    Tokenize();
+    PrepareTokens();
+}
+
+char *cTextExpr::DeterminateText(void) {
+    //calculate length of complete new string
+    int textLength = 0;
+    for (cTextToken* t = textTokens.First(); t; t = textTokens.Next(t)) {
+        if (t->type == eTexttokenType::constant) {
+            textLength += strlen(t->constValue);
+        } else if (t->type == eTexttokenType::stringtoken) {
+            char *str = tokenContainer->StringToken(t->tokenIndex);
+            if (str)
+                textLength += strlen(str);
+        } else if (t->type == eTexttokenType::inttoken) {
+            int value  = tokenContainer->IntToken(t->tokenIndex);
+            if (value >= 0) {
+                cString str = cString::sprintf("%d", value);
+                textLength += strlen(*str);
+            }
+        } else if (t->type == eTexttokenType::looptoken && loopInfo && loopInfo->row >= 0) {
+            char *str = tokenContainer->LoopToken(loopInfo->index, loopInfo->row, t->tokenIndex);
+            if (str)
+                textLength += strlen(str);
+        } else if (t->type == eTexttokenType::printftoken) {
+            DeterminatePrintfToken(t);
+            if (t->printfResult)
+                textLength += strlen(t->printfResult);
+        } else if (t->type == eTexttokenType::condstringtoken) {
+            char *str = tokenContainer->StringToken(t->tokenIndex);
+            if (str) {
+                textLength += strlen(str);
+                if (t->condStart)
+                    textLength += strlen(t->condStart);
+                if (t->condEnd)
+                    textLength += strlen(t->condEnd);
+            }
+        }  else if (t->type == eTexttokenType::condinttoken) {
+            int value  = tokenContainer->IntToken(t->tokenIndex);
+            if (value >= 0) {
+                cString str = cString::sprintf("%d", value);
+                textLength += strlen(*str);
+                if (t->condStart)
+                    textLength += strlen(t->condStart);
+                if (t->condEnd)
+                    textLength += strlen(t->condEnd);
+            }
+        }
+    }
+
+    if (textLength <= 0)
+        return NULL;
+
+    char *retVal = (char*)malloc(textLength+1);
+    memset(retVal, 0, textLength);
+    bool first = true;
+    for (cTextToken* t = textTokens.First(); t; t = textTokens.Next(t)) {
+        if (first) {
+            first = false;
+            if (t->type == eTexttokenType::constant) {
+                strcpy(retVal, t->constValue);
+            } else if (t->type == eTexttokenType::stringtoken) {
+                char *str = tokenContainer->StringToken(t->tokenIndex);
+                if (str)
+                    strcpy(retVal, str);
+            } else if (t->type == eTexttokenType::inttoken) {
+                int value  = tokenContainer->IntToken(t->tokenIndex);
+                if (value >= 0) {
+                    cString str = cString::sprintf("%d", value);
+                    strcpy(retVal, *str);
+                }
+            } else if (t->type == eTexttokenType::looptoken && loopInfo && loopInfo->row >= 0) {
+                char *str = tokenContainer->LoopToken(loopInfo->index, loopInfo->row, t->tokenIndex);
+                if (str)
+                    strcpy(retVal, str);
+            }  else if (t->type == eTexttokenType::printftoken) {
+                if (t->printfResult) {
+                    strcpy(retVal, t->printfResult);
+                    free(t->printfResult);
+                    t->printfResult = NULL;
+                }
+            } else if (t->type == eTexttokenType::condstringtoken) {
+                char *str = tokenContainer->StringToken(t->tokenIndex);
+                if (str) {
+                    if (t->condStart) {
+                        strcpy(retVal, t->condStart);
+                        strcat(retVal, str);
+                    } else {
+                        strcpy(retVal, str);
+                    }
+                    if (t->condEnd)
+                        strcat(retVal, t->condEnd);
+                }
+            }  else if (t->type == eTexttokenType::condinttoken) {
+                int value  = tokenContainer->IntToken(t->tokenIndex);
+                if (value >= 0) {
+                    cString str = cString::sprintf("%d", value);
+                    if (t->condStart) {
+                        strcpy(retVal, t->condStart);
+                        strcat(retVal, *str);
+                    } else {
+                        strcpy(retVal, *str);
+                    }
+                    if (t->condEnd)
+                        strcat(retVal, t->condEnd);
+                }
+            }
+        } else {
+            if (t->type == eTexttokenType::constant) {
+                strcat(retVal, t->constValue);
+            } else if (t->type == eTexttokenType::stringtoken) {
+                char *str = tokenContainer->StringToken(t->tokenIndex);
+                if (str)
+                    strcat(retVal, str);
+            } else if (t->type == eTexttokenType::inttoken) {
+                int value  = tokenContainer->IntToken(t->tokenIndex);
+                cString str = cString::sprintf("%d", value);
+                strcat(retVal, *str);
+            } else if (t->type == eTexttokenType::looptoken && loopInfo && loopInfo->row >= 0) {
+                char *str = tokenContainer->LoopToken(loopInfo->index, loopInfo->row, t->tokenIndex);
+                if (str)
+                    strcat(retVal, str);
+            }  else if (t->type == eTexttokenType::printftoken) {
+                if (t->printfResult) {
+                    strcat(retVal, t->printfResult);
+                    free(t->printfResult);
+                    t->printfResult = NULL;
+                }
+            } else if (t->type == eTexttokenType::condstringtoken) {
+                char *str = tokenContainer->StringToken(t->tokenIndex);
+                if (str) {
+                    if (t->condStart)
+                        strcat(retVal, t->condStart);
+                    strcat(retVal, str);
+                    if (t->condEnd)
+                        strcat(retVal, t->condEnd);
+                }
+            } else if (t->type == eTexttokenType::condinttoken) {
+                int value  = tokenContainer->IntToken(t->tokenIndex);
+                if (value >= 0) {
+                    cString str = cString::sprintf("%d", value);
+                    if (t->condStart)
+                        strcat(retVal, t->condStart);
+                    strcat(retVal, *str);
+                    if (t->condEnd)
+                        strcat(retVal, t->condEnd);
+                }
+            }
+        }
+    }
+    return retVal;
+}
+
+
+void cTextExpr::Debug(const char *exprName) {
+    esyslog("skindesigner:            TextExpr %s: \"%s\"", exprName, expr);
+    char *res = DeterminateText();
+    esyslog("skindesigner:            Result: \"%s\"", res);
+    free(res);
+    for (cTextToken *t = textTokens.First(); t; t = textTokens.Next(t)) {
+        if (t->type == eTexttokenType::constant)
+            esyslog("skindesigner:            constant token \"%s\"", t->constValue);
+        else if (t->type == eTexttokenType::stringtoken)
+            esyslog("skindesigner:            string token %s, index %d", t->constValue, t->tokenIndex);
+        else if (t->type == eTexttokenType::inttoken)
+            esyslog("skindesigner:            int token %s, index %d", t->constValue, t->tokenIndex);
+        else if (t->type == eTexttokenType::looptoken)
+            esyslog("skindesigner:            loop token %s, index %d", t->constValue, t->tokenIndex);
+        else if (t->type == eTexttokenType::printftoken)
+            esyslog("skindesigner:            printf token %s", t->constValue);
+        else if (t->type == eTexttokenType::condstringtoken || t->type == eTexttokenType::condinttoken)
+            esyslog("skindesigner:            conditional token %s", t->constValue);
+    }
+}
+
+void cTextExpr::Translate(void) {
+    string translated = "";
+    if (!globals->Translate(expr, translated))
+        return;
+    free(expr);
+    expr = strdup(translated.c_str());
+}
+
+void cTextExpr::Tokenize(void) {
+    char *head = expr;
+    char *tail = expr;
+    while (*tail) {
+        if (*tail == '|') {
+            char *begin = CopyTextPart(head, tail, false);
+            if (begin) {
+                cTextToken *t = new cTextToken();
+                t->constValue = begin;
+                textTokens.Add(t);
+            }
+            head = tail;
+            tail++;
+            while (*tail) {
+                if (*tail == '|') {
+                    char *token = CopyTextPart(head, tail);
+                    cTextToken *t = new cTextToken();
+                    t->type = eTexttokenType::condstringtoken;
+                    t->constValue = token;
+                    textTokens.Add(t);
+                    head = tail+1;
+                    break;
+                }
+                tail++;
+            }
+        } else if (*tail == '{') {
+            char *begin = CopyTextPart(head, tail, false);
+            if (begin) {
+                cTextToken *t = new cTextToken();
+                t->constValue = begin;
+                textTokens.Add(t);
+            }
+            head = tail;
+            tail++;
+            while (*tail) {
+                if (*tail == '}') {
+                    char *token = CopyTextPart(head, tail);
+                    cTextToken *t = new cTextToken();
+                    t->type = eTexttokenType::stringtoken;
+                    t->constValue = token;
+                    textTokens.Add(t);
+                    head = tail+1;
+                    break;
+                }
+                tail++;
+            }
+        }
+        tail++;
+    }
+    char *end = CopyTextPart(head, tail, false);
+    if (end) {
+        cTextToken *t = new cTextToken();
+        t->constValue = end;
+        textTokens.Add(t);
+    }
+}
+
+void cTextExpr::PrepareTokens(void) {
+    bool error = false;
+    for (cTextToken *t = textTokens.First(); t; t = textTokens.Next(t)) {
+        if (t->type == eTexttokenType::condstringtoken) {
+            ParseCondToken(t);
+            continue;
+        } else if (t->type != eTexttokenType::stringtoken)
+            continue;
+        if (ParsePrintfToken(t)) {
+            continue;
+        }
+        if (CheckGlobals(t)) {
+            continue;
+        }
+        int tokenIndex = tokenContainer->IntTokenIndex(t->constValue);
+        if (tokenIndex >= 0) {
+            t->tokenIndex = tokenIndex;
+            t->type = eTexttokenType::inttoken;
+            continue;
+        }
+        tokenIndex = tokenContainer->StringTokenIndex(t->constValue);
+        if (tokenIndex >= 0) {
+            t->tokenIndex = tokenIndex;
+            t->type = eTexttokenType::stringtoken;
+            continue;
+        }
+        tokenIndex = tokenContainer->LoopTokenIndex(t->constValue);
+        if (tokenIndex >= 0) {
+            t->tokenIndex = tokenIndex;
+            t->type = eTexttokenType::looptoken;
+            continue;
+        }
+        esyslog("skindesigner: invalid text token %s in expression \"%s\"", t->constValue, expr);
+        error = true;
+        break;
+    }
+    if (error) {
+        textTokens.Clear();
+    }
+}
+
+bool cTextExpr::CheckGlobals(cTextToken *t) {
+    if (!globals || !t->constValue)
+        return false;
+
+    string name = t->constValue;
+    name = name.substr(1, name.size()-2);
+    string replacement = "";
+    if (globals->GetString(name, replacement)) {
+        free(t->constValue);
+        t->constValue = strdup(replacement.c_str());
+        t->type = eTexttokenType::constant;
+        return true;
+    }
+    int numReplacement = 0;
+    if (globals->GetInt(name, numReplacement)) {
+        free(t->constValue);
+        cString repl = cString::sprintf("%d", numReplacement);
+        t->constValue = strdup(*repl);
+        t->type = eTexttokenType::constant;
+        return true;
+    }
+    return false;
+}
+
+bool cTextExpr::ParsePrintfToken(cTextToken *t) {
+    //check valid printftoken
+    char *start = strstr(t->constValue, "printf(");
+    if (!start)
+        return false;
+    char *end =  strchr(start, ')');
+    if (!end)
+        return false;
+    t->type = eTexttokenType::printftoken;
+
+    //find printf expression
+    char *startExpr = strchr(t->constValue, '\'');
+    if (!startExpr)
+        return false;
+    char *endExpr = strchr(startExpr + 1, '\'');
+    if (!endExpr)
+        return false;
+    int expLen = endExpr - startExpr - 1;
+    char buffer[100];
+    strncpy(buffer, startExpr+1, expLen);
+    buffer[expLen] = '\0';
+    t->printfExpr = strdup(buffer);
+    
+    //find variables
+    char *startVar = strchr(t->constValue, ',');
+    if (!startVar)
+        return false;
+    startVar++;
+    vector<string> varTokens;
+    char *nextVar = NULL;
+    while (nextVar = strchr(startVar, ',')) {
+        while(isspace(*startVar))
+            startVar++;
+        int varLen = nextVar - startVar;
+        buffer[0] = '{';
+        strncpy((char*)buffer + 1, startVar, varLen);
+        buffer[varLen+1] = '}';
+        buffer[varLen+2] = '\0';
+        int i = 1;
+        while(isspace(buffer[varLen-i])) {
+            buffer[varLen-i] = '}';
+            buffer[varLen-i+1] = '\0';
+            i++;
+        }
+        varTokens.push_back(buffer);
+        startVar = nextVar + 1;
+    }
+    while (isspace(*startVar))
+        startVar++;
+    if (startVar+1) {
+        int varLen = end - startVar + 1;
+        buffer[0] = '{';
+        strncpy((char*)buffer + 1, startVar, varLen);
+        buffer[varLen] = '}';
+        buffer[varLen+1] = '\0';
+        varTokens.push_back(buffer);
+    }
+    //evaluate variables
+    bool ok = true;
+    for (size_t i=0; i < varTokens.size(); i++) {
+        sPrintfInfo info;
+        int tokenIndex = tokenContainer->IntTokenIndex(varTokens[i].c_str());
+        if (tokenIndex >= 0) {
+            info.type = ePrintfVarType::inttoken;
+            info.index = tokenIndex;
+            t->printfVarIndices.push_back(info);
+            continue;
+        }
+        tokenIndex = tokenContainer->StringTokenIndex(varTokens[i].c_str());
+        if (tokenIndex >= 0) {
+            info.type = ePrintfVarType::stringtoken;
+            info.index = tokenIndex;
+            t->printfVarIndices.push_back(info);
+            continue;
+        }
+        tokenIndex = tokenContainer->LoopTokenIndex(varTokens[i].c_str());
+        if (tokenIndex >= 0) {
+            info.type = ePrintfVarType::looptoken;
+            info.index = tokenIndex;
+            t->printfVarIndices.push_back(info);
+            continue;
+        }
+        ok = false;
+    }
+    return ok;
+}
+
+void cTextExpr::DeterminatePrintfToken(cTextToken *t) {
+    int numVars = t->printfVarIndices.size();
+    vector<int> results;
+    for (int i=0; i < numVars; i++) {
+        if (t->printfVarIndices[i].type == ePrintfVarType::inttoken) {
+            results.push_back(tokenContainer->IntToken(t->printfVarIndices[i].index));
+        } else if (t->printfVarIndices[i].type == ePrintfVarType::stringtoken) {
+            if (tokenContainer->StringToken(t->printfVarIndices[i].index)) {
+                results.push_back(atoi(tokenContainer->StringToken(t->printfVarIndices[i].index)));
+            }
+        } else if (t->printfVarIndices[i].type == ePrintfVarType::looptoken  && loopInfo && loopInfo->row >= 0) {
+            if (tokenContainer->LoopToken(loopInfo->index, loopInfo->row, t->printfVarIndices[i].index)) {
+                results.push_back(atoi(tokenContainer->LoopToken(loopInfo->index, loopInfo->row, t->printfVarIndices[i].index)));                
+            }
+        }
+    }
+
+    switch (numVars) {
+        case 1:
+            t->printfResult = strdup(*cString::sprintf(t->printfExpr, results[0]));
+            break;
+        case 2:
+            t->printfResult = strdup(*cString::sprintf(t->printfExpr, results[0], results[1]));
+            break;
+        case 3:
+            t->printfResult = strdup(*cString::sprintf(t->printfExpr, results[0], results[1], results[2]));
+            break;
+        case 4:
+            t->printfResult = strdup(*cString::sprintf(t->printfExpr, results[0], results[1], results[2], results[3]));
+            break;
+        case 5:
+            t->printfResult = strdup(*cString::sprintf(t->printfExpr, results[0], results[1], results[2], results[3], results[4]));
+            break;
+        case 6:
+            t->printfResult = strdup(*cString::sprintf(t->printfExpr, results[0], results[1], results[2], results[3], results[4], results[5]));
+            break;
+        default:
+            break;
+    }
+}
+
+void cTextExpr::ParseCondToken(cTextToken *t) {
+    char *head = t->constValue;
+    char *tail = t->constValue;
+    head++;
+    tail++;
+    char *token = NULL;
+    while (*tail) {
+        if (*tail == '{') {
+            t->condStart = CopyTextPart(head, tail, false);
+            head = tail;
+            tail++;
+            while (*tail) {
+                if (*tail == '}') {
+                    token = CopyTextPart(head, tail);
+                    head = tail+1;
+                    break;
+                }
+                tail++;
+            }
+        }
+        tail++;
+    }
+    tail--;
+    t->condEnd = CopyTextPart(head, tail, false);
+    if (!token) {
+        esyslog("skindesigner: invalid conditional texttoken %s in expression \"%s\"", t->constValue, expr);
+        return;
+    }
+
+    int tokenIndex = tokenContainer->StringTokenIndex(token);
+    if (tokenIndex >= 0) {
+        t->tokenIndex = tokenIndex;
+        return;
+    }
+
+    tokenIndex = tokenContainer->IntTokenIndex(token);
+    if (tokenIndex >= 0) {
+        t->tokenIndex = tokenIndex;
+        t->type = eTexttokenType::condinttoken;
+        return;
+    }
+    esyslog("skindesigner: invalid token %s in expression\"%s\"", token, expr);
+}
+
+char *cTextExpr::CopyTextPart(char *start, char *stop, bool incLastChar) {
+    if (!start)
+        return NULL;
+    if (start >= stop)
+        return NULL;
+    char *val = NULL;
+    size_t len = 0;
+    if (stop) {
+        //defined end
+        len = stop - start + 1;
+    } else {
+        //search end of text
+        char *p = start;
+        while (*p)
+            len++; p++;
+        len++;
+    }
+    val = (char*)malloc(len+1);
+    memset(val, 0, len+1);
+    if (!incLastChar)
+        len--;
+    memcpy(val, start, len);
+    return val;
+}
diff --git a/coreengine/complextypes.h b/coreengine/complextypes.h
index 7f03128..5ab6c35 100644
--- a/coreengine/complextypes.h
+++ b/coreengine/complextypes.h
@@ -1,318 +1,318 @@
-#ifndef __COMPLEXTYPES_H

-#define __COMPLEXTYPES_H

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string>

-#include <vector>

-#include <vdr/skins.h>

-#include "globals.h"

-#include "../libskindesignerapi/tokencontainer.h"

-

-class cLoopInfo;

-class cFunction;

-/******************************************************************

-* helpers

-******************************************************************/

-char *RemoveSpace(char *e);

-void ReplaceDecimalpoint(char *e);

-void ReplaceStart(char *e, int num);

-void ReplaceEnd(char *e, int num);

-

-/******************************************************************

-* cCondition

-******************************************************************/

-enum class eCondOp {

-    tAnd,

-    tOr

-};

-

-enum class eCondType {

-    token,

-    negtoken,

-    lowerInt,

-    equalInt,

-    greaterInt,

-    isset,

-    empty,

-    equalString,

-    notEqualString,

-    contains,

-    notContains

-};

-

-enum class eCondTokenType {

-    inttoken,

-    stringtoken,

-    looptoken

-};

-

-class cCond : public cListObject {

-public:

-    cCond(const char *expression);

-    cCond(const cCond &other);

-    virtual ~cCond(void);

-    void Debug(void);

-    char *expr;

-    eCondOp operation;

-    eCondType type;

-    eCondTokenType tokenType;

-    bool constant;

-    bool isTrue;

-    int tokenIndex;

-    int compareValue;

-    char *compareStrValue;

-};

-

-class cCondition {

-private:

-    char *expr;

-    cGlobals *globals;

-    skindesignerapi::cTokenContainer *tokenContainer;

-    cLoopInfo *loopInfo;

-    cList<cCond> conds;

-    void Tokenize(void);

-    void PrepareTokens(void);

-    void SetTokenCond(cCond *c);

-    void SetIntegerCond(cCond *c);

-    void SetStringCond(cCond *c);

-    void SetStringCompareCond(cCond *c);

-    void SetTokenIndex(cCond *c, const char *token);

-public:

-    cCondition(const char *expression);

-    cCondition(const cCondition &other);

-    virtual ~cCondition(void);

-    void SetGlobals(cGlobals *globals) { this->globals = globals; };

-    void SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer) {this->tokenContainer = tokenContainer; };

-    void SetLoopInfo(cLoopInfo *loopInfo) { this->loopInfo = loopInfo; };

-    void Prepare(void);

-    bool True(void);

-    void Debug(void);

-};

-

-/******************************************************************

-* cNumericExpr

-******************************************************************/

-enum class eFactorType {

-    constant = 0,

-    stringtoken,

-    inttoken,

-    looptoken,

-    xref,

-    yref,

-    widthref,

-    heightref,

-    areawidth,

-    areaheight,

-    columnwidth,

-    rowheight

-};

-

-class cFactor: public cListObject {

-public:

-    cFactor(void) {

-        multiplication = true;

-        type = eFactorType::constant;

-        constValue = 1.0f;

-        tokenIndex = -1;

-        funcRefName = NULL;

-        funcRef = NULL;

-    };

-    cFactor(const cFactor &other) {

-        multiplication = other.multiplication;

-        type = other.type;

-        constValue = other.constValue;

-        tokenIndex = other.tokenIndex;

-        funcRefName = NULL;

-        if (other.funcRefName)

-            funcRefName = strdup(other.funcRefName);

-        funcRef = other.funcRef;

-    }

-    ~cFactor(void) {

-        free(funcRefName);

-    };

-    bool multiplication;

-    eFactorType type;

-    double constValue;

-    int tokenIndex;

-    char *funcRefName;

-    cFunction *funcRef;

-};

-

-class cSummand : public cListObject {

-public:

-    cSummand(const char *summand);

-    cSummand(const cSummand &other);

-    ~cSummand(void);

-    void Debug(void);

-    char *summand;

-    bool positive;

-    cList<cFactor> factors;

-};

-

-class cNumericExpr {

-private:

-    cGlobals *globals;

-    cRect *container;

-    skindesignerapi::cTokenContainer *tokenContainer;

-    cLoopInfo *loopInfo;

-    char *expr;

-    cList<cSummand> summands;

-    bool horizontal;

-    int value;

-    bool dynamic;

-    //common string functions

-    bool IsNumeric(const char *e);

-    bool IsNumericExpression(const char *e);

-    bool PercentValue(const char *e);

-    char *ReplacePercentValue(char *e);

-    char *ReplaceToken(char *e, const char* token, int value);

-    char *ReplaceTokens(char *e, const char* token, int value);

-    //calculate numeric expressions

-    int EvaluateExpression(char *e);

-    double EvaluateExpressionDouble(char *e);

-    double ParseAtom(char*& e);

-    double ParseFactors(char*& e);

-    double ParseSummands(char*& e);

-    //prepare expressions with tokens

-    void CreateSummands(void);

-    void CreateFactors(void);

-    bool SetTokenFactor(cFactor *f, char *tokenName);

-    bool SetReferenceFactor(cFactor *f, char *tokenName);

-    bool SetGeometryFactor(cFactor *f, char *tokenName);

-    void ConsolidateSummand(void);

-    void ConsolidateFactors(void);

-public:

-    cNumericExpr(const char *expression);

-    cNumericExpr(const cNumericExpr &other);

-    virtual ~cNumericExpr(void);

-    void SetContainer(cRect *container) { this->container = container; };

-    void SetGlobals(cGlobals *globals) { this->globals = globals; };

-    void SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer) { this->tokenContainer = tokenContainer; };

-    void SetLoopInfo(cLoopInfo *loopInfo) { this->loopInfo = loopInfo; };

-    void SetVertical(void) { horizontal = false; };

-    bool CacheStatic(void);

-    void PrepareTokens(void);

-    vector<cFactor*> GetRefFactors(void);

-    int GetValue(void) { return value; };

-    bool Dynamic(void) { return dynamic; };

-    int Calculate(void);

-    void Debug(void);

-};

-

-/******************************************************************

-* cColor

-******************************************************************/

-class cColor {

-private:

-    cGlobals *globals;

-    char *expr;

-    tColor value;

-public:

-    cColor(const char *expression);

-    cColor(const cColor &other);

-    virtual ~cColor(void);

-    void SetGlobals(cGlobals *globals) { this->globals = globals; };

-    void Cache(void);

-    tColor Color(void);

-    void Debug(void);

-};

-

-/******************************************************************

-* cTextExpr

-******************************************************************/

-enum class eTexttokenType {

-    constant = 0,

-    stringtoken,

-    inttoken,

-    looptoken,

-    printftoken,

-    condstringtoken,

-    condinttoken,

-};

-

-enum class ePrintfVarType {

-    stringtoken,

-    inttoken,

-    looptoken

-};

-

-struct sPrintfInfo {

-    ePrintfVarType type;

-    int index;

-};

-

-class cTextToken: public cListObject {

-public:

-    cTextToken(void) {

-        type = eTexttokenType::constant;

-        constValue = NULL;

-        printfExpr = NULL;

-        printfResult = NULL;

-        tokenIndex = -1;

-        condStart = NULL;

-        condEnd = NULL;

-    };

-    cTextToken(const cTextToken &other) {

-        type = other.type;

-        constValue = NULL;

-        if (other.constValue)

-            constValue = strdup(other.constValue);

-        printfExpr = NULL;

-        if (other.printfExpr)

-            printfExpr = strdup(other.printfExpr);

-        printfVarIndices = other.printfVarIndices;

-        printfResult = NULL;

-        if (other.printfResult)

-            printfResult = strdup(other.printfResult);

-        tokenIndex = other.tokenIndex;

-        condStart = NULL;

-        if (other.condStart)

-            condStart = strdup(other.condStart);

-        condEnd = NULL;

-        if (other.condEnd)

-            condEnd = strdup(other.condEnd);

-    };

-    ~cTextToken(void) {

-        free(constValue);

-        free(printfExpr);

-    };

-    eTexttokenType type;

-    char *constValue;

-    int tokenIndex;

-    char *printfExpr;

-    vector<sPrintfInfo> printfVarIndices;

-    char *printfResult;

-    char *condStart;

-    char *condEnd;

-};

-

-class cTextExpr {

-private:

-    cGlobals *globals;

-    skindesignerapi::cTokenContainer *tokenContainer;

-    cLoopInfo *loopInfo;

-    char *expr;

-    cList<cTextToken> textTokens;

-    void Translate(void);

-    void Tokenize(void);

-    void PrepareTokens(void);

-    bool CheckGlobals(cTextToken *t);

-    bool ParsePrintfToken(cTextToken *t);

-    void DeterminatePrintfToken(cTextToken *t);

-    void ParseCondToken(cTextToken *t);

-    char *CopyTextPart(char *start, char *stop, bool incLastChar= true);

-public:

-    cTextExpr(const char *expression);

-    cTextExpr(const cTextExpr &other);

-    virtual ~cTextExpr(void);

-    void SetGlobals(cGlobals *globals) { this->globals = globals; };

-    void SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer) { this->tokenContainer = tokenContainer; };

-    void SetLoopInfo(cLoopInfo *loopInfo) { this->loopInfo = loopInfo; };

-    void CorrectImagePath(void);

-    void Cache(void);

-    char *DeterminateText(void);

-    void Debug(const char *exprName);

-};

-

+#ifndef __COMPLEXTYPES_H
+#define __COMPLEXTYPES_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string>
+#include <vector>
+#include <vdr/skins.h>
+#include "globals.h"
+#include "../libskindesignerapi/tokencontainer.h"
+
+class cLoopInfo;
+class cFunction;
+/******************************************************************
+* helpers
+******************************************************************/
+char *RemoveSpace(char *e);
+void ReplaceDecimalpoint(char *e);
+void ReplaceStart(char *e, int num);
+void ReplaceEnd(char *e, int num);
+
+/******************************************************************
+* cCondition
+******************************************************************/
+enum class eCondOp {
+    tAnd,
+    tOr
+};
+
+enum class eCondType {
+    token,
+    negtoken,
+    lowerInt,
+    equalInt,
+    greaterInt,
+    isset,
+    empty,
+    equalString,
+    notEqualString,
+    contains,
+    notContains
+};
+
+enum class eCondTokenType {
+    inttoken,
+    stringtoken,
+    looptoken
+};
+
+class cCond : public cListObject {
+public:
+    cCond(const char *expression);
+    cCond(const cCond &other);
+    virtual ~cCond(void);
+    void Debug(void);
+    char *expr;
+    eCondOp operation;
+    eCondType type;
+    eCondTokenType tokenType;
+    bool constant;
+    bool isTrue;
+    int tokenIndex;
+    int compareValue;
+    char *compareStrValue;
+};
+
+class cCondition {
+private:
+    char *expr;
+    cGlobals *globals;
+    skindesignerapi::cTokenContainer *tokenContainer;
+    cLoopInfo *loopInfo;
+    cList<cCond> conds;
+    void Tokenize(void);
+    void PrepareTokens(void);
+    void SetTokenCond(cCond *c);
+    void SetIntegerCond(cCond *c);
+    void SetStringCond(cCond *c);
+    void SetStringCompareCond(cCond *c);
+    void SetTokenIndex(cCond *c, const char *token);
+public:
+    cCondition(const char *expression);
+    cCondition(const cCondition &other);
+    virtual ~cCondition(void);
+    void SetGlobals(cGlobals *globals) { this->globals = globals; };
+    void SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer) {this->tokenContainer = tokenContainer; };
+    void SetLoopInfo(cLoopInfo *loopInfo) { this->loopInfo = loopInfo; };
+    void Prepare(void);
+    bool True(void);
+    void Debug(void);
+};
+
+/******************************************************************
+* cNumericExpr
+******************************************************************/
+enum class eFactorType {
+    constant = 0,
+    stringtoken,
+    inttoken,
+    looptoken,
+    xref,
+    yref,
+    widthref,
+    heightref,
+    areawidth,
+    areaheight,
+    columnwidth,
+    rowheight
+};
+
+class cFactor: public cListObject {
+public:
+    cFactor(void) {
+        multiplication = true;
+        type = eFactorType::constant;
+        constValue = 1.0f;
+        tokenIndex = -1;
+        funcRefName = NULL;
+        funcRef = NULL;
+    };
+    cFactor(const cFactor &other) {
+        multiplication = other.multiplication;
+        type = other.type;
+        constValue = other.constValue;
+        tokenIndex = other.tokenIndex;
+        funcRefName = NULL;
+        if (other.funcRefName)
+            funcRefName = strdup(other.funcRefName);
+        funcRef = other.funcRef;
+    }
+    ~cFactor(void) {
+        free(funcRefName);
+    };
+    bool multiplication;
+    eFactorType type;
+    double constValue;
+    int tokenIndex;
+    char *funcRefName;
+    cFunction *funcRef;
+};
+
+class cSummand : public cListObject {
+public:
+    cSummand(const char *summand);
+    cSummand(const cSummand &other);
+    ~cSummand(void);
+    void Debug(void);
+    char *summand;
+    bool positive;
+    cList<cFactor> factors;
+};
+
+class cNumericExpr {
+private:
+    cGlobals *globals;
+    cRect *container;
+    skindesignerapi::cTokenContainer *tokenContainer;
+    cLoopInfo *loopInfo;
+    char *expr;
+    cList<cSummand> summands;
+    bool horizontal;
+    int value;
+    bool dynamic;
+    //common string functions
+    bool IsNumeric(const char *e);
+    bool IsNumericExpression(const char *e);
+    bool PercentValue(const char *e);
+    char *ReplacePercentValue(char *e);
+    char *ReplaceToken(char *e, const char* token, int value);
+    char *ReplaceTokens(char *e, const char* token, int value);
+    //calculate numeric expressions
+    int EvaluateExpression(char *e);
+    double EvaluateExpressionDouble(char *e);
+    double ParseAtom(char*& e);
+    double ParseFactors(char*& e);
+    double ParseSummands(char*& e);
+    //prepare expressions with tokens
+    void CreateSummands(void);
+    void CreateFactors(void);
+    bool SetTokenFactor(cFactor *f, char *tokenName);
+    bool SetReferenceFactor(cFactor *f, char *tokenName);
+    bool SetGeometryFactor(cFactor *f, char *tokenName);
+    void ConsolidateSummand(void);
+    void ConsolidateFactors(void);
+public:
+    cNumericExpr(const char *expression);
+    cNumericExpr(const cNumericExpr &other);
+    virtual ~cNumericExpr(void);
+    void SetContainer(cRect *container) { this->container = container; };
+    void SetGlobals(cGlobals *globals) { this->globals = globals; };
+    void SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer) { this->tokenContainer = tokenContainer; };
+    void SetLoopInfo(cLoopInfo *loopInfo) { this->loopInfo = loopInfo; };
+    void SetVertical(void) { horizontal = false; };
+    bool CacheStatic(void);
+    void PrepareTokens(void);
+    vector<cFactor*> GetRefFactors(void);
+    int GetValue(void) { return value; };
+    bool Dynamic(void) { return dynamic; };
+    int Calculate(void);
+    void Debug(void);
+};
+
+/******************************************************************
+* cColor
+******************************************************************/
+class cColor {
+private:
+    cGlobals *globals;
+    char *expr;
+    tColor value;
+public:
+    cColor(const char *expression);
+    cColor(const cColor &other);
+    virtual ~cColor(void);
+    void SetGlobals(cGlobals *globals) { this->globals = globals; };
+    void Cache(void);
+    tColor Color(void);
+    void Debug(void);
+};
+
+/******************************************************************
+* cTextExpr
+******************************************************************/
+enum class eTexttokenType {
+    constant = 0,
+    stringtoken,
+    inttoken,
+    looptoken,
+    printftoken,
+    condstringtoken,
+    condinttoken,
+};
+
+enum class ePrintfVarType {
+    stringtoken,
+    inttoken,
+    looptoken
+};
+
+struct sPrintfInfo {
+    ePrintfVarType type;
+    int index;
+};
+
+class cTextToken: public cListObject {
+public:
+    cTextToken(void) {
+        type = eTexttokenType::constant;
+        constValue = NULL;
+        printfExpr = NULL;
+        printfResult = NULL;
+        tokenIndex = -1;
+        condStart = NULL;
+        condEnd = NULL;
+    };
+    cTextToken(const cTextToken &other) {
+        type = other.type;
+        constValue = NULL;
+        if (other.constValue)
+            constValue = strdup(other.constValue);
+        printfExpr = NULL;
+        if (other.printfExpr)
+            printfExpr = strdup(other.printfExpr);
+        printfVarIndices = other.printfVarIndices;
+        printfResult = NULL;
+        if (other.printfResult)
+            printfResult = strdup(other.printfResult);
+        tokenIndex = other.tokenIndex;
+        condStart = NULL;
+        if (other.condStart)
+            condStart = strdup(other.condStart);
+        condEnd = NULL;
+        if (other.condEnd)
+            condEnd = strdup(other.condEnd);
+    };
+    ~cTextToken(void) {
+        free(constValue);
+        free(printfExpr);
+    };
+    eTexttokenType type;
+    char *constValue;
+    int tokenIndex;
+    char *printfExpr;
+    vector<sPrintfInfo> printfVarIndices;
+    char *printfResult;
+    char *condStart;
+    char *condEnd;
+};
+
+class cTextExpr {
+private:
+    cGlobals *globals;
+    skindesignerapi::cTokenContainer *tokenContainer;
+    cLoopInfo *loopInfo;
+    char *expr;
+    cList<cTextToken> textTokens;
+    void Translate(void);
+    void Tokenize(void);
+    void PrepareTokens(void);
+    bool CheckGlobals(cTextToken *t);
+    bool ParsePrintfToken(cTextToken *t);
+    void DeterminatePrintfToken(cTextToken *t);
+    void ParseCondToken(cTextToken *t);
+    char *CopyTextPart(char *start, char *stop, bool incLastChar= true);
+public:
+    cTextExpr(const char *expression);
+    cTextExpr(const cTextExpr &other);
+    virtual ~cTextExpr(void);
+    void SetGlobals(cGlobals *globals) { this->globals = globals; };
+    void SetTokenContainer(skindesignerapi::cTokenContainer *tokenContainer) { this->tokenContainer = tokenContainer; };
+    void SetLoopInfo(cLoopInfo *loopInfo) { this->loopInfo = loopInfo; };
+    void CorrectImagePath(void);
+    void Cache(void);
+    char *DeterminateText(void);
+    void Debug(const char *exprName);
+};
+
 #endif //__COMPLEXTYPES_H
\ No newline at end of file
diff --git a/coreengine/definitions.h b/coreengine/definitions.h
index 948cfe4..2326072 100644
--- a/coreengine/definitions.h
+++ b/coreengine/definitions.h
@@ -1,1747 +1,1747 @@
-#ifndef __DEFINITIONS_H

-#define __DEFINITIONS_H

-

-#include <string>

-#include <map>

-

-using namespace std;

-

-typedef pair<string,string> stringpair;

-typedef map<string,string> stringmap;

-

-#define ATTR_UNKNOWN (-1)

-#define ATTR_COND    (-2)

-

-/******************************************************************

-* Views

-*******************************************************************/

-enum class eViewType {

-    DisplayChannel,

-    DisplayMenu,

-    DisplayReplay,

-    DisplayVolume,

-    DisplayTracks,

-    DisplayMessage,

-    DisplayPlugin

-};

-/******************************************************************

-* ViewElements DisplayChannel

-*******************************************************************/

-enum class eVeDisplayChannel {

-    background = 0,

-    datetime,

-    time,

-    message,

-    devices,

-    currentweather,

-    customtokens,

-    channelinfo,

-    channelgroup,

-    epginfo,

-    progressbar,

-    statusinfo,

-    audioinfo,

-    screenresolution,

-    signalquality,

-    scrapercontent,

-    ecminfo,

-    count

-};

-/******************************************************************

-* ViewElements DisplayMenu

-*******************************************************************/

-enum class eVeDisplayMenu {

-    background = 0,

-    header,

-    datetime,

-    time,

-    sortmode,

-    colorbuttons,

-    message,

-    scrollbar,

-    count

-};

-

-enum class eVeDisplayMenuMain {

-    timers = eVeDisplayMenu::count,

-    devices,

-    currentweather,

-    currentschedule,

-    discusage,

-    systemload,

-    systemmemory,

-    temperatures,

-    vdrstatistics,

-    lastrecordings,

-    customtokens,

-    count

-};

-

-enum class eVeDisplayDetailedMenu {

-    detailheader = eVeDisplayMenu::count,

-    tablabels,

-    count

-};

-/******************************************************************

-* Subviews DisplayMenu

-*******************************************************************/

-enum class eSvDisplayMenu {

-    menudefault = 0,

-    main,

-    setup,

-    schedules,

-    channels,

-    timers,

-    recordings,

-    detailepg,

-    detailrec,

-    detailtext,

-    count

-};

-

-/******************************************************************

-* DisplayMessage

-*******************************************************************/

-enum class eVeDisplayMessage {

-    background = 0,

-    message,

-    count

-};

-

-/******************************************************************

-* DisplayReplay

-*******************************************************************/

-enum class eVeDisplayReplay {

-    background = 0,

-    backgroundmodeonly,

-    datetime,

-    time,

-    scrapercontent,

-    rectitle,

-    recinfo,

-    currenttime,

-    totaltime,

-    endtime,

-    progressbar,

-    cutmarks,

-    controlicons,

-    controliconsmodeonly,

-    progressmodeonly,

-    jump,

-    message,

-    onpause,

-    onpausemodeonly,

-    customtokens,

-    count

-};

-

-/******************************************************************

-* DisplayVolume

-*******************************************************************/

-enum class eVeDisplayVolume {

-    background = 0,

-    volume,

-    count

-};

-

-/******************************************************************

-* DisplayTracks

-*******************************************************************/

-enum class eVeDisplayTracks {

-    background = 0,

-    header,

-    count

-};

-

-/******************************************************************

-* Tokens common viewelements

-*******************************************************************/

-enum class eBackgroundST {

-    count

-};

-

-enum class eBackgroundIT {

-    count

-};

-

-enum class eDateTimeST {

-    time = 0,

-    dayleadingzero,

-    dayname,

-    daynameshort,

-    month,

-    monthname,

-    monthnameshort,

-    count

-};

-

-enum class eDateTimeIT {

-    day = 0,

-    year,

-    count

-};

-

-enum class eTimeST {

-    count = 0

-};

-

-enum class eTimeIT {

-    sec = 0,

-    min,

-    hour,

-    hmins,

-    count

-};

-

-enum class eMessageST {

-    text = 0,

-    count

-};

-

-enum class eMessageIT {

-    status = 0,

-    info,

-    warning,

-    error,

-    count

-};

-

-enum class eDevicesLT {

-    num = 0,

-    type,

-    istuned,

-    livetv,

-    recording,

-    hascam,

-    cam,

-    signalstrength,

-    signalquality,

-    channelnumber,

-    channelname,

-    channellogoexists, 

-    channelid,

-    source,

-    count

-};

-

-enum class eDevicesIT {

-    numdevices = 0,

-    count

-};

-

-enum class eCurrentWeatherST {

-    timestamp = 0,

-    summary,

-    icon,

-    precipitationtype,

-    windbearingstring,

-    temperature,

-    apparenttemperature,

-    mintemperature,

-    maxtemperature,

-    precipitationintensity,

-    windspeed,

-    visibility,

-    pressure,

-    ozone,

-    count

-};

-

-enum class eCurrentWeatherIT {

-    precipitationprobability = 0,

-    humidity,

-    windbearing,

-    cloudcover,

-    count

-};

-

-enum class eScraperPosterBannerST {

-    posterpath = 0,

-    bannerpath,

-    mediapath,

-    count

-};

-

-enum class eScraperPosterBannerIT {

-    posterwidth = 0,

-    posterheight,

-    hasposter,

-    bannerwidth,

-    bannerheight,

-    hasbanner,

-    mediawidth,

-    mediaheight,

-    isbanner,

-    count

-};

-

-/******************************************************************

-* Tokens displaychannel viewelements

-*******************************************************************/

-enum class eDCChannelInfoST {

-    channelnumber = 0,

-    channelname,

-    channelid,

-    count

-};

-

-enum class eDCChannelInfoIT {

-    channellogoexists = 0,

-    switching,

-    count

-};

-

-enum class eDCEpgInfoST {

-    currenttitle = 0,

-    currentsubtitle,

-    currentstart,

-    currentstop,

-    nexttitle,

-    nextsubtitle,

-    nextstart,

-    nextstop,

-    count

-};

-

-enum class eDCEpgInfoIT {

-    currentduration = 0,

-    currentdurationhours,

-    currentdurationminutes,

-    currentelapsed,

-    currentremaining,

-    nextduration,

-    nextdurationhours,

-    nextdurationminutes,

-    nextrecording,

-    currentrecording,

-    hasVPS,

-    count

-};

-

-enum class eDCProgressBarST {

-    start = 0,

-    stop,

-    count

-};

-

-enum class eDCProgressBarIT {

-    duration = 0,

-    elapsed,

-    remaining,

-    permashift,

-    livebuffer,

-    count

-};

-

-enum class eDCStatusInfoST {

-    count

-};

-

-enum class eDCStatusInfoIT {

-    isRadio = 0,

-    hasVT,

-    isStereo,

-    isDolby,

-    isEncrypted,

-    isRecording,

-    newmails,

-    count

-};

-

-enum class eDCAudioInfoST {

-    trackdesc = 0,

-    tracklang,

-    count

-};

-

-enum class eDCAudioInfoIT {

-    numaudiotracks = 0,

-    audiochannel,

-    count

-};

-

-enum class eDCEcmInfoST {

-    cardsystem = 0,

-    reader,

-    from,

-    protocol,

-    count

-};

-

-enum class eDCEcmInfoIT {

-    caid = 0,

-    pid,

-    prid,

-    ecmtime,

-    hops,

-    count

-};

-

-enum class eDCScreenResolutionST {

-    resolution = 0,

-    aspect,

-    count

-};

-

-enum class eDCScreenResolutionIT {

-    screenwidth = 0,

-    screenheight,

-    isHD,

-    isWideScreen,

-    count

-};

-

-enum class eDCChannelGroupST {

-    group = 0,

-    nextgroup,

-    prevgroup,

-    seppath,

-    count

-};

-

-enum class eDCChannelGroupIT {

-    prevAvailable = 0,

-    nextAvailable,

-    sepexists,

-    count

-};

-

-enum class eDCSignalQualityST {

-    count = 0

-};

-

-enum class eDCSignalQualityIT {

-    signalstrength = 0,

-    signalquality,

-    count

-};

-

-/******************************************************************

-* Tokens displaymenu viewelements

-*******************************************************************/

-enum class eDMHeaderST {

-    title = 0,

-    vdrversion,

-    icon,

-    freetime,

-    vdrusagestring,

-    channelname,

-    channelid,

-    count

-};

-

-enum class eDMHeaderIT {

-    hasicon = 0,

-    freepercent,

-    usedpercent,

-    freegb,

-    discalert,

-    channelnumber,

-    channellogoexists,

-    whatson,

-    whatsonnow,

-    whatsonnext,

-    whatsonfavorites,

-    count

-};

-

-enum class eDMSortmodeST {

-    count = 0

-};

-

-enum class eDMSortmodeIT {

-    sortnumber = 0,

-    sortname,

-    sorttime,

-    sortprovider,

-    count

-};

-

-enum class eDMColorbuttonsST {

-    red = 0,

-    green,

-    yellow,

-    blue,

-    count

-};

-

-enum class eDMColorbuttonsIT {

-    red1 = 0, red2, red3, red4,

-    green1, green2, green3, green4,

-    yellow1, yellow2, yellow3, yellow4,

-    blue1, blue2, blue3, blue4,

-    count

-};

-

-enum class eDMScrollbarST {

-    count = 0

-};

-

-enum class eDMScrollbarIT {

-    height = 0,

-    offset,

-    hasprev,

-    hasnext,

-    count

-};

-

-enum class eDMTimersIT {

-    numtimers = 0,

-    numtimerconflicts,

-    timer1exists,  timer2exists,  timer3exists,  timer4exists,  timer5exists,

-    timer6exists,  timer7exists,  timer8exists,  timer9exists,  timer10exists,

-    timer11exists, timer12exists, timer13exists, timer14exists, timer15exists,

-    count

-};

-

-enum class eDMTimersLT {

-    title = 0,

-    datetime,

-    recording,

-    channelname,

-    channelnumber,

-    channelid,

-    channellogoexists,

-    isremotetimer,

-    count

-};

-

-enum class eDMCurrentscheduleIT {

-    islivetv = eScraperPosterBannerIT::count,

-    duration,

-    durationhours,

-    minutes,

-    elapsed,

-    remaining,

-    count

-};

-

-enum class eDMCurrentscheduleST {

-    title = eScraperPosterBannerST::count,

-    subtitle,

-    start,

-    stop,

-    durationminutes,

-    count

-};

-

-enum class eDMLastrecordingsIT {

-    numtimers = 0,

-    count

-};

-

-enum class eDMLastrecordingsLT {

-    name = 0,

-    seriesname,

-    date,

-    time,

-    duration,

-    hasposter,

-    posterpath,

-    posterwidth,

-    posterheight,

-    count

-};

-

-enum class eDMDiscusageST {

-    freetime = 0,

-    vdrusagestring,

-    count

-};

-

-enum class eDMDiscusageIT {

-    freepercent = 0,

-    usedpercent,

-    freegb,

-    discalert,

-    count

-};

-

-enum class eDMSystemloadST {

-    load = 0,

-    count

-};

-

-enum class eDMSystemloadIT {

-    loadhand = 0,

-    count

-};

-

-enum class eDMSystemmemoryST {

-    count = 0

-};

-

-enum class eDMSystemmemoryIT {

-    totalmem = 0,

-    usedmem,

-    usedmempercent,

-    count

-};

-

-enum class eDMVdrstatisticsST {

-    vdrcpu = 0,

-    vdrmem,

-    count

-};

-

-enum class eDMVdrstatisticsIT {

-    count = 0

-};

-

-enum class eDMTemperaturesST {

-    count = 0

-};

-

-enum class eDMTemperaturesIT {

-    cputemp = 0,

-    gputemp,

-    count

-};

-

-/******************************************************************

-* Tokens displaymenu listelements

-*******************************************************************/

-enum class eLeMenuDefaultST {

-    column1 = 0,

-    column2,

-    column3,

-    column4,

-    column5,

-    column6,

-    count

-};

-

-enum class eLeMenuDefaultIT {

-    nummenuitem = 0,

-    current,

-    separator,

-    column2set,

-    column3set,

-    column4set,

-    column5set,

-    column6set,

-    column1x,

-    column2x,

-    column3x,

-    column4x,

-    column5x,

-    column6x,

-    column1width,

-    column2width,

-    column3width,

-    column4width,

-    column5width,

-    column6width,

-    column1pb,

-    column2pb,

-    column3pb,

-    column4pb,

-    column5pb,

-    column6pb,

-    column1pbtotalsize,

-    column2pbtotalsize,

-    column3pbtotalsize,

-    column4pbtotalsize,

-    column5pbtotalsize,

-    column6pbtotalsize,

-    column1pbsize,

-    column2pbsize,

-    column3pbsize,

-    column4pbsize,

-    column5pbsize,

-    column6pbsize,

-    setup,

-    commands,

-    fritzbox,

-    systeminfo,

-    mailbox,

-    neutrinoepg,

-    remotetimers,

-    count

-};

-

-enum class eLeMenuMainST {

-    label = 0,

-    number,

-    icon,

-    count

-};

-

-enum class eLeMenuMainIT {

-    nummenuitem = 0,

-    current,

-    separator,

-    count

-};

-

-enum class eCeMenuMainST {

-    label = 0,

-    number,

-    icon,

-    count

-};

-

-enum class eCeMenuMainIT {

-    menuitemx = 0,

-    menuitemy,

-    menuitemwidth,

-    menuitemheight,

-    count

-};

-

-enum class eLeMenuSchedulesST {

-    title = 0,

-    shorttext,

-    start,

-    stop,

-    day,

-    date,

-    durationminutes,

-    channelname,

-    channelid,

-    count

-};

-

-enum class eLeMenuSchedulesIT {

-    nummenuitem = 0,

-    current,

-    separator,

-    daynumeric,

-    month,

-    year,

-    running,

-    elapsed,

-    startsin,

-    duration,

-    durationhours,

-    channelnumber,

-    channellogoexists,

-    whatson,

-    whatsonnow,

-    whatsonnext,

-    whatsonfavorites,

-    timerpartitial,

-    timerfull,

-    hasVPS,

-    count

-};

-

-enum class eCeMenuSchedulesST {

-    title = 0,

-    shorttext,

-    description,

-    start,

-    stop,

-    day,

-    date,

-    channelname,

-    channelid,

-    posterpath,

-    bannerpath,

-    count

-};

-

-enum class eCeMenuSchedulesLT {

-    title = 0,

-    shorttext,

-    start,

-    stop,

-    count

-};

-

-enum class eCeMenuSchedulesIT {

-    menuitemx = 0,

-    menuitemy,

-    menuitemwidth,

-    menuitemheight,

-    daynumeric,

-    month,

-    year,

-    running,

-    elapsed,

-    duration,

-    durationhours,

-    durationminutes,

-    channelnumber,

-    channellogoexists,

-    hasposter,

-    posterwidth,

-    posterheight,

-    hasbanner,

-    bannerwidth,

-    bannerheight,

-    whatson,

-    whatsonnow,

-    whatsonnext,

-    whatsonfavorites,

-    timerpartitial,

-    timerfull,

-    count

-};

-

-enum class eLeMenuChannelsST {

-    name = 0,

-    channelid,

-    source,

-    sourcedescription,

-    position,

-    presenteventtitle,

-    presenteventstart,

-    presenteventstop,

-    count

-};

-

-enum class eLeMenuChannelsIT {

-    nummenuitem = 0,

-    current,

-    separator,

-    number,

-    transponder,

-    frequency,

-    channellogoexists,

-    isAtsc,

-    isCable,

-    isSat,

-    isTerr,

-    count

-};

-

-enum class eCeMenuChannelsST {

-    name = 0,

-    channelid,

-    source,

-    sourcedescription,

-    position,

-    presenteventtitle,

-    presenteventstart,

-    presenteventstop,

-    presenteventshorttext,

-    presenteventdescription,

-    presenteventday,

-    presenteventdate,

-    presenteventdurationminutes,

-    posterpath,

-    nexteventtitle,

-    nexteventstart,

-    nexteventstop,

-    nexteventshorttext,

-    nexteventdescription,

-    nexteventday,

-    nexteventdate,

-    nexteventdurationminutes,

-    count

-};

-

-enum class eCeMenuChannelsIT {

-    menuitemx = 0,

-    menuitemy,

-    menuitemwidth,

-    menuitemheight,

-    number,

-    transponder,

-    frequency,

-    channellogoexists,

-    isAtsc,

-    isCable,

-    isSat,

-    isTerr,

-    presenteventduration,

-    presenteventdurationhours,

-    presenteventelapsed,

-    hasposter,

-    posterwidth,

-    posterheight,

-    nexteventduration,

-    nexteventdurationhours,

-    count

-};

-

-enum class eCeMenuChannelsLT {

-    title = 0,

-    shorttext,

-    start,

-    stop,

-    count

-};

-

-enum class eLeMenuTimersST {

-    title = 0,

-    timerstart,

-    timerstop,

-    day,

-    dayname,

-    monthname,

-    channelname,

-    channelid,

-    eventtitle,

-    eventstart,

-    eventstop,

-    count

-};

-

-enum class eLeMenuTimersIT {

-    nummenuitem = 0,

-    current,

-    separator,

-    month,

-    year,

-    channellogoexists,

-    channelnumber,

-    flagactive,

-    flaginstant,

-    flagvps,

-    flagrecording,

-    flagpending,

-    count

-};

-

-enum class eCeMenuTimersST {

-    title = 0,

-    timerstart,

-    timerstop,

-    day,

-    dayname,

-    monthname,

-    channelname,

-    channelid,

-    eventtitle,

-    eventstart,

-    eventstop,

-    eventshorttext,

-    eventdescription,

-    posterpath,

-    count

-};

-

-enum class eCeMenuTimersIT {

-    menuitemx = 0,

-    menuitemy,

-    menuitemwidth,

-    menuitemheight,

-    month,

-    year,

-    channellogoexists,

-    channelnumber,

-    flagactive,

-    flaginstant,

-    flagvps,

-    flagrecording,

-    flagpending,

-    hasposter,

-    posterwidth,

-    posterheight,

-    count

-};

-

-enum class eLeMenuRecordingsST {

-    name = 0,

-    epgname,

-    shorttext,

-    description,

-    date,

-    time,

-    durationminutes,

-    durationeventminutes,

-    thumbnailpath,

-    posterpath,

-    count

-};

-

-enum class eLeMenuRecordingsIT {

-    nummenuitem = 0,

-    current,

-    separator,

-    isnew,

-    percentseen,

-    watched,

-    cutted,

-    folder,

-    daynumeric,

-    month,

-    year,

-    duration,

-    durationhours,

-    durationevent,

-    durationeventhours,

-    numrecordingsfolder,

-    newrecordingsfolder,

-    hasposterthumbnail,

-    thumbnailwidth,

-    thumbnailheight,

-    hasposter,

-    posterwidth,

-    posterheight,

-    count

-};

-

-enum class eCeMenuRecordingsST {

-    name = 0,

-    epgname,

-    shorttext,

-    description,

-    date,

-    time,

-    durationminutes,

-    durationeventminutes,

-    thumbnailpath,

-    posterpath,

-    count

-};

-

-enum class eCeMenuRecordingsIT {

-    menuitemx = 0,

-    menuitemy,

-    menuitemwidth,

-    menuitemheight,

-    isnew,

-    percentseen,

-    watched,

-    cutted,

-    folder,

-    daynumeric,

-    month,

-    year,

-    duration,

-    durationhours,

-    durationevent,

-    durationeventhours,

-    numrecordingsfolder,

-    newrecordingsfolder,

-    hasposterthumbnail,

-    thumbnailwidth,

-    thumbnailheight,

-    hasposter,

-    posterwidth,

-    posterheight,

-    count

-};

-

-/******************************************************************

-* Tokens displaymenu detailed views

-*******************************************************************/

-enum class eScraperHeaderST {

-    posterpath = 0,

-    bannerpath,

-    count

-};

-

-enum class eScraperHeaderIT {

-    ismovie = 0,

-    isseries,

-    posteravailable,

-    posterwidth,

-    posterheight,

-    banneravailable,

-    bannerwidth,

-    bannerheight,

-    count

-};

-

-enum class eDmDetailedHeaderEpgST {

-    title = eScraperHeaderST::count,

-    shorttext,

-    start,

-    stop,

-    day,

-    date,

-    durationminutes,

-    vps,

-    channelname,

-    channelid,

-    epgpicpath,

-    count

-};

-

-enum class eDmDetailedHeaderEpgIT {

-    daynumeric = eScraperHeaderIT::count,

-    month,

-    year,

-    running,

-    elapsed,

-    duration,

-    durationhours,

-    channelnumber,

-    channellogoexists,

-    epgpicavailable,

-    count

-};

-

-enum class eDmDetailedHeaderRecST {

-    name = eScraperHeaderST::count,

-    epgname,

-    shorttext,

-    date,

-    time,

-    recimgpath,

-    recchannelname,

-    recchannelid,

-    durationminutes,

-    durationeventminutes,

-    count

-};

-

-enum class eDmDetailedHeaderRecIT {

-    daynumeric = eScraperHeaderIT::count,

-    month,

-    year,

-    duration,

-    durationhours,

-    durationevent,

-    durationeventhours,

-    recimgavailable,

-    recchannelnumber,

-    count

-};

-

-enum class eDmTabsIT {

-    count = 0,

-};

-

-enum class eDmTabsST {

-    currenttab = 0,

-    prevtab,

-    nexttab,

-    count

-};

-

-enum class eDmTabsLT {

-    title = 0,

-    current,

-    count

-};

-

-enum class eScraperST {

-    movietitle = 0,

-    movieoriginalTitle,

-    movietagline,

-    movieoverview,

-    moviegenres,

-    moviehomepage,

-    moviereleasedate,

-    moviepopularity,

-    movievoteaverage,

-    posterpath,

-    fanartpath,

-    moviecollectionName,

-    collectionposterpath,

-    collectionfanartpath,

-    seriesname,

-    seriesoverview,

-    seriesfirstaired,

-    seriesnetwork,

-    seriesgenre,

-    seriesrating,

-    seriesstatus,

-    episodetitle,

-    episodefirstaired,

-    episodegueststars,

-    episodeoverview,

-    episoderating,

-    episodeimagepath,

-    seasonposterpath,

-    seriesposter1path,

-    seriesposter2path,

-    seriesposter3path,

-    seriesfanart1path,

-    seriesfanart2path,

-    seriesfanart3path,

-    seriesbanner1path,

-    seriesbanner2path,

-    seriesbanner3path,

-    count

-};

-

-enum class eScraperIT {

-    ismovie = 0,

-    moviebudget,

-    movierevenue,

-    movieadult,

-    movieruntime,

-    isseries,

-    posterwidth,

-    posterheight,

-    fanartwidth,

-    fanartheight,

-    movieiscollection,

-    collectionposterwidth,

-    collectionposterheight,

-    collectionfanartwidth,

-    collectionfanartheight,

-    epgpicavailable,

-    episodenumber,

-    episodeseason,

-    episodeimagewidth,

-    episodeimageheight,

-    seasonposterwidth,

-    seasonposterheight,

-    seriesposter1width,

-    seriesposter1height,

-    seriesposter2width,

-    seriesposter2height,

-    seriesposter3width,

-    seriesposter3height,

-    seriesfanart1width,

-    seriesfanart1height,

-    seriesfanart2width,

-    seriesfanart2height,

-    seriesfanart3width,

-    seriesfanart3height,

-    seriesbanner1width,

-    seriesbanner1height,

-    seriesbanner2width,

-    seriesbanner2height,

-    seriesbanner3width,

-    seriesbanner3height,

-    count

-};

-

-enum class eScraperLT {

-    //actors

-    name = 0,

-    role,

-    thumb,

-    thumbwidth,

-    thumbheight,

-    count

-};

-

-enum class eDmDetailedEpgST {

-    title = eScraperST::count,

-    shorttext,

-    description,

-    start,

-    stop,

-    day,

-    date,

-    durationminutes,

-    vps,

-    channelname,

-    channelid,

-    epgpic1path,

-    epgpic2path,

-    epgpic3path,

-    count

-};

-

-enum class eDmDetailedEpgIT {

-    daynumeric = eScraperIT::count,

-    month,

-    year,

-    running,

-    elapsed,

-    duration,

-    durationhours,

-    channelnumber,

-    channellogoexists,

-    hasreruns,

-    epgpic1avaialble,

-    epgpic2avaialble,

-    epgpic3avaialble,

-    count

-};

-

-enum class eRerunsLT {

-    title = 0,

-    shorttext,

-    date,

-    day,

-    start,

-    stop,

-    channelname,

-    channelnumber,

-    channelid,

-    channellogoexists,

-    count

-};

-

-enum class eDmDetailedRecST {

-    name = eScraperST::count,

-    epgname,

-    shorttext,

-    description,

-    day,

-    date,

-    time,

-    durationminutes,

-    durationeventminutes,

-    recordingsize,

-    recordingsizecutted,

-    recordinglength,

-    recordinglengthcutted,

-    recordingbitrate,

-    recordingformat,

-    recchannelname,

-    recchannelid,

-    searchtimer,

-    recimg1path,

-    recimg2path,

-    recimg3path,

-    count

-};

-

-enum class eDmDetailedRecIT {

-    daynumeric = eScraperIT::count,

-    month,

-    year,

-    duration,

-    durationhours,

-    durationevent,

-    durationeventhours,

-    cutted,

-    recchannelnumber,

-    recimg1avaialble,

-    recimg2avaialble,

-    recimg3avaialble,

-    count

-};

-

-enum class eDmDetailedTextST {

-    text = 0,

-    count

-};

-

-enum class eDmSkinPreviewST {

-    menuheader = 0,

-    skinname,

-    author,

-    count

-};

-

-enum class eDmSkinPreviewFontsLT {

-    name = 0,

-    installed,

-    count

-};

-

-enum class eDmSkinPreviewPluginsLT {

-    name = 0,

-    count

-};

-

-enum class eDmSkinPreviewScreenshotsLT {

-    desc = 0,

-    path,

-    count

-};

-/******************************************************************

-* Tokens DisplayReplay Viewelements

-*******************************************************************/

-enum class eDRRecTitleST {

-    rectitle = 0,

-    recsubtitle,

-    recdate,

-    rectime,

-    count

-};

-

-enum class eDRRecInfoST {

-    resolution = 0,

-    aspect,

-    count

-};

-

-enum class eDRRecInfoIT {

-    screenwidth = 0,

-    screenheight,

-    isHD,

-    isWideScreen,

-    count

-};

-

-enum class eDRCurrentTimeST {

-    reccurrent = 0,

-    count

-};

-

-enum class eDRTotalTimeST {

-    rectotal = 0,

-    timeshifttotal,

-    count

-};

-

-enum class eDRTotalTimeIT {

-    timeshift = 0,

-    count

-};

-

-enum class eDREndTimeST {

-    recend = 0,

-    count

-};

-

-enum class eDRProgressbarIT {

-    current = 0,

-    total,

-    timeshift,

-    timeshifttotal,

-    count

-};

-

-enum class eDRCutmarksIT {

-    timeshift = 0,

-    count

-};

-

-enum class eDRCutmarksLT {

-    position = 0,

-    endposition,

-    total,

-    timeshifttotal,

-    active,

-    startmark,

-    count

-};

-

-enum class eDRControlIconsIT {

-    play = 0,

-    pause,

-    forward,

-    forward1x,

-    forward2x,

-    forward3x,

-    rewind,

-    rewind1x,

-    rewind2x,

-    rewind3x,

-    count

-};

-

-enum class eDRProgressModeonlyIT {

-    current = 0,

-    total,

-    count

-};

-

-enum class eDRProgressModeonlyST {

-    timecurrent = 0,

-    timetotal,

-    count

-};

-

-enum class eDRJumpST {

-    jump = 0,

-    count

-};

-

-enum class eDROnpauseST {

-    name = eScraperST::count,

-    shorttext,

-    description,

-    date,

-    time,

-    durationminutes,

-    durationeventminutes,

-    count

-};

-

-enum class eDROnpauseIT {

-    daynumeric = eScraperIT::count,

-    month,

-    year,

-    duration,

-    durationhours,

-    durationevent,

-    durationeventhours,

-    count

-};

-

-/******************************************************************

-* Tokens DisplayVolume Viewelements

-*******************************************************************/

-enum class eDVVolumeIT {

-    volume = 0,

-    volpercent,

-    maxvolume,

-    mute,

-    count

-};

-

-/******************************************************************

-* Tokens DisplayTracks Viewelements

-*******************************************************************/

-enum class eDTBackgroundIT {

-    numtracks = 0,

-    count

-};

-

-enum class eDTHeaderIT {

-    numtracks = 0,

-    isstereo,

-    isac3,

-    count

-};

-

-enum class eDTHeaderST {

-    title = 0,

-    count

-};

-

-enum class eLeDisplayTracksIT {

-    nummenuitem = 0,

-    current,

-    count

-};

-

-enum class eLeDisplayTracksST {

-    title = 0,

-    count

-};

-/******************************************************************

-* Attributes

-*******************************************************************/

-enum class eCommonAttribs {

-    x = 0,

-    y,

-    width, 

-    height,

-    debug,

-    count

-};

-

-enum class eViewAttribs {

-    fadetime = 0,

-    shifttime, 

-    shifttype,

-    shiftmode,

-    startx,

-    starty,

-    scaletvx,

-    scaletvy,

-    scaletvwidth,

-    scaletvheight,

-    orientation,

-    debuggrid,

-    hideroot,

-    count

-};

-

-enum class eViewElementAttribs {

-    delay = 0,

-    fadetime,

-    shifttime, 

-    shifttype,

-    shiftmode,

-    startx,

-    starty,

-    mode,

-    orientation,

-    name,

-    count

-};

-

-enum class eViewListAttribs {

-    align = 0,

-    menuitemwidth,

-    determinatefont,

-    numlistelements, 

-    orientation,

-    condition,

-    count

-};

-

-enum class eAreaAttribs {

-    layer = 0,

-    transparency,

-    mode,

-    orientation, 

-    scrollelement,

-    scrollspeed,

-    delay,

-    background,

-    name,

-    scrollheight,

-    count

-};

-

-enum class eAreaContainerAttribs {

-    count = 0

-};

-

-/******************************************************************

-* Functions

-*******************************************************************/

-enum class eFillAttribs {

-    color = 0,

-    count

-};

-

-enum class eDrawRectangleAttribs {

-    align = 0,

-    valign,

-    color,

-    name,

-    animtype,

-    animfreq,

-    count

-};

-

-enum class eDrawEllipseAttribs {

-    align = 0,

-    valign,

-    color,

-    name,

-    quadrant,

-    animtype,

-    animfreq,

-    count

-};

-

-enum class eDrawSlopeAttribs {

-    align = 0,

-    valign,

-    color,

-    name,

-    type,

-    animtype,

-    animfreq,

-    count

-};

-

-enum class eDrawTextAttribs {

-    align = 0,

-    valign,

-    color,

-    font,

-    fontsize,

-    name,

-    text,

-    animtype,

-    animfreq,

-    count

-};

-

-enum class eDrawTextAttribsVertical {

-    align = 0,

-    valign,

-    direction,

-    color,

-    font,

-    fontsize,

-    name,

-    text,

-    animtype,

-    animfreq,

-    count

-};

-

-enum class eDrawTextBoxAttribs {

-    align = 0,

-    valign,

-    maxlines,

-    floatwidth,

-    floatheight,

-    floatmode,

-    color,

-    font,

-    fontsize,

-    name,

-    text,

-    count

-};

-

-enum class eDrawImageAttribs {

-    align = 0,

-    valign,

-    imagetype,

-    name,

-    cache,

-    path,

-    animtype,

-    animfreq,

-    count

-};

-

-enum class eLoopAttribs {

-    columnwidth = 0,

-    rowheight,

-    name,

-    orientation,

-    overflow,

-    maxitems,

-    count

-};

-

-/******************************************************************

-* Common Parameters

-*******************************************************************/

-enum class eViewElementMode {

-    regular,

-    light

-};

-

-enum class eShiftType {

-    none = -1,

-    left,

-    right,

-    top,

-    bottom

-};

-

-enum class eShiftMode {

-    linear,

-    slowedDown

-};

-

-enum class eScrollMode {

-    none,

-    carriagereturn,

-    forthandback

-};

-

-enum class eScrollSpeed {

-    none,

-    slow,

-    medium,

-    fast

-};

-

-enum class eOrientation {

-    none,

-    horizontal,

-    vertical,

-    absolute

-};

-

-enum class eAlign {

-    left,

-    center,

-    right,

-    top,

-    bottom

-};

-

-enum class eAnimType {

-    none,

-    blink,

-    animated

-};

-

-enum class eImageType {

-    channellogo,

-    seplogo,

-    skinpart,

-    menuicon,

-    icon,

-    image

-};

-

-enum class eOverflowType {

-    none,

-    wrap,

-    cut

-};

-

-enum class eFloatMode {

-    none = -1,

-    topleft,

-    topright

-};

-

-enum class eDirection {

-    none = -1,

-    bottomup,

-    topdown

-};

-

-

+#ifndef __DEFINITIONS_H
+#define __DEFINITIONS_H
+
+#include <string>
+#include <map>
+
+using namespace std;
+
+typedef pair<string,string> stringpair;
+typedef map<string,string> stringmap;
+
+#define ATTR_UNKNOWN (-1)
+#define ATTR_COND    (-2)
+
+/******************************************************************
+* Views
+*******************************************************************/
+enum class eViewType {
+    DisplayChannel,
+    DisplayMenu,
+    DisplayReplay,
+    DisplayVolume,
+    DisplayTracks,
+    DisplayMessage,
+    DisplayPlugin
+};
+/******************************************************************
+* ViewElements DisplayChannel
+*******************************************************************/
+enum class eVeDisplayChannel {
+    background = 0,
+    datetime,
+    time,
+    message,
+    devices,
+    currentweather,
+    customtokens,
+    channelinfo,
+    channelgroup,
+    epginfo,
+    progressbar,
+    statusinfo,
+    audioinfo,
+    screenresolution,
+    signalquality,
+    scrapercontent,
+    ecminfo,
+    count
+};
+/******************************************************************
+* ViewElements DisplayMenu
+*******************************************************************/
+enum class eVeDisplayMenu {
+    background = 0,
+    header,
+    datetime,
+    time,
+    sortmode,
+    colorbuttons,
+    message,
+    scrollbar,
+    count
+};
+
+enum class eVeDisplayMenuMain {
+    timers = eVeDisplayMenu::count,
+    devices,
+    currentweather,
+    currentschedule,
+    discusage,
+    systemload,
+    systemmemory,
+    temperatures,
+    vdrstatistics,
+    lastrecordings,
+    customtokens,
+    count
+};
+
+enum class eVeDisplayDetailedMenu {
+    detailheader = eVeDisplayMenu::count,
+    tablabels,
+    count
+};
+/******************************************************************
+* Subviews DisplayMenu
+*******************************************************************/
+enum class eSvDisplayMenu {
+    menudefault = 0,
+    main,
+    setup,
+    schedules,
+    channels,
+    timers,
+    recordings,
+    detailepg,
+    detailrec,
+    detailtext,
+    count
+};
+
+/******************************************************************
+* DisplayMessage
+*******************************************************************/
+enum class eVeDisplayMessage {
+    background = 0,
+    message,
+    count
+};
+
+/******************************************************************
+* DisplayReplay
+*******************************************************************/
+enum class eVeDisplayReplay {
+    background = 0,
+    backgroundmodeonly,
+    datetime,
+    time,
+    scrapercontent,
+    rectitle,
+    recinfo,
+    currenttime,
+    totaltime,
+    endtime,
+    progressbar,
+    cutmarks,
+    controlicons,
+    controliconsmodeonly,
+    progressmodeonly,
+    jump,
+    message,
+    onpause,
+    onpausemodeonly,
+    customtokens,
+    count
+};
+
+/******************************************************************
+* DisplayVolume
+*******************************************************************/
+enum class eVeDisplayVolume {
+    background = 0,
+    volume,
+    count
+};
+
+/******************************************************************
+* DisplayTracks
+*******************************************************************/
+enum class eVeDisplayTracks {
+    background = 0,
+    header,
+    count
+};
+
+/******************************************************************
+* Tokens common viewelements
+*******************************************************************/
+enum class eBackgroundST {
+    count
+};
+
+enum class eBackgroundIT {
+    count
+};
+
+enum class eDateTimeST {
+    time = 0,
+    dayleadingzero,
+    dayname,
+    daynameshort,
+    month,
+    monthname,
+    monthnameshort,
+    count
+};
+
+enum class eDateTimeIT {
+    day = 0,
+    year,
+    count
+};
+
+enum class eTimeST {
+    count = 0
+};
+
+enum class eTimeIT {
+    sec = 0,
+    min,
+    hour,
+    hmins,
+    count
+};
+
+enum class eMessageST {
+    text = 0,
+    count
+};
+
+enum class eMessageIT {
+    status = 0,
+    info,
+    warning,
+    error,
+    count
+};
+
+enum class eDevicesLT {
+    num = 0,
+    type,
+    istuned,
+    livetv,
+    recording,
+    hascam,
+    cam,
+    signalstrength,
+    signalquality,
+    channelnumber,
+    channelname,
+    channellogoexists, 
+    channelid,
+    source,
+    count
+};
+
+enum class eDevicesIT {
+    numdevices = 0,
+    count
+};
+
+enum class eCurrentWeatherST {
+    timestamp = 0,
+    summary,
+    icon,
+    precipitationtype,
+    windbearingstring,
+    temperature,
+    apparenttemperature,
+    mintemperature,
+    maxtemperature,
+    precipitationintensity,
+    windspeed,
+    visibility,
+    pressure,
+    ozone,
+    count
+};
+
+enum class eCurrentWeatherIT {
+    precipitationprobability = 0,
+    humidity,
+    windbearing,
+    cloudcover,
+    count
+};
+
+enum class eScraperPosterBannerST {
+    posterpath = 0,
+    bannerpath,
+    mediapath,
+    count
+};
+
+enum class eScraperPosterBannerIT {
+    posterwidth = 0,
+    posterheight,
+    hasposter,
+    bannerwidth,
+    bannerheight,
+    hasbanner,
+    mediawidth,
+    mediaheight,
+    isbanner,
+    count
+};
+
+/******************************************************************
+* Tokens displaychannel viewelements
+*******************************************************************/
+enum class eDCChannelInfoST {
+    channelnumber = 0,
+    channelname,
+    channelid,
+    count
+};
+
+enum class eDCChannelInfoIT {
+    channellogoexists = 0,
+    switching,
+    count
+};
+
+enum class eDCEpgInfoST {
+    currenttitle = 0,
+    currentsubtitle,
+    currentstart,
+    currentstop,
+    nexttitle,
+    nextsubtitle,
+    nextstart,
+    nextstop,
+    count
+};
+
+enum class eDCEpgInfoIT {
+    currentduration = 0,
+    currentdurationhours,
+    currentdurationminutes,
+    currentelapsed,
+    currentremaining,
+    nextduration,
+    nextdurationhours,
+    nextdurationminutes,
+    nextrecording,
+    currentrecording,
+    hasVPS,
+    count
+};
+
+enum class eDCProgressBarST {
+    start = 0,
+    stop,
+    count
+};
+
+enum class eDCProgressBarIT {
+    duration = 0,
+    elapsed,
+    remaining,
+    permashift,
+    livebuffer,
+    count
+};
+
+enum class eDCStatusInfoST {
+    count
+};
+
+enum class eDCStatusInfoIT {
+    isRadio = 0,
+    hasVT,
+    isStereo,
+    isDolby,
+    isEncrypted,
+    isRecording,
+    newmails,
+    count
+};
+
+enum class eDCAudioInfoST {
+    trackdesc = 0,
+    tracklang,
+    count
+};
+
+enum class eDCAudioInfoIT {
+    numaudiotracks = 0,
+    audiochannel,
+    count
+};
+
+enum class eDCEcmInfoST {
+    cardsystem = 0,
+    reader,
+    from,
+    protocol,
+    count
+};
+
+enum class eDCEcmInfoIT {
+    caid = 0,
+    pid,
+    prid,
+    ecmtime,
+    hops,
+    count
+};
+
+enum class eDCScreenResolutionST {
+    resolution = 0,
+    aspect,
+    count
+};
+
+enum class eDCScreenResolutionIT {
+    screenwidth = 0,
+    screenheight,
+    isHD,
+    isWideScreen,
+    count
+};
+
+enum class eDCChannelGroupST {
+    group = 0,
+    nextgroup,
+    prevgroup,
+    seppath,
+    count
+};
+
+enum class eDCChannelGroupIT {
+    prevAvailable = 0,
+    nextAvailable,
+    sepexists,
+    count
+};
+
+enum class eDCSignalQualityST {
+    count = 0
+};
+
+enum class eDCSignalQualityIT {
+    signalstrength = 0,
+    signalquality,
+    count
+};
+
+/******************************************************************
+* Tokens displaymenu viewelements
+*******************************************************************/
+enum class eDMHeaderST {
+    title = 0,
+    vdrversion,
+    icon,
+    freetime,
+    vdrusagestring,
+    channelname,
+    channelid,
+    count
+};
+
+enum class eDMHeaderIT {
+    hasicon = 0,
+    freepercent,
+    usedpercent,
+    freegb,
+    discalert,
+    channelnumber,
+    channellogoexists,
+    whatson,
+    whatsonnow,
+    whatsonnext,
+    whatsonfavorites,
+    count
+};
+
+enum class eDMSortmodeST {
+    count = 0
+};
+
+enum class eDMSortmodeIT {
+    sortnumber = 0,
+    sortname,
+    sorttime,
+    sortprovider,
+    count
+};
+
+enum class eDMColorbuttonsST {
+    red = 0,
+    green,
+    yellow,
+    blue,
+    count
+};
+
+enum class eDMColorbuttonsIT {
+    red1 = 0, red2, red3, red4,
+    green1, green2, green3, green4,
+    yellow1, yellow2, yellow3, yellow4,
+    blue1, blue2, blue3, blue4,
+    count
+};
+
+enum class eDMScrollbarST {
+    count = 0
+};
+
+enum class eDMScrollbarIT {
+    height = 0,
+    offset,
+    hasprev,
+    hasnext,
+    count
+};
+
+enum class eDMTimersIT {
+    numtimers = 0,
+    numtimerconflicts,
+    timer1exists,  timer2exists,  timer3exists,  timer4exists,  timer5exists,
+    timer6exists,  timer7exists,  timer8exists,  timer9exists,  timer10exists,
+    timer11exists, timer12exists, timer13exists, timer14exists, timer15exists,
+    count
+};
+
+enum class eDMTimersLT {
+    title = 0,
+    datetime,
+    recording,
+    channelname,
+    channelnumber,
+    channelid,
+    channellogoexists,
+    isremotetimer,
+    count
+};
+
+enum class eDMCurrentscheduleIT {
+    islivetv = eScraperPosterBannerIT::count,
+    duration,
+    durationhours,
+    minutes,
+    elapsed,
+    remaining,
+    count
+};
+
+enum class eDMCurrentscheduleST {
+    title = eScraperPosterBannerST::count,
+    subtitle,
+    start,
+    stop,
+    durationminutes,
+    count
+};
+
+enum class eDMLastrecordingsIT {
+    numtimers = 0,
+    count
+};
+
+enum class eDMLastrecordingsLT {
+    name = 0,
+    seriesname,
+    date,
+    time,
+    duration,
+    hasposter,
+    posterpath,
+    posterwidth,
+    posterheight,
+    count
+};
+
+enum class eDMDiscusageST {
+    freetime = 0,
+    vdrusagestring,
+    count
+};
+
+enum class eDMDiscusageIT {
+    freepercent = 0,
+    usedpercent,
+    freegb,
+    discalert,
+    count
+};
+
+enum class eDMSystemloadST {
+    load = 0,
+    count
+};
+
+enum class eDMSystemloadIT {
+    loadhand = 0,
+    count
+};
+
+enum class eDMSystemmemoryST {
+    count = 0
+};
+
+enum class eDMSystemmemoryIT {
+    totalmem = 0,
+    usedmem,
+    usedmempercent,
+    count
+};
+
+enum class eDMVdrstatisticsST {
+    vdrcpu = 0,
+    vdrmem,
+    count
+};
+
+enum class eDMVdrstatisticsIT {
+    count = 0
+};
+
+enum class eDMTemperaturesST {
+    count = 0
+};
+
+enum class eDMTemperaturesIT {
+    cputemp = 0,
+    gputemp,
+    count
+};
+
+/******************************************************************
+* Tokens displaymenu listelements
+*******************************************************************/
+enum class eLeMenuDefaultST {
+    column1 = 0,
+    column2,
+    column3,
+    column4,
+    column5,
+    column6,
+    count
+};
+
+enum class eLeMenuDefaultIT {
+    nummenuitem = 0,
+    current,
+    separator,
+    column2set,
+    column3set,
+    column4set,
+    column5set,
+    column6set,
+    column1x,
+    column2x,
+    column3x,
+    column4x,
+    column5x,
+    column6x,
+    column1width,
+    column2width,
+    column3width,
+    column4width,
+    column5width,
+    column6width,
+    column1pb,
+    column2pb,
+    column3pb,
+    column4pb,
+    column5pb,
+    column6pb,
+    column1pbtotalsize,
+    column2pbtotalsize,
+    column3pbtotalsize,
+    column4pbtotalsize,
+    column5pbtotalsize,
+    column6pbtotalsize,
+    column1pbsize,
+    column2pbsize,
+    column3pbsize,
+    column4pbsize,
+    column5pbsize,
+    column6pbsize,
+    setup,
+    commands,
+    fritzbox,
+    systeminfo,
+    mailbox,
+    neutrinoepg,
+    remotetimers,
+    count
+};
+
+enum class eLeMenuMainST {
+    label = 0,
+    number,
+    icon,
+    count
+};
+
+enum class eLeMenuMainIT {
+    nummenuitem = 0,
+    current,
+    separator,
+    count
+};
+
+enum class eCeMenuMainST {
+    label = 0,
+    number,
+    icon,
+    count
+};
+
+enum class eCeMenuMainIT {
+    menuitemx = 0,
+    menuitemy,
+    menuitemwidth,
+    menuitemheight,
+    count
+};
+
+enum class eLeMenuSchedulesST {
+    title = 0,
+    shorttext,
+    start,
+    stop,
+    day,
+    date,
+    durationminutes,
+    channelname,
+    channelid,
+    count
+};
+
+enum class eLeMenuSchedulesIT {
+    nummenuitem = 0,
+    current,
+    separator,
+    daynumeric,
+    month,
+    year,
+    running,
+    elapsed,
+    startsin,
+    duration,
+    durationhours,
+    channelnumber,
+    channellogoexists,
+    whatson,
+    whatsonnow,
+    whatsonnext,
+    whatsonfavorites,
+    timerpartitial,
+    timerfull,
+    hasVPS,
+    count
+};
+
+enum class eCeMenuSchedulesST {
+    title = 0,
+    shorttext,
+    description,
+    start,
+    stop,
+    day,
+    date,
+    channelname,
+    channelid,
+    posterpath,
+    bannerpath,
+    count
+};
+
+enum class eCeMenuSchedulesLT {
+    title = 0,
+    shorttext,
+    start,
+    stop,
+    count
+};
+
+enum class eCeMenuSchedulesIT {
+    menuitemx = 0,
+    menuitemy,
+    menuitemwidth,
+    menuitemheight,
+    daynumeric,
+    month,
+    year,
+    running,
+    elapsed,
+    duration,
+    durationhours,
+    durationminutes,
+    channelnumber,
+    channellogoexists,
+    hasposter,
+    posterwidth,
+    posterheight,
+    hasbanner,
+    bannerwidth,
+    bannerheight,
+    whatson,
+    whatsonnow,
+    whatsonnext,
+    whatsonfavorites,
+    timerpartitial,
+    timerfull,
+    count
+};
+
+enum class eLeMenuChannelsST {
+    name = 0,
+    channelid,
+    source,
+    sourcedescription,
+    position,
+    presenteventtitle,
+    presenteventstart,
+    presenteventstop,
+    count
+};
+
+enum class eLeMenuChannelsIT {
+    nummenuitem = 0,
+    current,
+    separator,
+    number,
+    transponder,
+    frequency,
+    channellogoexists,
+    isAtsc,
+    isCable,
+    isSat,
+    isTerr,
+    count
+};
+
+enum class eCeMenuChannelsST {
+    name = 0,
+    channelid,
+    source,
+    sourcedescription,
+    position,
+    presenteventtitle,
+    presenteventstart,
+    presenteventstop,
+    presenteventshorttext,
+    presenteventdescription,
+    presenteventday,
+    presenteventdate,
+    presenteventdurationminutes,
+    posterpath,
+    nexteventtitle,
+    nexteventstart,
+    nexteventstop,
+    nexteventshorttext,
+    nexteventdescription,
+    nexteventday,
+    nexteventdate,
+    nexteventdurationminutes,
+    count
+};
+
+enum class eCeMenuChannelsIT {
+    menuitemx = 0,
+    menuitemy,
+    menuitemwidth,
+    menuitemheight,
+    number,
+    transponder,
+    frequency,
+    channellogoexists,
+    isAtsc,
+    isCable,
+    isSat,
+    isTerr,
+    presenteventduration,
+    presenteventdurationhours,
+    presenteventelapsed,
+    hasposter,
+    posterwidth,
+    posterheight,
+    nexteventduration,
+    nexteventdurationhours,
+    count
+};
+
+enum class eCeMenuChannelsLT {
+    title = 0,
+    shorttext,
+    start,
+    stop,
+    count
+};
+
+enum class eLeMenuTimersST {
+    title = 0,
+    timerstart,
+    timerstop,
+    day,
+    dayname,
+    monthname,
+    channelname,
+    channelid,
+    eventtitle,
+    eventstart,
+    eventstop,
+    count
+};
+
+enum class eLeMenuTimersIT {
+    nummenuitem = 0,
+    current,
+    separator,
+    month,
+    year,
+    channellogoexists,
+    channelnumber,
+    flagactive,
+    flaginstant,
+    flagvps,
+    flagrecording,
+    flagpending,
+    count
+};
+
+enum class eCeMenuTimersST {
+    title = 0,
+    timerstart,
+    timerstop,
+    day,
+    dayname,
+    monthname,
+    channelname,
+    channelid,
+    eventtitle,
+    eventstart,
+    eventstop,
+    eventshorttext,
+    eventdescription,
+    posterpath,
+    count
+};
+
+enum class eCeMenuTimersIT {
+    menuitemx = 0,
+    menuitemy,
+    menuitemwidth,
+    menuitemheight,
+    month,
+    year,
+    channellogoexists,
+    channelnumber,
+    flagactive,
+    flaginstant,
+    flagvps,
+    flagrecording,
+    flagpending,
+    hasposter,
+    posterwidth,
+    posterheight,
+    count
+};
+
+enum class eLeMenuRecordingsST {
+    name = 0,
+    epgname,
+    shorttext,
+    description,
+    date,
+    time,
+    durationminutes,
+    durationeventminutes,
+    thumbnailpath,
+    posterpath,
+    count
+};
+
+enum class eLeMenuRecordingsIT {
+    nummenuitem = 0,
+    current,
+    separator,
+    isnew,
+    percentseen,
+    watched,
+    cutted,
+    folder,
+    daynumeric,
+    month,
+    year,
+    duration,
+    durationhours,
+    durationevent,
+    durationeventhours,
+    numrecordingsfolder,
+    newrecordingsfolder,
+    hasposterthumbnail,
+    thumbnailwidth,
+    thumbnailheight,
+    hasposter,
+    posterwidth,
+    posterheight,
+    count
+};
+
+enum class eCeMenuRecordingsST {
+    name = 0,
+    epgname,
+    shorttext,
+    description,
+    date,
+    time,
+    durationminutes,
+    durationeventminutes,
+    thumbnailpath,
+    posterpath,
+    count
+};
+
+enum class eCeMenuRecordingsIT {
+    menuitemx = 0,
+    menuitemy,
+    menuitemwidth,
+    menuitemheight,
+    isnew,
+    percentseen,
+    watched,
+    cutted,
+    folder,
+    daynumeric,
+    month,
+    year,
+    duration,
+    durationhours,
+    durationevent,
+    durationeventhours,
+    numrecordingsfolder,
+    newrecordingsfolder,
+    hasposterthumbnail,
+    thumbnailwidth,
+    thumbnailheight,
+    hasposter,
+    posterwidth,
+    posterheight,
+    count
+};
+
+/******************************************************************
+* Tokens displaymenu detailed views
+*******************************************************************/
+enum class eScraperHeaderST {
+    posterpath = 0,
+    bannerpath,
+    count
+};
+
+enum class eScraperHeaderIT {
+    ismovie = 0,
+    isseries,
+    posteravailable,
+    posterwidth,
+    posterheight,
+    banneravailable,
+    bannerwidth,
+    bannerheight,
+    count
+};
+
+enum class eDmDetailedHeaderEpgST {
+    title = eScraperHeaderST::count,
+    shorttext,
+    start,
+    stop,
+    day,
+    date,
+    durationminutes,
+    vps,
+    channelname,
+    channelid,
+    epgpicpath,
+    count
+};
+
+enum class eDmDetailedHeaderEpgIT {
+    daynumeric = eScraperHeaderIT::count,
+    month,
+    year,
+    running,
+    elapsed,
+    duration,
+    durationhours,
+    channelnumber,
+    channellogoexists,
+    epgpicavailable,
+    count
+};
+
+enum class eDmDetailedHeaderRecST {
+    name = eScraperHeaderST::count,
+    epgname,
+    shorttext,
+    date,
+    time,
+    recimgpath,
+    recchannelname,
+    recchannelid,
+    durationminutes,
+    durationeventminutes,
+    count
+};
+
+enum class eDmDetailedHeaderRecIT {
+    daynumeric = eScraperHeaderIT::count,
+    month,
+    year,
+    duration,
+    durationhours,
+    durationevent,
+    durationeventhours,
+    recimgavailable,
+    recchannelnumber,
+    count
+};
+
+enum class eDmTabsIT {
+    count = 0,
+};
+
+enum class eDmTabsST {
+    currenttab = 0,
+    prevtab,
+    nexttab,
+    count
+};
+
+enum class eDmTabsLT {
+    title = 0,
+    current,
+    count
+};
+
+enum class eScraperST {
+    movietitle = 0,
+    movieoriginalTitle,
+    movietagline,
+    movieoverview,
+    moviegenres,
+    moviehomepage,
+    moviereleasedate,
+    moviepopularity,
+    movievoteaverage,
+    posterpath,
+    fanartpath,
+    moviecollectionName,
+    collectionposterpath,
+    collectionfanartpath,
+    seriesname,
+    seriesoverview,
+    seriesfirstaired,
+    seriesnetwork,
+    seriesgenre,
+    seriesrating,
+    seriesstatus,
+    episodetitle,
+    episodefirstaired,
+    episodegueststars,
+    episodeoverview,
+    episoderating,
+    episodeimagepath,
+    seasonposterpath,
+    seriesposter1path,
+    seriesposter2path,
+    seriesposter3path,
+    seriesfanart1path,
+    seriesfanart2path,
+    seriesfanart3path,
+    seriesbanner1path,
+    seriesbanner2path,
+    seriesbanner3path,
+    count
+};
+
+enum class eScraperIT {
+    ismovie = 0,
+    moviebudget,
+    movierevenue,
+    movieadult,
+    movieruntime,
+    isseries,
+    posterwidth,
+    posterheight,
+    fanartwidth,
+    fanartheight,
+    movieiscollection,
+    collectionposterwidth,
+    collectionposterheight,
+    collectionfanartwidth,
+    collectionfanartheight,
+    epgpicavailable,
+    episodenumber,
+    episodeseason,
+    episodeimagewidth,
+    episodeimageheight,
+    seasonposterwidth,
+    seasonposterheight,
+    seriesposter1width,
+    seriesposter1height,
+    seriesposter2width,
+    seriesposter2height,
+    seriesposter3width,
+    seriesposter3height,
+    seriesfanart1width,
+    seriesfanart1height,
+    seriesfanart2width,
+    seriesfanart2height,
+    seriesfanart3width,
+    seriesfanart3height,
+    seriesbanner1width,
+    seriesbanner1height,
+    seriesbanner2width,
+    seriesbanner2height,
+    seriesbanner3width,
+    seriesbanner3height,
+    count
+};
+
+enum class eScraperLT {
+    //actors
+    name = 0,
+    role,
+    thumb,
+    thumbwidth,
+    thumbheight,
+    count
+};
+
+enum class eDmDetailedEpgST {
+    title = eScraperST::count,
+    shorttext,
+    description,
+    start,
+    stop,
+    day,
+    date,
+    durationminutes,
+    vps,
+    channelname,
+    channelid,
+    epgpic1path,
+    epgpic2path,
+    epgpic3path,
+    count
+};
+
+enum class eDmDetailedEpgIT {
+    daynumeric = eScraperIT::count,
+    month,
+    year,
+    running,
+    elapsed,
+    duration,
+    durationhours,
+    channelnumber,
+    channellogoexists,
+    hasreruns,
+    epgpic1avaialble,
+    epgpic2avaialble,
+    epgpic3avaialble,
+    count
+};
+
+enum class eRerunsLT {
+    title = 0,
+    shorttext,
+    date,
+    day,
+    start,
+    stop,
+    channelname,
+    channelnumber,
+    channelid,
+    channellogoexists,
+    count
+};
+
+enum class eDmDetailedRecST {
+    name = eScraperST::count,
+    epgname,
+    shorttext,
+    description,
+    day,
+    date,
+    time,
+    durationminutes,
+    durationeventminutes,
+    recordingsize,
+    recordingsizecutted,
+    recordinglength,
+    recordinglengthcutted,
+    recordingbitrate,
+    recordingformat,
+    recchannelname,
+    recchannelid,
+    searchtimer,
+    recimg1path,
+    recimg2path,
+    recimg3path,
+    count
+};
+
+enum class eDmDetailedRecIT {
+    daynumeric = eScraperIT::count,
+    month,
+    year,
+    duration,
+    durationhours,
+    durationevent,
+    durationeventhours,
+    cutted,
+    recchannelnumber,
+    recimg1avaialble,
+    recimg2avaialble,
+    recimg3avaialble,
+    count
+};
+
+enum class eDmDetailedTextST {
+    text = 0,
+    count
+};
+
+enum class eDmSkinPreviewST {
+    menuheader = 0,
+    skinname,
+    author,
+    count
+};
+
+enum class eDmSkinPreviewFontsLT {
+    name = 0,
+    installed,
+    count
+};
+
+enum class eDmSkinPreviewPluginsLT {
+    name = 0,
+    count
+};
+
+enum class eDmSkinPreviewScreenshotsLT {
+    desc = 0,
+    path,
+    count
+};
+/******************************************************************
+* Tokens DisplayReplay Viewelements
+*******************************************************************/
+enum class eDRRecTitleST {
+    rectitle = 0,
+    recsubtitle,
+    recdate,
+    rectime,
+    count
+};
+
+enum class eDRRecInfoST {
+    resolution = 0,
+    aspect,
+    count
+};
+
+enum class eDRRecInfoIT {
+    screenwidth = 0,
+    screenheight,
+    isHD,
+    isWideScreen,
+    count
+};
+
+enum class eDRCurrentTimeST {
+    reccurrent = 0,
+    count
+};
+
+enum class eDRTotalTimeST {
+    rectotal = 0,
+    timeshifttotal,
+    count
+};
+
+enum class eDRTotalTimeIT {
+    timeshift = 0,
+    count
+};
+
+enum class eDREndTimeST {
+    recend = 0,
+    count
+};
+
+enum class eDRProgressbarIT {
+    current = 0,
+    total,
+    timeshift,
+    timeshifttotal,
+    count
+};
+
+enum class eDRCutmarksIT {
+    timeshift = 0,
+    count
+};
+
+enum class eDRCutmarksLT {
+    position = 0,
+    endposition,
+    total,
+    timeshifttotal,
+    active,
+    startmark,
+    count
+};
+
+enum class eDRControlIconsIT {
+    play = 0,
+    pause,
+    forward,
+    forward1x,
+    forward2x,
+    forward3x,
+    rewind,
+    rewind1x,
+    rewind2x,
+    rewind3x,
+    count
+};
+
+enum class eDRProgressModeonlyIT {
+    current = 0,
+    total,
+    count
+};
+
+enum class eDRProgressModeonlyST {
+    timecurrent = 0,
+    timetotal,
+    count
+};
+
+enum class eDRJumpST {
+    jump = 0,
+    count
+};
+
+enum class eDROnpauseST {
+    name = eScraperST::count,
+    shorttext,
+    description,
+    date,
+    time,
+    durationminutes,
+    durationeventminutes,
+    count
+};
+
+enum class eDROnpauseIT {
+    daynumeric = eScraperIT::count,
+    month,
+    year,
+    duration,
+    durationhours,
+    durationevent,
+    durationeventhours,
+    count
+};
+
+/******************************************************************
+* Tokens DisplayVolume Viewelements
+*******************************************************************/
+enum class eDVVolumeIT {
+    volume = 0,
+    volpercent,
+    maxvolume,
+    mute,
+    count
+};
+
+/******************************************************************
+* Tokens DisplayTracks Viewelements
+*******************************************************************/
+enum class eDTBackgroundIT {
+    numtracks = 0,
+    count
+};
+
+enum class eDTHeaderIT {
+    numtracks = 0,
+    isstereo,
+    isac3,
+    count
+};
+
+enum class eDTHeaderST {
+    title = 0,
+    count
+};
+
+enum class eLeDisplayTracksIT {
+    nummenuitem = 0,
+    current,
+    count
+};
+
+enum class eLeDisplayTracksST {
+    title = 0,
+    count
+};
+/******************************************************************
+* Attributes
+*******************************************************************/
+enum class eCommonAttribs {
+    x = 0,
+    y,
+    width, 
+    height,
+    debug,
+    count
+};
+
+enum class eViewAttribs {
+    fadetime = 0,
+    shifttime, 
+    shifttype,
+    shiftmode,
+    startx,
+    starty,
+    scaletvx,
+    scaletvy,
+    scaletvwidth,
+    scaletvheight,
+    orientation,
+    debuggrid,
+    hideroot,
+    count
+};
+
+enum class eViewElementAttribs {
+    delay = 0,
+    fadetime,
+    shifttime, 
+    shifttype,
+    shiftmode,
+    startx,
+    starty,
+    mode,
+    orientation,
+    name,
+    count
+};
+
+enum class eViewListAttribs {
+    align = 0,
+    menuitemwidth,
+    determinatefont,
+    numlistelements, 
+    orientation,
+    condition,
+    count
+};
+
+enum class eAreaAttribs {
+    layer = 0,
+    transparency,
+    mode,
+    orientation, 
+    scrollelement,
+    scrollspeed,
+    delay,
+    background,
+    name,
+    scrollheight,
+    count
+};
+
+enum class eAreaContainerAttribs {
+    count = 0
+};
+
+/******************************************************************
+* Functions
+*******************************************************************/
+enum class eFillAttribs {
+    color = 0,
+    count
+};
+
+enum class eDrawRectangleAttribs {
+    align = 0,
+    valign,
+    color,
+    name,
+    animtype,
+    animfreq,
+    count
+};
+
+enum class eDrawEllipseAttribs {
+    align = 0,
+    valign,
+    color,
+    name,
+    quadrant,
+    animtype,
+    animfreq,
+    count
+};
+
+enum class eDrawSlopeAttribs {
+    align = 0,
+    valign,
+    color,
+    name,
+    type,
+    animtype,
+    animfreq,
+    count
+};
+
+enum class eDrawTextAttribs {
+    align = 0,
+    valign,
+    color,
+    font,
+    fontsize,
+    name,
+    text,
+    animtype,
+    animfreq,
+    count
+};
+
+enum class eDrawTextAttribsVertical {
+    align = 0,
+    valign,
+    direction,
+    color,
+    font,
+    fontsize,
+    name,
+    text,
+    animtype,
+    animfreq,
+    count
+};
+
+enum class eDrawTextBoxAttribs {
+    align = 0,
+    valign,
+    maxlines,
+    floatwidth,
+    floatheight,
+    floatmode,
+    color,
+    font,
+    fontsize,
+    name,
+    text,
+    count
+};
+
+enum class eDrawImageAttribs {
+    align = 0,
+    valign,
+    imagetype,
+    name,
+    cache,
+    path,
+    animtype,
+    animfreq,
+    count
+};
+
+enum class eLoopAttribs {
+    columnwidth = 0,
+    rowheight,
+    name,
+    orientation,
+    overflow,
+    maxitems,
+    count
+};
+
+/******************************************************************
+* Common Parameters
+*******************************************************************/
+enum class eViewElementMode {
+    regular,
+    light
+};
+
+enum class eShiftType {
+    none = -1,
+    left,
+    right,
+    top,
+    bottom
+};
+
+enum class eShiftMode {
+    linear,
+    slowedDown
+};
+
+enum class eScrollMode {
+    none,
+    carriagereturn,
+    forthandback
+};
+
+enum class eScrollSpeed {
+    none,
+    slow,
+    medium,
+    fast
+};
+
+enum class eOrientation {
+    none,
+    horizontal,
+    vertical,
+    absolute
+};
+
+enum class eAlign {
+    left,
+    center,
+    right,
+    top,
+    bottom
+};
+
+enum class eAnimType {
+    none,
+    blink,
+    animated
+};
+
+enum class eImageType {
+    channellogo,
+    seplogo,
+    skinpart,
+    menuicon,
+    icon,
+    image
+};
+
+enum class eOverflowType {
+    none,
+    wrap,
+    cut
+};
+
+enum class eFloatMode {
+    none = -1,
+    topleft,
+    topright
+};
+
+enum class eDirection {
+    none = -1,
+    bottomup,
+    topdown
+};
+
+
 #endif //__DEFINITIONS_H
\ No newline at end of file
diff --git a/coreengine/functions.c b/coreengine/functions.c
index 054304e..1b089bc 100644
--- a/coreengine/functions.c
+++ b/coreengine/functions.c
@@ -1,1564 +1,1564 @@
-#include "attribute.h"

-#include "../config.h"

-

-/***************************************************************************

-* cFuncFill

-***************************************************************************/

-cFuncFill::cFuncFill(cArea *owner, int numAttributes) : cFunction(owner, numAttributes) {

-    funcType = "Fill";

-    SetAttributesDefs();

-}

-

-cFuncFill::cFuncFill(const cFuncFill &other) : cFunction(other) {

-    funcType = other.funcType;

-}

-

-cFuncFill::~cFuncFill(void) {

-}

-

-void cFuncFill::Set(vector<stringpair> &attributes) {

-    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {

-        const char *attName = (*att).first.c_str();

-        const char *attVal = (*att).second.c_str();

-        int id = AttributeId(attName);

-        if (id == ATTR_UNKNOWN) {

-            esyslog("skindesigner: unknown func Fill attribute \"%s\" = \"%s\"", attName, attVal);

-            continue;

-        }

-        if (SetCommon(id, attVal))

-            continue;

-        if (IdEqual(id, (int)eFillAttribs::color)) {

-            SetColor(attVal);

-        }

-    }

-}

-

-void cFuncFill::SetAttributesDefs(void) {

-    attribIDs.insert(pair<string, int>("color", (int)eFillAttribs::color));

-    attribNames.insert(pair<int, string>((int)eFillAttribs::color, "color"));

-}

-

-void cFuncFill::Render(cPixmap *p, int x0, int y0, int colWidth, int rowHeight) {

-    if (!color)

-        return;

-    p->Fill(color->Color());

-}

-

-/***************************************************************************

-* cFuncDrawRectangle

-***************************************************************************/

-cFuncDrawRectangle::cFuncDrawRectangle(cArea *owner, int numAttributes) : cFunction(owner, numAttributes) {

-    funcType = "DrawRectangle";

-    SetAttributesDefs();

-}

-

-cFuncDrawRectangle::cFuncDrawRectangle(const cFuncDrawRectangle &other) : cFunction(other) {

-    funcType = other.funcType;

-}

-

-cFuncDrawRectangle::~cFuncDrawRectangle(void) {

-}

-

-void cFuncDrawRectangle::Set(vector<stringpair> &attributes) {

-    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {

-        const char *attName = (*att).first.c_str();

-        const char *attVal = (*att).second.c_str();

-        int id = AttributeId(attName);

-        if (id == ATTR_UNKNOWN) {

-            esyslog("skindesigner: unknown func DrawRectangle attribute \"%s\" = \"%s\"", attName, attVal);

-            continue;

-        }

-        if (SetCommon(id, attVal))

-            continue;

-        if (IdEqual(id, (int)eDrawRectangleAttribs::color)) {

-            SetColor(attVal);

-        } else if (IdEqual(id, (int)eDrawRectangleAttribs::name)) {

-            name = strdup(attVal);

-        } else if (IdEqual(id, (int)eDrawRectangleAttribs::align)) {

-            SetAlign(id, attVal);

-        } else if (IdEqual(id, (int)eDrawRectangleAttribs::valign)) {

-            SetAlign(id, attVal);

-        } else if (IdEqual(id, (int)eDrawRectangleAttribs::animtype)) {

-            SetAnimType(id, attVal);

-        } else {

-            attribCtors[id] = new cNumericExpr(attVal);

-        }

-    }

-}

-

-void cFuncDrawRectangle::SetAttributesDefs(void) {

-    attribIDs.insert(pair<string, int>("align", (int)eDrawRectangleAttribs::align));

-    attribIDs.insert(pair<string, int>("valign", (int)eDrawRectangleAttribs::valign));

-    attribIDs.insert(pair<string, int>("color", (int)eDrawRectangleAttribs::color));

-    attribIDs.insert(pair<string, int>("name", (int)eDrawRectangleAttribs::name));

-    attribIDs.insert(pair<string, int>("animtype", (int)eDrawRectangleAttribs::animtype));

-    attribIDs.insert(pair<string, int>("animfreq", (int)eDrawRectangleAttribs::animfreq));

-    attribNames.insert(pair<int, string>((int)eDrawRectangleAttribs::align, "align"));

-    attribNames.insert(pair<int, string>((int)eDrawRectangleAttribs::valign, "valign"));

-    attribNames.insert(pair<int, string>((int)eDrawRectangleAttribs::color, "color"));

-    attribNames.insert(pair<int, string>((int)eDrawRectangleAttribs::name, "name"));

-    attribNames.insert(pair<int, string>((int)eDrawRectangleAttribs::animtype, "animtype"));

-    attribNames.insert(pair<int, string>((int)eDrawRectangleAttribs::animfreq, "animfreq"));

-}

-

-void cFuncDrawRectangle::Render(cPixmap *p, int x0, int y0, int colWidth, int rowHeight) {

-    eAlign align = (eAlign)GetValue((int)eDrawRectangleAttribs::align);

-    eAlign valign = (eAlign)GetValue((int)eDrawRectangleAttribs::valign);

-    int x = GetX(align, x0, colWidth);

-    int y = GetY(valign, y0, rowHeight);

-    cRect rect(x, y, Width(), Height());

-    p->DrawRectangle(rect, color->Color());

-}

-

-/***************************************************************************

-* cFuncDrawEllipse

-***************************************************************************/

-cFuncDrawEllipse::cFuncDrawEllipse(cArea *owner, int numAttributes) : cFunction(owner, numAttributes) {

-    funcType = "DrawEllipse";

-    SetAttributesDefs();

-}

-

-cFuncDrawEllipse::cFuncDrawEllipse(const cFuncDrawEllipse &other) : cFunction(other) {

-    funcType = other.funcType;

-}

-

-cFuncDrawEllipse::~cFuncDrawEllipse(void) {

-}

-

-void cFuncDrawEllipse::Set(vector<stringpair> &attributes) {

-    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {

-        const char *attName = (*att).first.c_str();

-        const char *attVal = (*att).second.c_str();

-        int id = AttributeId(attName);

-        if (id == ATTR_UNKNOWN) {

-            esyslog("skindesigner: unknown func DrawEllipse attribute \"%s\" = \"%s\"", attName, attVal);

-            continue;

-        }

-        if (SetCommon(id, attVal))

-            continue;

-        if (IdEqual(id, (int)eDrawEllipseAttribs::color)) {

-            SetColor(attVal);

-        } else if (IdEqual(id, (int)eDrawEllipseAttribs::name)) {

-            name = strdup(attVal);

-        } else if (IdEqual(id, (int)eDrawEllipseAttribs::align)) {

-            SetAlign(id, attVal);

-        } else if (IdEqual(id, (int)eDrawEllipseAttribs::valign)) {

-            SetAlign(id, attVal);

-        } else if (IdEqual(id, (int)eDrawEllipseAttribs::animtype)) {

-            SetAnimType(id, attVal);

-        } else {

-            attribCtors[id] = new cNumericExpr(attVal);

-        }

-    }

-}

-

-void cFuncDrawEllipse::SetAttributesDefs(void) {

-    attribIDs.insert(pair<string, int>("align", (int)eDrawEllipseAttribs::align));

-    attribIDs.insert(pair<string, int>("valign", (int)eDrawEllipseAttribs::valign));

-    attribIDs.insert(pair<string, int>("color", (int)eDrawEllipseAttribs::color));

-    attribIDs.insert(pair<string, int>("name", (int)eDrawEllipseAttribs::name));

-    attribIDs.insert(pair<string, int>("quadrant", (int)eDrawEllipseAttribs::quadrant));

-    attribIDs.insert(pair<string, int>("animtype", (int)eDrawEllipseAttribs::animtype));

-    attribIDs.insert(pair<string, int>("animfreq", (int)eDrawEllipseAttribs::animfreq));

-    attribNames.insert(pair<int, string>((int)eDrawEllipseAttribs::align, "align"));

-    attribNames.insert(pair<int, string>((int)eDrawEllipseAttribs::valign, "valign"));

-    attribNames.insert(pair<int, string>((int)eDrawEllipseAttribs::color, "color"));

-    attribNames.insert(pair<int, string>((int)eDrawEllipseAttribs::name, "name"));

-    attribNames.insert(pair<int, string>((int)eDrawEllipseAttribs::quadrant, "quadrant"));

-    attribNames.insert(pair<int, string>((int)eDrawEllipseAttribs::animtype, "animtype"));

-    attribNames.insert(pair<int, string>((int)eDrawEllipseAttribs::animfreq, "animfreq"));

-}

-

-void cFuncDrawEllipse::Render(cPixmap *p, int x0, int y0, int colWidth, int rowHeight) {

-    eAlign align = (eAlign)GetValue((int)eDrawEllipseAttribs::align);

-    eAlign valign = (eAlign)GetValue((int)eDrawEllipseAttribs::valign);

-    int x = GetX(align, x0, colWidth);

-    int y = GetY(valign, y0, rowHeight);

-    cRect rect(x, y, Width(), Height());

-    int quadrant = GetValue((int)eDrawEllipseAttribs::quadrant);

-    p->DrawEllipse(rect, color->Color(), quadrant);

-}

-

-/***************************************************************************

-* cFuncDrawSlope

-***************************************************************************/

-cFuncDrawSlope::cFuncDrawSlope(cArea *owner, int numAttributes) : cFunction(owner, numAttributes) {

-    funcType = "DrawSlope";

-    SetAttributesDefs();

-}

-

-cFuncDrawSlope::cFuncDrawSlope(const cFuncDrawSlope &other) : cFunction(other) {

-    funcType = other.funcType;

-}

-

-cFuncDrawSlope::~cFuncDrawSlope(void) {

-}

-

-void cFuncDrawSlope::Set(vector<stringpair> &attributes) {

-    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {

-        const char *attName = (*att).first.c_str();

-        const char *attVal = (*att).second.c_str();

-        int id = AttributeId(attName);

-        if (id == ATTR_UNKNOWN) {

-            esyslog("skindesigner: unknown func DrawSlope attribute \"%s\" = \"%s\"", attName, attVal);

-            continue;

-        }

-        if (SetCommon(id, attVal))

-            continue;

-        if (IdEqual(id, (int)eDrawSlopeAttribs::color)) {

-            SetColor(attVal);

-        } else if (IdEqual(id, (int)eDrawSlopeAttribs::name)) {

-            name = strdup(attVal);

-        } else if (IdEqual(id, (int)eDrawSlopeAttribs::align)) {

-            SetAlign(id, attVal);

-        } else if (IdEqual(id, (int)eDrawSlopeAttribs::valign)) {

-            SetAlign(id, attVal);

-        } else if (IdEqual(id, (int)eDrawSlopeAttribs::animtype)) {

-            SetAnimType(id, attVal);

-        } else {

-            attribCtors[id] = new cNumericExpr(attVal);

-        }

-    }

-}

-

-void cFuncDrawSlope::SetAttributesDefs(void) {

-    attribIDs.insert(pair<string, int>("align", (int)eDrawSlopeAttribs::align));

-    attribIDs.insert(pair<string, int>("valign", (int)eDrawSlopeAttribs::valign));

-    attribIDs.insert(pair<string, int>("color", (int)eDrawSlopeAttribs::color));

-    attribIDs.insert(pair<string, int>("name", (int)eDrawSlopeAttribs::name));

-    attribIDs.insert(pair<string, int>("type", (int)eDrawSlopeAttribs::type));

-    attribIDs.insert(pair<string, int>("animtype", (int)eDrawSlopeAttribs::animtype));

-    attribIDs.insert(pair<string, int>("animfreq", (int)eDrawSlopeAttribs::animfreq));

-    attribNames.insert(pair<int, string>((int)eDrawSlopeAttribs::align, "align"));

-    attribNames.insert(pair<int, string>((int)eDrawSlopeAttribs::valign, "valign"));

-    attribNames.insert(pair<int, string>((int)eDrawSlopeAttribs::color, "color"));

-    attribNames.insert(pair<int, string>((int)eDrawSlopeAttribs::name, "name"));

-    attribNames.insert(pair<int, string>((int)eDrawSlopeAttribs::type, "type"));

-    attribNames.insert(pair<int, string>((int)eDrawSlopeAttribs::animtype, "animtype"));

-    attribNames.insert(pair<int, string>((int)eDrawSlopeAttribs::animfreq, "animfreq"));

-}

-

-void cFuncDrawSlope::Render(cPixmap *p, int x0, int y0, int colWidth, int rowHeight) {

-    eAlign align = (eAlign)GetValue((int)eDrawSlopeAttribs::align);

-    eAlign valign = (eAlign)GetValue((int)eDrawSlopeAttribs::valign);

-    int x = GetX(align, x0, colWidth);

-    int y = GetY(valign, y0, rowHeight);

-    cRect rect(x, y, Width(), Height());

-    int type = GetValue((int)eDrawSlopeAttribs::type);

-    p->DrawSlope(rect, color->Color(), type);

-}

-

-/***************************************************************************

-* cTextDrawer

-***************************************************************************/

-cMutex cTextDrawer::fontLock;

-

-cTextDrawer::cTextDrawer(void) {

-    font = NULL;

-    fontName = NULL;

-    fontSize = 0;

-}

-

-cTextDrawer::~cTextDrawer(void) {

-    free(fontName);

-}

-

-void cTextDrawer::CacheFont(cGlobals *globals, int size) {

-    //check if font name is a global token

-    if (startswith(fontName, "{") && endswith(fontName, "}")) {

-        string tmpFontName = "";

-        if (globals->GetFont(fontName, tmpFontName)) {

-            free(fontName);

-            fontName = strdup(tmpFontName.c_str());

-        } else {

-            esyslog("skindesigner: unknown font %s", fontName);

-            return;

-        }

-    }

-    if (size > 0)

-        LoadFont(size);

-}

-

-void cTextDrawer::LoadFont(int size) {

-    if (!fontName)

-        return; 

-    if (size <= 0)

-        return;

-    font = fontManager->Font(fontName, size);

-    if (font)

-        fontSize = size;

-}

-    

-int cTextDrawer::TextWidth(const char *text) {

-    int textWidth = 0;

-    fontLock.Lock();

-    textWidth = font->Width(text);

-    fontLock.Unlock();

-    return textWidth;

-}

-

-int cTextDrawer::FontHeight(void) {

-    int fontHeight = 0;

-    fontLock.Lock();

-    fontHeight = font->Height();

-    fontLock.Unlock();

-    return fontHeight;

-}

-/***************************************************************************

-* cFuncDrawText

-***************************************************************************/

-cFuncDrawText::cFuncDrawText(cArea *owner, int numAttributes) : cFunction(owner, numAttributes) {

-    funcType = "DrawText";

-    text = NULL;

-    SetAttributesDefs();

-}

-

-cFuncDrawText::cFuncDrawText(const cFuncDrawText &other) : cFunction(other) {

-    funcType = other.funcType;

-    fontName = NULL;

-    if (other.fontName)

-        fontName = strdup(other.fontName);

-    font = other.font;

-    text = NULL;

-    if (other.text)

-        text = new cTextExpr(*other.text);

-}

-

-cFuncDrawText::~cFuncDrawText(void) {

-    delete text;

-}

-

-void cFuncDrawText::SetLoopInfo(cLoopInfo *loopInfo) {

-    cFunction::SetLoopInfo(loopInfo);

-    if (text)

-        text->SetLoopInfo(loopInfo);

-}

-

-void cFuncDrawText::SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer) {

-    cAttributes::SetTokenContainerDeep(tokenContainer);

-    if (text) {

-        text->SetTokenContainer(tokenContainer);

-    }

-}

-

-void cFuncDrawText::Set(vector<stringpair> &attributes) {

-    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {

-        const char *attName = (*att).first.c_str();

-        const char *attVal = (*att).second.c_str();

-        int id = AttributeId(attName);

-        if (id == ATTR_UNKNOWN) {

-            esyslog("skindesigner: unknown func DrawText attribute \"%s\" = \"%s\"", attName, attVal);

-            continue;

-        }

-        

-        if (SetCommon(id, attVal))

-            continue;

-        if (IdEqual(id, (int)eDrawTextAttribs::color)) {

-            SetColor(attVal);

-        } else if (IdEqual(id, (int)eDrawTextAttribs::name)) {

-            name = strdup(attVal);

-        } else if (IdEqual(id, (int)eDrawTextAttribs::align)) {

-            SetAlign(id, attVal);

-        } else if (IdEqual(id, (int)eDrawTextAttribs::valign)) {

-            SetAlign(id, attVal);

-        } else if (IdEqual(id, (int)eDrawTextAttribs::animtype)) {

-            SetAnimType(id, attVal);

-        } else if (IdEqual(id, (int)eDrawTextAttribs::font)) {

-            fontName = strdup(attVal);

-        } else if (IdEqual(id, (int)eDrawTextAttribs::text)) {

-            text = new cTextExpr(attVal);

-        } else if (IdEqual(id, (int)eDrawTextAttribs::fontsize)) {

-            attribCtors[id] = new cNumericExpr(attVal);

-            attribCtors[id]->SetVertical();

-        } else {

-            attribCtors[id] = new cNumericExpr(attVal);

-        }

-    }

-}

-

-void cFuncDrawText::Cache(void) {

-    cFunction::Cache();

-    if (text) {

-        text->SetTokenContainer(tokenContainer);

-        text->SetGlobals(globals);

-        text->Cache();

-    }

-    if (fontName) {

-        CacheFont(globals, GetValue((int)eDrawTextAttribs::fontsize));

-    }

-}

-

-void cFuncDrawText::Render(cPixmap *p, int x0, int y0, int colWidth, int rowHeight) {

-    if (!font) {

-        LoadFont(GetValue((int)eDrawTextAttribs::fontsize));

-        if (!font)

-            return;

-    }

-    char *funcText = NULL;

-    if (text)

-        funcText = text->DeterminateText();

-    if (!funcText)

-        return;

-    int maxTextWidth = Width();

-    if (maxTextWidth > 0 && !scrolling) {

-        if (TextWidth(funcText) > maxTextWidth) {

-            funcText = Cut(funcText, maxTextWidth);

-        }

-    } else if (!scrolling) {

-        maxTextWidth = container.Width() - X();

-        if (TextWidth(funcText) > maxTextWidth) {

-            funcText = Cut(funcText, maxTextWidth);

-        }

-    }

-

-    eAlign horAlign = (eAlign)GetValue((int)eDrawTextAttribs::align);

-    eAlign verAlign = (eAlign)GetValue((int)eDrawTextAttribs::valign);

-

-    int contWidth = colWidth > 0 ? colWidth : container.Width();

-    int x = X() + x0;

-    if (horAlign == eAlign::right) {

-        x = x0 + contWidth - TextWidth(funcText);

-    } else if (horAlign == eAlign::center) {

-        x = x0 + (contWidth - TextWidth(funcText)) / 2;

-    }

-

-    int contHeight = rowHeight > 0 ? rowHeight : container.Height();

-    int y = Y() + y0;

-    if (verAlign == eAlign::bottom) {

-        y = y0 + contHeight - FontHeight();

-    } else if (verAlign == eAlign::center) {

-        y = y0 + (contHeight - FontHeight()) / 2;

-    }

-

-    p->DrawText(cPoint(x, y), funcText, color->Color(), clrTransparent, font);

-    free(funcText);

-}

-

-int cFuncDrawText::FuncX(void) {

-    if (!font)

-        return 0;

-    char *funcText = NULL;

-    if (text)

-        funcText = text->DeterminateText();

-    if (!funcText)

-        return 0;

-    eAlign horAlign = (eAlign)GetValue((int)eDrawTextAttribs::align);

-    int x = X();

-    if (horAlign == eAlign::right) {

-        x = container.Width() - TextWidth(funcText);

-    } else if (horAlign == eAlign::center) {

-        x = (container.Width() - TextWidth(funcText)) / 2;

-    }

-    return x;

-}

-

-int cFuncDrawText::FuncY(void) {

-    if (!font)

-        return 0;

-    eAlign verAlign = (eAlign)GetValue((int)eDrawTextAttribs::valign);

-    int y = Y();

-    if (verAlign == eAlign::bottom) {

-        y = container.Height() - FontHeight();

-    } else if (verAlign == eAlign::center) {

-        y = (container.Height() - FontHeight()) / 2;

-    }

-    return y;

-}

-

-int cFuncDrawText::FuncWidth(void) {

-    if (!font)

-        return 0;

-    char *funcText = NULL;

-    if (text)

-        funcText = text->DeterminateText();

-    if (!funcText)

-        return 0;

-    int textWidth = TextWidth(funcText);

-    free(funcText);

-    return textWidth;

-}

-

-int cFuncDrawText::FuncHeight(void) {

-    if (!font)

-        return 0;

-    return FontHeight();

-}

-

-int cFuncDrawText::AvrgFontWidth(void) {

-    if (!font)

-        return 20;

-    return TextWidth("x")+3;

-}

-

-const cFont *cFuncDrawText::GetFont(void) {

-    return font;

-}

-

-void cFuncDrawText::Debug(void) {

-    cFunction::Debug();

-    if (fontName)

-        esyslog("skindesigner:            fontname: \"%s\"", fontName);

-    if (font)

-        esyslog("skindesigner:            cached font name: \"%s\", size %d", font->FontName(), font->Height());

-    if (text)

-        text->Debug("draw text");

-}

-

-void cFuncDrawText::SetAttributesDefs(void) {

-    attribIDs.insert(pair<string, int>("align", (int)eDrawTextAttribs::align));

-    attribIDs.insert(pair<string, int>("valign", (int)eDrawTextAttribs::valign));

-    attribIDs.insert(pair<string, int>("color", (int)eDrawTextAttribs::color));

-    attribIDs.insert(pair<string, int>("font", (int)eDrawTextAttribs::font));

-    attribIDs.insert(pair<string, int>("fontsize", (int)eDrawTextAttribs::fontsize));

-    attribIDs.insert(pair<string, int>("name", (int)eDrawTextAttribs::name));

-    attribIDs.insert(pair<string, int>("text", (int)eDrawTextAttribs::text));

-    attribIDs.insert(pair<string, int>("animtype", (int)eDrawTextAttribs::animtype));

-    attribIDs.insert(pair<string, int>("animfreq", (int)eDrawTextAttribs::animfreq));

-    attribNames.insert(pair<int, string>((int)eDrawTextAttribs::align, "align"));

-    attribNames.insert(pair<int, string>((int)eDrawTextAttribs::valign, "valign"));

-    attribNames.insert(pair<int, string>((int)eDrawTextAttribs::color, "color"));

-    attribNames.insert(pair<int, string>((int)eDrawTextAttribs::font, "font"));

-    attribNames.insert(pair<int, string>((int)eDrawTextAttribs::fontsize, "fontsize"));

-    attribNames.insert(pair<int, string>((int)eDrawTextAttribs::name, "name"));

-    attribNames.insert(pair<int, string>((int)eDrawTextAttribs::text, "text"));

-    attribNames.insert(pair<int, string>((int)eDrawTextAttribs::animtype, "animtype"));

-    attribNames.insert(pair<int, string>((int)eDrawTextAttribs::animfreq, "animfreq"));

-}

-

-char *cFuncDrawText::Cut(char *expr, int width) {

-    char *cutted = NULL;

-    int w = 3 * font->Width(".");

-    for (char *p = expr; *p; ) {

-        int sl = Utf8CharLen(p);

-        uint sym = Utf8CharGet(p, sl);

-        w += font->Width(sym);

-        if( w >= width ) {

-            cutted = (char*)malloc(p - expr + 4);

-            memset(cutted, 0, p - expr + 4);

-            strncpy(cutted, expr, p - expr);

-            cutted[p - expr] = '.';

-            cutted[p - expr + 1] = '.';

-            cutted[p - expr + 2] = '.';

-            break;

-        }

-        p += sl;

-    }

-    if (cutted) {

-        free(expr);

-        return cutted;

-    }

-    return expr;

-}

-

-/***************************************************************************

-* cFuncDrawTextVertical

-***************************************************************************/

-cFuncDrawTextVertical::cFuncDrawTextVertical(cArea *owner, int numAttributes) : cFunction(owner, numAttributes) {

-    funcType = "DrawTextVertical";

-    text = NULL;

-    SetAttributesDefs();

-}

-

-cFuncDrawTextVertical::cFuncDrawTextVertical(const cFuncDrawTextVertical &other) : cFunction(other) {

-    funcType = other.funcType;

-    fontName = NULL;

-    if (other.fontName)

-        fontName = strdup(other.fontName);

-    text = NULL;

-    if (other.text)

-        text = new cTextExpr(*other.text);

-}

-

-cFuncDrawTextVertical::~cFuncDrawTextVertical(void) {

-    delete text;

-}

-

-void cFuncDrawTextVertical::SetLoopInfo(cLoopInfo *loopInfo) {

-    cFunction::SetLoopInfo(loopInfo);

-    if (text)

-        text->SetLoopInfo(loopInfo);

-}

-

-void cFuncDrawTextVertical::SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer) {

-    cAttributes::SetTokenContainerDeep(tokenContainer);

-    if (text) {

-        text->SetTokenContainer(tokenContainer);

-    }

-}

-

-void cFuncDrawTextVertical::Set(vector<stringpair> &attributes) {

-    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {

-        const char *attName = (*att).first.c_str();

-        const char *attVal = (*att).second.c_str();

-        int id = AttributeId(attName);

-        if (id == ATTR_UNKNOWN) {

-            esyslog("skindesigner: unknown func DrawTextVertical attribute \"%s\" = \"%s\"", attName, attVal);

-            continue;

-        }

-        

-        if (SetCommon(id, attVal))

-            continue;

-        if (IdEqual(id, (int)eDrawTextAttribsVertical::color)) {

-            SetColor(attVal);

-        } else if (IdEqual(id, (int)eDrawTextAttribsVertical::name)) {

-            name = strdup(attVal);

-        } else if (IdEqual(id, (int)eDrawTextAttribsVertical::align)) {

-            SetAlign(id, attVal);

-        } else if (IdEqual(id, (int)eDrawTextAttribsVertical::direction)) {

-            SetDirection(id, attVal);

-        } else if (IdEqual(id, (int)eDrawTextAttribsVertical::valign)) {

-            SetAlign(id, attVal);

-        } else if (IdEqual(id, (int)eDrawTextAttribsVertical::animtype)) {

-            SetAnimType(id, attVal);

-        } else if (IdEqual(id, (int)eDrawTextAttribsVertical::font)) {

-            fontName = strdup(attVal);

-        } else if (IdEqual(id, (int)eDrawTextAttribsVertical::text)) {

-            text = new cTextExpr(attVal);

-        } else {

-            attribCtors[id] = new cNumericExpr(attVal);

-        }

-    }

-}

-

-void cFuncDrawTextVertical::Cache(void) {

-    cFunction::Cache();

-    if (text) {

-        text->SetTokenContainer(tokenContainer);

-        text->SetGlobals(globals);

-        text->Cache();

-    }

-    if (fontName) {

-        CacheFont(globals, 0);

-    }

-}

-

-void cFuncDrawTextVertical::Render(cPixmap *p, int x0, int y0, int colWidth, int rowHeight) {

-    char *funcText = NULL;

-    if (text)

-        funcText = text->DeterminateText();

-    if (!funcText)

-        return;

-    int fontSize = GetValue((int)eDrawTextAttribsVertical::fontsize);

-    int direction = GetValue((int)eDrawTextAttribsVertical::direction);

-    tColor clr = color->Color();

-    cImage *textVertical = imgCache->GetVerticalText(funcText, clr, fontName, fontSize, direction);

-    if (!textVertical)

-        return;

-

-    eAlign horAlign = (eAlign)GetValue((int)eDrawTextAttribsVertical::align);

-    eAlign verAlign = (eAlign)GetValue((int)eDrawTextAttribsVertical::valign);

-    int x = 0;

-    int y = 0;

-    if (horAlign == eAlign::center) {

-        x = (container.Width() - textVertical->Width()) / 2;

-    } else if (horAlign == eAlign::right) {

-        x = container.Width() - textVertical->Width();

-    }

-    if (verAlign == eAlign::center) {

-        y = (container.Height() - textVertical->Height()) / 2;

-    } else if (horAlign == eAlign::bottom) {

-        y = container.Height() - textVertical->Height();

-    }

-    cPoint pos(x, y);

-    p->DrawImage(pos, *textVertical);

-    free(funcText);

-}

-

-int cFuncDrawTextVertical::FuncWidth(void) {

-    char *funcText = NULL;

-    if (text)

-        funcText = text->DeterminateText();

-    if (!funcText)

-        return 0;

-    int fontSize = GetValue((int)eDrawTextAttribsVertical::fontsize);

-    int direction = GetValue((int)eDrawTextAttribsVertical::direction);

-    tColor clr = color->Color();

-    cImage *textVertical = imgCache->GetVerticalText(funcText, clr, fontName, fontSize, direction);

-    if (!textVertical)

-        return 0;

-    return textVertical->Width();

-}

-

-int cFuncDrawTextVertical::FuncHeight(void) {

-    char *funcText = NULL;

-    if (text)

-        funcText = text->DeterminateText();

-    if (!funcText)

-        return 0;

-    int fontSize = GetValue((int)eDrawTextAttribsVertical::fontsize);

-    int direction = GetValue((int)eDrawTextAttribsVertical::direction);

-    tColor clr = color->Color();

-    cImage *textVertical = imgCache->GetVerticalText(funcText, clr, fontName, fontSize, direction);

-    if (!textVertical)

-        return 0;

-    return textVertical->Height();

-}

-

-void cFuncDrawTextVertical::Debug(void) {

-    cFunction::Debug();

-    if (fontName)

-        esyslog("skindesigner:            fontname: \"%s\"", fontName);

-    if (text)

-        text->Debug("draw text");

-}

-

-void cFuncDrawTextVertical::SetAttributesDefs(void) {

-    attribIDs.insert(pair<string, int>("align", (int)eDrawTextAttribsVertical::align));

-    attribIDs.insert(pair<string, int>("valign", (int)eDrawTextAttribsVertical::valign));

-    attribIDs.insert(pair<string, int>("direction", (int)eDrawTextAttribsVertical::direction));

-    attribIDs.insert(pair<string, int>("color", (int)eDrawTextAttribsVertical::color));

-    attribIDs.insert(pair<string, int>("font", (int)eDrawTextAttribsVertical::font));

-    attribIDs.insert(pair<string, int>("fontsize", (int)eDrawTextAttribsVertical::fontsize));

-    attribIDs.insert(pair<string, int>("name", (int)eDrawTextAttribsVertical::name));

-    attribIDs.insert(pair<string, int>("text", (int)eDrawTextAttribsVertical::text));

-    attribIDs.insert(pair<string, int>("animtype", (int)eDrawTextAttribsVertical::animtype));

-    attribIDs.insert(pair<string, int>("animfreq", (int)eDrawTextAttribsVertical::animfreq));

-    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::align, "align"));

-    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::valign, "valign"));

-    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::direction, "direction"));

-    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::color, "color"));

-    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::font, "font"));

-    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::fontsize, "fontsize"));

-    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::name, "name"));

-    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::text, "text"));

-    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::animtype, "animtype"));

-    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::animfreq, "animfreq"));

-}

-

-/***************************************************************************

-* cFuncDrawTextBox

-***************************************************************************/

-cFuncDrawTextBox::cFuncDrawTextBox(cArea *owner, int numAttributes) : cFunction(owner, numAttributes) {

-    funcType = "DrawTextBox";

-    text = NULL;

-    floater = NULL;

-    SetAttributesDefs();

-}

-

-cFuncDrawTextBox::cFuncDrawTextBox(const cFuncDrawTextBox &other) : cFunction(other) {

-    funcType = other.funcType;

-    fontName = NULL;

-    if (other.fontName)

-        fontName = strdup(other.fontName);

-    font = other.font;

-    text = NULL;

-    if (other.text)

-        text = new cTextExpr(*other.text);

-    floater = NULL;

-}

-

-cFuncDrawTextBox::~cFuncDrawTextBox(void) {

-    delete text;

-    delete floater;

-}

-

-void cFuncDrawTextBox::SetLoopInfo(cLoopInfo *loopInfo) {

-    cFunction::SetLoopInfo(loopInfo);

-    if (text)

-        text->SetLoopInfo(loopInfo);

-}

-

-void cFuncDrawTextBox::SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer) {

-    cAttributes::SetTokenContainerDeep(tokenContainer);

-    if (text) {

-        text->SetTokenContainer(tokenContainer);

-    }

-}

-

-void cFuncDrawTextBox::Set(vector<stringpair> &attributes) {

-    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {

-        const char *attName = (*att).first.c_str();

-        const char *attVal = (*att).second.c_str();

-        int id = AttributeId(attName);

-        if (id == ATTR_UNKNOWN) {

-            esyslog("skindesigner: unknown func DrawTextBox attribute \"%s\" = \"%s\"", attName, attVal);

-            continue;

-        }

-        

-        if (SetCommon(id, attVal))

-            continue;

-        if (IdEqual(id, (int)eDrawTextBoxAttribs::color)) {

-            SetColor(attVal);

-        } else if (IdEqual(id, (int)eDrawTextBoxAttribs::name)) {

-            name = strdup(attVal);

-        } else if (IdEqual(id, (int)eDrawTextBoxAttribs::align)) {

-            SetAlign(id, attVal);

-        } else if (IdEqual(id, (int)eDrawTextBoxAttribs::valign)) {

-            SetAlign(id, attVal);

-        } else if (IdEqual(id, (int)eDrawTextBoxAttribs::floatmode)) {

-            SetFloatMode(id, attVal);

-        } else if (IdEqual(id, (int)eDrawTextBoxAttribs::floatheight)) {

-            attribCtors[id] = new cNumericExpr(attVal);

-            attribCtors[id]->SetVertical();

-        } else if (IdEqual(id, (int)eDrawTextBoxAttribs::font)) {

-            fontName = strdup(attVal);

-        } else if (IdEqual(id, (int)eDrawTextBoxAttribs::text)) {

-            text = new cTextExpr(attVal);

-        } else if (IdEqual(id, (int)eDrawTextBoxAttribs::fontsize)) {

-            attribCtors[id] = new cNumericExpr(attVal);

-            attribCtors[id]->SetVertical();

-        } else {

-            attribCtors[id] = new cNumericExpr(attVal);

-        }

-    }

-}

-

-void cFuncDrawTextBox::Cache(void) {

-    cFunction::Cache();

-    if (text) {

-        text->SetTokenContainer(tokenContainer);

-        text->SetGlobals(globals);

-        text->Cache();

-    }

-    if (fontName) {

-        CacheFont(globals, GetValue((int)eDrawTextBoxAttribs::fontsize));

-    }

-}

-

-void cFuncDrawTextBox::Render(cPixmap *p, int x0, int y0, int colWidth, int rowHeight) {

-    if (!font) {

-        LoadFont(GetValue((int)eDrawTextBoxAttribs::fontsize));

-        if (!font)

-            return;

-    }

-    SetFloater();

-    eFloatMode mode = (eFloatMode)GetValue((int)eDrawTextBoxAttribs::floatmode);

-    int fontHeight = FontHeight();

-    int lines = floater->Lines();

-    eAlign align = (eAlign)GetValue((int)eDrawTextBoxAttribs::align);

-    int boxX = X() + x0;

-    int floatHeight = 0;

-    if ( mode == eFloatMode::topleft ) {

-        boxX += GetValue((int)eDrawTextBoxAttribs::floatwidth);

-        floatHeight = GetValue((int)eDrawTextBoxAttribs::floatheight);

-    }

-    eAlign valign = (eAlign)GetValue((int)eDrawTextBoxAttribs::valign);

-    int height = Height();

-    if (height <= 0)

-        height = container.Height();

-    int y = Y() + y0;

-    if (valign == eAlign::center) {

-        y = y0 + (height - fontHeight * lines) / 2;

-    } else if (valign == eAlign::bottom) {

-        y = y0 + height - fontHeight * lines;

-    }

-    int x = boxX;

-    for (int line=0; line < lines; line++) {

-        const char *lineText = floater->GetLine(line);

-        if (!lineText)

-            break;

-        if (align == eAlign::center) {

-            x = boxX + (Width() - TextWidth(lineText)) / 2;

-        } else if (align == eAlign::right) {

-            x = boxX + Width() - TextWidth(lineText);

-        }

-        p->DrawText(cPoint(x, y), lineText, color->Color(), clrTransparent, font);

-        y += fontHeight;

-        if ( mode == eFloatMode::topleft ) {

-            if ((line+1) * fontHeight >= floatHeight)

-                x = X() + x0;

-        }

-    }

-}

-

-int cFuncDrawTextBox::FuncWidth(void) {

-    return Width();

-}

-

-int cFuncDrawTextBox::FuncHeight(void) {

-    if (!font)

-        return 0;

-    int boxHeight = Height();

-    if (boxHeight > 0)

-        return boxHeight;

-    SetFloater();

-    int lines = floater->Lines();

-    return lines * FontHeight();

-}

-

-void cFuncDrawTextBox::Debug(void) {

-    cFunction::Debug();

-    if (fontName)

-        esyslog("skindesigner:            fontname: \"%s\"", fontName);

-    if (font)

-        esyslog("skindesigner:            cached font name: \"%s\", size %d", font->FontName(), font->Height());

-    if (text)

-        text->Debug("draw textbox");

-}

-

-void cFuncDrawTextBox::SetFloater(void) {

-    char *funcText = NULL;

-    if (text)

-        funcText = text->DeterminateText();

-    int boxWidth = Width();

-    int boxHeight  = Height();

-    int floatWidth = GetValue((int)eDrawTextBoxAttribs::floatwidth);

-    int floatHeight = GetValue((int)eDrawTextBoxAttribs::floatheight);

-    int maxLines = GetValue((int)eDrawTextBoxAttribs::maxlines);

-    delete floater;

-    floater = new cTextFloater();

-    floater->Set(funcText, font, boxWidth, boxHeight, floatWidth, floatHeight, maxLines);

-    free(funcText);

-}

-

-void cFuncDrawTextBox::SetAttributesDefs(void) {

-    attribIDs.insert(pair<string, int>("align", (int)eDrawTextBoxAttribs::align));

-    attribIDs.insert(pair<string, int>("valign", (int)eDrawTextBoxAttribs::valign));

-    attribIDs.insert(pair<string, int>("maxlines", (int)eDrawTextBoxAttribs::maxlines));

-    attribIDs.insert(pair<string, int>("floatwidth", (int)eDrawTextBoxAttribs::floatwidth));

-    attribIDs.insert(pair<string, int>("floatheight", (int)eDrawTextBoxAttribs::floatheight));

-    attribIDs.insert(pair<string, int>("float", (int)eDrawTextBoxAttribs::floatmode));

-    attribIDs.insert(pair<string, int>("color", (int)eDrawTextBoxAttribs::color));

-    attribIDs.insert(pair<string, int>("font", (int)eDrawTextBoxAttribs::font));

-    attribIDs.insert(pair<string, int>("fontsize", (int)eDrawTextBoxAttribs::fontsize));

-    attribIDs.insert(pair<string, int>("name", (int)eDrawTextBoxAttribs::name));

-    attribIDs.insert(pair<string, int>("text", (int)eDrawTextBoxAttribs::text));

-    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::align, "align"));

-    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::valign, "valign"));

-    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::maxlines, "maxlines"));

-    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::floatwidth, "floatwidth"));

-    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::floatheight, "floatheight"));

-    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::floatmode, "float"));

-    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::color, "color"));

-    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::font, "font"));

-    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::fontsize, "fontsize"));

-    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::name, "name"));

-    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::text, "text"));

-}

-

-void cFuncDrawTextBox::SetFloatMode(int id, const char *val) {

-    eFloatMode mode = eFloatMode::none;

-    if (!strcmp(val, "topleft"))

-        mode = eFloatMode::topleft;

-    else if (!strcmp(val, "topright"))

-        mode = eFloatMode::topright;

-    attribs[id] = (int)mode;

-}

-

-/***************************************************************************

-* cFuncDrawImage

-***************************************************************************/

-cFuncDrawImage::cFuncDrawImage(cArea *owner, int numAttributes) : cFunction(owner, numAttributes) {

-    funcType = "DrawImage";

-    path = NULL;

-    SetAttributesDefs();

-}

-

-cFuncDrawImage::cFuncDrawImage(const cFuncDrawImage &other) : cFunction(other) {

-    funcType = other.funcType;

-    path = NULL;

-    if (other.path)

-        path = new cTextExpr(*other.path);

-}

-

-cFuncDrawImage::~cFuncDrawImage(void) {

-    delete path;

-}

-

-void cFuncDrawImage::SetLoopInfo(cLoopInfo *loopInfo) {

-    cFunction::SetLoopInfo(loopInfo);

-    if (path)

-        path->SetLoopInfo(loopInfo);

-}

-

-void cFuncDrawImage::SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer) {

-    cAttributes::SetTokenContainerDeep(tokenContainer);

-    if (path) {

-        path->SetTokenContainer(tokenContainer);

-    }

-}

-

-void cFuncDrawImage::Set(vector<stringpair> &attributes) {

-    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {

-        const char *attName = (*att).first.c_str();

-        const char *attVal = (*att).second.c_str();

-        int id = AttributeId(attName);

-        if (id == ATTR_UNKNOWN) {

-            esyslog("skindesigner: unknown func DrawText attribute \"%s\" = \"%s\"", attName, attVal);

-            continue;

-        }

-        

-        if (SetCommon(id, attVal))

-            continue;

-        if (IdEqual(id, (int)eDrawImageAttribs::name)) {

-            name = strdup(attVal);

-        } else if (IdEqual(id, (int)eDrawImageAttribs::path)) {

-            path = new cTextExpr(attVal);

-        } else if (IdEqual(id, (int)eDrawImageAttribs::align)) {

-            SetAlign(id, attVal);

-        } else if (IdEqual(id, (int)eDrawImageAttribs::valign)) {

-            SetAlign(id, attVal);

-        } else if (IdEqual(id, (int)eDrawImageAttribs::imagetype)) {

-            SetImageType(id, attVal);

-        } else if (IdEqual(id, (int)eDrawImageAttribs::animtype)) {

-            SetAnimType(id, attVal);

-        } else if (IdEqual(id, (int)eDrawImageAttribs::cache)) {

-            SetBool(id, attVal);

-        } else {

-            attribCtors[id] = new cNumericExpr(attVal);

-        }

-    }

-}

-

-void cFuncDrawImage::Debug(void) {

-    cFunction::Debug();

-    if (path)

-        path->Debug("image path");

-}

-

-void cFuncDrawImage::SetImageType(int id, const char *val) {

-    eImageType imgType = eImageType::image;

-    if (!strcmp(val, "channellogo"))

-        imgType = eImageType::channellogo;

-    else if (!strcmp(val, "seplogo"))

-        imgType = eImageType::seplogo;

-    else if (!strcmp(val, "skinpart"))

-        imgType = eImageType::skinpart;

-    else if (!strcmp(val, "menuicon"))

-        imgType = eImageType::menuicon;

-    else if (!strcmp(val, "icon"))

-        imgType = eImageType::icon;

-    attribs[id] = (int)imgType;

-}

-

-void cFuncDrawImage::SetAttributesDefs(void) {

-    attribIDs.insert(pair<string, int>("align", (int)eDrawImageAttribs::align));

-    attribIDs.insert(pair<string, int>("valign", (int)eDrawImageAttribs::valign));

-    attribIDs.insert(pair<string, int>("imagetype", (int)eDrawImageAttribs::imagetype));

-    attribIDs.insert(pair<string, int>("name", (int)eDrawImageAttribs::name));

-    attribIDs.insert(pair<string, int>("cache", (int)eDrawImageAttribs::cache));

-    attribIDs.insert(pair<string, int>("path", (int)eDrawImageAttribs::path));

-    attribIDs.insert(pair<string, int>("animtype", (int)eDrawImageAttribs::animtype));

-    attribIDs.insert(pair<string, int>("animfreq", (int)eDrawImageAttribs::animfreq));

-    attribNames.insert(pair<int, string>((int)eDrawImageAttribs::align, "align"));

-    attribNames.insert(pair<int, string>((int)eDrawImageAttribs::valign, "valign"));

-    attribNames.insert(pair<int, string>((int)eDrawImageAttribs::imagetype, "imagetype"));

-    attribNames.insert(pair<int, string>((int)eDrawImageAttribs::name, "name"));

-    attribNames.insert(pair<int, string>((int)eDrawImageAttribs::cache, "cache"));

-    attribNames.insert(pair<int, string>((int)eDrawImageAttribs::path, "path"));

-    attribNames.insert(pair<int, string>((int)eDrawImageAttribs::animtype, "animtype"));

-    attribNames.insert(pair<int, string>((int)eDrawImageAttribs::animfreq, "animfreq"));

-}

-

-void cFuncDrawImage::Cache(void) {

-    cFunction::Cache();

-    if (path) {

-        int type = GetValue((int)eDrawImageAttribs::imagetype);

-        if (type == (int)eImageType::image) {

-            path->CorrectImagePath();

-        }

-        path->SetGlobals(globals);

-        path->SetTokenContainer(tokenContainer);

-        path->Cache();

-    }

-

-    if (config.cacheImagesInitial)

-        PreCacheImage();

-}

-

-void cFuncDrawImage::PreCacheImage(void) {

-    int imgWidth = Width();

-    int imgHeight = Height();

-    char *imgPath = path->DeterminateText();

-    if (!(imgWidth > 0 && imgHeight > 0))

-        return;

-

-    eImageType type = (eImageType)GetValue((int)eDrawImageAttribs::imagetype);

-    switch (type) {

-        case eImageType::channellogo:

-            imgCache->CacheLogo(imgWidth, imgHeight);

-            break;

-        case eImageType::skinpart:

-            if (imgPath)

-                imgCache->GetSkinpart(imgPath, imgWidth, imgHeight);

-            break;

-        case eImageType::icon: 

-        case eImageType::menuicon:

-            if (imgPath)

-                imgCache->GetIcon(type, imgPath, imgWidth, imgHeight);

-            break;

-        default: 

-            break;

-    }

-    free(imgPath);

-}

-

-void cFuncDrawImage::Render(cPixmap *p, int x0, int y0, int colWidth, int rowHeight) {

-    if (!path)

-        return;

-    eAlign align = (eAlign)GetValue((int)eDrawImageAttribs::align);

-    eAlign valign = (eAlign)GetValue((int)eDrawImageAttribs::valign);

-    int x = GetX(align, x0, colWidth);

-    int y = GetY(valign, y0, rowHeight);

-    cPoint pos(x, y);

-    eImageType type = (eImageType)GetValue((int)eDrawImageAttribs::imagetype);

-    char *imgPath = path->DeterminateText();

-    if (!imgPath)

-        return;

-    

-    switch (type) {

-        case eImageType::channellogo: {

-            cImage *logo = imgCache->GetLogo(imgPath, Width(), Height());

-            if (logo) {

-                p->DrawImage(pos, *logo);

-            }

-            break; }

-        case eImageType::seplogo: {

-            cImage *sep = imgCache->GetSeparatorLogo(imgPath, Width(), Height());

-            if (sep) {

-                p->DrawImage(pos, *sep);

-            }

-            break; }

-        case eImageType::skinpart: {

-            cCachedImage *img = imgCache->GetSkinpart(imgPath, Width(), Height());

-            if (!img) break;

-            if (img->handle) {

-                p->DrawImage(pos, img->handle);

-            } else if (img->image) {

-                p->DrawImage(pos, *(img->image));                

-            }

-            break; }

-        case eImageType::icon: 

-        case eImageType::menuicon: {

-            cCachedImage *img = imgCache->GetIcon(type, imgPath, Width(), Height());

-            if (!img) break;

-            if (img->handle) {

-                p->DrawImage(pos, img->handle);

-            } else if (img->image) {

-                p->DrawImage(pos, *(img->image));                

-            }

-            break; }

-        case eImageType::image: {

-            cImageLoader imgLoader;

-            if (imgLoader.LoadImage(imgPath)) {

-                cImage *img = imgLoader.CreateImage(Width(), Height());

-                if (!img) break;

-                p->DrawImage(pos, *img);

-                delete(img);

-            }

-            break; }

-    }

-    free(imgPath);

-}

-

-/***************************************************************************

-* cFuncLoop

-***************************************************************************/

-cFuncLoop::cFuncLoop(cArea *owner, int numAttributes) : cFunction(owner, numAttributes) {

-    funcType = "LoopFunc";

-    SetAttributesDefs();

-}

-

-cFuncLoop::~cFuncLoop(void) {

-}

-

-void cFuncLoop::Set(vector<stringpair> &attributes) {

-    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {

-        const char *attName = (*att).first.c_str();

-        const char *attVal = (*att).second.c_str();

-        int id = AttributeId(attName);

-        if (id == ATTR_UNKNOWN) {

-            esyslog("skindesigner: unknown loopfunc attribute \"%s\" = \"%s\"", attName, attVal);

-            continue;

-        }

-        

-        if (SetCommon(id, attVal))

-            continue;

-        if (IdEqual(id, (int)eLoopAttribs::name)) {

-            name = strdup(attVal);

-        } else if (IdEqual(id, (int)eLoopAttribs::orientation)) {

-            SetOrientation(id, attVal);

-        } else if (IdEqual(id, (int)eLoopAttribs::overflow)) {

-            SetOverflow(id, attVal);

-        } else {

-            attribCtors[id] = new cNumericExpr(attVal);

-        }

-    }

-}

-

-void cFuncLoop::Cache(void) {

-    cFunction::Cache();

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        f->SetGlobals(globals);

-        f->SetTokenContainer(tokenContainer);

-        f->Cache();

-    }

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        f->SetLoopInfo(&loopInfo);

-        f->CacheFuncReferences();

-    }

-}

-

-void cFuncLoop::SetContainer(int x, int y, int width, int height) {

-    cAttributes::SetContainer(x, y, width, height);

-    int funcX = X();

-    int funcY = Y();

-    int funcWidth = Width();

-    int funcHeight = Height();

-    

-    int funcContainerX = (funcX > 0) ? x + funcX : x;

-    int funcContainerY = (funcY > 0) ? y + funcY : y;

-    int funcContainerWidth = (funcWidth > 0) ? funcWidth : width;

-    int funcContainerHeight = (funcHeight > 0) ? funcHeight : height;

-

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        f->SetContainer(funcContainerX, funcContainerY, funcContainerWidth, funcContainerHeight);

-    }

-}

-

-

-void cFuncLoop::AddFunction(cFunction *f) {

-    functions.Add(f);

-}

-

-cFunction *cFuncLoop::GetFunction(const char *name) {

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        const char *funcName = f->Name();

-        if (funcName && !strcmp(funcName, name)) {

-            return f;

-        }

-    }

-    return NULL;

-}

-

-void cFuncLoop::Render(cPixmap *p, int x0, int y0, int cw, int rh) {

-    int loopIndex = tokenContainer->LoopIndex(Name());

-    if (loopIndex < 0) {

-        esyslog("skindesigner: unknown loop function \"%s\"", Name());

-        return;

-    }

-    int numRows = tokenContainer->NumLoops(loopIndex);

-    int columnWidth = GetValue((int)eLoopAttribs::columnwidth);

-    int rowHeight = GetValue((int)eLoopAttribs::rowheight);

-    int maxItems = GetValue((int)eLoopAttribs::maxitems);

-    eOrientation orientation = (eOrientation)GetValue((int)eLoopAttribs::orientation);

-    eOverflowType overflow = (eOverflowType)GetValue((int)eLoopAttribs::overflow);

-    int loopWidth = Width();

-    if (loopWidth <= 0)

-        loopWidth = container.Width();

-    int loopHeight = Height();

-    if (loopHeight <= 0)

-        loopHeight = container.Height();

-

-    loopInfo.colWidth = columnWidth;

-    loopInfo.rowHeight = rowHeight;

-    loopInfo.index = loopIndex;

-

-    int loopX = X();

-    int loopY = Y();

-    int x = (loopX > 0) ? loopX : 0;

-    int y = (loopY > 0) ? loopY : 0;

-    for (int row = 0; row < numRows; ++row) {

-        if (maxItems > 0 && row >= maxItems) {

-            break;

-        }

-        loopInfo.row = row;

-        //check overflow cut

-        if (overflow == eOverflowType::cut) {

-            if (orientation == eOrientation::horizontal && (row * columnWidth > loopWidth)) {

-                return;

-            } else if (orientation == eOrientation::vertical && (row * rowHeight > loopHeight)) {

-                return;

-            }

-        }

-        for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-            if (f->DoDebug())

-                f->Debug();

-            if (!f->DoExecute())

-                continue;

-            f->Render(p, x, y, columnWidth, rowHeight);

-        }        

-        if (orientation == eOrientation::horizontal) {

-            if (columnWidth > 0) {

-                x += columnWidth;

-            } else {

-                x += ColumnWidth();

-            }

-            //check overflow wrap

-            if (overflow == eOverflowType::wrap && orientation == eOrientation::horizontal) {

-                if (x + columnWidth - 10 > loopWidth) {

-                    x = X();

-                    if (x < 0) x = 0;

-                    y += rowHeight;

-                }

-            }

-        } else if (orientation == eOrientation::vertical) {

-            if (rowHeight > 0) {

-                y += rowHeight;

-            } else {

-                y += RowHeight();

-            }

-        }

-    }

-}

-

-int cFuncLoop::FuncWidth(void) {

-    loopInfo.row = 0;

-    int loopIndex = tokenContainer->LoopIndex(Name());

-    if (loopIndex < 0) {

-        esyslog("skindesigner: unknown loop function \"%s\"", Name());

-        return 0;

-    }

-    int numLoops = tokenContainer->NumLoops(loopIndex);

-    int columnWidth = GetValue((int)eLoopAttribs::columnwidth);

-    if (columnWidth <=0)

-        columnWidth = ColumnWidth();

-    eOverflowType overflow = (eOverflowType)GetValue((int)eLoopAttribs::overflow);

-    if (overflow == eOverflowType::cut) {

-        int maxItems = GetValue((int)eLoopAttribs::maxitems);

-        numLoops = min(numLoops, maxItems);

-    }

-    if (numLoops > 0)

-        return numLoops * columnWidth;

-    return 0;

-}

-

-int cFuncLoop::FuncHeight(void) {

-    loopInfo.row = 0;

-    int loopIndex = tokenContainer->LoopIndex(Name());

-    if (loopIndex < 0) {

-        esyslog("skindesigner: unknown loop function \"%s\"", Name());

-        return 0;

-    }

-    int numLoops = tokenContainer->NumLoops(loopIndex);

-    int rowHeight = GetValue((int)eLoopAttribs::rowheight);

-    if (rowHeight <=0)

-        rowHeight = RowHeight();

-    

-    eOverflowType overflow = (eOverflowType)GetValue((int)eLoopAttribs::overflow);

-    if (overflow == eOverflowType::cut) {

-        int maxItems = GetValue((int)eLoopAttribs::maxitems);

-        numLoops = min(numLoops, maxItems);

-    } else if (overflow == eOverflowType::wrap) {

-        int loopWidth = Width();

-        if (loopWidth <= 0)

-            loopWidth = container.Width();

-        loopWidth++;

-        int columnWidth = GetValue((int)eLoopAttribs::columnwidth);

-        if (columnWidth <=0)

-            columnWidth = ColumnWidth();

-        int itemsPerRow = loopWidth / columnWidth;

-        int rows = numLoops / itemsPerRow;

-        if (numLoops % itemsPerRow > 0)

-            rows++;

-        return rows * rowHeight;

-    }

-    if (numLoops > 0)

-        return numLoops * rowHeight;

-    return 0;

-}

-

-void cFuncLoop::Debug(void) {

-    loopInfo.row = 0;

-    cFunction::Debug();

-    dsyslog("skindesigner:        loopfunc Functions:");

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        f->Debug();

-    }

-}

-

-void cFuncLoop::SetAttributesDefs(void) {

-    attribIDs.insert(pair<string, int>("columnwidth", (int)eLoopAttribs::columnwidth));

-    attribIDs.insert(pair<string, int>("rowheight", (int)eLoopAttribs::rowheight));

-    attribIDs.insert(pair<string, int>("name", (int)eLoopAttribs::name));

-    attribIDs.insert(pair<string, int>("orientation", (int)eLoopAttribs::orientation));

-    attribIDs.insert(pair<string, int>("overflow", (int)eLoopAttribs::overflow));

-    attribIDs.insert(pair<string, int>("maxitems", (int)eLoopAttribs::maxitems));

-    attribNames.insert(pair<int, string>((int)eLoopAttribs::columnwidth, "columnwidth"));

-    attribNames.insert(pair<int, string>((int)eLoopAttribs::rowheight, "rowheight"));

-    attribNames.insert(pair<int, string>((int)eLoopAttribs::name, "name"));

-    attribNames.insert(pair<int, string>((int)eLoopAttribs::orientation, "orientation"));

-    attribNames.insert(pair<int, string>((int)eLoopAttribs::overflow, "overflow"));

-    attribNames.insert(pair<int, string>((int)eLoopAttribs::maxitems, "maxitems"));

-}

-

-int cFuncLoop::ColumnWidth(void) {

-    int width = 0;

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        if (!f->DoExecute())

-            continue;

-        int funcWidth = f->X() + f->FuncWidth();

-        if (funcWidth > width)

-            width = funcWidth;

-    }

-    return width;

-}

-

-int cFuncLoop::RowHeight(void) {

-    int height = 0;

-    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {

-        if (!f->DoExecute())

-            continue;

-        int funcHeight = f->Y() + f->FuncHeight();

-        if (funcHeight > height)

-            height = funcHeight;

-    }

-    return height;

-}

-

-// --- cTextFloater ----------------------------------------------------------

-

-cTextFloater::cTextFloater(void) {

-    text = eol = NULL;

-    lines = 0;

-    lastLine = -1;

-}

-

-cTextFloater::cTextFloater(const char *fext, const cFont *font, int width, int height, int floatWidth, int floatHeight, int maxLines) {

-    text = NULL;

-    Set(text, font, width, height, floatWidth, floatHeight, maxLines);

-}

-

-cTextFloater::~cTextFloater() {

-    free(text);

-}

-

-void cTextFloater::Set(const char *Text, const cFont *font, int width, int height, int floatWidth, int floatHeight, int maxLines) {

-    free(text);

-    text = Text ? strdup(Text) : NULL;

-    eol = NULL;

-    lines = 0;

-    lastLine = -1;

-    if (!text)

-        return;

-    lines = 1;

-    if (width <= 0)

-        return;

-    int lineHeight = font->Height();

-    bool cut = false;

-    if (height > 0)

-        cut = true;

-    bool doFloat = false;

-    if (floatWidth > 0 && floatHeight > 0)

-        doFloat = true;

-    int textWidth = width;

-    if (doFloat) {

-        textWidth = width - floatWidth;

-    }

-

-    char *Blank = NULL;

-    char *Delim = NULL;

-    int w = 0;

-

-    stripspace(text); // strips trailing newlines

-

-    for (char *p = text; *p; ) {

-        int sl = Utf8CharLen(p);

-        uint sym = Utf8CharGet(p, sl);

-        if (sym == '\n') {

-            if ((maxLines > 0) && (lines == maxLines)) {

-                while (*p) {

-                    *p = 0;

-                    p++;

-                }

-                return;

-            }

-            lines++;

-            if (cut) {

-                if (lines * lineHeight >= height) {

-                    //remove last line, find last linebreak

-                    p--;

-                    int max = 100;

-                    int i = 0;

-                    while (*p) {

-                        int sl = Utf8CharLen(p);

-                        uint sym = Utf8CharGet(p, sl);

-                        if (sym == '\n')

-                            break;

-                        p -= sl;

-                        i++;

-                        if (i > max)

-                            break;

-                    }

-                    p++; 

-                    if (*p) {

-                        *p = '.'; p++; 

-                        if (*p) { 

-                            *p = '.'; p++; 

-                            if (*p) { 

-                                *p = '.'; p++; 

-                                *p = 0;

-                            }

-                        }

-                    }

-                    break;

-                }

-            }

-            if (doFloat) {

-                if ((lines-1) * lineHeight >= floatHeight) {

-                    textWidth = width;

-                }

-            }

-            w = 0;

-            Blank = Delim = NULL;

-            p++;

-            continue;

-        } else if (sl == 1 && isspace(sym))

-            Blank = p;

-

-        int cw = font->Width(sym);

-        if (w + cw > textWidth) {

-            if (Blank) {

-                *Blank = '\n';

-                p = Blank;

-                continue;

-            } else if (w > 0) { // there has to be at least one character before the newline

-                // Here's the ugly part, where we don't have any whitespace to

-                // punch in a newline, so we need to make room for it:

-                if (Delim)

-                    p = Delim + 1; // let's fall back to the most recent delimiter

-                char *s = MALLOC(char, strlen(text) + 2); // The additional '\n' plus the terminating '\0'

-                int l = p - text;

-                strncpy(s, text, l);

-                s[l] = '\n';

-                strcpy(s + l + 1, p);

-                free(text);

-                text = s;

-                p = text + l;

-                continue;

-            }

-        }

-        w += cw;

-        if (strchr("-.,:;!?_", *p)) {

-            Delim = p;

-            Blank = NULL;

-        }

-        p += sl;

-    }

-}

-

-const char *cTextFloater::Text(void) {

-    if (eol) {

-        *eol = '\n';

-        eol = NULL;

-    }

-    return text;

-}

-

-const char *cTextFloater::GetLine(int line) {

-    char *s = NULL;

-    if (line < lines) {

-        if (eol) {

-            *eol = '\n';

-            if (line == lastLine + 1)

-                s = eol + 1;

-            eol = NULL;

-        }

-        if (!s) {

-            s = text;

-            for (int i = 0; i < line; i++) {

-                s = strchr(s, '\n');

-                if (s)

-                    s++;

-                else

-                    break;

-            }

-        }

-        if (s) {

-            if ((eol = strchr(s, '\n')) != NULL)

-                *eol = 0;

-        }

-        lastLine = line;

-    }

-    return s;

-}

+#include "attribute.h"
+#include "../config.h"
+
+/***************************************************************************
+* cFuncFill
+***************************************************************************/
+cFuncFill::cFuncFill(cArea *owner, int numAttributes) : cFunction(owner, numAttributes) {
+    funcType = "Fill";
+    SetAttributesDefs();
+}
+
+cFuncFill::cFuncFill(const cFuncFill &other) : cFunction(other) {
+    funcType = other.funcType;
+}
+
+cFuncFill::~cFuncFill(void) {
+}
+
+void cFuncFill::Set(vector<stringpair> &attributes) {
+    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {
+        const char *attName = (*att).first.c_str();
+        const char *attVal = (*att).second.c_str();
+        int id = AttributeId(attName);
+        if (id == ATTR_UNKNOWN) {
+            esyslog("skindesigner: unknown func Fill attribute \"%s\" = \"%s\"", attName, attVal);
+            continue;
+        }
+        if (SetCommon(id, attVal))
+            continue;
+        if (IdEqual(id, (int)eFillAttribs::color)) {
+            SetColor(attVal);
+        }
+    }
+}
+
+void cFuncFill::SetAttributesDefs(void) {
+    attribIDs.insert(pair<string, int>("color", (int)eFillAttribs::color));
+    attribNames.insert(pair<int, string>((int)eFillAttribs::color, "color"));
+}
+
+void cFuncFill::Render(cPixmap *p, int x0, int y0, int colWidth, int rowHeight) {
+    if (!color)
+        return;
+    p->Fill(color->Color());
+}
+
+/***************************************************************************
+* cFuncDrawRectangle
+***************************************************************************/
+cFuncDrawRectangle::cFuncDrawRectangle(cArea *owner, int numAttributes) : cFunction(owner, numAttributes) {
+    funcType = "DrawRectangle";
+    SetAttributesDefs();
+}
+
+cFuncDrawRectangle::cFuncDrawRectangle(const cFuncDrawRectangle &other) : cFunction(other) {
+    funcType = other.funcType;
+}
+
+cFuncDrawRectangle::~cFuncDrawRectangle(void) {
+}
+
+void cFuncDrawRectangle::Set(vector<stringpair> &attributes) {
+    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {
+        const char *attName = (*att).first.c_str();
+        const char *attVal = (*att).second.c_str();
+        int id = AttributeId(attName);
+        if (id == ATTR_UNKNOWN) {
+            esyslog("skindesigner: unknown func DrawRectangle attribute \"%s\" = \"%s\"", attName, attVal);
+            continue;
+        }
+        if (SetCommon(id, attVal))
+            continue;
+        if (IdEqual(id, (int)eDrawRectangleAttribs::color)) {
+            SetColor(attVal);
+        } else if (IdEqual(id, (int)eDrawRectangleAttribs::name)) {
+            name = strdup(attVal);
+        } else if (IdEqual(id, (int)eDrawRectangleAttribs::align)) {
+            SetAlign(id, attVal);
+        } else if (IdEqual(id, (int)eDrawRectangleAttribs::valign)) {
+            SetAlign(id, attVal);
+        } else if (IdEqual(id, (int)eDrawRectangleAttribs::animtype)) {
+            SetAnimType(id, attVal);
+        } else {
+            attribCtors[id] = new cNumericExpr(attVal);
+        }
+    }
+}
+
+void cFuncDrawRectangle::SetAttributesDefs(void) {
+    attribIDs.insert(pair<string, int>("align", (int)eDrawRectangleAttribs::align));
+    attribIDs.insert(pair<string, int>("valign", (int)eDrawRectangleAttribs::valign));
+    attribIDs.insert(pair<string, int>("color", (int)eDrawRectangleAttribs::color));
+    attribIDs.insert(pair<string, int>("name", (int)eDrawRectangleAttribs::name));
+    attribIDs.insert(pair<string, int>("animtype", (int)eDrawRectangleAttribs::animtype));
+    attribIDs.insert(pair<string, int>("animfreq", (int)eDrawRectangleAttribs::animfreq));
+    attribNames.insert(pair<int, string>((int)eDrawRectangleAttribs::align, "align"));
+    attribNames.insert(pair<int, string>((int)eDrawRectangleAttribs::valign, "valign"));
+    attribNames.insert(pair<int, string>((int)eDrawRectangleAttribs::color, "color"));
+    attribNames.insert(pair<int, string>((int)eDrawRectangleAttribs::name, "name"));
+    attribNames.insert(pair<int, string>((int)eDrawRectangleAttribs::animtype, "animtype"));
+    attribNames.insert(pair<int, string>((int)eDrawRectangleAttribs::animfreq, "animfreq"));
+}
+
+void cFuncDrawRectangle::Render(cPixmap *p, int x0, int y0, int colWidth, int rowHeight) {
+    eAlign align = (eAlign)GetValue((int)eDrawRectangleAttribs::align);
+    eAlign valign = (eAlign)GetValue((int)eDrawRectangleAttribs::valign);
+    int x = GetX(align, x0, colWidth);
+    int y = GetY(valign, y0, rowHeight);
+    cRect rect(x, y, Width(), Height());
+    p->DrawRectangle(rect, color->Color());
+}
+
+/***************************************************************************
+* cFuncDrawEllipse
+***************************************************************************/
+cFuncDrawEllipse::cFuncDrawEllipse(cArea *owner, int numAttributes) : cFunction(owner, numAttributes) {
+    funcType = "DrawEllipse";
+    SetAttributesDefs();
+}
+
+cFuncDrawEllipse::cFuncDrawEllipse(const cFuncDrawEllipse &other) : cFunction(other) {
+    funcType = other.funcType;
+}
+
+cFuncDrawEllipse::~cFuncDrawEllipse(void) {
+}
+
+void cFuncDrawEllipse::Set(vector<stringpair> &attributes) {
+    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {
+        const char *attName = (*att).first.c_str();
+        const char *attVal = (*att).second.c_str();
+        int id = AttributeId(attName);
+        if (id == ATTR_UNKNOWN) {
+            esyslog("skindesigner: unknown func DrawEllipse attribute \"%s\" = \"%s\"", attName, attVal);
+            continue;
+        }
+        if (SetCommon(id, attVal))
+            continue;
+        if (IdEqual(id, (int)eDrawEllipseAttribs::color)) {
+            SetColor(attVal);
+        } else if (IdEqual(id, (int)eDrawEllipseAttribs::name)) {
+            name = strdup(attVal);
+        } else if (IdEqual(id, (int)eDrawEllipseAttribs::align)) {
+            SetAlign(id, attVal);
+        } else if (IdEqual(id, (int)eDrawEllipseAttribs::valign)) {
+            SetAlign(id, attVal);
+        } else if (IdEqual(id, (int)eDrawEllipseAttribs::animtype)) {
+            SetAnimType(id, attVal);
+        } else {
+            attribCtors[id] = new cNumericExpr(attVal);
+        }
+    }
+}
+
+void cFuncDrawEllipse::SetAttributesDefs(void) {
+    attribIDs.insert(pair<string, int>("align", (int)eDrawEllipseAttribs::align));
+    attribIDs.insert(pair<string, int>("valign", (int)eDrawEllipseAttribs::valign));
+    attribIDs.insert(pair<string, int>("color", (int)eDrawEllipseAttribs::color));
+    attribIDs.insert(pair<string, int>("name", (int)eDrawEllipseAttribs::name));
+    attribIDs.insert(pair<string, int>("quadrant", (int)eDrawEllipseAttribs::quadrant));
+    attribIDs.insert(pair<string, int>("animtype", (int)eDrawEllipseAttribs::animtype));
+    attribIDs.insert(pair<string, int>("animfreq", (int)eDrawEllipseAttribs::animfreq));
+    attribNames.insert(pair<int, string>((int)eDrawEllipseAttribs::align, "align"));
+    attribNames.insert(pair<int, string>((int)eDrawEllipseAttribs::valign, "valign"));
+    attribNames.insert(pair<int, string>((int)eDrawEllipseAttribs::color, "color"));
+    attribNames.insert(pair<int, string>((int)eDrawEllipseAttribs::name, "name"));
+    attribNames.insert(pair<int, string>((int)eDrawEllipseAttribs::quadrant, "quadrant"));
+    attribNames.insert(pair<int, string>((int)eDrawEllipseAttribs::animtype, "animtype"));
+    attribNames.insert(pair<int, string>((int)eDrawEllipseAttribs::animfreq, "animfreq"));
+}
+
+void cFuncDrawEllipse::Render(cPixmap *p, int x0, int y0, int colWidth, int rowHeight) {
+    eAlign align = (eAlign)GetValue((int)eDrawEllipseAttribs::align);
+    eAlign valign = (eAlign)GetValue((int)eDrawEllipseAttribs::valign);
+    int x = GetX(align, x0, colWidth);
+    int y = GetY(valign, y0, rowHeight);
+    cRect rect(x, y, Width(), Height());
+    int quadrant = GetValue((int)eDrawEllipseAttribs::quadrant);
+    p->DrawEllipse(rect, color->Color(), quadrant);
+}
+
+/***************************************************************************
+* cFuncDrawSlope
+***************************************************************************/
+cFuncDrawSlope::cFuncDrawSlope(cArea *owner, int numAttributes) : cFunction(owner, numAttributes) {
+    funcType = "DrawSlope";
+    SetAttributesDefs();
+}
+
+cFuncDrawSlope::cFuncDrawSlope(const cFuncDrawSlope &other) : cFunction(other) {
+    funcType = other.funcType;
+}
+
+cFuncDrawSlope::~cFuncDrawSlope(void) {
+}
+
+void cFuncDrawSlope::Set(vector<stringpair> &attributes) {
+    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {
+        const char *attName = (*att).first.c_str();
+        const char *attVal = (*att).second.c_str();
+        int id = AttributeId(attName);
+        if (id == ATTR_UNKNOWN) {
+            esyslog("skindesigner: unknown func DrawSlope attribute \"%s\" = \"%s\"", attName, attVal);
+            continue;
+        }
+        if (SetCommon(id, attVal))
+            continue;
+        if (IdEqual(id, (int)eDrawSlopeAttribs::color)) {
+            SetColor(attVal);
+        } else if (IdEqual(id, (int)eDrawSlopeAttribs::name)) {
+            name = strdup(attVal);
+        } else if (IdEqual(id, (int)eDrawSlopeAttribs::align)) {
+            SetAlign(id, attVal);
+        } else if (IdEqual(id, (int)eDrawSlopeAttribs::valign)) {
+            SetAlign(id, attVal);
+        } else if (IdEqual(id, (int)eDrawSlopeAttribs::animtype)) {
+            SetAnimType(id, attVal);
+        } else {
+            attribCtors[id] = new cNumericExpr(attVal);
+        }
+    }
+}
+
+void cFuncDrawSlope::SetAttributesDefs(void) {
+    attribIDs.insert(pair<string, int>("align", (int)eDrawSlopeAttribs::align));
+    attribIDs.insert(pair<string, int>("valign", (int)eDrawSlopeAttribs::valign));
+    attribIDs.insert(pair<string, int>("color", (int)eDrawSlopeAttribs::color));
+    attribIDs.insert(pair<string, int>("name", (int)eDrawSlopeAttribs::name));
+    attribIDs.insert(pair<string, int>("type", (int)eDrawSlopeAttribs::type));
+    attribIDs.insert(pair<string, int>("animtype", (int)eDrawSlopeAttribs::animtype));
+    attribIDs.insert(pair<string, int>("animfreq", (int)eDrawSlopeAttribs::animfreq));
+    attribNames.insert(pair<int, string>((int)eDrawSlopeAttribs::align, "align"));
+    attribNames.insert(pair<int, string>((int)eDrawSlopeAttribs::valign, "valign"));
+    attribNames.insert(pair<int, string>((int)eDrawSlopeAttribs::color, "color"));
+    attribNames.insert(pair<int, string>((int)eDrawSlopeAttribs::name, "name"));
+    attribNames.insert(pair<int, string>((int)eDrawSlopeAttribs::type, "type"));
+    attribNames.insert(pair<int, string>((int)eDrawSlopeAttribs::animtype, "animtype"));
+    attribNames.insert(pair<int, string>((int)eDrawSlopeAttribs::animfreq, "animfreq"));
+}
+
+void cFuncDrawSlope::Render(cPixmap *p, int x0, int y0, int colWidth, int rowHeight) {
+    eAlign align = (eAlign)GetValue((int)eDrawSlopeAttribs::align);
+    eAlign valign = (eAlign)GetValue((int)eDrawSlopeAttribs::valign);
+    int x = GetX(align, x0, colWidth);
+    int y = GetY(valign, y0, rowHeight);
+    cRect rect(x, y, Width(), Height());
+    int type = GetValue((int)eDrawSlopeAttribs::type);
+    p->DrawSlope(rect, color->Color(), type);
+}
+
+/***************************************************************************
+* cTextDrawer
+***************************************************************************/
+cMutex cTextDrawer::fontLock;
+
+cTextDrawer::cTextDrawer(void) {
+    font = NULL;
+    fontName = NULL;
+    fontSize = 0;
+}
+
+cTextDrawer::~cTextDrawer(void) {
+    free(fontName);
+}
+
+void cTextDrawer::CacheFont(cGlobals *globals, int size) {
+    //check if font name is a global token
+    if (startswith(fontName, "{") && endswith(fontName, "}")) {
+        string tmpFontName = "";
+        if (globals->GetFont(fontName, tmpFontName)) {
+            free(fontName);
+            fontName = strdup(tmpFontName.c_str());
+        } else {
+            esyslog("skindesigner: unknown font %s", fontName);
+            return;
+        }
+    }
+    if (size > 0)
+        LoadFont(size);
+}
+
+void cTextDrawer::LoadFont(int size) {
+    if (!fontName)
+        return; 
+    if (size <= 0)
+        return;
+    font = fontManager->Font(fontName, size);
+    if (font)
+        fontSize = size;
+}
+    
+int cTextDrawer::TextWidth(const char *text) {
+    int textWidth = 0;
+    fontLock.Lock();
+    textWidth = font->Width(text);
+    fontLock.Unlock();
+    return textWidth;
+}
+
+int cTextDrawer::FontHeight(void) {
+    int fontHeight = 0;
+    fontLock.Lock();
+    fontHeight = font->Height();
+    fontLock.Unlock();
+    return fontHeight;
+}
+/***************************************************************************
+* cFuncDrawText
+***************************************************************************/
+cFuncDrawText::cFuncDrawText(cArea *owner, int numAttributes) : cFunction(owner, numAttributes) {
+    funcType = "DrawText";
+    text = NULL;
+    SetAttributesDefs();
+}
+
+cFuncDrawText::cFuncDrawText(const cFuncDrawText &other) : cFunction(other) {
+    funcType = other.funcType;
+    fontName = NULL;
+    if (other.fontName)
+        fontName = strdup(other.fontName);
+    font = other.font;
+    text = NULL;
+    if (other.text)
+        text = new cTextExpr(*other.text);
+}
+
+cFuncDrawText::~cFuncDrawText(void) {
+    delete text;
+}
+
+void cFuncDrawText::SetLoopInfo(cLoopInfo *loopInfo) {
+    cFunction::SetLoopInfo(loopInfo);
+    if (text)
+        text->SetLoopInfo(loopInfo);
+}
+
+void cFuncDrawText::SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer) {
+    cAttributes::SetTokenContainerDeep(tokenContainer);
+    if (text) {
+        text->SetTokenContainer(tokenContainer);
+    }
+}
+
+void cFuncDrawText::Set(vector<stringpair> &attributes) {
+    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {
+        const char *attName = (*att).first.c_str();
+        const char *attVal = (*att).second.c_str();
+        int id = AttributeId(attName);
+        if (id == ATTR_UNKNOWN) {
+            esyslog("skindesigner: unknown func DrawText attribute \"%s\" = \"%s\"", attName, attVal);
+            continue;
+        }
+        
+        if (SetCommon(id, attVal))
+            continue;
+        if (IdEqual(id, (int)eDrawTextAttribs::color)) {
+            SetColor(attVal);
+        } else if (IdEqual(id, (int)eDrawTextAttribs::name)) {
+            name = strdup(attVal);
+        } else if (IdEqual(id, (int)eDrawTextAttribs::align)) {
+            SetAlign(id, attVal);
+        } else if (IdEqual(id, (int)eDrawTextAttribs::valign)) {
+            SetAlign(id, attVal);
+        } else if (IdEqual(id, (int)eDrawTextAttribs::animtype)) {
+            SetAnimType(id, attVal);
+        } else if (IdEqual(id, (int)eDrawTextAttribs::font)) {
+            fontName = strdup(attVal);
+        } else if (IdEqual(id, (int)eDrawTextAttribs::text)) {
+            text = new cTextExpr(attVal);
+        } else if (IdEqual(id, (int)eDrawTextAttribs::fontsize)) {
+            attribCtors[id] = new cNumericExpr(attVal);
+            attribCtors[id]->SetVertical();
+        } else {
+            attribCtors[id] = new cNumericExpr(attVal);
+        }
+    }
+}
+
+void cFuncDrawText::Cache(void) {
+    cFunction::Cache();
+    if (text) {
+        text->SetTokenContainer(tokenContainer);
+        text->SetGlobals(globals);
+        text->Cache();
+    }
+    if (fontName) {
+        CacheFont(globals, GetValue((int)eDrawTextAttribs::fontsize));
+    }
+}
+
+void cFuncDrawText::Render(cPixmap *p, int x0, int y0, int colWidth, int rowHeight) {
+    if (!font) {
+        LoadFont(GetValue((int)eDrawTextAttribs::fontsize));
+        if (!font)
+            return;
+    }
+    char *funcText = NULL;
+    if (text)
+        funcText = text->DeterminateText();
+    if (!funcText)
+        return;
+    int maxTextWidth = Width();
+    if (maxTextWidth > 0 && !scrolling) {
+        if (TextWidth(funcText) > maxTextWidth) {
+            funcText = Cut(funcText, maxTextWidth);
+        }
+    } else if (!scrolling) {
+        maxTextWidth = container.Width() - X();
+        if (TextWidth(funcText) > maxTextWidth) {
+            funcText = Cut(funcText, maxTextWidth);
+        }
+    }
+
+    eAlign horAlign = (eAlign)GetValue((int)eDrawTextAttribs::align);
+    eAlign verAlign = (eAlign)GetValue((int)eDrawTextAttribs::valign);
+
+    int contWidth = colWidth > 0 ? colWidth : container.Width();
+    int x = X() + x0;
+    if (horAlign == eAlign::right) {
+        x = x0 + contWidth - TextWidth(funcText);
+    } else if (horAlign == eAlign::center) {
+        x = x0 + (contWidth - TextWidth(funcText)) / 2;
+    }
+
+    int contHeight = rowHeight > 0 ? rowHeight : container.Height();
+    int y = Y() + y0;
+    if (verAlign == eAlign::bottom) {
+        y = y0 + contHeight - FontHeight();
+    } else if (verAlign == eAlign::center) {
+        y = y0 + (contHeight - FontHeight()) / 2;
+    }
+
+    p->DrawText(cPoint(x, y), funcText, color->Color(), clrTransparent, font);
+    free(funcText);
+}
+
+int cFuncDrawText::FuncX(void) {
+    if (!font)
+        return 0;
+    char *funcText = NULL;
+    if (text)
+        funcText = text->DeterminateText();
+    if (!funcText)
+        return 0;
+    eAlign horAlign = (eAlign)GetValue((int)eDrawTextAttribs::align);
+    int x = X();
+    if (horAlign == eAlign::right) {
+        x = container.Width() - TextWidth(funcText);
+    } else if (horAlign == eAlign::center) {
+        x = (container.Width() - TextWidth(funcText)) / 2;
+    }
+    return x;
+}
+
+int cFuncDrawText::FuncY(void) {
+    if (!font)
+        return 0;
+    eAlign verAlign = (eAlign)GetValue((int)eDrawTextAttribs::valign);
+    int y = Y();
+    if (verAlign == eAlign::bottom) {
+        y = container.Height() - FontHeight();
+    } else if (verAlign == eAlign::center) {
+        y = (container.Height() - FontHeight()) / 2;
+    }
+    return y;
+}
+
+int cFuncDrawText::FuncWidth(void) {
+    if (!font)
+        return 0;
+    char *funcText = NULL;
+    if (text)
+        funcText = text->DeterminateText();
+    if (!funcText)
+        return 0;
+    int textWidth = TextWidth(funcText);
+    free(funcText);
+    return textWidth;
+}
+
+int cFuncDrawText::FuncHeight(void) {
+    if (!font)
+        return 0;
+    return FontHeight();
+}
+
+int cFuncDrawText::AvrgFontWidth(void) {
+    if (!font)
+        return 20;
+    return TextWidth("x")+3;
+}
+
+const cFont *cFuncDrawText::GetFont(void) {
+    return font;
+}
+
+void cFuncDrawText::Debug(void) {
+    cFunction::Debug();
+    if (fontName)
+        esyslog("skindesigner:            fontname: \"%s\"", fontName);
+    if (font)
+        esyslog("skindesigner:            cached font name: \"%s\", size %d", font->FontName(), font->Height());
+    if (text)
+        text->Debug("draw text");
+}
+
+void cFuncDrawText::SetAttributesDefs(void) {
+    attribIDs.insert(pair<string, int>("align", (int)eDrawTextAttribs::align));
+    attribIDs.insert(pair<string, int>("valign", (int)eDrawTextAttribs::valign));
+    attribIDs.insert(pair<string, int>("color", (int)eDrawTextAttribs::color));
+    attribIDs.insert(pair<string, int>("font", (int)eDrawTextAttribs::font));
+    attribIDs.insert(pair<string, int>("fontsize", (int)eDrawTextAttribs::fontsize));
+    attribIDs.insert(pair<string, int>("name", (int)eDrawTextAttribs::name));
+    attribIDs.insert(pair<string, int>("text", (int)eDrawTextAttribs::text));
+    attribIDs.insert(pair<string, int>("animtype", (int)eDrawTextAttribs::animtype));
+    attribIDs.insert(pair<string, int>("animfreq", (int)eDrawTextAttribs::animfreq));
+    attribNames.insert(pair<int, string>((int)eDrawTextAttribs::align, "align"));
+    attribNames.insert(pair<int, string>((int)eDrawTextAttribs::valign, "valign"));
+    attribNames.insert(pair<int, string>((int)eDrawTextAttribs::color, "color"));
+    attribNames.insert(pair<int, string>((int)eDrawTextAttribs::font, "font"));
+    attribNames.insert(pair<int, string>((int)eDrawTextAttribs::fontsize, "fontsize"));
+    attribNames.insert(pair<int, string>((int)eDrawTextAttribs::name, "name"));
+    attribNames.insert(pair<int, string>((int)eDrawTextAttribs::text, "text"));
+    attribNames.insert(pair<int, string>((int)eDrawTextAttribs::animtype, "animtype"));
+    attribNames.insert(pair<int, string>((int)eDrawTextAttribs::animfreq, "animfreq"));
+}
+
+char *cFuncDrawText::Cut(char *expr, int width) {
+    char *cutted = NULL;
+    int w = 3 * font->Width(".");
+    for (char *p = expr; *p; ) {
+        int sl = Utf8CharLen(p);
+        uint sym = Utf8CharGet(p, sl);
+        w += font->Width(sym);
+        if( w >= width ) {
+            cutted = (char*)malloc(p - expr + 4);
+            memset(cutted, 0, p - expr + 4);
+            strncpy(cutted, expr, p - expr);
+            cutted[p - expr] = '.';
+            cutted[p - expr + 1] = '.';
+            cutted[p - expr + 2] = '.';
+            break;
+        }
+        p += sl;
+    }
+    if (cutted) {
+        free(expr);
+        return cutted;
+    }
+    return expr;
+}
+
+/***************************************************************************
+* cFuncDrawTextVertical
+***************************************************************************/
+cFuncDrawTextVertical::cFuncDrawTextVertical(cArea *owner, int numAttributes) : cFunction(owner, numAttributes) {
+    funcType = "DrawTextVertical";
+    text = NULL;
+    SetAttributesDefs();
+}
+
+cFuncDrawTextVertical::cFuncDrawTextVertical(const cFuncDrawTextVertical &other) : cFunction(other) {
+    funcType = other.funcType;
+    fontName = NULL;
+    if (other.fontName)
+        fontName = strdup(other.fontName);
+    text = NULL;
+    if (other.text)
+        text = new cTextExpr(*other.text);
+}
+
+cFuncDrawTextVertical::~cFuncDrawTextVertical(void) {
+    delete text;
+}
+
+void cFuncDrawTextVertical::SetLoopInfo(cLoopInfo *loopInfo) {
+    cFunction::SetLoopInfo(loopInfo);
+    if (text)
+        text->SetLoopInfo(loopInfo);
+}
+
+void cFuncDrawTextVertical::SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer) {
+    cAttributes::SetTokenContainerDeep(tokenContainer);
+    if (text) {
+        text->SetTokenContainer(tokenContainer);
+    }
+}
+
+void cFuncDrawTextVertical::Set(vector<stringpair> &attributes) {
+    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {
+        const char *attName = (*att).first.c_str();
+        const char *attVal = (*att).second.c_str();
+        int id = AttributeId(attName);
+        if (id == ATTR_UNKNOWN) {
+            esyslog("skindesigner: unknown func DrawTextVertical attribute \"%s\" = \"%s\"", attName, attVal);
+            continue;
+        }
+        
+        if (SetCommon(id, attVal))
+            continue;
+        if (IdEqual(id, (int)eDrawTextAttribsVertical::color)) {
+            SetColor(attVal);
+        } else if (IdEqual(id, (int)eDrawTextAttribsVertical::name)) {
+            name = strdup(attVal);
+        } else if (IdEqual(id, (int)eDrawTextAttribsVertical::align)) {
+            SetAlign(id, attVal);
+        } else if (IdEqual(id, (int)eDrawTextAttribsVertical::direction)) {
+            SetDirection(id, attVal);
+        } else if (IdEqual(id, (int)eDrawTextAttribsVertical::valign)) {
+            SetAlign(id, attVal);
+        } else if (IdEqual(id, (int)eDrawTextAttribsVertical::animtype)) {
+            SetAnimType(id, attVal);
+        } else if (IdEqual(id, (int)eDrawTextAttribsVertical::font)) {
+            fontName = strdup(attVal);
+        } else if (IdEqual(id, (int)eDrawTextAttribsVertical::text)) {
+            text = new cTextExpr(attVal);
+        } else {
+            attribCtors[id] = new cNumericExpr(attVal);
+        }
+    }
+}
+
+void cFuncDrawTextVertical::Cache(void) {
+    cFunction::Cache();
+    if (text) {
+        text->SetTokenContainer(tokenContainer);
+        text->SetGlobals(globals);
+        text->Cache();
+    }
+    if (fontName) {
+        CacheFont(globals, 0);
+    }
+}
+
+void cFuncDrawTextVertical::Render(cPixmap *p, int x0, int y0, int colWidth, int rowHeight) {
+    char *funcText = NULL;
+    if (text)
+        funcText = text->DeterminateText();
+    if (!funcText)
+        return;
+    int fontSize = GetValue((int)eDrawTextAttribsVertical::fontsize);
+    int direction = GetValue((int)eDrawTextAttribsVertical::direction);
+    tColor clr = color->Color();
+    cImage *textVertical = imgCache->GetVerticalText(funcText, clr, fontName, fontSize, direction);
+    if (!textVertical)
+        return;
+
+    eAlign horAlign = (eAlign)GetValue((int)eDrawTextAttribsVertical::align);
+    eAlign verAlign = (eAlign)GetValue((int)eDrawTextAttribsVertical::valign);
+    int x = 0;
+    int y = 0;
+    if (horAlign == eAlign::center) {
+        x = (container.Width() - textVertical->Width()) / 2;
+    } else if (horAlign == eAlign::right) {
+        x = container.Width() - textVertical->Width();
+    }
+    if (verAlign == eAlign::center) {
+        y = (container.Height() - textVertical->Height()) / 2;
+    } else if (horAlign == eAlign::bottom) {
+        y = container.Height() - textVertical->Height();
+    }
+    cPoint pos(x, y);
+    p->DrawImage(pos, *textVertical);
+    free(funcText);
+}
+
+int cFuncDrawTextVertical::FuncWidth(void) {
+    char *funcText = NULL;
+    if (text)
+        funcText = text->DeterminateText();
+    if (!funcText)
+        return 0;
+    int fontSize = GetValue((int)eDrawTextAttribsVertical::fontsize);
+    int direction = GetValue((int)eDrawTextAttribsVertical::direction);
+    tColor clr = color->Color();
+    cImage *textVertical = imgCache->GetVerticalText(funcText, clr, fontName, fontSize, direction);
+    if (!textVertical)
+        return 0;
+    return textVertical->Width();
+}
+
+int cFuncDrawTextVertical::FuncHeight(void) {
+    char *funcText = NULL;
+    if (text)
+        funcText = text->DeterminateText();
+    if (!funcText)
+        return 0;
+    int fontSize = GetValue((int)eDrawTextAttribsVertical::fontsize);
+    int direction = GetValue((int)eDrawTextAttribsVertical::direction);
+    tColor clr = color->Color();
+    cImage *textVertical = imgCache->GetVerticalText(funcText, clr, fontName, fontSize, direction);
+    if (!textVertical)
+        return 0;
+    return textVertical->Height();
+}
+
+void cFuncDrawTextVertical::Debug(void) {
+    cFunction::Debug();
+    if (fontName)
+        esyslog("skindesigner:            fontname: \"%s\"", fontName);
+    if (text)
+        text->Debug("draw text");
+}
+
+void cFuncDrawTextVertical::SetAttributesDefs(void) {
+    attribIDs.insert(pair<string, int>("align", (int)eDrawTextAttribsVertical::align));
+    attribIDs.insert(pair<string, int>("valign", (int)eDrawTextAttribsVertical::valign));
+    attribIDs.insert(pair<string, int>("direction", (int)eDrawTextAttribsVertical::direction));
+    attribIDs.insert(pair<string, int>("color", (int)eDrawTextAttribsVertical::color));
+    attribIDs.insert(pair<string, int>("font", (int)eDrawTextAttribsVertical::font));
+    attribIDs.insert(pair<string, int>("fontsize", (int)eDrawTextAttribsVertical::fontsize));
+    attribIDs.insert(pair<string, int>("name", (int)eDrawTextAttribsVertical::name));
+    attribIDs.insert(pair<string, int>("text", (int)eDrawTextAttribsVertical::text));
+    attribIDs.insert(pair<string, int>("animtype", (int)eDrawTextAttribsVertical::animtype));
+    attribIDs.insert(pair<string, int>("animfreq", (int)eDrawTextAttribsVertical::animfreq));
+    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::align, "align"));
+    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::valign, "valign"));
+    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::direction, "direction"));
+    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::color, "color"));
+    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::font, "font"));
+    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::fontsize, "fontsize"));
+    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::name, "name"));
+    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::text, "text"));
+    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::animtype, "animtype"));
+    attribNames.insert(pair<int, string>((int)eDrawTextAttribsVertical::animfreq, "animfreq"));
+}
+
+/***************************************************************************
+* cFuncDrawTextBox
+***************************************************************************/
+cFuncDrawTextBox::cFuncDrawTextBox(cArea *owner, int numAttributes) : cFunction(owner, numAttributes) {
+    funcType = "DrawTextBox";
+    text = NULL;
+    floater = NULL;
+    SetAttributesDefs();
+}
+
+cFuncDrawTextBox::cFuncDrawTextBox(const cFuncDrawTextBox &other) : cFunction(other) {
+    funcType = other.funcType;
+    fontName = NULL;
+    if (other.fontName)
+        fontName = strdup(other.fontName);
+    font = other.font;
+    text = NULL;
+    if (other.text)
+        text = new cTextExpr(*other.text);
+    floater = NULL;
+}
+
+cFuncDrawTextBox::~cFuncDrawTextBox(void) {
+    delete text;
+    delete floater;
+}
+
+void cFuncDrawTextBox::SetLoopInfo(cLoopInfo *loopInfo) {
+    cFunction::SetLoopInfo(loopInfo);
+    if (text)
+        text->SetLoopInfo(loopInfo);
+}
+
+void cFuncDrawTextBox::SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer) {
+    cAttributes::SetTokenContainerDeep(tokenContainer);
+    if (text) {
+        text->SetTokenContainer(tokenContainer);
+    }
+}
+
+void cFuncDrawTextBox::Set(vector<stringpair> &attributes) {
+    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {
+        const char *attName = (*att).first.c_str();
+        const char *attVal = (*att).second.c_str();
+        int id = AttributeId(attName);
+        if (id == ATTR_UNKNOWN) {
+            esyslog("skindesigner: unknown func DrawTextBox attribute \"%s\" = \"%s\"", attName, attVal);
+            continue;
+        }
+        
+        if (SetCommon(id, attVal))
+            continue;
+        if (IdEqual(id, (int)eDrawTextBoxAttribs::color)) {
+            SetColor(attVal);
+        } else if (IdEqual(id, (int)eDrawTextBoxAttribs::name)) {
+            name = strdup(attVal);
+        } else if (IdEqual(id, (int)eDrawTextBoxAttribs::align)) {
+            SetAlign(id, attVal);
+        } else if (IdEqual(id, (int)eDrawTextBoxAttribs::valign)) {
+            SetAlign(id, attVal);
+        } else if (IdEqual(id, (int)eDrawTextBoxAttribs::floatmode)) {
+            SetFloatMode(id, attVal);
+        } else if (IdEqual(id, (int)eDrawTextBoxAttribs::floatheight)) {
+            attribCtors[id] = new cNumericExpr(attVal);
+            attribCtors[id]->SetVertical();
+        } else if (IdEqual(id, (int)eDrawTextBoxAttribs::font)) {
+            fontName = strdup(attVal);
+        } else if (IdEqual(id, (int)eDrawTextBoxAttribs::text)) {
+            text = new cTextExpr(attVal);
+        } else if (IdEqual(id, (int)eDrawTextBoxAttribs::fontsize)) {
+            attribCtors[id] = new cNumericExpr(attVal);
+            attribCtors[id]->SetVertical();
+        } else {
+            attribCtors[id] = new cNumericExpr(attVal);
+        }
+    }
+}
+
+void cFuncDrawTextBox::Cache(void) {
+    cFunction::Cache();
+    if (text) {
+        text->SetTokenContainer(tokenContainer);
+        text->SetGlobals(globals);
+        text->Cache();
+    }
+    if (fontName) {
+        CacheFont(globals, GetValue((int)eDrawTextBoxAttribs::fontsize));
+    }
+}
+
+void cFuncDrawTextBox::Render(cPixmap *p, int x0, int y0, int colWidth, int rowHeight) {
+    if (!font) {
+        LoadFont(GetValue((int)eDrawTextBoxAttribs::fontsize));
+        if (!font)
+            return;
+    }
+    SetFloater();
+    eFloatMode mode = (eFloatMode)GetValue((int)eDrawTextBoxAttribs::floatmode);
+    int fontHeight = FontHeight();
+    int lines = floater->Lines();
+    eAlign align = (eAlign)GetValue((int)eDrawTextBoxAttribs::align);
+    int boxX = X() + x0;
+    int floatHeight = 0;
+    if ( mode == eFloatMode::topleft ) {
+        boxX += GetValue((int)eDrawTextBoxAttribs::floatwidth);
+        floatHeight = GetValue((int)eDrawTextBoxAttribs::floatheight);
+    }
+    eAlign valign = (eAlign)GetValue((int)eDrawTextBoxAttribs::valign);
+    int height = Height();
+    if (height <= 0)
+        height = container.Height();
+    int y = Y() + y0;
+    if (valign == eAlign::center) {
+        y = y0 + (height - fontHeight * lines) / 2;
+    } else if (valign == eAlign::bottom) {
+        y = y0 + height - fontHeight * lines;
+    }
+    int x = boxX;
+    for (int line=0; line < lines; line++) {
+        const char *lineText = floater->GetLine(line);
+        if (!lineText)
+            break;
+        if (align == eAlign::center) {
+            x = boxX + (Width() - TextWidth(lineText)) / 2;
+        } else if (align == eAlign::right) {
+            x = boxX + Width() - TextWidth(lineText);
+        }
+        p->DrawText(cPoint(x, y), lineText, color->Color(), clrTransparent, font);
+        y += fontHeight;
+        if ( mode == eFloatMode::topleft ) {
+            if ((line+1) * fontHeight >= floatHeight)
+                x = X() + x0;
+        }
+    }
+}
+
+int cFuncDrawTextBox::FuncWidth(void) {
+    return Width();
+}
+
+int cFuncDrawTextBox::FuncHeight(void) {
+    if (!font)
+        return 0;
+    int boxHeight = Height();
+    if (boxHeight > 0)
+        return boxHeight;
+    SetFloater();
+    int lines = floater->Lines();
+    return lines * FontHeight();
+}
+
+void cFuncDrawTextBox::Debug(void) {
+    cFunction::Debug();
+    if (fontName)
+        esyslog("skindesigner:            fontname: \"%s\"", fontName);
+    if (font)
+        esyslog("skindesigner:            cached font name: \"%s\", size %d", font->FontName(), font->Height());
+    if (text)
+        text->Debug("draw textbox");
+}
+
+void cFuncDrawTextBox::SetFloater(void) {
+    char *funcText = NULL;
+    if (text)
+        funcText = text->DeterminateText();
+    int boxWidth = Width();
+    int boxHeight  = Height();
+    int floatWidth = GetValue((int)eDrawTextBoxAttribs::floatwidth);
+    int floatHeight = GetValue((int)eDrawTextBoxAttribs::floatheight);
+    int maxLines = GetValue((int)eDrawTextBoxAttribs::maxlines);
+    delete floater;
+    floater = new cTextFloater();
+    floater->Set(funcText, font, boxWidth, boxHeight, floatWidth, floatHeight, maxLines);
+    free(funcText);
+}
+
+void cFuncDrawTextBox::SetAttributesDefs(void) {
+    attribIDs.insert(pair<string, int>("align", (int)eDrawTextBoxAttribs::align));
+    attribIDs.insert(pair<string, int>("valign", (int)eDrawTextBoxAttribs::valign));
+    attribIDs.insert(pair<string, int>("maxlines", (int)eDrawTextBoxAttribs::maxlines));
+    attribIDs.insert(pair<string, int>("floatwidth", (int)eDrawTextBoxAttribs::floatwidth));
+    attribIDs.insert(pair<string, int>("floatheight", (int)eDrawTextBoxAttribs::floatheight));
+    attribIDs.insert(pair<string, int>("float", (int)eDrawTextBoxAttribs::floatmode));
+    attribIDs.insert(pair<string, int>("color", (int)eDrawTextBoxAttribs::color));
+    attribIDs.insert(pair<string, int>("font", (int)eDrawTextBoxAttribs::font));
+    attribIDs.insert(pair<string, int>("fontsize", (int)eDrawTextBoxAttribs::fontsize));
+    attribIDs.insert(pair<string, int>("name", (int)eDrawTextBoxAttribs::name));
+    attribIDs.insert(pair<string, int>("text", (int)eDrawTextBoxAttribs::text));
+    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::align, "align"));
+    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::valign, "valign"));
+    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::maxlines, "maxlines"));
+    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::floatwidth, "floatwidth"));
+    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::floatheight, "floatheight"));
+    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::floatmode, "float"));
+    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::color, "color"));
+    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::font, "font"));
+    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::fontsize, "fontsize"));
+    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::name, "name"));
+    attribNames.insert(pair<int, string>((int)eDrawTextBoxAttribs::text, "text"));
+}
+
+void cFuncDrawTextBox::SetFloatMode(int id, const char *val) {
+    eFloatMode mode = eFloatMode::none;
+    if (!strcmp(val, "topleft"))
+        mode = eFloatMode::topleft;
+    else if (!strcmp(val, "topright"))
+        mode = eFloatMode::topright;
+    attribs[id] = (int)mode;
+}
+
+/***************************************************************************
+* cFuncDrawImage
+***************************************************************************/
+cFuncDrawImage::cFuncDrawImage(cArea *owner, int numAttributes) : cFunction(owner, numAttributes) {
+    funcType = "DrawImage";
+    path = NULL;
+    SetAttributesDefs();
+}
+
+cFuncDrawImage::cFuncDrawImage(const cFuncDrawImage &other) : cFunction(other) {
+    funcType = other.funcType;
+    path = NULL;
+    if (other.path)
+        path = new cTextExpr(*other.path);
+}
+
+cFuncDrawImage::~cFuncDrawImage(void) {
+    delete path;
+}
+
+void cFuncDrawImage::SetLoopInfo(cLoopInfo *loopInfo) {
+    cFunction::SetLoopInfo(loopInfo);
+    if (path)
+        path->SetLoopInfo(loopInfo);
+}
+
+void cFuncDrawImage::SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer) {
+    cAttributes::SetTokenContainerDeep(tokenContainer);
+    if (path) {
+        path->SetTokenContainer(tokenContainer);
+    }
+}
+
+void cFuncDrawImage::Set(vector<stringpair> &attributes) {
+    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {
+        const char *attName = (*att).first.c_str();
+        const char *attVal = (*att).second.c_str();
+        int id = AttributeId(attName);
+        if (id == ATTR_UNKNOWN) {
+            esyslog("skindesigner: unknown func DrawText attribute \"%s\" = \"%s\"", attName, attVal);
+            continue;
+        }
+        
+        if (SetCommon(id, attVal))
+            continue;
+        if (IdEqual(id, (int)eDrawImageAttribs::name)) {
+            name = strdup(attVal);
+        } else if (IdEqual(id, (int)eDrawImageAttribs::path)) {
+            path = new cTextExpr(attVal);
+        } else if (IdEqual(id, (int)eDrawImageAttribs::align)) {
+            SetAlign(id, attVal);
+        } else if (IdEqual(id, (int)eDrawImageAttribs::valign)) {
+            SetAlign(id, attVal);
+        } else if (IdEqual(id, (int)eDrawImageAttribs::imagetype)) {
+            SetImageType(id, attVal);
+        } else if (IdEqual(id, (int)eDrawImageAttribs::animtype)) {
+            SetAnimType(id, attVal);
+        } else if (IdEqual(id, (int)eDrawImageAttribs::cache)) {
+            SetBool(id, attVal);
+        } else {
+            attribCtors[id] = new cNumericExpr(attVal);
+        }
+    }
+}
+
+void cFuncDrawImage::Debug(void) {
+    cFunction::Debug();
+    if (path)
+        path->Debug("image path");
+}
+
+void cFuncDrawImage::SetImageType(int id, const char *val) {
+    eImageType imgType = eImageType::image;
+    if (!strcmp(val, "channellogo"))
+        imgType = eImageType::channellogo;
+    else if (!strcmp(val, "seplogo"))
+        imgType = eImageType::seplogo;
+    else if (!strcmp(val, "skinpart"))
+        imgType = eImageType::skinpart;
+    else if (!strcmp(val, "menuicon"))
+        imgType = eImageType::menuicon;
+    else if (!strcmp(val, "icon"))
+        imgType = eImageType::icon;
+    attribs[id] = (int)imgType;
+}
+
+void cFuncDrawImage::SetAttributesDefs(void) {
+    attribIDs.insert(pair<string, int>("align", (int)eDrawImageAttribs::align));
+    attribIDs.insert(pair<string, int>("valign", (int)eDrawImageAttribs::valign));
+    attribIDs.insert(pair<string, int>("imagetype", (int)eDrawImageAttribs::imagetype));
+    attribIDs.insert(pair<string, int>("name", (int)eDrawImageAttribs::name));
+    attribIDs.insert(pair<string, int>("cache", (int)eDrawImageAttribs::cache));
+    attribIDs.insert(pair<string, int>("path", (int)eDrawImageAttribs::path));
+    attribIDs.insert(pair<string, int>("animtype", (int)eDrawImageAttribs::animtype));
+    attribIDs.insert(pair<string, int>("animfreq", (int)eDrawImageAttribs::animfreq));
+    attribNames.insert(pair<int, string>((int)eDrawImageAttribs::align, "align"));
+    attribNames.insert(pair<int, string>((int)eDrawImageAttribs::valign, "valign"));
+    attribNames.insert(pair<int, string>((int)eDrawImageAttribs::imagetype, "imagetype"));
+    attribNames.insert(pair<int, string>((int)eDrawImageAttribs::name, "name"));
+    attribNames.insert(pair<int, string>((int)eDrawImageAttribs::cache, "cache"));
+    attribNames.insert(pair<int, string>((int)eDrawImageAttribs::path, "path"));
+    attribNames.insert(pair<int, string>((int)eDrawImageAttribs::animtype, "animtype"));
+    attribNames.insert(pair<int, string>((int)eDrawImageAttribs::animfreq, "animfreq"));
+}
+
+void cFuncDrawImage::Cache(void) {
+    cFunction::Cache();
+    if (path) {
+        int type = GetValue((int)eDrawImageAttribs::imagetype);
+        if (type == (int)eImageType::image) {
+            path->CorrectImagePath();
+        }
+        path->SetGlobals(globals);
+        path->SetTokenContainer(tokenContainer);
+        path->Cache();
+    }
+
+    if (config.cacheImagesInitial)
+        PreCacheImage();
+}
+
+void cFuncDrawImage::PreCacheImage(void) {
+    int imgWidth = Width();
+    int imgHeight = Height();
+    char *imgPath = path->DeterminateText();
+    if (!(imgWidth > 0 && imgHeight > 0))
+        return;
+
+    eImageType type = (eImageType)GetValue((int)eDrawImageAttribs::imagetype);
+    switch (type) {
+        case eImageType::channellogo:
+            imgCache->CacheLogo(imgWidth, imgHeight);
+            break;
+        case eImageType::skinpart:
+            if (imgPath)
+                imgCache->GetSkinpart(imgPath, imgWidth, imgHeight);
+            break;
+        case eImageType::icon: 
+        case eImageType::menuicon:
+            if (imgPath)
+                imgCache->GetIcon(type, imgPath, imgWidth, imgHeight);
+            break;
+        default: 
+            break;
+    }
+    free(imgPath);
+}
+
+void cFuncDrawImage::Render(cPixmap *p, int x0, int y0, int colWidth, int rowHeight) {
+    if (!path)
+        return;
+    eAlign align = (eAlign)GetValue((int)eDrawImageAttribs::align);
+    eAlign valign = (eAlign)GetValue((int)eDrawImageAttribs::valign);
+    int x = GetX(align, x0, colWidth);
+    int y = GetY(valign, y0, rowHeight);
+    cPoint pos(x, y);
+    eImageType type = (eImageType)GetValue((int)eDrawImageAttribs::imagetype);
+    char *imgPath = path->DeterminateText();
+    if (!imgPath)
+        return;
+    
+    switch (type) {
+        case eImageType::channellogo: {
+            cImage *logo = imgCache->GetLogo(imgPath, Width(), Height());
+            if (logo) {
+                p->DrawImage(pos, *logo);
+            }
+            break; }
+        case eImageType::seplogo: {
+            cImage *sep = imgCache->GetSeparatorLogo(imgPath, Width(), Height());
+            if (sep) {
+                p->DrawImage(pos, *sep);
+            }
+            break; }
+        case eImageType::skinpart: {
+            cCachedImage *img = imgCache->GetSkinpart(imgPath, Width(), Height());
+            if (!img) break;
+            if (img->handle) {
+                p->DrawImage(pos, img->handle);
+            } else if (img->image) {
+                p->DrawImage(pos, *(img->image));                
+            }
+            break; }
+        case eImageType::icon: 
+        case eImageType::menuicon: {
+            cCachedImage *img = imgCache->GetIcon(type, imgPath, Width(), Height());
+            if (!img) break;
+            if (img->handle) {
+                p->DrawImage(pos, img->handle);
+            } else if (img->image) {
+                p->DrawImage(pos, *(img->image));                
+            }
+            break; }
+        case eImageType::image: {
+            cImageLoader imgLoader;
+            if (imgLoader.LoadImage(imgPath)) {
+                cImage *img = imgLoader.CreateImage(Width(), Height());
+                if (!img) break;
+                p->DrawImage(pos, *img);
+                delete(img);
+            }
+            break; }
+    }
+    free(imgPath);
+}
+
+/***************************************************************************
+* cFuncLoop
+***************************************************************************/
+cFuncLoop::cFuncLoop(cArea *owner, int numAttributes) : cFunction(owner, numAttributes) {
+    funcType = "LoopFunc";
+    SetAttributesDefs();
+}
+
+cFuncLoop::~cFuncLoop(void) {
+}
+
+void cFuncLoop::Set(vector<stringpair> &attributes) {
+    for (vector<stringpair>::iterator att = attributes.begin(); att != attributes.end(); att++) {
+        const char *attName = (*att).first.c_str();
+        const char *attVal = (*att).second.c_str();
+        int id = AttributeId(attName);
+        if (id == ATTR_UNKNOWN) {
+            esyslog("skindesigner: unknown loopfunc attribute \"%s\" = \"%s\"", attName, attVal);
+            continue;
+        }
+        
+        if (SetCommon(id, attVal))
+            continue;
+        if (IdEqual(id, (int)eLoopAttribs::name)) {
+            name = strdup(attVal);
+        } else if (IdEqual(id, (int)eLoopAttribs::orientation)) {
+            SetOrientation(id, attVal);
+        } else if (IdEqual(id, (int)eLoopAttribs::overflow)) {
+            SetOverflow(id, attVal);
+        } else {
+            attribCtors[id] = new cNumericExpr(attVal);
+        }
+    }
+}
+
+void cFuncLoop::Cache(void) {
+    cFunction::Cache();
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        f->SetGlobals(globals);
+        f->SetTokenContainer(tokenContainer);
+        f->Cache();
+    }
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        f->SetLoopInfo(&loopInfo);
+        f->CacheFuncReferences();
+    }
+}
+
+void cFuncLoop::SetContainer(int x, int y, int width, int height) {
+    cAttributes::SetContainer(x, y, width, height);
+    int funcX = X();
+    int funcY = Y();
+    int funcWidth = Width();
+    int funcHeight = Height();
+    
+    int funcContainerX = (funcX > 0) ? x + funcX : x;
+    int funcContainerY = (funcY > 0) ? y + funcY : y;
+    int funcContainerWidth = (funcWidth > 0) ? funcWidth : width;
+    int funcContainerHeight = (funcHeight > 0) ? funcHeight : height;
+
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        f->SetContainer(funcContainerX, funcContainerY, funcContainerWidth, funcContainerHeight);
+    }
+}
+
+
+void cFuncLoop::AddFunction(cFunction *f) {
+    functions.Add(f);
+}
+
+cFunction *cFuncLoop::GetFunction(const char *name) {
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        const char *funcName = f->Name();
+        if (funcName && !strcmp(funcName, name)) {
+            return f;
+        }
+    }
+    return NULL;
+}
+
+void cFuncLoop::Render(cPixmap *p, int x0, int y0, int cw, int rh) {
+    int loopIndex = tokenContainer->LoopIndex(Name());
+    if (loopIndex < 0) {
+        esyslog("skindesigner: unknown loop function \"%s\"", Name());
+        return;
+    }
+    int numRows = tokenContainer->NumLoops(loopIndex);
+    int columnWidth = GetValue((int)eLoopAttribs::columnwidth);
+    int rowHeight = GetValue((int)eLoopAttribs::rowheight);
+    int maxItems = GetValue((int)eLoopAttribs::maxitems);
+    eOrientation orientation = (eOrientation)GetValue((int)eLoopAttribs::orientation);
+    eOverflowType overflow = (eOverflowType)GetValue((int)eLoopAttribs::overflow);
+    int loopWidth = Width();
+    if (loopWidth <= 0)
+        loopWidth = container.Width();
+    int loopHeight = Height();
+    if (loopHeight <= 0)
+        loopHeight = container.Height();
+
+    loopInfo.colWidth = columnWidth;
+    loopInfo.rowHeight = rowHeight;
+    loopInfo.index = loopIndex;
+
+    int loopX = X();
+    int loopY = Y();
+    int x = (loopX > 0) ? loopX : 0;
+    int y = (loopY > 0) ? loopY : 0;
+    for (int row = 0; row < numRows; ++row) {
+        if (maxItems > 0 && row >= maxItems) {
+            break;
+        }
+        loopInfo.row = row;
+        //check overflow cut
+        if (overflow == eOverflowType::cut) {
+            if (orientation == eOrientation::horizontal && (row * columnWidth > loopWidth)) {
+                return;
+            } else if (orientation == eOrientation::vertical && (row * rowHeight > loopHeight)) {
+                return;
+            }
+        }
+        for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+            if (f->DoDebug())
+                f->Debug();
+            if (!f->DoExecute())
+                continue;
+            f->Render(p, x, y, columnWidth, rowHeight);
+        }        
+        if (orientation == eOrientation::horizontal) {
+            if (columnWidth > 0) {
+                x += columnWidth;
+            } else {
+                x += ColumnWidth();
+            }
+            //check overflow wrap
+            if (overflow == eOverflowType::wrap && orientation == eOrientation::horizontal) {
+                if (x + columnWidth - 10 > loopWidth) {
+                    x = X();
+                    if (x < 0) x = 0;
+                    y += rowHeight;
+                }
+            }
+        } else if (orientation == eOrientation::vertical) {
+            if (rowHeight > 0) {
+                y += rowHeight;
+            } else {
+                y += RowHeight();
+            }
+        }
+    }
+}
+
+int cFuncLoop::FuncWidth(void) {
+    loopInfo.row = 0;
+    int loopIndex = tokenContainer->LoopIndex(Name());
+    if (loopIndex < 0) {
+        esyslog("skindesigner: unknown loop function \"%s\"", Name());
+        return 0;
+    }
+    int numLoops = tokenContainer->NumLoops(loopIndex);
+    int columnWidth = GetValue((int)eLoopAttribs::columnwidth);
+    if (columnWidth <=0)
+        columnWidth = ColumnWidth();
+    eOverflowType overflow = (eOverflowType)GetValue((int)eLoopAttribs::overflow);
+    if (overflow == eOverflowType::cut) {
+        int maxItems = GetValue((int)eLoopAttribs::maxitems);
+        numLoops = min(numLoops, maxItems);
+    }
+    if (numLoops > 0)
+        return numLoops * columnWidth;
+    return 0;
+}
+
+int cFuncLoop::FuncHeight(void) {
+    loopInfo.row = 0;
+    int loopIndex = tokenContainer->LoopIndex(Name());
+    if (loopIndex < 0) {
+        esyslog("skindesigner: unknown loop function \"%s\"", Name());
+        return 0;
+    }
+    int numLoops = tokenContainer->NumLoops(loopIndex);
+    int rowHeight = GetValue((int)eLoopAttribs::rowheight);
+    if (rowHeight <=0)
+        rowHeight = RowHeight();
+    
+    eOverflowType overflow = (eOverflowType)GetValue((int)eLoopAttribs::overflow);
+    if (overflow == eOverflowType::cut) {
+        int maxItems = GetValue((int)eLoopAttribs::maxitems);
+        numLoops = min(numLoops, maxItems);
+    } else if (overflow == eOverflowType::wrap) {
+        int loopWidth = Width();
+        if (loopWidth <= 0)
+            loopWidth = container.Width();
+        loopWidth++;
+        int columnWidth = GetValue((int)eLoopAttribs::columnwidth);
+        if (columnWidth <=0)
+            columnWidth = ColumnWidth();
+        int itemsPerRow = loopWidth / columnWidth;
+        int rows = numLoops / itemsPerRow;
+        if (numLoops % itemsPerRow > 0)
+            rows++;
+        return rows * rowHeight;
+    }
+    if (numLoops > 0)
+        return numLoops * rowHeight;
+    return 0;
+}
+
+void cFuncLoop::Debug(void) {
+    loopInfo.row = 0;
+    cFunction::Debug();
+    dsyslog("skindesigner:        loopfunc Functions:");
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        f->Debug();
+    }
+}
+
+void cFuncLoop::SetAttributesDefs(void) {
+    attribIDs.insert(pair<string, int>("columnwidth", (int)eLoopAttribs::columnwidth));
+    attribIDs.insert(pair<string, int>("rowheight", (int)eLoopAttribs::rowheight));
+    attribIDs.insert(pair<string, int>("name", (int)eLoopAttribs::name));
+    attribIDs.insert(pair<string, int>("orientation", (int)eLoopAttribs::orientation));
+    attribIDs.insert(pair<string, int>("overflow", (int)eLoopAttribs::overflow));
+    attribIDs.insert(pair<string, int>("maxitems", (int)eLoopAttribs::maxitems));
+    attribNames.insert(pair<int, string>((int)eLoopAttribs::columnwidth, "columnwidth"));
+    attribNames.insert(pair<int, string>((int)eLoopAttribs::rowheight, "rowheight"));
+    attribNames.insert(pair<int, string>((int)eLoopAttribs::name, "name"));
+    attribNames.insert(pair<int, string>((int)eLoopAttribs::orientation, "orientation"));
+    attribNames.insert(pair<int, string>((int)eLoopAttribs::overflow, "overflow"));
+    attribNames.insert(pair<int, string>((int)eLoopAttribs::maxitems, "maxitems"));
+}
+
+int cFuncLoop::ColumnWidth(void) {
+    int width = 0;
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        if (!f->DoExecute())
+            continue;
+        int funcWidth = f->X() + f->FuncWidth();
+        if (funcWidth > width)
+            width = funcWidth;
+    }
+    return width;
+}
+
+int cFuncLoop::RowHeight(void) {
+    int height = 0;
+    for (cFunction *f = functions.First(); f; f = functions.Next(f)) {
+        if (!f->DoExecute())
+            continue;
+        int funcHeight = f->Y() + f->FuncHeight();
+        if (funcHeight > height)
+            height = funcHeight;
+    }
+    return height;
+}
+
+// --- cTextFloater ----------------------------------------------------------
+
+cTextFloater::cTextFloater(void) {
+    text = eol = NULL;
+    lines = 0;
+    lastLine = -1;
+}
+
+cTextFloater::cTextFloater(const char *fext, const cFont *font, int width, int height, int floatWidth, int floatHeight, int maxLines) {
+    text = NULL;
+    Set(text, font, width, height, floatWidth, floatHeight, maxLines);
+}
+
+cTextFloater::~cTextFloater() {
+    free(text);
+}
+
+void cTextFloater::Set(const char *Text, const cFont *font, int width, int height, int floatWidth, int floatHeight, int maxLines) {
+    free(text);
+    text = Text ? strdup(Text) : NULL;
+    eol = NULL;
+    lines = 0;
+    lastLine = -1;
+    if (!text)
+        return;
+    lines = 1;
+    if (width <= 0)
+        return;
+    int lineHeight = font->Height();
+    bool cut = false;
+    if (height > 0)
+        cut = true;
+    bool doFloat = false;
+    if (floatWidth > 0 && floatHeight > 0)
+        doFloat = true;
+    int textWidth = width;
+    if (doFloat) {
+        textWidth = width - floatWidth;
+    }
+
+    char *Blank = NULL;
+    char *Delim = NULL;
+    int w = 0;
+
+    stripspace(text); // strips trailing newlines
+
+    for (char *p = text; *p; ) {
+        int sl = Utf8CharLen(p);
+        uint sym = Utf8CharGet(p, sl);
+        if (sym == '\n') {
+            if ((maxLines > 0) && (lines == maxLines)) {
+                while (*p) {
+                    *p = 0;
+                    p++;
+                }
+                return;
+            }
+            lines++;
+            if (cut) {
+                if (lines * lineHeight >= height) {
+                    //remove last line, find last linebreak
+                    p--;
+                    int max = 100;
+                    int i = 0;
+                    while (*p) {
+                        int sl = Utf8CharLen(p);
+                        uint sym = Utf8CharGet(p, sl);
+                        if (sym == '\n')
+                            break;
+                        p -= sl;
+                        i++;
+                        if (i > max)
+                            break;
+                    }
+                    p++; 
+                    if (*p) {
+                        *p = '.'; p++; 
+                        if (*p) { 
+                            *p = '.'; p++; 
+                            if (*p) { 
+                                *p = '.'; p++; 
+                                *p = 0;
+                            }
+                        }
+                    }
+                    break;
+                }
+            }
+            if (doFloat) {
+                if ((lines-1) * lineHeight >= floatHeight) {
+                    textWidth = width;
+                }
+            }
+            w = 0;
+            Blank = Delim = NULL;
+            p++;
+            continue;
+        } else if (sl == 1 && isspace(sym))
+            Blank = p;
+
+        int cw = font->Width(sym);
+        if (w + cw > textWidth) {
+            if (Blank) {
+                *Blank = '\n';
+                p = Blank;
+                continue;
+            } else if (w > 0) { // there has to be at least one character before the newline
+                // Here's the ugly part, where we don't have any whitespace to
+                // punch in a newline, so we need to make room for it:
+                if (Delim)
+                    p = Delim + 1; // let's fall back to the most recent delimiter
+                char *s = MALLOC(char, strlen(text) + 2); // The additional '\n' plus the terminating '\0'
+                int l = p - text;
+                strncpy(s, text, l);
+                s[l] = '\n';
+                strcpy(s + l + 1, p);
+                free(text);
+                text = s;
+                p = text + l;
+                continue;
+            }
+        }
+        w += cw;
+        if (strchr("-.,:;!?_", *p)) {
+            Delim = p;
+            Blank = NULL;
+        }
+        p += sl;
+    }
+}
+
+const char *cTextFloater::Text(void) {
+    if (eol) {
+        *eol = '\n';
+        eol = NULL;
+    }
+    return text;
+}
+
+const char *cTextFloater::GetLine(int line) {
+    char *s = NULL;
+    if (line < lines) {
+        if (eol) {
+            *eol = '\n';
+            if (line == lastLine + 1)
+                s = eol + 1;
+            eol = NULL;
+        }
+        if (!s) {
+            s = text;
+            for (int i = 0; i < line; i++) {
+                s = strchr(s, '\n');
+                if (s)
+                    s++;
+                else
+                    break;
+            }
+        }
+        if (s) {
+            if ((eol = strchr(s, '\n')) != NULL)
+                *eol = 0;
+        }
+        lastLine = line;
+    }
+    return s;
+}
diff --git a/coreengine/functions.h b/coreengine/functions.h
index 57cbe64..90d2045 100644
--- a/coreengine/functions.h
+++ b/coreengine/functions.h
@@ -1,220 +1,220 @@
-#ifndef __FUNCTIONS_H

-#define __FUNCTIONS_H

-

-#include "functions.h"

-

-class cFuncFill : public cFunction {

-private:

-    void SetAttributesDefs(void);

-public:

-    cFuncFill(cArea *owner, int numAttributes);

-    cFuncFill(const cFuncFill &other);

-    virtual ~cFuncFill(void);

-    void Set(vector<stringpair> &attributes);

-    void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0);

-};

-

-class cFuncDrawRectangle : public cFunction {

-private:

-    void SetAttributesDefs(void);

-public:

-    cFuncDrawRectangle(cArea *owner, int numAttributes);

-    cFuncDrawRectangle(const cFuncDrawRectangle &other);

-    virtual ~cFuncDrawRectangle(void);

-    void Set(vector<stringpair> &attributes);

-    void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0);

-    bool Blinking(void) { return GetValue((int)eDrawRectangleAttribs::animtype) == (int)eAnimType::blink; };

-    int BlinkFreq(void) { return GetValue((int)eDrawRectangleAttribs::animfreq); };

-    int Align(void) { return GetValue((int)eDrawRectangleAttribs::align); };

-    int Valign(void) { return GetValue((int)eDrawRectangleAttribs::valign); };

-};

-

-class cFuncDrawEllipse : public cFunction {

-private:

-    void SetAttributesDefs(void);

-public:

-    cFuncDrawEllipse(cArea *owner, int numAttributes);

-    cFuncDrawEllipse(const cFuncDrawEllipse &other);

-    virtual ~cFuncDrawEllipse(void);

-    void Set(vector<stringpair> &attributes);

-    void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0);

-    bool Blinking(void) { return GetValue((int)eDrawEllipseAttribs::animtype) == (int)eAnimType::blink; };

-    int BlinkFreq(void) { return GetValue((int)eDrawEllipseAttribs::animfreq); };

-    int Align(void) { return GetValue((int)eDrawEllipseAttribs::align); };

-    int Valign(void) { return GetValue((int)eDrawEllipseAttribs::valign); };

-};

-

-class cFuncDrawSlope : public cFunction {

-private:

-    void SetAttributesDefs(void);

-public:

-    cFuncDrawSlope(cArea *owner, int numAttributes);

-    cFuncDrawSlope(const cFuncDrawSlope &other);

-    virtual ~cFuncDrawSlope(void);

-    void Set(vector<stringpair> &attributes);

-    void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0);

-    bool Blinking(void) { return GetValue((int)eDrawSlopeAttribs::animtype) == (int)eAnimType::blink; };

-    int BlinkFreq(void) { return GetValue((int)eDrawSlopeAttribs::animfreq); };

-    int Align(void) { return GetValue((int)eDrawSlopeAttribs::align); };

-    int Valign(void) { return GetValue((int)eDrawSlopeAttribs::valign); };

-};

-

-class cTextDrawer {

-private:

-    static cMutex fontLock;

-protected:

-    const cFont *font;

-    char *fontName;

-    int fontSize;

-    void CacheFont(cGlobals *globals, int size);

-    void LoadFont(int size);

-    int TextWidth(const char *text);

-    int FontHeight(void);

-public:

-    cTextDrawer(void);

-    virtual ~cTextDrawer(void);

-};

-

-class cFuncDrawText : public cFunction, public cTextDrawer {

-private:

-    cTextExpr *text;

-    void SetAttributesDefs(void);

-    char *Cut(char *expr, int width);

-public:

-    cFuncDrawText(cArea *owner, int numAttributes);

-    cFuncDrawText(const cFuncDrawText &other);

-    virtual ~cFuncDrawText(void);

-    void SetLoopInfo(cLoopInfo *loopInfo);

-    void SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer);

-    void Set(vector<stringpair> &attributes);

-    void Cache(void);

-    void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0);

-    int FuncX(void);

-    int FuncY(void);

-    int FuncWidth(void);

-    int FuncHeight(void);

-    int AvrgFontWidth(void);

-    const cFont *GetFont(void);

-    bool Blinking(void) { return GetValue((int)eDrawTextAttribs::animtype) == (int)eAnimType::blink; };

-    int BlinkFreq(void) { return GetValue((int)eDrawTextAttribs::animfreq); };

-    int Align(void) { return GetValue((int)eDrawTextAttribs::align); };

-    int Valign(void) { return GetValue((int)eDrawTextAttribs::valign); };

-    void Debug(void);

-};

-

-class cFuncDrawTextVertical : public cFunction, public cTextDrawer {

-private:

-    cTextExpr *text;

-    void SetAttributesDefs(void);

-public:

-    cFuncDrawTextVertical(cArea *owner, int numAttributes);

-    cFuncDrawTextVertical(const cFuncDrawTextVertical &other);

-    virtual ~cFuncDrawTextVertical(void);

-    void SetLoopInfo(cLoopInfo *loopInfo);

-    void SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer);

-    void Set(vector<stringpair> &attributes);

-    void Cache(void);

-    void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0);

-    int FuncWidth(void);

-    int FuncHeight(void);

-    bool Blinking(void) { return GetValue((int)eDrawTextAttribsVertical::animtype) == (int)eAnimType::blink; };

-    int BlinkFreq(void) { return GetValue((int)eDrawTextAttribsVertical::animfreq); };

-    int Align(void) { return GetValue((int)eDrawTextAttribsVertical::align); };

-    int Valign(void) { return GetValue((int)eDrawTextAttribsVertical::valign); };

-    void Debug(void);

-};

-

-class cTextFloater;

-

-class cFuncDrawTextBox : public cFunction, public cTextDrawer {

-private:

-    cTextExpr *text;

-    cTextFloater *floater;

-    void SetFloater(void);

-    void SetAttributesDefs(void);

-    void SetFloatMode(int id, const char *val);

-public:

-    cFuncDrawTextBox(cArea *owner, int numAttributes);

-    cFuncDrawTextBox(const cFuncDrawTextBox &other);

-    virtual ~cFuncDrawTextBox(void);

-    void SetLoopInfo(cLoopInfo *loopInfo);

-    void SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer);

-    void Set(vector<stringpair> &attributes);

-    void Cache(void);

-    void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0);

-    int FuncWidth(void);

-    int FuncHeight(void);

-    void Debug(void);

-};

-

-class cFuncDrawImage : public cFunction {

-private:

-    cTextExpr *path;

-    void SetAttributesDefs(void);

-    void SetImageType(int id, const char *val);

-    void PreCacheImage(void);

-public:

-    cFuncDrawImage(cArea *owner, int numAttributes);

-    cFuncDrawImage(const cFuncDrawImage &other);

-    virtual ~cFuncDrawImage(void);

-    void SetLoopInfo(cLoopInfo *loopInfo);

-    void SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer);

-    void Set(vector<stringpair> &attributes);

-    void Cache(void);

-    void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0);

-    bool Blinking(void) { return GetValue((int)eDrawImageAttribs::animtype) == (int)eAnimType::blink; };

-    int BlinkFreq(void) { return GetValue((int)eDrawImageAttribs::animfreq); };

-    int Align(void) { return GetValue((int)eDrawImageAttribs::align); };

-    int Valign(void) { return GetValue((int)eDrawImageAttribs::valign); };

-    void Debug(void);

-};

-

-class cFuncLoop : public cFunction {

-private:

-    cLoopInfo loopInfo;

-    cList<cFunction> functions;

-    void SetAttributesDefs(void);

-    int ColumnWidth(void);

-    int RowHeight(void);

-public:

-    cFuncLoop(cArea *owner, int numAttributes);

-    virtual ~cFuncLoop(void);

-    void Set(vector<stringpair> &attributes);

-    void SetContainer(int x, int y, int width, int height);

-    void Cache(void);

-    void AddFunction(cFunction *f);

-    cFunction *GetFunction(const char *name);

-    void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0);

-    int FuncWidth(void);

-    int FuncHeight(void);

-    void Debug(void);

-};

-

-class cTextFloater {

-private:

-    char *text;

-    char *eol;

-    int lines;

-    int lastLine;

-public:

-    cTextFloater(void);

-    cTextFloater(const char *text, const cFont *font, int width, int height = 0, int floatWidth = 0, int floatHeight = 0, int maxLines = 0);

-    ~cTextFloater();

-    void Set(const char *Text, const cFont *font, int width, int height = 0, int floatWidth = 0, int floatHeight = 0, int maxLines = 0);

-    ///< Wraps the Text to make it fit into the area defined by the given Width

-    ///< when displayed with the given Font.

-    ///< Wrapping is done by inserting the necessary number of newline

-    ///< characters into the string.

-    ///< if height is set, new lines are only set till height is reached

-    ///< if floatwidth and floatheight are set, the first lines (depending on 

-    ///< size of floatheight) are set to floatwidth

-    const char *Text(void);

-    ///< Returns the full wrapped text.

-    int Lines(void) { return lines; }

-    ///< Returns the actual number of lines needed to display the full wrapped text.

-    const char *GetLine(int line);

-    ///< Returns the given Line. The first line is numbered 0.

-};

-

-

+#ifndef __FUNCTIONS_H
+#define __FUNCTIONS_H
+
+#include "functions.h"
+
+class cFuncFill : public cFunction {
+private:
+    void SetAttributesDefs(void);
+public:
+    cFuncFill(cArea *owner, int numAttributes);
+    cFuncFill(const cFuncFill &other);
+    virtual ~cFuncFill(void);
+    void Set(vector<stringpair> &attributes);
+    void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0);
+};
+
+class cFuncDrawRectangle : public cFunction {
+private:
+    void SetAttributesDefs(void);
+public:
+    cFuncDrawRectangle(cArea *owner, int numAttributes);
+    cFuncDrawRectangle(const cFuncDrawRectangle &other);
+    virtual ~cFuncDrawRectangle(void);
+    void Set(vector<stringpair> &attributes);
+    void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0);
+    bool Blinking(void) { return GetValue((int)eDrawRectangleAttribs::animtype) == (int)eAnimType::blink; };
+    int BlinkFreq(void) { return GetValue((int)eDrawRectangleAttribs::animfreq); };
+    int Align(void) { return GetValue((int)eDrawRectangleAttribs::align); };
+    int Valign(void) { return GetValue((int)eDrawRectangleAttribs::valign); };
+};
+
+class cFuncDrawEllipse : public cFunction {
+private:
+    void SetAttributesDefs(void);
+public:
+    cFuncDrawEllipse(cArea *owner, int numAttributes);
+    cFuncDrawEllipse(const cFuncDrawEllipse &other);
+    virtual ~cFuncDrawEllipse(void);
+    void Set(vector<stringpair> &attributes);
+    void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0);
+    bool Blinking(void) { return GetValue((int)eDrawEllipseAttribs::animtype) == (int)eAnimType::blink; };
+    int BlinkFreq(void) { return GetValue((int)eDrawEllipseAttribs::animfreq); };
+    int Align(void) { return GetValue((int)eDrawEllipseAttribs::align); };
+    int Valign(void) { return GetValue((int)eDrawEllipseAttribs::valign); };
+};
+
+class cFuncDrawSlope : public cFunction {
+private:
+    void SetAttributesDefs(void);
+public:
+    cFuncDrawSlope(cArea *owner, int numAttributes);
+    cFuncDrawSlope(const cFuncDrawSlope &other);
+    virtual ~cFuncDrawSlope(void);
+    void Set(vector<stringpair> &attributes);
+    void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0);
+    bool Blinking(void) { return GetValue((int)eDrawSlopeAttribs::animtype) == (int)eAnimType::blink; };
+    int BlinkFreq(void) { return GetValue((int)eDrawSlopeAttribs::animfreq); };
+    int Align(void) { return GetValue((int)eDrawSlopeAttribs::align); };
+    int Valign(void) { return GetValue((int)eDrawSlopeAttribs::valign); };
+};
+
+class cTextDrawer {
+private:
+    static cMutex fontLock;
+protected:
+    const cFont *font;
+    char *fontName;
+    int fontSize;
+    void CacheFont(cGlobals *globals, int size);
+    void LoadFont(int size);
+    int TextWidth(const char *text);
+    int FontHeight(void);
+public:
+    cTextDrawer(void);
+    virtual ~cTextDrawer(void);
+};
+
+class cFuncDrawText : public cFunction, public cTextDrawer {
+private:
+    cTextExpr *text;
+    void SetAttributesDefs(void);
+    char *Cut(char *expr, int width);
+public:
+    cFuncDrawText(cArea *owner, int numAttributes);
+    cFuncDrawText(const cFuncDrawText &other);
+    virtual ~cFuncDrawText(void);
+    void SetLoopInfo(cLoopInfo *loopInfo);
+    void SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer);
+    void Set(vector<stringpair> &attributes);
+    void Cache(void);
+    void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0);
+    int FuncX(void);
+    int FuncY(void);
+    int FuncWidth(void);
+    int FuncHeight(void);
+    int AvrgFontWidth(void);
+    const cFont *GetFont(void);
+    bool Blinking(void) { return GetValue((int)eDrawTextAttribs::animtype) == (int)eAnimType::blink; };
+    int BlinkFreq(void) { return GetValue((int)eDrawTextAttribs::animfreq); };
+    int Align(void) { return GetValue((int)eDrawTextAttribs::align); };
+    int Valign(void) { return GetValue((int)eDrawTextAttribs::valign); };
+    void Debug(void);
+};
+
+class cFuncDrawTextVertical : public cFunction, public cTextDrawer {
+private:
+    cTextExpr *text;
+    void SetAttributesDefs(void);
+public:
+    cFuncDrawTextVertical(cArea *owner, int numAttributes);
+    cFuncDrawTextVertical(const cFuncDrawTextVertical &other);
+    virtual ~cFuncDrawTextVertical(void);
+    void SetLoopInfo(cLoopInfo *loopInfo);
+    void SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer);
+    void Set(vector<stringpair> &attributes);
+    void Cache(void);
+    void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0);
+    int FuncWidth(void);
+    int FuncHeight(void);
+    bool Blinking(void) { return GetValue((int)eDrawTextAttribsVertical::animtype) == (int)eAnimType::blink; };
+    int BlinkFreq(void) { return GetValue((int)eDrawTextAttribsVertical::animfreq); };
+    int Align(void) { return GetValue((int)eDrawTextAttribsVertical::align); };
+    int Valign(void) { return GetValue((int)eDrawTextAttribsVertical::valign); };
+    void Debug(void);
+};
+
+class cTextFloater;
+
+class cFuncDrawTextBox : public cFunction, public cTextDrawer {
+private:
+    cTextExpr *text;
+    cTextFloater *floater;
+    void SetFloater(void);
+    void SetAttributesDefs(void);
+    void SetFloatMode(int id, const char *val);
+public:
+    cFuncDrawTextBox(cArea *owner, int numAttributes);
+    cFuncDrawTextBox(const cFuncDrawTextBox &other);
+    virtual ~cFuncDrawTextBox(void);
+    void SetLoopInfo(cLoopInfo *loopInfo);
+    void SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer);
+    void Set(vector<stringpair> &attributes);
+    void Cache(void);
+    void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0);
+    int FuncWidth(void);
+    int FuncHeight(void);
+    void Debug(void);
+};
+
+class cFuncDrawImage : public cFunction {
+private:
+    cTextExpr *path;
+    void SetAttributesDefs(void);
+    void SetImageType(int id, const char *val);
+    void PreCacheImage(void);
+public:
+    cFuncDrawImage(cArea *owner, int numAttributes);
+    cFuncDrawImage(const cFuncDrawImage &other);
+    virtual ~cFuncDrawImage(void);
+    void SetLoopInfo(cLoopInfo *loopInfo);
+    void SetTokenContainerDeep(skindesignerapi::cTokenContainer *tokenContainer);
+    void Set(vector<stringpair> &attributes);
+    void Cache(void);
+    void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0);
+    bool Blinking(void) { return GetValue((int)eDrawImageAttribs::animtype) == (int)eAnimType::blink; };
+    int BlinkFreq(void) { return GetValue((int)eDrawImageAttribs::animfreq); };
+    int Align(void) { return GetValue((int)eDrawImageAttribs::align); };
+    int Valign(void) { return GetValue((int)eDrawImageAttribs::valign); };
+    void Debug(void);
+};
+
+class cFuncLoop : public cFunction {
+private:
+    cLoopInfo loopInfo;
+    cList<cFunction> functions;
+    void SetAttributesDefs(void);
+    int ColumnWidth(void);
+    int RowHeight(void);
+public:
+    cFuncLoop(cArea *owner, int numAttributes);
+    virtual ~cFuncLoop(void);
+    void Set(vector<stringpair> &attributes);
+    void SetContainer(int x, int y, int width, int height);
+    void Cache(void);
+    void AddFunction(cFunction *f);
+    cFunction *GetFunction(const char *name);
+    void Render(cPixmap *p, int x0 = 0, int y0 = 0, int colWidth = 0, int rowHeight = 0);
+    int FuncWidth(void);
+    int FuncHeight(void);
+    void Debug(void);
+};
+
+class cTextFloater {
+private:
+    char *text;
+    char *eol;
+    int lines;
+    int lastLine;
+public:
+    cTextFloater(void);
+    cTextFloater(const char *text, const cFont *font, int width, int height = 0, int floatWidth = 0, int floatHeight = 0, int maxLines = 0);
+    ~cTextFloater();
+    void Set(const char *Text, const cFont *font, int width, int height = 0, int floatWidth = 0, int floatHeight = 0, int maxLines = 0);
+    ///< Wraps the Text to make it fit into the area defined by the given Width
+    ///< when displayed with the given Font.
+    ///< Wrapping is done by inserting the necessary number of newline
+    ///< characters into the string.
+    ///< if height is set, new lines are only set till height is reached
+    ///< if floatwidth and floatheight are set, the first lines (depending on 
+    ///< size of floatheight) are set to floatwidth
+    const char *Text(void);
+    ///< Returns the full wrapped text.
+    int Lines(void) { return lines; }
+    ///< Returns the actual number of lines needed to display the full wrapped text.
+    const char *GetLine(int line);
+    ///< Returns the given Line. The first line is numbered 0.
+};
+
+
 #endif //__FUNCTIONS_H
\ No newline at end of file
diff --git a/coreengine/gridelement.c b/coreengine/gridelement.c
index 223546e..f9773d3 100644
--- a/coreengine/gridelement.c
+++ b/coreengine/gridelement.c
@@ -1,57 +1,57 @@
-#include "gridelement.h"

-#include "../config.h"

-

-cGridElement::cGridElement(void) {

-    current = false;

-    indexCurrent = -1;

-    viewId = -1;

-    plugId = -1;

-}

-

-cGridElement::cGridElement(const cGridElement &other) : cViewElement(other) {

-    current = false;

-    viewId = other.viewId;

-    plugId = other.plugId;

-    tokenContainer = new skindesignerapi::cTokenContainer(*other.tokenContainer);

-    indexCurrent = other.indexCurrent;

-    InheritTokenContainerDeep();

-}

-

-cGridElement::~cGridElement(void) {

-}

-

-void cGridElement::SetTokenContainer(void) {

-    skindesignerapi::cTokenContainer *tkGe = plgManager->GetTokenContainerGE(plugId, viewId, id);

-    if (!tkGe)

-        return;

-    tokenContainer = new skindesignerapi::cTokenContainer(*tkGe);

-    indexCurrent = tokenContainer->GetNumDefinedIntTokens();

-    tokenContainer->DefineIntToken("{current}", indexCurrent);

-    InheritTokenContainer();

-}

-

-void cGridElement::Set(skindesignerapi::cTokenContainer *tk) {

-    tokenContainer->Clear();

-    tokenContainer->SetTokens(tk);

-    SetDirty();

-}

-

-void cGridElement::SetCurrent(bool current) {

-    this->current = current;

-    SetDirty();

-}

-

-bool cGridElement::Parse(bool forced) {

-    if (!dirty)

-        return false;

-    tokenContainer->AddIntToken(indexCurrent, current);

-    return true;

-}

-

-int cGridElement::Width(void) {

-    return container.Width();

-}

-

-int cGridElement::Height(void) {

-    return container.Height();

+#include "gridelement.h"
+#include "../config.h"
+
+cGridElement::cGridElement(void) {
+    current = false;
+    indexCurrent = -1;
+    viewId = -1;
+    plugId = -1;
+}
+
+cGridElement::cGridElement(const cGridElement &other) : cViewElement(other) {
+    current = false;
+    viewId = other.viewId;
+    plugId = other.plugId;
+    tokenContainer = new skindesignerapi::cTokenContainer(*other.tokenContainer);
+    indexCurrent = other.indexCurrent;
+    InheritTokenContainerDeep();
+}
+
+cGridElement::~cGridElement(void) {
+}
+
+void cGridElement::SetTokenContainer(void) {
+    skindesignerapi::cTokenContainer *tkGe = plgManager->GetTokenContainerGE(plugId, viewId, id);
+    if (!tkGe)
+        return;
+    tokenContainer = new skindesignerapi::cTokenContainer(*tkGe);
+    indexCurrent = tokenContainer->GetNumDefinedIntTokens();
+    tokenContainer->DefineIntToken("{current}", indexCurrent);
+    InheritTokenContainer();
+}
+
+void cGridElement::Set(skindesignerapi::cTokenContainer *tk) {
+    tokenContainer->Clear();
+    tokenContainer->SetTokens(tk);
+    SetDirty();
+}
+
+void cGridElement::SetCurrent(bool current) {
+    this->current = current;
+    SetDirty();
+}
+
+bool cGridElement::Parse(bool forced) {
+    if (!dirty)
+        return false;
+    tokenContainer->AddIntToken(indexCurrent, current);
+    return true;
+}
+
+int cGridElement::Width(void) {
+    return container.Width();
+}
+
+int cGridElement::Height(void) {
+    return container.Height();
 }
\ No newline at end of file
diff --git a/coreengine/gridelement.h b/coreengine/gridelement.h
index 6e94985..8aae3b5 100644
--- a/coreengine/gridelement.h
+++ b/coreengine/gridelement.h
@@ -1,27 +1,27 @@
-#ifndef __GRIDELEMENT_H

-#define __GRIDELEMENT_H

-

-#include "viewelement.h"

-

-class cGridElement : public cViewElement {

-private:

-    int viewId;

-    int plugId;

-    bool current;

-    int indexCurrent;

-public:

-    cGridElement(void);

-    cGridElement(const cGridElement &other);

-    virtual ~cGridElement(void);

-    void SetPluginId(int plugId) { this->plugId = plugId; };

-    void SetViewId(int viewId) { this->viewId = viewId; };

-    void SetTokenContainer(void);

-    skindesignerapi::cTokenContainer *GetTokenContainer(void) { return tokenContainer; };

-    void Set(skindesignerapi::cTokenContainer *tk);

-    void SetCurrent(bool current);

-    bool Parse(bool forced = true);

-    int Width(void);

-    int Height(void);

-};

-

+#ifndef __GRIDELEMENT_H
+#define __GRIDELEMENT_H
+
+#include "viewelement.h"
+
+class cGridElement : public cViewElement {
+private:
+    int viewId;
+    int plugId;
+    bool current;
+    int indexCurrent;
+public:
+    cGridElement(void);
+    cGridElement(const cGridElement &other);
+    virtual ~cGridElement(void);
+    void SetPluginId(int plugId) { this->plugId = plugId; };
+    void SetViewId(int viewId) { this->viewId = viewId; };
+    void SetTokenContainer(void);
+    skindesignerapi::cTokenContainer *GetTokenContainer(void) { return tokenContainer; };
+    void Set(skindesignerapi::cTokenContainer *tk);
+    void SetCurrent(bool current);
+    bool Parse(bool forced = true);
+    int Width(void);
+    int Height(void);
+};
+
 #endif //__GRIDELEMENT_H
\ No newline at end of file
diff --git a/coreengine/listelements.c b/coreengine/listelements.c
index d04f635..950e185 100644
--- a/coreengine/listelements.c
+++ b/coreengine/listelements.c
@@ -1,1852 +1,1852 @@
-#include "listelements.h"

-#include "../config.h"

-#include <sstream>

-#include <algorithm>

-

-/******************************************************************

-* cListElement

-******************************************************************/

-cListElement::cListElement(void) { 

-    dirty = false;

-    num = -1;

-    current = false;

-    wasCurrent = false;

-    selectable = false;

-    currentElement = NULL;

-    menuCat = mcUnknown;

-};

-

-cListElement::cListElement(const cListElement &other) : cViewElement(other) {

-    num = -1;

-    current = false; 

-    selectable = false;     

-    currentElement = NULL;

-}

-

-void cListElement::SetCurrent(bool cur) { 

-    if (!cur && current)

-        wasCurrent = true;

-    else

-        wasCurrent = false;

-    current = cur;

-}

-

-void cListElement::Close(void) {

-    if (current && currentElement) {

-        currentElement->Close();

-    }

-    cViewElement::Close();

-    dirty = false;

-}

-

-void cListElement::Clear(void) {

-    if (current && currentElement) {

-        currentElement->Close();

-    }

-    cViewElement::Clear();

-    dirty = false;

-}

-

-void cListElement::WakeCurrent(void) {

-    if (currentElement) {

-        currentElement->WakeUp();

-    }    

-}

-

-

-char *cListElement::ParseSeparator(const char *text) {

-    const char *start = text;

-    while (*start && (*start == '-' || *start == ' ' || *start == 9)) {

-        start++;

-    }

-    const char *end = start;

-    while (*end && *end != '-') {

-        end++;

-    }

-    int len = end - start;

-    char *ret = (char*)malloc(len);

-    memset(ret, 0, len);

-    strncpy(ret, start, len-1);

-    return ret;

-}

-

-/******************************************************************

-* cCurrentElement

-******************************************************************/

-cCurrentElement::cCurrentElement(void) {

-    listX = 0;

-    listY = 0;

-    listWidth = 0;

-    listHeight = 0;

-}

-

-void cCurrentElement::SetListPosition(int x, int y, int width, int height) {

-    listX = x;

-    listY = y;

-    listWidth = width;

-    listHeight = height;

-}

-

-void cCurrentElement::SetListTokens(skindesignerapi::cTokenContainer *tokenContainer) {

-    tokenContainer->AddIntToken(0, listX);

-    tokenContainer->AddIntToken(1, listY);

-    tokenContainer->AddIntToken(2, listWidth);

-    tokenContainer->AddIntToken(3, listHeight);

-}

-

-/******************************************************************

-* cLeMenuDefault

-******************************************************************/

-cLeMenuDefault::cLeMenuDefault(void) {

-    text = NULL;

-    colX = NULL;

-    colWidths = NULL;

-    plugName = NULL;

-}

-

-cLeMenuDefault::cLeMenuDefault(const cLeMenuDefault &other) : cListElement(other) {

-    text = NULL;

-    colX = NULL;

-    colWidths = NULL;

-    plugName = NULL;

-}

-

-cLeMenuDefault::~cLeMenuDefault(void) {

-

-}

-

-void cLeMenuDefault::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{column1}", (int)eLeMenuDefaultST::column1);

-    tokenContainer->DefineStringToken("{column2}", (int)eLeMenuDefaultST::column2);

-    tokenContainer->DefineStringToken("{column3}", (int)eLeMenuDefaultST::column3);

-    tokenContainer->DefineStringToken("{column4}", (int)eLeMenuDefaultST::column4);

-    tokenContainer->DefineStringToken("{column5}", (int)eLeMenuDefaultST::column5);

-    tokenContainer->DefineStringToken("{column6}", (int)eLeMenuDefaultST::column6);

-    tokenContainer->DefineIntToken("{nummenuitem}", (int)eLeMenuDefaultIT::nummenuitem);

-    tokenContainer->DefineIntToken("{current}", (int)eLeMenuDefaultIT::current);

-    tokenContainer->DefineIntToken("{separator}", (int)eLeMenuDefaultIT::separator);

-    tokenContainer->DefineIntToken("{column2set}", (int)eLeMenuDefaultIT::column2set);

-    tokenContainer->DefineIntToken("{column3set}", (int)eLeMenuDefaultIT::column3set);

-    tokenContainer->DefineIntToken("{column4set}", (int)eLeMenuDefaultIT::column4set);

-    tokenContainer->DefineIntToken("{column5set}", (int)eLeMenuDefaultIT::column5set);

-    tokenContainer->DefineIntToken("{column6set}", (int)eLeMenuDefaultIT::column6set);

-    tokenContainer->DefineIntToken("{column1x}", (int)eLeMenuDefaultIT::column1x);

-    tokenContainer->DefineIntToken("{column2x}", (int)eLeMenuDefaultIT::column2x);

-    tokenContainer->DefineIntToken("{column3x}", (int)eLeMenuDefaultIT::column3x);

-    tokenContainer->DefineIntToken("{column4x}", (int)eLeMenuDefaultIT::column4x);

-    tokenContainer->DefineIntToken("{column5x}", (int)eLeMenuDefaultIT::column5x);

-    tokenContainer->DefineIntToken("{column6x}", (int)eLeMenuDefaultIT::column6x);

-    tokenContainer->DefineIntToken("{column1width}", (int)eLeMenuDefaultIT::column1width);

-    tokenContainer->DefineIntToken("{column2width}", (int)eLeMenuDefaultIT::column2width);

-    tokenContainer->DefineIntToken("{column3width}", (int)eLeMenuDefaultIT::column3width);

-    tokenContainer->DefineIntToken("{column4width}", (int)eLeMenuDefaultIT::column4width);

-    tokenContainer->DefineIntToken("{column5width}", (int)eLeMenuDefaultIT::column5width);

-    tokenContainer->DefineIntToken("{column6width}", (int)eLeMenuDefaultIT::column6width);

-    tokenContainer->DefineIntToken("{column1pb}", (int)eLeMenuDefaultIT::column1pb);

-    tokenContainer->DefineIntToken("{column2pb}", (int)eLeMenuDefaultIT::column2pb);

-    tokenContainer->DefineIntToken("{column3pb}", (int)eLeMenuDefaultIT::column3pb);

-    tokenContainer->DefineIntToken("{column4pb}", (int)eLeMenuDefaultIT::column4pb);

-    tokenContainer->DefineIntToken("{column5pb}", (int)eLeMenuDefaultIT::column5pb);

-    tokenContainer->DefineIntToken("{column6pb}", (int)eLeMenuDefaultIT::column6pb);

-    tokenContainer->DefineIntToken("{column1pbtotalsize}", (int)eLeMenuDefaultIT::column1pbtotalsize);

-    tokenContainer->DefineIntToken("{column2pbtotalsize}", (int)eLeMenuDefaultIT::column2pbtotalsize);

-    tokenContainer->DefineIntToken("{column3pbtotalsize}", (int)eLeMenuDefaultIT::column3pbtotalsize);

-    tokenContainer->DefineIntToken("{column4pbtotalsize}", (int)eLeMenuDefaultIT::column4pbtotalsize);

-    tokenContainer->DefineIntToken("{column5pbtotalsize}", (int)eLeMenuDefaultIT::column5pbtotalsize);

-    tokenContainer->DefineIntToken("{column6pbtotalsize}", (int)eLeMenuDefaultIT::column6pbtotalsize);

-    tokenContainer->DefineIntToken("{column1pbsize}", (int)eLeMenuDefaultIT::column1pbsize);

-    tokenContainer->DefineIntToken("{column2pbsize}", (int)eLeMenuDefaultIT::column2pbsize);

-    tokenContainer->DefineIntToken("{column3pbsize}", (int)eLeMenuDefaultIT::column3pbsize);

-    tokenContainer->DefineIntToken("{column4pbsize}", (int)eLeMenuDefaultIT::column4pbsize);

-    tokenContainer->DefineIntToken("{column5pbsize}", (int)eLeMenuDefaultIT::column5pbsize);

-    tokenContainer->DefineIntToken("{column6pbsize}", (int)eLeMenuDefaultIT::column6pbsize);

-    tokenContainer->DefineIntToken("{setup}", (int)eLeMenuDefaultIT::setup);

-    tokenContainer->DefineIntToken("{commands}", (int)eLeMenuDefaultIT::commands);

-    tokenContainer->DefineIntToken("{fritzbox}", (int)eLeMenuDefaultIT::fritzbox);

-    tokenContainer->DefineIntToken("{systeminfo}", (int)eLeMenuDefaultIT::systeminfo);

-    tokenContainer->DefineIntToken("{mailbox}", (int)eLeMenuDefaultIT::mailbox);

-    tokenContainer->DefineIntToken("{neutrinoepg}", (int)eLeMenuDefaultIT::neutrinoepg);

-    tokenContainer->DefineIntToken("{remotetimers}", (int)eLeMenuDefaultIT::remotetimers);

-    InheritTokenContainer();

-}

-

-void cLeMenuDefault::SetListInfo(int *colX, int *colWidths) {

-    this->colX = colX;

-    this->colWidths = colWidths;

-}

-

-void cLeMenuDefault::SetText(const char *text) {

-    dirty = true;

-    free(this->text);

-    this->text = strdup(text);

-}

-

-bool cLeMenuDefault::Parse(bool forced) {

-    if (!dirty)

-        return false;

-

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eLeMenuDefaultIT::nummenuitem, num);

-    tokenContainer->AddIntToken((int)eLeMenuDefaultIT::current, current);

-    tokenContainer->AddIntToken((int)eLeMenuDefaultIT::separator, !selectable);

-    for (int i = 0; i < MAX_TABS; i++) {

-        bool colUsed = false;

-        const char *s = GetTabbedText(text, i);

-        if (s) {

-            tokenContainer->AddStringToken(i, s);

-            colUsed = true;

-            CheckProgressBar(s, i);

-        }

-        else

-            tokenContainer->AddStringToken(i, "");

-        if (i > 0)

-            tokenContainer->AddIntToken(i + 2, colUsed);

-        tokenContainer->AddIntToken(i + 8, colX[i]);

-        tokenContainer->AddIntToken(i + 14, colWidths[i]);

-    }

-    SetMenuCategory();

-    return true;

-}

-

-const char *cLeMenuDefault::GetTabbedText(const char *s, int tab) {

-    if (!s)

-        return NULL;

-    static char buffer[1000];

-    const char *a = s;

-    const char *b = strchrnul(a, '\t');

-    while (*b && tab-- > 0) {

-        a = b + 1;

-        b = strchrnul(a, '\t');

-    }

-    if (!*b)

-        return (tab <= 0) ? a : NULL;

-    unsigned int n = b - a;

-    if (n >= sizeof(buffer))

-        n = sizeof(buffer) - 1;

-    strncpy(buffer, a, n);

-    buffer[n] = 0;

-    return buffer;

-}

-

-void cLeMenuDefault::SetMenuCategory(void) {

-    if (menuCat >= mcPluginSetup && menuCat <= mcSetupPlugins) {

-        tokenContainer->AddIntToken((int)eLeMenuDefaultIT::setup, 1);

-        return;

-    } else if (menuCat == mcCommand) {

-        tokenContainer->AddIntToken((int)eLeMenuDefaultIT::commands, 1);        

-        return;

-    } 

-

-    if (!plugName) {

-        return;

-    }

-    if (!strcmp(plugName, "fritzbox")) {

-        tokenContainer->AddIntToken((int)eLeMenuDefaultIT::fritzbox, 1);

-    } else if (!strcmp(plugName, "systeminfo")) {

-        tokenContainer->AddIntToken((int)eLeMenuDefaultIT::systeminfo, 1);

-    } else if (!strcmp(plugName, "mailbox")) {

-        tokenContainer->AddIntToken((int)eLeMenuDefaultIT::mailbox, 1);

-    } else if (!strcmp(plugName, "neutrinoepg")) {

-        tokenContainer->AddIntToken((int)eLeMenuDefaultIT::neutrinoepg, 1);

-    } else if (!strcmp(plugName, "remotetimers")) {

-        tokenContainer->AddIntToken((int)eLeMenuDefaultIT::remotetimers, 1);

-    } 

-}

-

-void cLeMenuDefault::CheckProgressBar(const char *text, int tab) {

-    const char *start = strchr(text, '[');

-    if (!start)

-        return;

-    const char *stop = strchr(text, ']');

-    if (!stop)

-        return;

-    int total = stop - start - 1;

-    int len = 0;

-    char *s = (char*)start + 1;

-    while (*s && *s == '|') {

-        len++;

-        s++;

-    }

-    tokenContainer->AddIntToken(20 + tab, 1);

-    tokenContainer->AddIntToken(26 + tab, total);

-    tokenContainer->AddIntToken(32 + tab, len);

-}

-

-/******************************************************************

-* cVeMenuMain

-******************************************************************/

-cVeMenuMain::cVeMenuMain(void) {

-    text = NULL;

-    number = NULL;

-    label = NULL;

-}

-

-cVeMenuMain::~cVeMenuMain(void) {

-    free(text);

-    free(number);

-    free(label);

-}

-

-void cVeMenuMain::SplitText(void) {

-    char *start = skipspace(text);

-    bool found = false;

-    bool doBreak = false;

-    size_t i = 0;

-    char *c = start;

-    while (*c) {

-        if (i==0) {

-            //if text directly starts with nonnumeric, break

-            if (!(*c >= '0' && *c <= '9')) {

-                break;

-            }

-        }

-        if (found) {

-            //if current char is not a figure anymore, break

-            if (!(*c >= '0' && *c <= '9')) {

-                //there has to be a space after the menu item number 

-                //plugins with figures in their name are eval :-)

-                if (*c != ' ')

-                    found = false;

-                doBreak = true;

-            }

-        }

-        if (*c >= '0' && *c <= '9') {

-            found = true;

-        }

-        if (doBreak)

-            break;

-        if (i>4)

-            break;

-        c++;

-        i++;

-    }

-

-    free(number);

-    free(label);

-    if (found) {

-        number = (char*)malloc(i+1);

-        memset(number, 0, i+1);

-        strncpy(number, start, i);

-    } else {

-        number = (char*)malloc(2);

-        memset(number, 0, 2);

-        strncpy(number, "", 1);

-    }

-    label = strdup(skipspace(c));

-}

-

-/******************************************************************

-* cLeMenuMain

-******************************************************************/

-cLeMenuMain::cLeMenuMain(void) {

-    currentMain = NULL;

-}

-

-cLeMenuMain::cLeMenuMain(const cLeMenuMain &other) : cListElement(other) {

-    text = NULL;

-    number = NULL;

-    label = NULL;

-    currentMain = NULL;

-}

-

-cLeMenuMain::~cLeMenuMain(void) {

-}

-

-void cLeMenuMain::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{label}", (int)eLeMenuMainST::label);

-    tokenContainer->DefineStringToken("{number}", (int)eLeMenuMainST::number);

-    tokenContainer->DefineStringToken("{icon}", (int)eLeMenuMainST::icon);

-    tokenContainer->DefineIntToken("{nummenuitem}", (int)eLeMenuMainIT::nummenuitem);

-    tokenContainer->DefineIntToken("{current}", (int)eLeMenuMainIT::current);

-    tokenContainer->DefineIntToken("{separator}", (int)eLeMenuMainIT::separator);

-    InheritTokenContainer();

-}

-

-void cLeMenuMain::ClearCurrentElement(void) {

-    if (wasCurrent && currentMain) {

-        currentMain->Close();

-    }

-}

-

-void cLeMenuMain::SetText(const char *text) {

-    dirty = true;

-    free(this->text);

-    this->text = strdup(text);

-}

-

-bool cLeMenuMain::Parse(bool forced) {

-    if (!dirty)

-        return false;

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eLeMenuMainIT::nummenuitem, num);

-    tokenContainer->AddIntToken((int)eLeMenuMainIT::current, current);

-    tokenContainer->AddIntToken((int)eLeMenuMainIT::separator, !selectable);

-    SplitText();

-    tokenContainer->AddStringToken((int)eLeMenuMainST::number, number);

-    tokenContainer->AddStringToken((int)eLeMenuMainST::label, label);

-    tokenContainer->AddStringToken((int)eLeMenuMainST::icon, imgCache->GetIconName(label).c_str());

-    return true;

-}

-

-void cLeMenuMain::RenderCurrent(void) {

-    if (!currentMain)

-        return;

-    currentMain->SetText(text);

-    currentMain->SetListPosition(container.X(), container.Y(), container.Width(), container.Height());

-    currentMain->Parse();

-}

-

-const char *cLeMenuMain::PluginName(void) {

-    if (!label)

-        return NULL;

-    for (int i = 0; ; i++) {

-        cPlugin *p = cPluginManager::GetPlugin(i);

-        if (p) {

-            const char *mainMenuEntry = p->MainMenuEntry();

-            if (!mainMenuEntry)

-                continue;

-            if (!strcmp(mainMenuEntry, label)) {

-                return p->Name();

-            }

-        } else

-            break;

-    }

-    return NULL;

-}

-

-/******************************************************************

-* cCeMenuMain

-******************************************************************/

-cCeMenuMain::cCeMenuMain(void) {

-

-}

-

-cCeMenuMain::~cCeMenuMain(void) {

-

-}

-

-void cCeMenuMain::SetText(const char *text) {

-    dirty = true;

-    free(this->text);

-    this->text = strdup(text);

-}

-

-void cCeMenuMain::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineIntToken("{menuitemx}", (int)eCeMenuMainIT::menuitemx);

-    tokenContainer->DefineIntToken("{menuitemy}", (int)eCeMenuMainIT::menuitemy);

-    tokenContainer->DefineIntToken("{menuitemwidth}", (int)eCeMenuMainIT::menuitemwidth);

-    tokenContainer->DefineIntToken("{menuitemheight}", (int)eCeMenuMainIT::menuitemheight);

-    tokenContainer->DefineStringToken("{label}", (int)eCeMenuMainST::label);

-    tokenContainer->DefineStringToken("{number}", (int)eCeMenuMainST::number);

-    tokenContainer->DefineStringToken("{icon}", (int)eCeMenuMainST::icon);

-    InheritTokenContainer();

-}

-

-bool cCeMenuMain::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    if (!dirty)

-        return false;

-    tokenContainer->Clear();

-    SplitText();

-    SetListTokens(tokenContainer);

-    tokenContainer->AddStringToken((int)eLeMenuMainST::number, number);

-    tokenContainer->AddStringToken((int)eLeMenuMainST::label, label);

-    tokenContainer->AddStringToken((int)eLeMenuMainST::icon, imgCache->GetIconName(label).c_str());

-    return true;

-}

-

-/******************************************************************

-* cVeMenuSchedules

-******************************************************************/

-cVeMenuSchedules::cVeMenuSchedules(void) {

-    event = NULL;

-    channel = NULL;

-    withDate = false;

-    timerMatch = tmNone;

-    epgSearchFav = false;

-}

-

-/******************************************************************

-* cLeMenuSchedules

-******************************************************************/

-cLeMenuSchedules::cLeMenuSchedules(void) {

-    currentSchedules = NULL;

-    menuCat = mcUnknown;

-}

-

-cLeMenuSchedules::cLeMenuSchedules(const cLeMenuSchedules &other) : cListElement(other) {

-    currentSchedules = NULL;

-}

-

-cLeMenuSchedules::~cLeMenuSchedules(void) {

-}

-

-void cLeMenuSchedules::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{title}", (int)eLeMenuSchedulesST::title);

-    tokenContainer->DefineStringToken("{shorttext}", (int)eLeMenuSchedulesST::shorttext);

-    tokenContainer->DefineStringToken("{start}", (int)eLeMenuSchedulesST::start);

-    tokenContainer->DefineStringToken("{stop}", (int)eLeMenuSchedulesST::stop);

-    tokenContainer->DefineStringToken("{day}", (int)eLeMenuSchedulesST::day);

-    tokenContainer->DefineStringToken("{date}", (int)eLeMenuSchedulesST::date);

-    tokenContainer->DefineStringToken("{durationminutes}", (int)eLeMenuSchedulesST::durationminutes);

-    tokenContainer->DefineStringToken("{channelname}", (int)eLeMenuSchedulesST::channelname);

-    tokenContainer->DefineStringToken("{channelid}", (int)eLeMenuSchedulesST::channelid);

-    tokenContainer->DefineIntToken("{nummenuitem}", (int)eLeMenuSchedulesIT::nummenuitem);

-    tokenContainer->DefineIntToken("{current}", (int)eLeMenuSchedulesIT::current);

-    tokenContainer->DefineIntToken("{separator}", (int)eLeMenuSchedulesIT::separator);

-    tokenContainer->DefineIntToken("{daynumeric}", (int)eLeMenuSchedulesIT::daynumeric);

-    tokenContainer->DefineIntToken("{month}", (int)eLeMenuSchedulesIT::month);

-    tokenContainer->DefineIntToken("{year}", (int)eLeMenuSchedulesIT::year);

-    tokenContainer->DefineIntToken("{running}", (int)eLeMenuSchedulesIT::running);

-    tokenContainer->DefineIntToken("{elapsed}", (int)eLeMenuSchedulesIT::elapsed);

-    tokenContainer->DefineIntToken("{startsin}", (int)eLeMenuSchedulesIT::startsin);

-    tokenContainer->DefineIntToken("{duration}", (int)eLeMenuSchedulesIT::duration);

-    tokenContainer->DefineIntToken("{durationhours}", (int)eLeMenuSchedulesIT::durationhours);

-    tokenContainer->DefineIntToken("{channelnumber}", (int)eLeMenuSchedulesIT::channelnumber);

-    tokenContainer->DefineIntToken("{channellogoexists}", (int)eLeMenuSchedulesIT::channellogoexists);

-    tokenContainer->DefineIntToken("{whatson}", (int)eLeMenuSchedulesIT::whatson);

-    tokenContainer->DefineIntToken("{whatsonnow}", (int)eLeMenuSchedulesIT::whatsonnow);

-    tokenContainer->DefineIntToken("{whatsonnext}", (int)eLeMenuSchedulesIT::whatsonnext);

-    tokenContainer->DefineIntToken("{whatsonfavorites}", (int)eLeMenuSchedulesIT::whatsonfavorites);

-    tokenContainer->DefineIntToken("{timerpartitial}", (int)eLeMenuSchedulesIT::timerpartitial);

-    tokenContainer->DefineIntToken("{timerfull}", (int)eLeMenuSchedulesIT::timerfull);

-    tokenContainer->DefineIntToken("{hasVPS}", (int)eLeMenuSchedulesIT::hasVPS);

-    InheritTokenContainer();

-}

-

-void cLeMenuSchedules::ClearCurrentElement(void) {

-    if (wasCurrent && currentSchedules) {

-        currentSchedules->Close();

-    }

-}

-

-void cLeMenuSchedules::Set(const cEvent *event, const cChannel *channel, bool withDate, eTimerMatch timerMatch) {

-    dirty = true;

-    this->event = event;

-    this->channel = channel;

-    this->withDate = withDate;

-    this->timerMatch = timerMatch;

-}

-

-bool cLeMenuSchedules::Parse(bool forced) {

-    if (!dirty)

-        return false;

-

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::nummenuitem, num);

-    tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::current, current);

-    tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::separator, !selectable);

-

-    tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::whatson, (menuCat == mcSchedule && !epgSearchFav) ? true : false);

-    tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::whatsonnow, menuCat == mcScheduleNow ? true : false);

-    tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::whatsonnext, menuCat == mcScheduleNext ? true : false);

-    tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::whatsonfavorites, epgSearchFav);

-

-    if (timerMatch == tmFull) {

-        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerpartitial, false);

-        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerfull, true);

-    } else if (timerMatch == tmPartial) {

-        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerpartitial, true);

-        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerfull, false);

-    } else {

-        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerpartitial, false);

-        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerfull, false);

-    }

-

-    if (event) {

-        if (selectable) {

-            tokenContainer->AddStringToken((int)eLeMenuSchedulesST::title, event->Title());

-            tokenContainer->AddStringToken((int)eLeMenuSchedulesST::shorttext, event->ShortText());

-            tokenContainer->AddStringToken((int)eLeMenuSchedulesST::start, *(event->GetTimeString()));

-            tokenContainer->AddStringToken((int)eLeMenuSchedulesST::stop, *(event->GetEndTimeString()));

-            time_t startTime = event->StartTime();

-            struct tm * sStartTime = localtime(&startTime);

-            tokenContainer->AddStringToken((int)eLeMenuSchedulesST::day, *WeekDayName(startTime));

-            tokenContainer->AddStringToken((int)eLeMenuSchedulesST::date, *ShortDateString(startTime));

-            tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::year, sStartTime->tm_year + 1900);

-            tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::daynumeric, sStartTime->tm_mday);

-            tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::month, sStartTime->tm_mon+1);

-

-            bool isRunning = false;

-            time_t now = time(NULL);

-            if ((now >= event->StartTime()) && (now <= event->EndTime()))

-                isRunning = true;

-            tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::running, isRunning);

-            if (isRunning) {

-                tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::elapsed, (now - event->StartTime())/60);

-                tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::startsin, 0);

-            } else {

-                tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::elapsed, 0);

-                tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::startsin, (event->StartTime() - now)/60);

-            }

-            tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::duration, event->Duration() / 60);

-            tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::durationhours, event->Duration() / 3600);

-            tokenContainer->AddStringToken((int)eLeMenuSchedulesST::durationminutes, *cString::sprintf("%.2d", (event->Duration() / 60)%60));

-            tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::hasVPS, (bool)event->Vps());

-        } else {

-            char *sep = ParseSeparator(event->Title());

-            tokenContainer->AddStringToken((int)eLeMenuSchedulesST::title, sep);

-            free(sep);

-        }

-    } else if (!channel) {

-        //Hack für komischen patch von jinx

-        //stringTokens.insert(pair<string,string>("title", dayseparator));        

-    }

-    if (channel) {

-        tokenContainer->AddStringToken((int)eLeMenuSchedulesST::channelname, channel->Name());

-        cString channelID = channel->GetChannelID().ToString();

-        tokenContainer->AddStringToken((int)eLeMenuSchedulesST::channelid, *channelID);

-        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::channelnumber, channel->Number());

-        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::channellogoexists, imgCache->LogoExists(*channelID));

-        if (!event && !selectable) {

-            tokenContainer->AddStringToken((int)eLeMenuSchedulesST::title, channel->Name());

-        }

-    }

-    return true;

-}

-

-void cLeMenuSchedules::RenderCurrent(void) {

-    if (!currentSchedules)

-        return;

-    currentSchedules->Set(event, channel, withDate, timerMatch, menuCat);

-    currentSchedules->SetEpgSearchFav(epgSearchFav);

-    currentSchedules->SetListPosition(container.X(), container.Y(), container.Width(), container.Height());

-    currentSchedules->Parse();

-}

-

-/******************************************************************

-* cCeMenuSchedules

-******************************************************************/

-cCeMenuSchedules::cCeMenuSchedules(void) {

-    schedulesIndex = -1;

-}

-

-cCeMenuSchedules::~cCeMenuSchedules(void) {

-}

-

-void cCeMenuSchedules::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{title}", (int)eCeMenuSchedulesST::title);

-    tokenContainer->DefineStringToken("{shorttext}", (int)eCeMenuSchedulesST::shorttext);

-    tokenContainer->DefineStringToken("{description}", (int)eCeMenuSchedulesST::description);

-    tokenContainer->DefineStringToken("{start}", (int)eCeMenuSchedulesST::start);

-    tokenContainer->DefineStringToken("{stop}", (int)eCeMenuSchedulesST::stop);

-    tokenContainer->DefineStringToken("{day}", (int)eCeMenuSchedulesST::day);

-    tokenContainer->DefineStringToken("{date}", (int)eCeMenuSchedulesST::date);

-    tokenContainer->DefineStringToken("{channelname}", (int)eCeMenuSchedulesST::channelname);

-    tokenContainer->DefineStringToken("{channelid}", (int)eCeMenuSchedulesST::channelid);

-    tokenContainer->DefineStringToken("{posterpath}", (int)eCeMenuSchedulesST::posterpath);

-    tokenContainer->DefineStringToken("{bannerpath}", (int)eCeMenuSchedulesST::bannerpath);

-    tokenContainer->DefineIntToken("{menuitemx}", (int)eCeMenuSchedulesIT::menuitemx);

-    tokenContainer->DefineIntToken("{menuitemy}", (int)eCeMenuSchedulesIT::menuitemy);

-    tokenContainer->DefineIntToken("{menuitemwidth}", (int)eCeMenuSchedulesIT::menuitemwidth);

-    tokenContainer->DefineIntToken("{menuitemheight}", (int)eCeMenuSchedulesIT::menuitemheight);

-    tokenContainer->DefineIntToken("{daynumeric}", (int)eCeMenuSchedulesIT::daynumeric);

-    tokenContainer->DefineIntToken("{month}", (int)eCeMenuSchedulesIT::month);

-    tokenContainer->DefineIntToken("{year}", (int)eCeMenuSchedulesIT::year);

-    tokenContainer->DefineIntToken("{running}", (int)eCeMenuSchedulesIT::running);

-    tokenContainer->DefineIntToken("{elapsed}", (int)eCeMenuSchedulesIT::elapsed);

-    tokenContainer->DefineIntToken("{duration}", (int)eCeMenuSchedulesIT::duration);

-    tokenContainer->DefineIntToken("{durationhours}", (int)eCeMenuSchedulesIT::durationhours);

-    tokenContainer->DefineIntToken("{durationminutes}", (int)eCeMenuSchedulesIT::durationminutes);

-    tokenContainer->DefineIntToken("{channelnumber}", (int)eCeMenuSchedulesIT::channelnumber);

-    tokenContainer->DefineIntToken("{channellogoexists}", (int)eCeMenuSchedulesIT::channellogoexists);

-    tokenContainer->DefineIntToken("{hasposter}", (int)eCeMenuSchedulesIT::hasposter);

-    tokenContainer->DefineIntToken("{posterwidth}", (int)eCeMenuSchedulesIT::posterwidth);

-    tokenContainer->DefineIntToken("{posterheight}", (int)eCeMenuSchedulesIT::posterheight);

-    tokenContainer->DefineIntToken("{hasbanner}", (int)eCeMenuSchedulesIT::hasbanner);

-    tokenContainer->DefineIntToken("{bannerwidth}", (int)eCeMenuSchedulesIT::bannerwidth);

-    tokenContainer->DefineIntToken("{bannerheight}", (int)eCeMenuSchedulesIT::bannerheight);

-    tokenContainer->DefineIntToken("{whatson}", (int)eCeMenuSchedulesIT::whatson);

-    tokenContainer->DefineIntToken("{whatsonnow}", (int)eCeMenuSchedulesIT::whatsonnow);

-    tokenContainer->DefineIntToken("{whatsonnext}", (int)eCeMenuSchedulesIT::whatsonnext);

-    tokenContainer->DefineIntToken("{whatsonfavorites}", (int)eCeMenuSchedulesIT::whatsonfavorites);

-    tokenContainer->DefineIntToken("{timerpartitial}", (int)eCeMenuSchedulesIT::timerpartitial);

-    tokenContainer->DefineIntToken("{timerfull}", (int)eCeMenuSchedulesIT::timerfull);

-    tokenContainer->DefineLoopToken("{schedule[title]}", (int)eCeMenuSchedulesLT::title);

-    tokenContainer->DefineLoopToken("{schedule[shorttext]}", (int)eCeMenuSchedulesLT::shorttext);

-    tokenContainer->DefineLoopToken("{schedule[start]}", (int)eCeMenuSchedulesLT::start);

-    tokenContainer->DefineLoopToken("{schedule[stop]}", (int)eCeMenuSchedulesLT::stop);

-    schedulesIndex = tokenContainer->LoopIndex("schedule");

-    InheritTokenContainer();    

-}

-

-void cCeMenuSchedules::Set(const cEvent *event, const cChannel *channel, bool withDate, eTimerMatch timerMatch, eMenuCategory menuCat) {

-    dirty = true;

-    this->menuCat = menuCat;

-    this->event = event;

-    this->channel = channel;

-    this->withDate = withDate;

-    this->timerMatch = timerMatch;

-}

-

-bool cCeMenuSchedules::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    if (!dirty)

-        return false;

-    tokenContainer->Clear();

-    SetListTokens(tokenContainer);

-    tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::whatson, (menuCat == mcSchedule && !epgSearchFav) ? true : false);

-    tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::whatsonnow, menuCat == mcScheduleNow ? true : false);

-    tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::whatsonnext, menuCat == mcScheduleNext ? true : false);

-    tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::whatsonfavorites, epgSearchFav);

-    if (timerMatch == tmFull) {

-        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerpartitial, false);

-        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerfull, true);

-    } else if (timerMatch == tmPartial) {

-        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerpartitial, true);

-        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerfull, false);

-    } else {

-        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerpartitial, false);

-        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerfull, false);

-    }

-

-    if (event) {

-        tokenContainer->AddStringToken((int)eCeMenuSchedulesST::title, event->Title());

-        tokenContainer->AddStringToken((int)eCeMenuSchedulesST::shorttext, event->ShortText());

-        tokenContainer->AddStringToken((int)eCeMenuSchedulesST::description, event->Description());

-        tokenContainer->AddStringToken((int)eCeMenuSchedulesST::start, *(event->GetTimeString()));

-        tokenContainer->AddStringToken((int)eCeMenuSchedulesST::stop, *(event->GetEndTimeString()));

-        time_t startTime = event->StartTime();

-        struct tm * sStartTime = localtime(&startTime);

-        tokenContainer->AddStringToken((int)eCeMenuSchedulesST::day, *WeekDayName(startTime));

-        tokenContainer->AddStringToken((int)eCeMenuSchedulesST::date, *ShortDateString(startTime));

-        tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::year, sStartTime->tm_year + 1900);

-        tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::daynumeric, sStartTime->tm_mday);

-        tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::month, sStartTime->tm_mon+1);

-        bool isRunning = false;

-        time_t now = time(NULL);

-        if ((now >= event->StartTime()) && (now <= event->EndTime()))

-            isRunning = true;

-        tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::running, isRunning);

-        if (isRunning) {

-            tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::elapsed, (now - event->StartTime())/60);

-        } else {

-            tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::elapsed, 0);

-        }

-        tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::duration, event->Duration() / 60);

-        tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::durationhours, event->Duration() / 3600);

-        if (LoadFullScrapInfo(event, NULL))

-            SetScraperPosterBanner(tokenContainer);

-    }

-    if (channel) {

-        tokenContainer->AddStringToken((int)eCeMenuSchedulesST::channelname, channel->Name());

-        cString channelID = channel->GetChannelID().ToString();

-        tokenContainer->AddStringToken((int)eCeMenuSchedulesST::channelid, *channelID);

-        tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::channelnumber, channel->Number());

-        tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::channellogoexists, imgCache->LogoExists(*channelID));

-    }

-

-    if (menuCat == mcScheduleNow || menuCat == mcScheduleNext) {

-        int eventsAvailable = 0;

-        cSchedulesLock schedulesLock;

-        const cSchedules *schedules = cSchedules::Schedules(schedulesLock);

-        const cSchedule *schedule = NULL;

-        schedule = schedules->GetSchedule(channel);

-        if (schedule) {

-            for (const cEvent *e = schedule->GetPresentEvent(); e; e = schedule->Events()->Next(e)) {

-                eventsAvailable++;

-                if (eventsAvailable == 10)

-                    break;

-            }

-        }

-        vector<int> loopInfo;

-        loopInfo.push_back(eventsAvailable);

-        tokenContainer->CreateLoopTokenContainer(&loopInfo);        

-

-        if (schedule) {

-            int num = 0;

-            for (const cEvent *e = schedule->GetPresentEvent(); e; e = schedule->Events()->Next(e)) {

-                if (num < 2) {

-                    num++;

-                    continue;

-                }

-                tokenContainer->AddLoopToken(schedulesIndex, num-2, (int)eCeMenuChannelsLT::title, e->Title());

-                tokenContainer->AddLoopToken(schedulesIndex, num-2, (int)eCeMenuChannelsLT::shorttext, e->ShortText());

-                tokenContainer->AddLoopToken(schedulesIndex, num-2, (int)eCeMenuChannelsLT::start, *(e->GetTimeString()));

-                tokenContainer->AddLoopToken(schedulesIndex, num-2, (int)eCeMenuChannelsLT::stop, *(e->GetEndTimeString()));

-                num++;

-                if (num > 11)

-                    break;

-            }            

-        }

-    }

-    return true;

-}

-

-/******************************************************************

-* cLeMenuChannels

-******************************************************************/

-cLeMenuChannels::cLeMenuChannels(void) {

-    currentChannel = NULL;

-    channel = NULL;

-    withProvider = false;

-}

-

-cLeMenuChannels::cLeMenuChannels(const cLeMenuChannels &other) : cListElement(other) {

-    currentChannel = NULL;

-    channel = NULL;

-    withProvider = false;

-}

-

-cLeMenuChannels::~cLeMenuChannels(void) {

-}

-

-void cLeMenuChannels::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{name}", (int)eLeMenuChannelsST::name);

-    tokenContainer->DefineStringToken("{channelid}", (int)eLeMenuChannelsST::channelid);

-    tokenContainer->DefineStringToken("{source}", (int)eLeMenuChannelsST::source);

-    tokenContainer->DefineStringToken("{sourcedescription}", (int)eLeMenuChannelsST::sourcedescription);

-    tokenContainer->DefineStringToken("{position}", (int)eLeMenuChannelsST::position);

-    tokenContainer->DefineStringToken("{presenteventtitle}", (int)eLeMenuChannelsST::presenteventtitle);

-    tokenContainer->DefineStringToken("{presenteventstart}", (int)eLeMenuChannelsST::presenteventstart);

-    tokenContainer->DefineStringToken("{presenteventstop}", (int)eLeMenuChannelsST::presenteventstop);

-    tokenContainer->DefineIntToken("{nummenuitem}", (int)eLeMenuChannelsIT::nummenuitem);

-    tokenContainer->DefineIntToken("{current}", (int)eLeMenuChannelsIT::current);

-    tokenContainer->DefineIntToken("{separator}", (int)eLeMenuChannelsIT::separator);

-    tokenContainer->DefineIntToken("{number}", (int)eLeMenuChannelsIT::number);

-    tokenContainer->DefineIntToken("{transponder}", (int)eLeMenuChannelsIT::transponder);

-    tokenContainer->DefineIntToken("{frequency}", (int)eLeMenuChannelsIT::frequency);

-    tokenContainer->DefineIntToken("{channellogoexists}", (int)eLeMenuChannelsIT::channellogoexists);

-    tokenContainer->DefineIntToken("{isAtsc}", (int)eLeMenuChannelsIT::isAtsc);

-    tokenContainer->DefineIntToken("{isCable}", (int)eLeMenuChannelsIT::isCable);

-    tokenContainer->DefineIntToken("{isSat}", (int)eLeMenuChannelsIT::isSat);

-    tokenContainer->DefineIntToken("{isTerr}", (int)eLeMenuChannelsIT::isTerr);

-    InheritTokenContainer();    

-}

-

-void cLeMenuChannels::ClearCurrentElement(void) {

-    if (wasCurrent && currentChannel) {

-        currentChannel->Close();

-    }

-}

-

-void cLeMenuChannels::Set(const cChannel *channel, bool withProvider) {

-    dirty = true;

-    this->channel = channel;

-    this->withProvider = withProvider;

-}

-

-bool cLeMenuChannels::Parse(bool forced) {

-    if (!dirty)

-        return false;

-

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eLeMenuChannelsIT::nummenuitem, num);

-    tokenContainer->AddIntToken((int)eLeMenuChannelsIT::current, current);

-    tokenContainer->AddIntToken((int)eLeMenuChannelsIT::separator, !selectable);

-    tokenContainer->AddIntToken((int)eLeMenuChannelsIT::number, channel->Number());

-    tokenContainer->AddIntToken((int)eLeMenuChannelsIT::transponder, channel->Transponder());

-    tokenContainer->AddIntToken((int)eLeMenuChannelsIT::frequency, channel->Frequency());

-

-    tokenContainer->AddStringToken((int)eLeMenuChannelsST::name, channel->Name());

-    cString channelID = channel->GetChannelID().ToString();

-    tokenContainer->AddStringToken((int)eLeMenuChannelsST::channelid, *channelID);

-    tokenContainer->AddIntToken((int)eLeMenuChannelsIT::channellogoexists, imgCache->LogoExists(*channelID));

-

-    //Channel Source Information

-    const cSource *source = Sources.Get(channel->Source());

-    if (source) {

-        tokenContainer->AddStringToken((int)eLeMenuChannelsST::source, *cSource::ToString(source->Code()));

-        tokenContainer->AddStringToken((int)eLeMenuChannelsST::sourcedescription, source->Description());

-        tokenContainer->AddIntToken((int)eLeMenuChannelsIT::isAtsc, source->IsAtsc(source->Code()));

-        tokenContainer->AddIntToken((int)eLeMenuChannelsIT::isCable, source->IsCable(source->Code()));

-        tokenContainer->AddIntToken((int)eLeMenuChannelsIT::isSat, source->IsSat(source->Code()));

-        tokenContainer->AddIntToken((int)eLeMenuChannelsIT::isTerr, source->IsTerr(source->Code()));

-    }

-

-    //current schedule

-    cSchedulesLock schedulesLock;

-    const cSchedules *schedules = cSchedules::Schedules(schedulesLock);

-    const cSchedule *schedule = NULL;

-    schedule = schedules->GetSchedule(channel);

-    if (schedule) {

-        const cEvent *presentEvent = schedule->GetPresentEvent();

-        if (presentEvent) {

-            tokenContainer->AddStringToken((int)eLeMenuChannelsST::presenteventtitle, presentEvent->Title());

-            tokenContainer->AddStringToken((int)eLeMenuChannelsST::presenteventstart, *presentEvent->GetTimeString());

-            tokenContainer->AddStringToken((int)eLeMenuChannelsST::presenteventstop, *presentEvent->GetEndTimeString());

-        }

-    }

-    return true;

-}

-

-void cLeMenuChannels::RenderCurrent(void) {

-    if (!currentChannel)

-        return;

-    currentChannel->Set(channel, withProvider);

-    currentChannel->SetListPosition(container.X(), container.Y(), container.Width(), container.Height());

-    currentChannel->Parse();

-}

-

-/******************************************************************

-* cCeMenuChannels

-******************************************************************/

-cCeMenuChannels::cCeMenuChannels(void) {

-    schedulesIndex = -1;

-    channel = NULL;

-    withProvider = false;

-}

-

-cCeMenuChannels::~cCeMenuChannels(void) {

-}

-

-void cCeMenuChannels::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{name}", (int)eCeMenuChannelsST::name);

-    tokenContainer->DefineStringToken("{channelid}", (int)eCeMenuChannelsST::channelid);

-    tokenContainer->DefineStringToken("{source}", (int)eCeMenuChannelsST::source);

-    tokenContainer->DefineStringToken("{sourcedescription}", (int)eCeMenuChannelsST::sourcedescription);

-    tokenContainer->DefineStringToken("{position}", (int)eCeMenuChannelsST::position);

-    tokenContainer->DefineStringToken("{presenteventtitle}", (int)eCeMenuChannelsST::presenteventtitle);

-    tokenContainer->DefineStringToken("{presenteventstart}", (int)eCeMenuChannelsST::presenteventstart);

-    tokenContainer->DefineStringToken("{presenteventstop}", (int)eCeMenuChannelsST::presenteventstop);

-    tokenContainer->DefineStringToken("{presenteventshorttext}", (int)eCeMenuChannelsST::presenteventshorttext);

-    tokenContainer->DefineStringToken("{presenteventdescription}", (int)eCeMenuChannelsST::presenteventdescription);

-    tokenContainer->DefineStringToken("{presenteventday}", (int)eCeMenuChannelsST::presenteventday);

-    tokenContainer->DefineStringToken("{presenteventdate}", (int)eCeMenuChannelsST::presenteventdate);

-    tokenContainer->DefineStringToken("{presenteventdurationminutes}", (int)eCeMenuChannelsST::presenteventdurationminutes);

-    tokenContainer->DefineStringToken("{posterpath}", (int)eCeMenuChannelsST::posterpath);

-    tokenContainer->DefineStringToken("{nexteventtitle}", (int)eCeMenuChannelsST::nexteventtitle);

-    tokenContainer->DefineStringToken("{nexteventstart}", (int)eCeMenuChannelsST::nexteventstart);

-    tokenContainer->DefineStringToken("{nexteventstop}", (int)eCeMenuChannelsST::nexteventstop);

-    tokenContainer->DefineStringToken("{nexteventshorttext}", (int)eCeMenuChannelsST::nexteventshorttext);

-    tokenContainer->DefineStringToken("{nexteventdescription}", (int)eCeMenuChannelsST::nexteventdescription);

-    tokenContainer->DefineStringToken("{nexteventdurationminutes}", (int)eCeMenuChannelsST::nexteventdurationminutes);

-    tokenContainer->DefineStringToken("{nexteventday}", (int)eCeMenuChannelsST::nexteventday);

-    tokenContainer->DefineStringToken("{nexteventdate}", (int)eCeMenuChannelsST::nexteventdate);

-    tokenContainer->DefineIntToken("{menuitemx}", (int)eCeMenuChannelsIT::menuitemx);

-    tokenContainer->DefineIntToken("{menuitemy}", (int)eCeMenuChannelsIT::menuitemy);

-    tokenContainer->DefineIntToken("{menuitemwidth}", (int)eCeMenuChannelsIT::menuitemwidth);

-    tokenContainer->DefineIntToken("{menuitemheight}", (int)eCeMenuChannelsIT::menuitemheight);

-    tokenContainer->DefineIntToken("{number}", (int)eCeMenuChannelsIT::number);

-    tokenContainer->DefineIntToken("{transponder}", (int)eCeMenuChannelsIT::transponder);

-    tokenContainer->DefineIntToken("{frequency}", (int)eCeMenuChannelsIT::frequency);

-    tokenContainer->DefineIntToken("{channellogoexists}", (int)eCeMenuChannelsIT::channellogoexists);

-    tokenContainer->DefineIntToken("{isAtsc}", (int)eCeMenuChannelsIT::isAtsc);

-    tokenContainer->DefineIntToken("{isCable}", (int)eCeMenuChannelsIT::isCable);

-    tokenContainer->DefineIntToken("{isSat}", (int)eCeMenuChannelsIT::isSat);

-    tokenContainer->DefineIntToken("{isTerr}", (int)eCeMenuChannelsIT::isTerr);

-    tokenContainer->DefineIntToken("{presenteventelapsed}", (int)eCeMenuChannelsIT::presenteventelapsed);

-    tokenContainer->DefineIntToken("{presenteventduration}", (int)eCeMenuChannelsIT::presenteventduration);

-    tokenContainer->DefineIntToken("{presenteventdurationhours}", (int)eCeMenuChannelsIT::presenteventdurationhours);

-    tokenContainer->DefineIntToken("{hasposter}", (int)eCeMenuChannelsIT::hasposter);

-    tokenContainer->DefineIntToken("{posterwidth}", (int)eCeMenuChannelsIT::posterwidth);

-    tokenContainer->DefineIntToken("{posterheight}", (int)eCeMenuChannelsIT::posterheight);

-    tokenContainer->DefineIntToken("{nexteventduration}", (int)eCeMenuChannelsIT::nexteventduration);

-    tokenContainer->DefineIntToken("{nexteventdurationhours}", (int)eCeMenuChannelsIT::nexteventdurationhours);

-    tokenContainer->DefineLoopToken("{schedule[title]}", (int)eCeMenuChannelsLT::title);

-    tokenContainer->DefineLoopToken("{schedule[shorttext]}", (int)eCeMenuChannelsLT::shorttext);

-    tokenContainer->DefineLoopToken("{schedule[start]}", (int)eCeMenuChannelsLT::start);

-    tokenContainer->DefineLoopToken("{schedule[stop]}", (int)eCeMenuChannelsLT::stop);

-    schedulesIndex = tokenContainer->LoopIndex("schedule");

-    InheritTokenContainer();

-}

-

-void cCeMenuChannels::Set(const cChannel *channel, bool withProvider) {

-    dirty = true;

-    this->channel = channel;

-    this->withProvider = withProvider;

-}

-

-bool cCeMenuChannels::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    if (!dirty)

-        return false;

-

-    tokenContainer->Clear();

-

-    SetListTokens(tokenContainer);

-

-    tokenContainer->AddIntToken((int)eCeMenuChannelsIT::number, channel->Number());

-    tokenContainer->AddIntToken((int)eCeMenuChannelsIT::transponder, channel->Transponder());

-    tokenContainer->AddIntToken((int)eCeMenuChannelsIT::frequency, channel->Frequency());

-

-    tokenContainer->AddStringToken((int)eCeMenuChannelsST::name, channel->Name());

-    cString channelID = channel->GetChannelID().ToString();

-    tokenContainer->AddStringToken((int)eCeMenuChannelsST::channelid, *channelID);

-    tokenContainer->AddIntToken((int)eCeMenuChannelsIT::channellogoexists, imgCache->LogoExists(*channelID));

-

-    //Channel Source Information

-    const cSource *source = Sources.Get(channel->Source());

-    if (source) {

-        tokenContainer->AddStringToken((int)eCeMenuChannelsST::source, *cSource::ToString(source->Code()));

-        tokenContainer->AddStringToken((int)eCeMenuChannelsST::sourcedescription, source->Description());

-        tokenContainer->AddIntToken((int)eCeMenuChannelsIT::isAtsc, source->IsAtsc(source->Code()));

-        tokenContainer->AddIntToken((int)eCeMenuChannelsIT::isCable, source->IsCable(source->Code()));

-        tokenContainer->AddIntToken((int)eCeMenuChannelsIT::isSat, source->IsSat(source->Code()));

-        tokenContainer->AddIntToken((int)eCeMenuChannelsIT::isTerr, source->IsTerr(source->Code()));

-    }

-

-    cSchedulesLock schedulesLock;

-    const cSchedules *schedules = cSchedules::Schedules(schedulesLock);

-    const cSchedule *schedule = NULL;

-    schedule = schedules->GetSchedule(channel);

-    if (schedule) {

-        const cEvent *presentEvent = schedule->GetPresentEvent();

-        if (presentEvent) {

-            tokenContainer->AddStringToken((int)eCeMenuChannelsST::presenteventtitle, presentEvent->Title());

-            tokenContainer->AddStringToken((int)eCeMenuChannelsST::presenteventshorttext, presentEvent->ShortText());

-            tokenContainer->AddStringToken((int)eCeMenuChannelsST::presenteventdescription, presentEvent->Description());

-            tokenContainer->AddStringToken((int)eCeMenuChannelsST::presenteventstart, *presentEvent->GetTimeString());

-            tokenContainer->AddStringToken((int)eCeMenuChannelsST::presenteventstop, *presentEvent->GetEndTimeString());

-            tokenContainer->AddStringToken((int)eCeMenuChannelsST::presenteventday, *WeekDayName(presentEvent->StartTime()));

-            tokenContainer->AddStringToken((int)eCeMenuChannelsST::presenteventdate, *ShortDateString(presentEvent->StartTime()));

-            tokenContainer->AddIntToken((int)eCeMenuChannelsIT::presenteventelapsed, (time(0) - presentEvent->StartTime())/60);

-            tokenContainer->AddIntToken((int)eCeMenuChannelsIT::presenteventduration, presentEvent->Duration() / 60);

-            tokenContainer->AddIntToken((int)eCeMenuChannelsIT::presenteventdurationhours, presentEvent->Duration() / 3600);

-            tokenContainer->AddStringToken((int)eCeMenuChannelsST::presenteventdurationminutes, *cString::sprintf("%.2d", (presentEvent->Duration() / 60)%60));

-            //SetScraperPoster(presentEvent);

-        }

-        const cList<cEvent> *events = schedule->Events();

-        if (events && presentEvent) {

-            const cEvent *nextEvent = events->Next(presentEvent);

-            if (nextEvent) {

-                tokenContainer->AddStringToken((int)eCeMenuChannelsST::nexteventtitle, nextEvent->Title());

-                tokenContainer->AddStringToken((int)eCeMenuChannelsST::nexteventshorttext, nextEvent->ShortText());

-                tokenContainer->AddStringToken((int)eCeMenuChannelsST::nexteventdescription, nextEvent->Description());

-                tokenContainer->AddStringToken((int)eCeMenuChannelsST::nexteventstart, *nextEvent->GetTimeString());

-                tokenContainer->AddStringToken((int)eCeMenuChannelsST::nexteventstop, *nextEvent->GetEndTimeString());

-                tokenContainer->AddStringToken((int)eCeMenuChannelsST::nexteventday, *WeekDayName(nextEvent->StartTime()));

-                tokenContainer->AddStringToken((int)eCeMenuChannelsST::nexteventdate, *ShortDateString(nextEvent->StartTime()));

-                tokenContainer->AddIntToken((int)eCeMenuChannelsIT::nexteventduration, nextEvent->Duration() / 60);

-                tokenContainer->AddIntToken((int)eCeMenuChannelsIT::nexteventdurationhours, nextEvent->Duration() / 3600);

-                tokenContainer->AddStringToken((int)eCeMenuChannelsST::nexteventdurationminutes, *cString::sprintf("%.2d", (nextEvent->Duration() / 60)%60));

-            }

-        }

-    }

-    

-    vector<int> loopInfo;

-    int eventsAvailable = 0;

-    if (schedule) {

-        for (const cEvent *e = schedule->GetPresentEvent(); e; e = schedule->Events()->Next(e)) {

-            eventsAvailable++;

-            if (eventsAvailable == 10)

-                break;

-        }

-    }

-    loopInfo.push_back(eventsAvailable);

-    tokenContainer->CreateLoopTokenContainer(&loopInfo);        

-

-    if (schedule) {

-        int num = 0;

-        for (const cEvent *e = schedule->GetPresentEvent(); e; e = schedule->Events()->Next(e)) {

-            if (num < 2) {

-                num++;

-                continue;

-            }

-            tokenContainer->AddLoopToken(schedulesIndex, num-2, (int)eCeMenuChannelsLT::title, e->Title());

-            tokenContainer->AddLoopToken(schedulesIndex, num-2, (int)eCeMenuChannelsLT::shorttext, e->ShortText());

-            tokenContainer->AddLoopToken(schedulesIndex, num-2, (int)eCeMenuChannelsLT::start, *(e->GetTimeString()));

-            tokenContainer->AddLoopToken(schedulesIndex, num-2, (int)eCeMenuChannelsLT::stop, *(e->GetEndTimeString()));

-            num++;

-            if (num > 11)

-                break;

-        }            

-    }

-    return true;

-}

-

-/******************************************************************

-* cLeMenuTimers

-******************************************************************/

-cLeMenuTimers::cLeMenuTimers(void) {

-    currentTimer = NULL;

-    timer = NULL;

-}

-

-cLeMenuTimers::cLeMenuTimers(const cLeMenuTimers &other) : cListElement(other) {

-    currentTimer = NULL;

-    timer = NULL;

-}

-

-cLeMenuTimers::~cLeMenuTimers(void) {

-}

-

-void cLeMenuTimers::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{title}", (int)eLeMenuTimersST::title);

-    tokenContainer->DefineStringToken("{timerstart}", (int)eLeMenuTimersST::timerstart);

-    tokenContainer->DefineStringToken("{timerstop}", (int)eLeMenuTimersST::timerstop);

-    tokenContainer->DefineStringToken("{day}", (int)eLeMenuTimersST::day);

-    tokenContainer->DefineStringToken("{dayname}", (int)eLeMenuTimersST::dayname);

-    tokenContainer->DefineStringToken("{monthname}", (int)eLeMenuTimersST::monthname);

-    tokenContainer->DefineStringToken("{channelname}", (int)eLeMenuTimersST::channelname);

-    tokenContainer->DefineStringToken("{channelid}", (int)eLeMenuTimersST::channelid);

-    tokenContainer->DefineStringToken("{eventtitle}", (int)eLeMenuTimersST::eventtitle);

-    tokenContainer->DefineStringToken("{eventstart}", (int)eLeMenuTimersST::eventstart);

-    tokenContainer->DefineStringToken("{eventstop}", (int)eLeMenuTimersST::eventstop);

-    tokenContainer->DefineIntToken("{nummenuitem}", (int)eLeMenuTimersIT::nummenuitem);

-    tokenContainer->DefineIntToken("{current}", (int)eLeMenuTimersIT::current);

-    tokenContainer->DefineIntToken("{separator}", (int)eLeMenuTimersIT::separator);

-    tokenContainer->DefineIntToken("{month}", (int)eLeMenuTimersIT::month);

-    tokenContainer->DefineIntToken("{year}", (int)eLeMenuTimersIT::year);

-    tokenContainer->DefineIntToken("{channellogoexists}", (int)eLeMenuTimersIT::channellogoexists);

-    tokenContainer->DefineIntToken("{channelnumber}", (int)eLeMenuTimersIT::channelnumber);

-    tokenContainer->DefineIntToken("{flagactive}", (int)eLeMenuTimersIT::flagactive);

-    tokenContainer->DefineIntToken("{flaginstant}", (int)eLeMenuTimersIT::flaginstant);

-    tokenContainer->DefineIntToken("{flagvps}", (int)eLeMenuTimersIT::flagvps);

-    tokenContainer->DefineIntToken("{flagrecording}", (int)eLeMenuTimersIT::flagrecording);

-    tokenContainer->DefineIntToken("{flagpending}", (int)eLeMenuTimersIT::flagpending);

-    InheritTokenContainer();    

-}

-

-void cLeMenuTimers::ClearCurrentElement(void) {

-   if (wasCurrent && currentTimer) {

-        currentTimer->Close();

-    }

-}

-

-void cLeMenuTimers::Set(const cTimer *timer) {

-    this->timer = timer;

-    dirty = true;

-}

-

-bool cLeMenuTimers::Parse(bool forced) {

-    if (!dirty)

-        return false;

-

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eLeMenuTimersIT::nummenuitem, num);

-    tokenContainer->AddIntToken((int)eLeMenuTimersIT::current, current);

-    tokenContainer->AddIntToken((int)eLeMenuTimersIT::separator, !selectable);

-    tokenContainer->AddIntToken((int)eLeMenuTimersIT::flagactive, timer->HasFlags(tfActive));

-    tokenContainer->AddIntToken((int)eLeMenuTimersIT::flaginstant, timer->HasFlags(tfInstant));

-    tokenContainer->AddIntToken((int)eLeMenuTimersIT::flagvps, timer->HasFlags(tfVps));

-    tokenContainer->AddIntToken((int)eLeMenuTimersIT::flagrecording, timer->Recording());

-    tokenContainer->AddIntToken((int)eLeMenuTimersIT::flagpending, timer->Pending());

-    

-    const char *file = Setup.FoldersInTimerMenu ? NULL : strrchr(timer->File(), FOLDERDELIMCHAR);

-    if (file && strcmp(file + 1, TIMERMACRO_TITLE) && strcmp(file + 1, TIMERMACRO_EPISODE))

-        file++;

-    else

-        file = timer->File();

-    tokenContainer->AddStringToken((int)eLeMenuTimersST::title, file);

-    tokenContainer->AddStringToken((int)eLeMenuTimersST::timerstart, *cString::sprintf("%02d:%02d", timer->Start() / 100, timer->Start() % 100));

-    tokenContainer->AddStringToken((int)eLeMenuTimersST::timerstop, *cString::sprintf("%02d:%02d", timer->Stop() / 100, timer->Stop() % 100));

-    

-    cString day("");

-    cString dayName("");

-    if (timer->WeekDays())

-        day = timer->PrintDay(0, timer->WeekDays(), false);

-    else if (timer->Day() - time(NULL) < 28 * SECSINDAY) {

-        day = itoa(timer->GetMDay(timer->Day()));

-        dayName = WeekDayName(timer->Day());

-    } else {

-        struct tm tm_r;

-        time_t Day = timer->Day();

-        localtime_r(&Day, &tm_r);

-        char buffer[16];

-        strftime(buffer, sizeof(buffer), "%Y%m%d", &tm_r);

-        day = buffer;

-    }

-    

-    struct tm tm_r;

-    time_t timerDate = timer->Day();

-    localtime_r(&timerDate, &tm_r);

-    char buffer[4];

-    strftime(buffer, sizeof(buffer), "%m", &tm_r);

-    int month = atoi(buffer);

-    char buffer2[6];

-    strftime(buffer2, sizeof(buffer2), "%b", &tm_r);

-    char buffer3[6];

-    strftime(buffer3, sizeof(buffer3), "%Y", &tm_r);

-    int year = atoi(buffer3);

-

-    tokenContainer->AddStringToken((int)eLeMenuTimersST::day, *day);

-    tokenContainer->AddStringToken((int)eLeMenuTimersST::dayname, *dayName);

-    tokenContainer->AddIntToken((int)eLeMenuTimersIT::month, month);

-    tokenContainer->AddStringToken((int)eLeMenuTimersST::monthname, buffer2);

-    tokenContainer->AddIntToken((int)eLeMenuTimersIT::year, year);

-

-    const cChannel *channel = timer->Channel();

-    if (channel) {

-        tokenContainer->AddStringToken((int)eLeMenuTimersST::channelname, channel->Name());

-        cString channelID = channel->GetChannelID().ToString();

-        tokenContainer->AddStringToken((int)eLeMenuTimersST::channelid, *channelID);

-        tokenContainer->AddIntToken((int)eLeMenuTimersIT::channellogoexists, imgCache->LogoExists(*channelID));

-        tokenContainer->AddIntToken((int)eLeMenuTimersIT::channelnumber, channel->Number());

-    }

-

-    const cEvent *event = timer->Event();

-    if (event) {

-        tokenContainer->AddStringToken((int)eLeMenuTimersST::eventtitle, event->Title());

-        tokenContainer->AddStringToken((int)eLeMenuTimersST::eventstart, *event->GetTimeString());

-        tokenContainer->AddStringToken((int)eLeMenuTimersST::eventstop, *event->GetEndTimeString());

-    }

-    return true;

-}

-

-void cLeMenuTimers::RenderCurrent(void) {

-    if (!currentTimer)

-        return;

-    currentTimer->Set(timer);

-    currentTimer->SetListPosition(container.X(), container.Y(), container.Width(), container.Height());

-    currentTimer->Parse();

-}

-

-/******************************************************************

-* cCeMenuTimers

-******************************************************************/

-cCeMenuTimers::cCeMenuTimers(void) {

-    timer = NULL;

-}

-

-cCeMenuTimers::~cCeMenuTimers(void) {

-

-}

-

-void cCeMenuTimers::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{title}", (int)eCeMenuTimersST::title);

-    tokenContainer->DefineStringToken("{timerstart}", (int)eCeMenuTimersST::timerstart);

-    tokenContainer->DefineStringToken("{timerstop}", (int)eCeMenuTimersST::timerstop);

-    tokenContainer->DefineStringToken("{day}", (int)eCeMenuTimersST::day);

-    tokenContainer->DefineStringToken("{dayname}", (int)eCeMenuTimersST::dayname);

-    tokenContainer->DefineStringToken("{monthname}", (int)eCeMenuTimersST::monthname);

-    tokenContainer->DefineStringToken("{channelname}", (int)eCeMenuTimersST::channelname);

-    tokenContainer->DefineStringToken("{channelid}", (int)eCeMenuTimersST::channelid);

-    tokenContainer->DefineStringToken("{eventtitle}", (int)eCeMenuTimersST::eventtitle);

-    tokenContainer->DefineStringToken("{eventstart}", (int)eCeMenuTimersST::eventstart);

-    tokenContainer->DefineStringToken("{eventstop}", (int)eCeMenuTimersST::eventstop);

-    tokenContainer->DefineStringToken("{eventshorttext}", (int)eCeMenuTimersST::eventshorttext);

-    tokenContainer->DefineStringToken("{eventdescription}", (int)eCeMenuTimersST::eventdescription);

-    tokenContainer->DefineStringToken("{posterpath}", (int)eCeMenuTimersST::posterpath);

-    tokenContainer->DefineIntToken("{menuitemx}", (int)eCeMenuTimersIT::menuitemx);

-    tokenContainer->DefineIntToken("{menuitemy}", (int)eCeMenuTimersIT::menuitemy);

-    tokenContainer->DefineIntToken("{menuitemwidth}", (int)eCeMenuTimersIT::menuitemwidth);

-    tokenContainer->DefineIntToken("{menuitemheight}", (int)eCeMenuTimersIT::menuitemheight);

-    tokenContainer->DefineIntToken("{month}", (int)eCeMenuTimersIT::month);

-    tokenContainer->DefineIntToken("{year}", (int)eCeMenuTimersIT::year);

-    tokenContainer->DefineIntToken("{channellogoexists}", (int)eCeMenuTimersIT::channellogoexists);

-    tokenContainer->DefineIntToken("{channelnumber}", (int)eCeMenuTimersIT::channelnumber);

-    tokenContainer->DefineIntToken("{flagactive}", (int)eCeMenuTimersIT::flagactive);

-    tokenContainer->DefineIntToken("{flaginstant}", (int)eCeMenuTimersIT::flaginstant);

-    tokenContainer->DefineIntToken("{flagvps}", (int)eCeMenuTimersIT::flagvps);

-    tokenContainer->DefineIntToken("{flagrecording}", (int)eCeMenuTimersIT::flagrecording);

-    tokenContainer->DefineIntToken("{flagpending}", (int)eCeMenuTimersIT::flagpending);

-    tokenContainer->DefineIntToken("{hasposter}", (int)eCeMenuTimersIT::hasposter);

-    tokenContainer->DefineIntToken("{posterwidth}", (int)eCeMenuTimersIT::posterwidth);

-    tokenContainer->DefineIntToken("{posterheight}", (int)eCeMenuTimersIT::posterheight);

-    InheritTokenContainer();

-}

-

-void cCeMenuTimers::Set(const cTimer *timer) {

-    dirty = true;

-    this->timer = timer;

-}

-

-bool cCeMenuTimers::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    if (!dirty)

-        return false;

-

-    tokenContainer->Clear();

-

-    SetListTokens(tokenContainer);

-    tokenContainer->AddIntToken((int)eCeMenuTimersIT::flagactive, timer->HasFlags(tfActive));

-    tokenContainer->AddIntToken((int)eCeMenuTimersIT::flaginstant, timer->HasFlags(tfInstant));

-    tokenContainer->AddIntToken((int)eCeMenuTimersIT::flagvps, timer->HasFlags(tfVps));

-    tokenContainer->AddIntToken((int)eCeMenuTimersIT::flagrecording, timer->Recording());

-    tokenContainer->AddIntToken((int)eCeMenuTimersIT::flagpending, timer->Pending());

-    

-    const char *file = Setup.FoldersInTimerMenu ? NULL : strrchr(timer->File(), FOLDERDELIMCHAR);

-    if (file && strcmp(file + 1, TIMERMACRO_TITLE) && strcmp(file + 1, TIMERMACRO_EPISODE))

-        file++;

-    else

-        file = timer->File();

-    tokenContainer->AddStringToken((int)eCeMenuTimersST::title, file);

-    tokenContainer->AddStringToken((int)eCeMenuTimersST::timerstart, *cString::sprintf("%02d:%02d", timer->Start() / 100, timer->Start() % 100));

-    tokenContainer->AddStringToken((int)eCeMenuTimersST::timerstop, *cString::sprintf("%02d:%02d", timer->Stop() / 100, timer->Stop() % 100));

-    

-    cString day("");

-    cString dayName("");

-    if (timer->WeekDays())

-        day = timer->PrintDay(0, timer->WeekDays(), false);

-    else if (timer->Day() - time(NULL) < 28 * SECSINDAY) {

-        day = itoa(timer->GetMDay(timer->Day()));

-        dayName = WeekDayName(timer->Day());

-    } else {

-        struct tm tm_r;

-        time_t Day = timer->Day();

-        localtime_r(&Day, &tm_r);

-        char buffer[16];

-        strftime(buffer, sizeof(buffer), "%Y%m%d", &tm_r);

-        day = buffer;

-    }

-    

-    struct tm tm_r;

-    time_t timerDate = timer->Day();

-    localtime_r(&timerDate, &tm_r);

-    char buffer[4];

-    strftime(buffer, sizeof(buffer), "%m", &tm_r);

-    int month = atoi(buffer);

-    char buffer2[6];

-    strftime(buffer2, sizeof(buffer2), "%b", &tm_r);

-    char buffer3[6];

-    strftime(buffer3, sizeof(buffer3), "%Y", &tm_r);

-    int year = atoi(buffer3);

-

-    tokenContainer->AddStringToken((int)eCeMenuTimersST::day, *day);

-    tokenContainer->AddStringToken((int)eCeMenuTimersST::dayname, *dayName);

-    tokenContainer->AddIntToken((int)eCeMenuTimersIT::month, month);

-    tokenContainer->AddStringToken((int)eCeMenuTimersST::monthname, buffer2);

-    tokenContainer->AddIntToken((int)eCeMenuTimersIT::year, year);

-

-    const cChannel *channel = timer->Channel();

-    if (channel) {

-        tokenContainer->AddStringToken((int)eCeMenuTimersST::channelname, channel->Name());

-        cString channelID = channel->GetChannelID().ToString();

-        tokenContainer->AddStringToken((int)eCeMenuTimersST::channelid, *channelID);

-        tokenContainer->AddIntToken((int)eCeMenuTimersIT::channellogoexists, imgCache->LogoExists(*channelID));

-        tokenContainer->AddIntToken((int)eCeMenuTimersIT::channelnumber, channel->Number());

-    }

-

-    const cEvent *event = timer->Event();

-    if (event) {

-        tokenContainer->AddStringToken((int)eCeMenuTimersST::eventtitle, event->Title());

-        tokenContainer->AddStringToken((int)eCeMenuTimersST::eventstart, *event->GetTimeString());

-        tokenContainer->AddStringToken((int)eCeMenuTimersST::eventstop, *event->GetEndTimeString());

-        tokenContainer->AddStringToken((int)eCeMenuTimersST::eventshorttext, event->ShortText());

-        tokenContainer->AddStringToken((int)eCeMenuTimersST::eventdescription, event->Description());

-    }

-    return true;

-}

-

-/******************************************************************

-* cLeMenuRecordings

-******************************************************************/

-cLeMenuRecordings::cLeMenuRecordings(void) {

-    currentRecording = NULL;

-    recording = NULL;

-    level = 0;

-    total = 0;

-    New = 0;

-}

-

-cLeMenuRecordings::cLeMenuRecordings(const cLeMenuRecordings &other) : cListElement(other) {

-    currentRecording = NULL;

-    recording = NULL;

-    level = 0;

-    total = 0;

-    New = 0;

-}

-

-cLeMenuRecordings::~cLeMenuRecordings(void) {

-}

-

-void cLeMenuRecordings::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{name}", (int)eLeMenuRecordingsST::name);

-    tokenContainer->DefineStringToken("{epgname}", (int)eLeMenuRecordingsST::epgname);

-    tokenContainer->DefineStringToken("{shorttext}", (int)eLeMenuRecordingsST::shorttext);

-    tokenContainer->DefineStringToken("{description}", (int)eLeMenuRecordingsST::description);

-    tokenContainer->DefineStringToken("{date}", (int)eLeMenuRecordingsST::date);

-    tokenContainer->DefineStringToken("{time}", (int)eLeMenuRecordingsST::time);

-    tokenContainer->DefineStringToken("{durationminutes}", (int)eLeMenuRecordingsST::durationminutes);

-    tokenContainer->DefineStringToken("{durationeventminutes}", (int)eLeMenuRecordingsST::durationeventminutes);

-    tokenContainer->DefineStringToken("{thumbnailpath}", (int)eLeMenuRecordingsST::thumbnailpath);

-    tokenContainer->DefineStringToken("{posterpath}", (int)eLeMenuRecordingsST::posterpath);

-    tokenContainer->DefineIntToken("{nummenuitem}", (int)eLeMenuRecordingsIT::nummenuitem);

-    tokenContainer->DefineIntToken("{current}", (int)eLeMenuRecordingsIT::current);

-    tokenContainer->DefineIntToken("{new}", (int)eLeMenuRecordingsIT::isnew);

-    tokenContainer->DefineIntToken("{percentseen}", (int)eLeMenuRecordingsIT::percentseen);

-    tokenContainer->DefineIntToken("{watched}", (int)eLeMenuRecordingsIT::watched);

-    tokenContainer->DefineIntToken("{cutted}", (int)eLeMenuRecordingsIT::cutted);

-    tokenContainer->DefineIntToken("{folder}", (int)eLeMenuRecordingsIT::folder);

-    tokenContainer->DefineIntToken("{daynumeric}", (int)eLeMenuRecordingsIT::daynumeric);

-    tokenContainer->DefineIntToken("{month}", (int)eLeMenuRecordingsIT::month);

-    tokenContainer->DefineIntToken("{year}", (int)eLeMenuRecordingsIT::year);

-    tokenContainer->DefineIntToken("{duration}", (int)eLeMenuRecordingsIT::duration);

-    tokenContainer->DefineIntToken("{durationhours}", (int)eLeMenuRecordingsIT::durationhours);

-    tokenContainer->DefineIntToken("{durationevent}", (int)eLeMenuRecordingsIT::durationevent);

-    tokenContainer->DefineIntToken("{durationeventhours}", (int)eLeMenuRecordingsIT::durationeventhours);

-    tokenContainer->DefineIntToken("{numrecordingsfolder}", (int)eLeMenuRecordingsIT::numrecordingsfolder);

-    tokenContainer->DefineIntToken("{newrecordingsfolder}", (int)eLeMenuRecordingsIT::newrecordingsfolder);

-    tokenContainer->DefineIntToken("{hasposterthumbnail}", (int)eLeMenuRecordingsIT::hasposterthumbnail);

-    tokenContainer->DefineIntToken("{thumbnailwidth}", (int)eLeMenuRecordingsIT::thumbnailwidth);

-    tokenContainer->DefineIntToken("{thumbnailheight}", (int)eLeMenuRecordingsIT::thumbnailheight);

-    tokenContainer->DefineIntToken("{hasposter}", (int)eLeMenuRecordingsIT::hasposter);

-    tokenContainer->DefineIntToken("{posterwidth}", (int)eLeMenuRecordingsIT::posterwidth);

-    tokenContainer->DefineIntToken("{posterheight}", (int)eLeMenuRecordingsIT::posterheight);

-    InheritTokenContainer();

-}

-

-void cLeMenuRecordings::ClearCurrentElement(void) {

-   if (wasCurrent && currentRecording) {

-        currentRecording->Close();

-    }

-}

-

-void cLeMenuRecordings::Set(const cRecording *recording, int level, int total, int New) {

-    this->recording = recording;

-    this->level = level;

-    this->total = total;

-    this->New = New;

-    dirty = true;

-}

-

-bool cLeMenuRecordings::Parse(bool forced) {

-    if (!dirty)

-        return false;

-

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::nummenuitem, num);

-    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::current, current);

-    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::separator, !selectable);

-    bool isFolder = (total > 0) ? true : false;

-    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::folder, isFolder);

-

-    char *recName = RecName(recording->Name(), level);

-    tokenContainer->AddStringToken((int)eLeMenuRecordingsST::name, recName);

-    delete[] recName;

-

-    const cRecording *usedRecording = recording;

-

-    if (isFolder) {

-        char *folderName = FolderName(recording->Name(), level);

-        cRecordingsFolderInfo::cFolderInfo *folderInfo = recFolderInfo.Get(folderName);

-        delete[] folderName;

-        if (folderInfo) {

-            cRecording *newestRec = Recordings.GetByName(*folderInfo->LatestFileName);

-            if (newestRec) {

-                usedRecording = newestRec;

-            }

-            delete folderInfo;

-        }

-    }

-    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::isnew, usedRecording->IsNew());

-

-    int percSeen = 0;

-#if APIVERSNUM < 20108

-    percSeen = -1;

-#else

-    percSeen = 0;

-    int framesSeen = usedRecording->GetResume();

-    int framesTotal = usedRecording->NumFrames();

-    if (framesTotal > 0) {

-        percSeen = (double)framesSeen / (double)framesTotal * 100;

-    }

-#endif

-    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::percentseen, percSeen);

-    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::newrecordingsfolder, New);

-    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::numrecordingsfolder, total);

-    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::cutted, usedRecording->IsEdited());

-

-    int recDuration = usedRecording->LengthInSeconds();

-    bool watched = false;

-    if (usedRecording->IsEdited()) {

-        if (percSeen >= 85)

-            watched = true;

-    } else {

-        int watchedLimit = recDuration * 85 / 100 - (Setup.MarginStop + 5)*60;

-        int watchedTime = percSeen * recDuration / 100;

-        if (watchedLimit > 0 && watchedTime > 0 && (watchedTime > watchedLimit))

-            watched = true;

-    }

-    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::watched, watched);

-

-    const cEvent *event = NULL;

-    const cRecordingInfo *info = usedRecording->Info();

-    if (!info) return true;

-    event = info->GetEvent();

-    if (!event) return true;

-

-    cString recDate = event->GetDateString();

-    cString recTime = event->GetTimeString();

-    if (strstr(*recDate, "1970")) {

-        time_t start = usedRecording->Start();

-        recDate = DateString(start);

-        recTime = TimeString(start);

-    }

-

-    time_t startTime = event->StartTime();

-    if (!startTime)

-        startTime = usedRecording->Start();

-    struct tm * sStartTime = localtime(&startTime);

-    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::year, sStartTime->tm_year + 1900);

-    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::daynumeric, sStartTime->tm_mday);

-    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::month, sStartTime->tm_mon+1);

-

-    int duration = event->Duration() / 60;

-    recDuration = (recDuration>0)?(recDuration / 60):0;

-    tokenContainer->AddStringToken((int)eLeMenuRecordingsST::date, *recDate);

-    tokenContainer->AddStringToken((int)eLeMenuRecordingsST::time, *recTime);

-    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::duration, recDuration);

-    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::durationhours, recDuration / 60);

-    tokenContainer->AddStringToken((int)eLeMenuRecordingsST::durationminutes, *cString::sprintf("%.2d", recDuration%60));

-    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::durationevent, duration);

-    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::durationeventhours, duration / 60);

-    tokenContainer->AddStringToken((int)eLeMenuRecordingsST::durationeventminutes, *cString::sprintf("%.2d", duration%60));

-

-    tokenContainer->AddStringToken((int)eLeMenuRecordingsST::shorttext, info->ShortText());

-    tokenContainer->AddStringToken((int)eLeMenuRecordingsST::description, info->Description());

-

-    SetScraperRecordingPoster(tokenContainer, usedRecording, true);

-

-    return true;

-}

-

-void cLeMenuRecordings::RenderCurrent(void) {

-    if (!currentRecording)

-        return;

-    currentRecording->Set(recording, level, total, New);

-    currentRecording->SetListPosition(container.X(), container.Y(), container.Width(), container.Height());

-    currentRecording->Parse();

-}

-

-char *cLeMenuRecordings::RecName(const char *path, int level) {

-    char *recName;

-    const char *startName = path;

-    for (int i = 0; i < level; i++) {

-        startName = strchr(startName, FOLDERDELIMCHAR);

-        startName++;

-    }

-    const char *endName = startName;

-    if (endName = strchr(endName, FOLDERDELIMCHAR)) {

-        int len = endName - startName;

-        recName = new char[len+1];

-        strncpy(recName, startName, len);

-        recName[len] = 0;

-    } else {

-        recName = strdup(startName);

-    }

-    return recName;

-}

-

-char *cLeMenuRecordings::FolderName(const char *path, int level) {

-    char *folderName;

-    const char *endName = path;

-    bool foundEnd = false;

-    for (int i = 0; i <= level; i++) {

-        endName = strchr(endName, FOLDERDELIMCHAR);

-        if (!endName) {

-            foundEnd = false;

-        }

-        foundEnd = true;

-        endName++;

-    }

-    if (foundEnd) {

-        int len = endName - path - 1;

-        folderName = new char[len+1];

-        strncpy(folderName, path, len);

-        folderName[len] = 0;

-    } else {

-        folderName = strdup(path);

-    }

-    return folderName;

-}

-

-/******************************************************************

-* cCeMenuRecordings

-******************************************************************/

-cCeMenuRecordings::cCeMenuRecordings(void) {

-    recording = NULL;

-    level = 0;

-    total = 0;

-    New = 0;

-}

-

-cCeMenuRecordings::~cCeMenuRecordings(void) {

-}

-

-void cCeMenuRecordings::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{name}", (int)eCeMenuRecordingsST::name);

-    tokenContainer->DefineStringToken("{epgname}", (int)eCeMenuRecordingsST::epgname);

-    tokenContainer->DefineStringToken("{shorttext}", (int)eCeMenuRecordingsST::shorttext);

-    tokenContainer->DefineStringToken("{description}", (int)eCeMenuRecordingsST::description);

-    tokenContainer->DefineStringToken("{date}", (int)eCeMenuRecordingsST::date);

-    tokenContainer->DefineStringToken("{time}", (int)eCeMenuRecordingsST::time);

-    tokenContainer->DefineStringToken("{durationminutes}", (int)eCeMenuRecordingsST::durationminutes);

-    tokenContainer->DefineStringToken("{durationeventminutes}", (int)eCeMenuRecordingsST::durationeventminutes);

-    tokenContainer->DefineStringToken("{thumbnailpath}", (int)eCeMenuRecordingsST::thumbnailpath);

-    tokenContainer->DefineStringToken("{posterpath}", (int)eCeMenuRecordingsST::posterpath);

-    tokenContainer->DefineIntToken("{menuitemx}", (int)eCeMenuRecordingsIT::menuitemx);

-    tokenContainer->DefineIntToken("{menuitemy}", (int)eCeMenuRecordingsIT::menuitemy);

-    tokenContainer->DefineIntToken("{menuitemwidth}", (int)eCeMenuRecordingsIT::menuitemwidth);

-    tokenContainer->DefineIntToken("{menuitemheight}", (int)eCeMenuRecordingsIT::menuitemheight);

-    tokenContainer->DefineIntToken("{new}", (int)eCeMenuRecordingsIT::isnew);

-    tokenContainer->DefineIntToken("{percentseen}", (int)eCeMenuRecordingsIT::percentseen);

-    tokenContainer->DefineIntToken("{watched}", (int)eCeMenuRecordingsIT::watched);

-    tokenContainer->DefineIntToken("{cutted}", (int)eCeMenuRecordingsIT::cutted);

-    tokenContainer->DefineIntToken("{folder}", (int)eCeMenuRecordingsIT::folder);

-    tokenContainer->DefineIntToken("{daynumeric}", (int)eCeMenuRecordingsIT::daynumeric);

-    tokenContainer->DefineIntToken("{month}", (int)eCeMenuRecordingsIT::month);

-    tokenContainer->DefineIntToken("{year}", (int)eCeMenuRecordingsIT::year);

-    tokenContainer->DefineIntToken("{duration}", (int)eCeMenuRecordingsIT::duration);

-    tokenContainer->DefineIntToken("{durationhours}", (int)eCeMenuRecordingsIT::durationhours);

-    tokenContainer->DefineIntToken("{durationevent}", (int)eCeMenuRecordingsIT::durationevent);

-    tokenContainer->DefineIntToken("{durationeventhours}", (int)eCeMenuRecordingsIT::durationeventhours);

-    tokenContainer->DefineIntToken("{numrecordingsfolder}", (int)eCeMenuRecordingsIT::numrecordingsfolder);

-    tokenContainer->DefineIntToken("{newrecordingsfolder}", (int)eCeMenuRecordingsIT::newrecordingsfolder);

-    tokenContainer->DefineIntToken("{hasposterthumbnail}", (int)eCeMenuRecordingsIT::hasposterthumbnail);

-    tokenContainer->DefineIntToken("{thumbnailwidth}", (int)eCeMenuRecordingsIT::thumbnailwidth);

-    tokenContainer->DefineIntToken("{thumbnailheight}", (int)eCeMenuRecordingsIT::thumbnailheight);

-    tokenContainer->DefineIntToken("{hasposter}", (int)eCeMenuRecordingsIT::hasposter);

-    tokenContainer->DefineIntToken("{posterwidth}", (int)eCeMenuRecordingsIT::posterwidth);

-    tokenContainer->DefineIntToken("{posterheight}", (int)eCeMenuRecordingsIT::posterheight);

-    InheritTokenContainer();

-}

-

-void cCeMenuRecordings::Set(const cRecording *recording, int level, int total, int New) {

-    this->recording = recording;

-    this->level = level;

-    this->total = total;

-    this->New = New;

-    dirty = true;

-}

-

-bool cCeMenuRecordings::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    if (!dirty)

-        return false;

-

-    tokenContainer->Clear();

-    SetListTokens(tokenContainer);

-    bool isFolder = (total > 0) ? true : false;

-    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::folder, isFolder);

-

-    string name = recording->Name() ? recording->Name() : "";

-    string buffer = "";

-    stringstream folderName;

-    try {

-        vector<string> tokens;

-        istringstream f(name.c_str());

-        string s;

-        int i=0;

-        while (getline(f, s, FOLDERDELIMCHAR)) {

-            tokens.push_back(s);

-            if (isFolder && i <= level) {

-                if (i > 0)

-                    folderName << FOLDERDELIMCHAR;

-                folderName << s;

-                i++;

-            }

-        }

-        buffer = tokens.at(level);

-        if (!isFolder && recording->IsEdited()) {

-            buffer = buffer.substr(1);

-        }

-    } catch (...) {

-        buffer = name.c_str();

-    }

-

-    const cRecording *usedRecording = recording;

-

-    if (isFolder) {

-        cRecordingsFolderInfo::cFolderInfo *folderInfo = recFolderInfo.Get(folderName.str().c_str());

-        if (folderInfo) {

-            cRecording *newestRec = Recordings.GetByName(*folderInfo->LatestFileName);

-            if (newestRec) {

-                usedRecording = newestRec;

-            }

-            delete folderInfo;

-        }

-    }

-

-    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::name, buffer.c_str());

-    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::isnew, usedRecording->IsNew());

-

-    int percSeen = 0;

-#if APIVERSNUM < 20108

-    percSeen = -1;

-#else

-    percSeen = 0;

-    int framesSeen = usedRecording->GetResume();

-    int framesTotal = usedRecording->NumFrames();

-    if (framesTotal > 0) {

-        percSeen = (double)framesSeen / (double)framesTotal * 100;

-    }

-#endif

-    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::percentseen, percSeen);

-    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::newrecordingsfolder, New);

-    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::numrecordingsfolder, total);

-    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::cutted, usedRecording->IsEdited());

-

-    int recDuration = usedRecording->LengthInSeconds();

-    bool watched = false;

-    if (usedRecording->IsEdited()) {

-        if (percSeen >= 85)

-            watched = true;

-    } else {

-        int watchedLimit = recDuration * 85 / 100 - (Setup.MarginStop + 5)*60;

-        int watchedTime = percSeen * recDuration / 100;

-        if (watchedLimit > 0 && watchedTime > 0 && (watchedTime > watchedLimit))

-            watched = true;

-    }

-    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::watched, watched);

-

-    const cEvent *event = NULL;

-    const cRecordingInfo *info = usedRecording->Info();

-    if (!info) return true;

-    event = info->GetEvent();

-    if (!event) return true;

-

-    cString recDate = event->GetDateString();

-    cString recTime = event->GetTimeString();

-    if (strstr(*recDate, "1970")) {

-        time_t start = usedRecording->Start();

-        recDate = DateString(start);

-        recTime = TimeString(start);

-    }

-

-    time_t startTime = event->StartTime();

-    if (!startTime)

-        startTime = usedRecording->Start();

-    struct tm * sStartTime = localtime(&startTime);

-    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::year, sStartTime->tm_year + 1900);

-    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::daynumeric, sStartTime->tm_mday);

-    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::month, sStartTime->tm_mon+1);

-

-    int duration = event->Duration() / 60;

-    recDuration = (recDuration>0)?(recDuration / 60):0;

-    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::date, *recDate);

-    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::time, *recTime);

-    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::duration, recDuration);

-    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::durationhours, recDuration / 60);

-    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::durationminutes, *cString::sprintf("%.2d", recDuration%60));

-    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::durationevent, duration);

-    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::durationeventhours, duration / 60);

-    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::durationeventminutes, *cString::sprintf("%.2d", duration%60));

-    

-    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::shorttext, info->ShortText());

-    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::description, info->Description());

-

-    SetScraperRecordingPoster(tokenContainer, usedRecording, false);

-

-    return true;

-}

-

-/******************************************************************

-* cLeMenuPlugin

-******************************************************************/

-cLeMenuPlugin::cLeMenuPlugin(void) {

-    currentPlugin = NULL;

-    plugId = -1;

-    plugMenuId = -1;

-}

-

-cLeMenuPlugin::cLeMenuPlugin(const cLeMenuPlugin &other) : cListElement(other) {

-    currentPlugin = NULL;

-    plugId = -1;

-    plugMenuId = -1;

-}

-

-cLeMenuPlugin::~cLeMenuPlugin(void) {

-}

-

-void cLeMenuPlugin::SetTokenContainer(void) {

-    if (plugId == -1 || plugMenuId == -1)

-        return;

-    skindesignerapi::cTokenContainer *tkPlugMenu = plgManager->GetTokenContainer(plugId, plugMenuId);

-    tokenContainer = new skindesignerapi::cTokenContainer(*tkPlugMenu);

-    InheritTokenContainer();

-}

-

-void cLeMenuPlugin::ClearCurrentElement(void) {

-    if (wasCurrent && currentPlugin) {

-        currentPlugin->Close();

-    }

-}

-

-void cLeMenuPlugin::Set(skindesignerapi::cTokenContainer *tk) {

-    tokenContainer->Clear();

-    tokenContainer->SetTokens(tk);

-    dirty = true;

-}

-

-bool cLeMenuPlugin::Parse(bool forced) {

-    if (!dirty)

-        return false;

-    tokenContainer->AddIntToken(0, current);

-    return true;

-}

-

-void cLeMenuPlugin::RenderCurrent(void) {

-    if (!currentPlugin)

-        return;

-    currentPlugin->Set(tokenContainer);

-    currentPlugin->SetListPosition(container.X(), container.Y(), container.Width(), container.Height());

-    currentPlugin->Parse();

-}

-

-/******************************************************************

-* cCeMenuPlugin

-******************************************************************/

-cCeMenuPlugin::cCeMenuPlugin(void) {

-    plugId = -1;

-    plugMenuId = -1;

-}

-

-cCeMenuPlugin::~cCeMenuPlugin(void) {

-}

-

-void cCeMenuPlugin::SetTokenContainer(void) {

-    if (plugId == -1 || plugMenuId == -1)

-        return;

-    skindesignerapi::cTokenContainer *tkPlugMenu = plgManager->GetTokenContainer(plugId, plugMenuId);

-    tokenContainer = new skindesignerapi::cTokenContainer(*tkPlugMenu);

-    InheritTokenContainer();

-}

-

-void cCeMenuPlugin::Set(skindesignerapi::cTokenContainer *tk) {

-    tokenContainer->Clear();

-    tokenContainer->SetTokens(tk);

-    dirty = true;

-}

-

-bool cCeMenuPlugin::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    if (!dirty)

-        return false;

-    return true;

-}

-

-/******************************************************************

-* cLeAudioTracks

-******************************************************************/

-cLeAudioTracks::cLeAudioTracks(void) {

-    text = NULL;

-}

-

-cLeAudioTracks::~cLeAudioTracks(void) {

-    free(text);

-}

-

-void cLeAudioTracks::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{title}", (int)eLeDisplayTracksST::title);

-    tokenContainer->DefineIntToken("{nummenuitem}", (int)eLeDisplayTracksIT::nummenuitem);

-    tokenContainer->DefineIntToken("{current}", (int)eLeDisplayTracksIT::current);

-    InheritTokenContainer();

-}

-

-void cLeAudioTracks::Set(const char *text) {

-    if (!text)

-        return;

-    free(this->text);

-    this->text = strdup(text);

-    dirty = true;

-}

-

-bool cLeAudioTracks::Parse(bool forced) {

-    if (!dirty)

-        return false;

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eLeDisplayTracksIT::nummenuitem, num);

-    tokenContainer->AddIntToken((int)eLeDisplayTracksIT::current, current);

-    tokenContainer->AddStringToken((int)eLeDisplayTracksST::title, text);

-    return true;

+#include "listelements.h"
+#include "../config.h"
+#include <sstream>
+#include <algorithm>
+
+/******************************************************************
+* cListElement
+******************************************************************/
+cListElement::cListElement(void) { 
+    dirty = false;
+    num = -1;
+    current = false;
+    wasCurrent = false;
+    selectable = false;
+    currentElement = NULL;
+    menuCat = mcUnknown;
+};
+
+cListElement::cListElement(const cListElement &other) : cViewElement(other) {
+    num = -1;
+    current = false; 
+    selectable = false;     
+    currentElement = NULL;
+}
+
+void cListElement::SetCurrent(bool cur) { 
+    if (!cur && current)
+        wasCurrent = true;
+    else
+        wasCurrent = false;
+    current = cur;
+}
+
+void cListElement::Close(void) {
+    if (current && currentElement) {
+        currentElement->Close();
+    }
+    cViewElement::Close();
+    dirty = false;
+}
+
+void cListElement::Clear(void) {
+    if (current && currentElement) {
+        currentElement->Close();
+    }
+    cViewElement::Clear();
+    dirty = false;
+}
+
+void cListElement::WakeCurrent(void) {
+    if (currentElement) {
+        currentElement->WakeUp();
+    }    
+}
+
+
+char *cListElement::ParseSeparator(const char *text) {
+    const char *start = text;
+    while (*start && (*start == '-' || *start == ' ' || *start == 9)) {
+        start++;
+    }
+    const char *end = start;
+    while (*end && *end != '-') {
+        end++;
+    }
+    int len = end - start;
+    char *ret = (char*)malloc(len);
+    memset(ret, 0, len);
+    strncpy(ret, start, len-1);
+    return ret;
+}
+
+/******************************************************************
+* cCurrentElement
+******************************************************************/
+cCurrentElement::cCurrentElement(void) {
+    listX = 0;
+    listY = 0;
+    listWidth = 0;
+    listHeight = 0;
+}
+
+void cCurrentElement::SetListPosition(int x, int y, int width, int height) {
+    listX = x;
+    listY = y;
+    listWidth = width;
+    listHeight = height;
+}
+
+void cCurrentElement::SetListTokens(skindesignerapi::cTokenContainer *tokenContainer) {
+    tokenContainer->AddIntToken(0, listX);
+    tokenContainer->AddIntToken(1, listY);
+    tokenContainer->AddIntToken(2, listWidth);
+    tokenContainer->AddIntToken(3, listHeight);
+}
+
+/******************************************************************
+* cLeMenuDefault
+******************************************************************/
+cLeMenuDefault::cLeMenuDefault(void) {
+    text = NULL;
+    colX = NULL;
+    colWidths = NULL;
+    plugName = NULL;
+}
+
+cLeMenuDefault::cLeMenuDefault(const cLeMenuDefault &other) : cListElement(other) {
+    text = NULL;
+    colX = NULL;
+    colWidths = NULL;
+    plugName = NULL;
+}
+
+cLeMenuDefault::~cLeMenuDefault(void) {
+
+}
+
+void cLeMenuDefault::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{column1}", (int)eLeMenuDefaultST::column1);
+    tokenContainer->DefineStringToken("{column2}", (int)eLeMenuDefaultST::column2);
+    tokenContainer->DefineStringToken("{column3}", (int)eLeMenuDefaultST::column3);
+    tokenContainer->DefineStringToken("{column4}", (int)eLeMenuDefaultST::column4);
+    tokenContainer->DefineStringToken("{column5}", (int)eLeMenuDefaultST::column5);
+    tokenContainer->DefineStringToken("{column6}", (int)eLeMenuDefaultST::column6);
+    tokenContainer->DefineIntToken("{nummenuitem}", (int)eLeMenuDefaultIT::nummenuitem);
+    tokenContainer->DefineIntToken("{current}", (int)eLeMenuDefaultIT::current);
+    tokenContainer->DefineIntToken("{separator}", (int)eLeMenuDefaultIT::separator);
+    tokenContainer->DefineIntToken("{column2set}", (int)eLeMenuDefaultIT::column2set);
+    tokenContainer->DefineIntToken("{column3set}", (int)eLeMenuDefaultIT::column3set);
+    tokenContainer->DefineIntToken("{column4set}", (int)eLeMenuDefaultIT::column4set);
+    tokenContainer->DefineIntToken("{column5set}", (int)eLeMenuDefaultIT::column5set);
+    tokenContainer->DefineIntToken("{column6set}", (int)eLeMenuDefaultIT::column6set);
+    tokenContainer->DefineIntToken("{column1x}", (int)eLeMenuDefaultIT::column1x);
+    tokenContainer->DefineIntToken("{column2x}", (int)eLeMenuDefaultIT::column2x);
+    tokenContainer->DefineIntToken("{column3x}", (int)eLeMenuDefaultIT::column3x);
+    tokenContainer->DefineIntToken("{column4x}", (int)eLeMenuDefaultIT::column4x);
+    tokenContainer->DefineIntToken("{column5x}", (int)eLeMenuDefaultIT::column5x);
+    tokenContainer->DefineIntToken("{column6x}", (int)eLeMenuDefaultIT::column6x);
+    tokenContainer->DefineIntToken("{column1width}", (int)eLeMenuDefaultIT::column1width);
+    tokenContainer->DefineIntToken("{column2width}", (int)eLeMenuDefaultIT::column2width);
+    tokenContainer->DefineIntToken("{column3width}", (int)eLeMenuDefaultIT::column3width);
+    tokenContainer->DefineIntToken("{column4width}", (int)eLeMenuDefaultIT::column4width);
+    tokenContainer->DefineIntToken("{column5width}", (int)eLeMenuDefaultIT::column5width);
+    tokenContainer->DefineIntToken("{column6width}", (int)eLeMenuDefaultIT::column6width);
+    tokenContainer->DefineIntToken("{column1pb}", (int)eLeMenuDefaultIT::column1pb);
+    tokenContainer->DefineIntToken("{column2pb}", (int)eLeMenuDefaultIT::column2pb);
+    tokenContainer->DefineIntToken("{column3pb}", (int)eLeMenuDefaultIT::column3pb);
+    tokenContainer->DefineIntToken("{column4pb}", (int)eLeMenuDefaultIT::column4pb);
+    tokenContainer->DefineIntToken("{column5pb}", (int)eLeMenuDefaultIT::column5pb);
+    tokenContainer->DefineIntToken("{column6pb}", (int)eLeMenuDefaultIT::column6pb);
+    tokenContainer->DefineIntToken("{column1pbtotalsize}", (int)eLeMenuDefaultIT::column1pbtotalsize);
+    tokenContainer->DefineIntToken("{column2pbtotalsize}", (int)eLeMenuDefaultIT::column2pbtotalsize);
+    tokenContainer->DefineIntToken("{column3pbtotalsize}", (int)eLeMenuDefaultIT::column3pbtotalsize);
+    tokenContainer->DefineIntToken("{column4pbtotalsize}", (int)eLeMenuDefaultIT::column4pbtotalsize);
+    tokenContainer->DefineIntToken("{column5pbtotalsize}", (int)eLeMenuDefaultIT::column5pbtotalsize);
+    tokenContainer->DefineIntToken("{column6pbtotalsize}", (int)eLeMenuDefaultIT::column6pbtotalsize);
+    tokenContainer->DefineIntToken("{column1pbsize}", (int)eLeMenuDefaultIT::column1pbsize);
+    tokenContainer->DefineIntToken("{column2pbsize}", (int)eLeMenuDefaultIT::column2pbsize);
+    tokenContainer->DefineIntToken("{column3pbsize}", (int)eLeMenuDefaultIT::column3pbsize);
+    tokenContainer->DefineIntToken("{column4pbsize}", (int)eLeMenuDefaultIT::column4pbsize);
+    tokenContainer->DefineIntToken("{column5pbsize}", (int)eLeMenuDefaultIT::column5pbsize);
+    tokenContainer->DefineIntToken("{column6pbsize}", (int)eLeMenuDefaultIT::column6pbsize);
+    tokenContainer->DefineIntToken("{setup}", (int)eLeMenuDefaultIT::setup);
+    tokenContainer->DefineIntToken("{commands}", (int)eLeMenuDefaultIT::commands);
+    tokenContainer->DefineIntToken("{fritzbox}", (int)eLeMenuDefaultIT::fritzbox);
+    tokenContainer->DefineIntToken("{systeminfo}", (int)eLeMenuDefaultIT::systeminfo);
+    tokenContainer->DefineIntToken("{mailbox}", (int)eLeMenuDefaultIT::mailbox);
+    tokenContainer->DefineIntToken("{neutrinoepg}", (int)eLeMenuDefaultIT::neutrinoepg);
+    tokenContainer->DefineIntToken("{remotetimers}", (int)eLeMenuDefaultIT::remotetimers);
+    InheritTokenContainer();
+}
+
+void cLeMenuDefault::SetListInfo(int *colX, int *colWidths) {
+    this->colX = colX;
+    this->colWidths = colWidths;
+}
+
+void cLeMenuDefault::SetText(const char *text) {
+    dirty = true;
+    free(this->text);
+    this->text = strdup(text);
+}
+
+bool cLeMenuDefault::Parse(bool forced) {
+    if (!dirty)
+        return false;
+
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eLeMenuDefaultIT::nummenuitem, num);
+    tokenContainer->AddIntToken((int)eLeMenuDefaultIT::current, current);
+    tokenContainer->AddIntToken((int)eLeMenuDefaultIT::separator, !selectable);
+    for (int i = 0; i < MAX_TABS; i++) {
+        bool colUsed = false;
+        const char *s = GetTabbedText(text, i);
+        if (s) {
+            tokenContainer->AddStringToken(i, s);
+            colUsed = true;
+            CheckProgressBar(s, i);
+        }
+        else
+            tokenContainer->AddStringToken(i, "");
+        if (i > 0)
+            tokenContainer->AddIntToken(i + 2, colUsed);
+        tokenContainer->AddIntToken(i + 8, colX[i]);
+        tokenContainer->AddIntToken(i + 14, colWidths[i]);
+    }
+    SetMenuCategory();
+    return true;
+}
+
+const char *cLeMenuDefault::GetTabbedText(const char *s, int tab) {
+    if (!s)
+        return NULL;
+    static char buffer[1000];
+    const char *a = s;
+    const char *b = strchrnul(a, '\t');
+    while (*b && tab-- > 0) {
+        a = b + 1;
+        b = strchrnul(a, '\t');
+    }
+    if (!*b)
+        return (tab <= 0) ? a : NULL;
+    unsigned int n = b - a;
+    if (n >= sizeof(buffer))
+        n = sizeof(buffer) - 1;
+    strncpy(buffer, a, n);
+    buffer[n] = 0;
+    return buffer;
+}
+
+void cLeMenuDefault::SetMenuCategory(void) {
+    if (menuCat >= mcPluginSetup && menuCat <= mcSetupPlugins) {
+        tokenContainer->AddIntToken((int)eLeMenuDefaultIT::setup, 1);
+        return;
+    } else if (menuCat == mcCommand) {
+        tokenContainer->AddIntToken((int)eLeMenuDefaultIT::commands, 1);        
+        return;
+    } 
+
+    if (!plugName) {
+        return;
+    }
+    if (!strcmp(plugName, "fritzbox")) {
+        tokenContainer->AddIntToken((int)eLeMenuDefaultIT::fritzbox, 1);
+    } else if (!strcmp(plugName, "systeminfo")) {
+        tokenContainer->AddIntToken((int)eLeMenuDefaultIT::systeminfo, 1);
+    } else if (!strcmp(plugName, "mailbox")) {
+        tokenContainer->AddIntToken((int)eLeMenuDefaultIT::mailbox, 1);
+    } else if (!strcmp(plugName, "neutrinoepg")) {
+        tokenContainer->AddIntToken((int)eLeMenuDefaultIT::neutrinoepg, 1);
+    } else if (!strcmp(plugName, "remotetimers")) {
+        tokenContainer->AddIntToken((int)eLeMenuDefaultIT::remotetimers, 1);
+    } 
+}
+
+void cLeMenuDefault::CheckProgressBar(const char *text, int tab) {
+    const char *start = strchr(text, '[');
+    if (!start)
+        return;
+    const char *stop = strchr(text, ']');
+    if (!stop)
+        return;
+    int total = stop - start - 1;
+    int len = 0;
+    char *s = (char*)start + 1;
+    while (*s && *s == '|') {
+        len++;
+        s++;
+    }
+    tokenContainer->AddIntToken(20 + tab, 1);
+    tokenContainer->AddIntToken(26 + tab, total);
+    tokenContainer->AddIntToken(32 + tab, len);
+}
+
+/******************************************************************
+* cVeMenuMain
+******************************************************************/
+cVeMenuMain::cVeMenuMain(void) {
+    text = NULL;
+    number = NULL;
+    label = NULL;
+}
+
+cVeMenuMain::~cVeMenuMain(void) {
+    free(text);
+    free(number);
+    free(label);
+}
+
+void cVeMenuMain::SplitText(void) {
+    char *start = skipspace(text);
+    bool found = false;
+    bool doBreak = false;
+    size_t i = 0;
+    char *c = start;
+    while (*c) {
+        if (i==0) {
+            //if text directly starts with nonnumeric, break
+            if (!(*c >= '0' && *c <= '9')) {
+                break;
+            }
+        }
+        if (found) {
+            //if current char is not a figure anymore, break
+            if (!(*c >= '0' && *c <= '9')) {
+                //there has to be a space after the menu item number 
+                //plugins with figures in their name are eval :-)
+                if (*c != ' ')
+                    found = false;
+                doBreak = true;
+            }
+        }
+        if (*c >= '0' && *c <= '9') {
+            found = true;
+        }
+        if (doBreak)
+            break;
+        if (i>4)
+            break;
+        c++;
+        i++;
+    }
+
+    free(number);
+    free(label);
+    if (found) {
+        number = (char*)malloc(i+1);
+        memset(number, 0, i+1);
+        strncpy(number, start, i);
+    } else {
+        number = (char*)malloc(2);
+        memset(number, 0, 2);
+        strncpy(number, "", 1);
+    }
+    label = strdup(skipspace(c));
+}
+
+/******************************************************************
+* cLeMenuMain
+******************************************************************/
+cLeMenuMain::cLeMenuMain(void) {
+    currentMain = NULL;
+}
+
+cLeMenuMain::cLeMenuMain(const cLeMenuMain &other) : cListElement(other) {
+    text = NULL;
+    number = NULL;
+    label = NULL;
+    currentMain = NULL;
+}
+
+cLeMenuMain::~cLeMenuMain(void) {
+}
+
+void cLeMenuMain::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{label}", (int)eLeMenuMainST::label);
+    tokenContainer->DefineStringToken("{number}", (int)eLeMenuMainST::number);
+    tokenContainer->DefineStringToken("{icon}", (int)eLeMenuMainST::icon);
+    tokenContainer->DefineIntToken("{nummenuitem}", (int)eLeMenuMainIT::nummenuitem);
+    tokenContainer->DefineIntToken("{current}", (int)eLeMenuMainIT::current);
+    tokenContainer->DefineIntToken("{separator}", (int)eLeMenuMainIT::separator);
+    InheritTokenContainer();
+}
+
+void cLeMenuMain::ClearCurrentElement(void) {
+    if (wasCurrent && currentMain) {
+        currentMain->Close();
+    }
+}
+
+void cLeMenuMain::SetText(const char *text) {
+    dirty = true;
+    free(this->text);
+    this->text = strdup(text);
+}
+
+bool cLeMenuMain::Parse(bool forced) {
+    if (!dirty)
+        return false;
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eLeMenuMainIT::nummenuitem, num);
+    tokenContainer->AddIntToken((int)eLeMenuMainIT::current, current);
+    tokenContainer->AddIntToken((int)eLeMenuMainIT::separator, !selectable);
+    SplitText();
+    tokenContainer->AddStringToken((int)eLeMenuMainST::number, number);
+    tokenContainer->AddStringToken((int)eLeMenuMainST::label, label);
+    tokenContainer->AddStringToken((int)eLeMenuMainST::icon, imgCache->GetIconName(label).c_str());
+    return true;
+}
+
+void cLeMenuMain::RenderCurrent(void) {
+    if (!currentMain)
+        return;
+    currentMain->SetText(text);
+    currentMain->SetListPosition(container.X(), container.Y(), container.Width(), container.Height());
+    currentMain->Parse();
+}
+
+const char *cLeMenuMain::PluginName(void) {
+    if (!label)
+        return NULL;
+    for (int i = 0; ; i++) {
+        cPlugin *p = cPluginManager::GetPlugin(i);
+        if (p) {
+            const char *mainMenuEntry = p->MainMenuEntry();
+            if (!mainMenuEntry)
+                continue;
+            if (!strcmp(mainMenuEntry, label)) {
+                return p->Name();
+            }
+        } else
+            break;
+    }
+    return NULL;
+}
+
+/******************************************************************
+* cCeMenuMain
+******************************************************************/
+cCeMenuMain::cCeMenuMain(void) {
+
+}
+
+cCeMenuMain::~cCeMenuMain(void) {
+
+}
+
+void cCeMenuMain::SetText(const char *text) {
+    dirty = true;
+    free(this->text);
+    this->text = strdup(text);
+}
+
+void cCeMenuMain::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineIntToken("{menuitemx}", (int)eCeMenuMainIT::menuitemx);
+    tokenContainer->DefineIntToken("{menuitemy}", (int)eCeMenuMainIT::menuitemy);
+    tokenContainer->DefineIntToken("{menuitemwidth}", (int)eCeMenuMainIT::menuitemwidth);
+    tokenContainer->DefineIntToken("{menuitemheight}", (int)eCeMenuMainIT::menuitemheight);
+    tokenContainer->DefineStringToken("{label}", (int)eCeMenuMainST::label);
+    tokenContainer->DefineStringToken("{number}", (int)eCeMenuMainST::number);
+    tokenContainer->DefineStringToken("{icon}", (int)eCeMenuMainST::icon);
+    InheritTokenContainer();
+}
+
+bool cCeMenuMain::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    if (!dirty)
+        return false;
+    tokenContainer->Clear();
+    SplitText();
+    SetListTokens(tokenContainer);
+    tokenContainer->AddStringToken((int)eLeMenuMainST::number, number);
+    tokenContainer->AddStringToken((int)eLeMenuMainST::label, label);
+    tokenContainer->AddStringToken((int)eLeMenuMainST::icon, imgCache->GetIconName(label).c_str());
+    return true;
+}
+
+/******************************************************************
+* cVeMenuSchedules
+******************************************************************/
+cVeMenuSchedules::cVeMenuSchedules(void) {
+    event = NULL;
+    channel = NULL;
+    withDate = false;
+    timerMatch = tmNone;
+    epgSearchFav = false;
+}
+
+/******************************************************************
+* cLeMenuSchedules
+******************************************************************/
+cLeMenuSchedules::cLeMenuSchedules(void) {
+    currentSchedules = NULL;
+    menuCat = mcUnknown;
+}
+
+cLeMenuSchedules::cLeMenuSchedules(const cLeMenuSchedules &other) : cListElement(other) {
+    currentSchedules = NULL;
+}
+
+cLeMenuSchedules::~cLeMenuSchedules(void) {
+}
+
+void cLeMenuSchedules::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{title}", (int)eLeMenuSchedulesST::title);
+    tokenContainer->DefineStringToken("{shorttext}", (int)eLeMenuSchedulesST::shorttext);
+    tokenContainer->DefineStringToken("{start}", (int)eLeMenuSchedulesST::start);
+    tokenContainer->DefineStringToken("{stop}", (int)eLeMenuSchedulesST::stop);
+    tokenContainer->DefineStringToken("{day}", (int)eLeMenuSchedulesST::day);
+    tokenContainer->DefineStringToken("{date}", (int)eLeMenuSchedulesST::date);
+    tokenContainer->DefineStringToken("{durationminutes}", (int)eLeMenuSchedulesST::durationminutes);
+    tokenContainer->DefineStringToken("{channelname}", (int)eLeMenuSchedulesST::channelname);
+    tokenContainer->DefineStringToken("{channelid}", (int)eLeMenuSchedulesST::channelid);
+    tokenContainer->DefineIntToken("{nummenuitem}", (int)eLeMenuSchedulesIT::nummenuitem);
+    tokenContainer->DefineIntToken("{current}", (int)eLeMenuSchedulesIT::current);
+    tokenContainer->DefineIntToken("{separator}", (int)eLeMenuSchedulesIT::separator);
+    tokenContainer->DefineIntToken("{daynumeric}", (int)eLeMenuSchedulesIT::daynumeric);
+    tokenContainer->DefineIntToken("{month}", (int)eLeMenuSchedulesIT::month);
+    tokenContainer->DefineIntToken("{year}", (int)eLeMenuSchedulesIT::year);
+    tokenContainer->DefineIntToken("{running}", (int)eLeMenuSchedulesIT::running);
+    tokenContainer->DefineIntToken("{elapsed}", (int)eLeMenuSchedulesIT::elapsed);
+    tokenContainer->DefineIntToken("{startsin}", (int)eLeMenuSchedulesIT::startsin);
+    tokenContainer->DefineIntToken("{duration}", (int)eLeMenuSchedulesIT::duration);
+    tokenContainer->DefineIntToken("{durationhours}", (int)eLeMenuSchedulesIT::durationhours);
+    tokenContainer->DefineIntToken("{channelnumber}", (int)eLeMenuSchedulesIT::channelnumber);
+    tokenContainer->DefineIntToken("{channellogoexists}", (int)eLeMenuSchedulesIT::channellogoexists);
+    tokenContainer->DefineIntToken("{whatson}", (int)eLeMenuSchedulesIT::whatson);
+    tokenContainer->DefineIntToken("{whatsonnow}", (int)eLeMenuSchedulesIT::whatsonnow);
+    tokenContainer->DefineIntToken("{whatsonnext}", (int)eLeMenuSchedulesIT::whatsonnext);
+    tokenContainer->DefineIntToken("{whatsonfavorites}", (int)eLeMenuSchedulesIT::whatsonfavorites);
+    tokenContainer->DefineIntToken("{timerpartitial}", (int)eLeMenuSchedulesIT::timerpartitial);
+    tokenContainer->DefineIntToken("{timerfull}", (int)eLeMenuSchedulesIT::timerfull);
+    tokenContainer->DefineIntToken("{hasVPS}", (int)eLeMenuSchedulesIT::hasVPS);
+    InheritTokenContainer();
+}
+
+void cLeMenuSchedules::ClearCurrentElement(void) {
+    if (wasCurrent && currentSchedules) {
+        currentSchedules->Close();
+    }
+}
+
+void cLeMenuSchedules::Set(const cEvent *event, const cChannel *channel, bool withDate, eTimerMatch timerMatch) {
+    dirty = true;
+    this->event = event;
+    this->channel = channel;
+    this->withDate = withDate;
+    this->timerMatch = timerMatch;
+}
+
+bool cLeMenuSchedules::Parse(bool forced) {
+    if (!dirty)
+        return false;
+
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::nummenuitem, num);
+    tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::current, current);
+    tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::separator, !selectable);
+
+    tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::whatson, (menuCat == mcSchedule && !epgSearchFav) ? true : false);
+    tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::whatsonnow, menuCat == mcScheduleNow ? true : false);
+    tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::whatsonnext, menuCat == mcScheduleNext ? true : false);
+    tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::whatsonfavorites, epgSearchFav);
+
+    if (timerMatch == tmFull) {
+        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerpartitial, false);
+        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerfull, true);
+    } else if (timerMatch == tmPartial) {
+        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerpartitial, true);
+        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerfull, false);
+    } else {
+        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerpartitial, false);
+        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerfull, false);
+    }
+
+    if (event) {
+        if (selectable) {
+            tokenContainer->AddStringToken((int)eLeMenuSchedulesST::title, event->Title());
+            tokenContainer->AddStringToken((int)eLeMenuSchedulesST::shorttext, event->ShortText());
+            tokenContainer->AddStringToken((int)eLeMenuSchedulesST::start, *(event->GetTimeString()));
+            tokenContainer->AddStringToken((int)eLeMenuSchedulesST::stop, *(event->GetEndTimeString()));
+            time_t startTime = event->StartTime();
+            struct tm * sStartTime = localtime(&startTime);
+            tokenContainer->AddStringToken((int)eLeMenuSchedulesST::day, *WeekDayName(startTime));
+            tokenContainer->AddStringToken((int)eLeMenuSchedulesST::date, *ShortDateString(startTime));
+            tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::year, sStartTime->tm_year + 1900);
+            tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::daynumeric, sStartTime->tm_mday);
+            tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::month, sStartTime->tm_mon+1);
+
+            bool isRunning = false;
+            time_t now = time(NULL);
+            if ((now >= event->StartTime()) && (now <= event->EndTime()))
+                isRunning = true;
+            tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::running, isRunning);
+            if (isRunning) {
+                tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::elapsed, (now - event->StartTime())/60);
+                tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::startsin, 0);
+            } else {
+                tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::elapsed, 0);
+                tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::startsin, (event->StartTime() - now)/60);
+            }
+            tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::duration, event->Duration() / 60);
+            tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::durationhours, event->Duration() / 3600);
+            tokenContainer->AddStringToken((int)eLeMenuSchedulesST::durationminutes, *cString::sprintf("%.2d", (event->Duration() / 60)%60));
+            tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::hasVPS, (bool)event->Vps());
+        } else {
+            char *sep = ParseSeparator(event->Title());
+            tokenContainer->AddStringToken((int)eLeMenuSchedulesST::title, sep);
+            free(sep);
+        }
+    } else if (!channel) {
+        //Hack für komischen patch von jinx
+        //stringTokens.insert(pair<string,string>("title", dayseparator));        
+    }
+    if (channel) {
+        tokenContainer->AddStringToken((int)eLeMenuSchedulesST::channelname, channel->Name());
+        cString channelID = channel->GetChannelID().ToString();
+        tokenContainer->AddStringToken((int)eLeMenuSchedulesST::channelid, *channelID);
+        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::channelnumber, channel->Number());
+        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::channellogoexists, imgCache->LogoExists(*channelID));
+        if (!event && !selectable) {
+            tokenContainer->AddStringToken((int)eLeMenuSchedulesST::title, channel->Name());
+        }
+    }
+    return true;
+}
+
+void cLeMenuSchedules::RenderCurrent(void) {
+    if (!currentSchedules)
+        return;
+    currentSchedules->Set(event, channel, withDate, timerMatch, menuCat);
+    currentSchedules->SetEpgSearchFav(epgSearchFav);
+    currentSchedules->SetListPosition(container.X(), container.Y(), container.Width(), container.Height());
+    currentSchedules->Parse();
+}
+
+/******************************************************************
+* cCeMenuSchedules
+******************************************************************/
+cCeMenuSchedules::cCeMenuSchedules(void) {
+    schedulesIndex = -1;
+}
+
+cCeMenuSchedules::~cCeMenuSchedules(void) {
+}
+
+void cCeMenuSchedules::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{title}", (int)eCeMenuSchedulesST::title);
+    tokenContainer->DefineStringToken("{shorttext}", (int)eCeMenuSchedulesST::shorttext);
+    tokenContainer->DefineStringToken("{description}", (int)eCeMenuSchedulesST::description);
+    tokenContainer->DefineStringToken("{start}", (int)eCeMenuSchedulesST::start);
+    tokenContainer->DefineStringToken("{stop}", (int)eCeMenuSchedulesST::stop);
+    tokenContainer->DefineStringToken("{day}", (int)eCeMenuSchedulesST::day);
+    tokenContainer->DefineStringToken("{date}", (int)eCeMenuSchedulesST::date);
+    tokenContainer->DefineStringToken("{channelname}", (int)eCeMenuSchedulesST::channelname);
+    tokenContainer->DefineStringToken("{channelid}", (int)eCeMenuSchedulesST::channelid);
+    tokenContainer->DefineStringToken("{posterpath}", (int)eCeMenuSchedulesST::posterpath);
+    tokenContainer->DefineStringToken("{bannerpath}", (int)eCeMenuSchedulesST::bannerpath);
+    tokenContainer->DefineIntToken("{menuitemx}", (int)eCeMenuSchedulesIT::menuitemx);
+    tokenContainer->DefineIntToken("{menuitemy}", (int)eCeMenuSchedulesIT::menuitemy);
+    tokenContainer->DefineIntToken("{menuitemwidth}", (int)eCeMenuSchedulesIT::menuitemwidth);
+    tokenContainer->DefineIntToken("{menuitemheight}", (int)eCeMenuSchedulesIT::menuitemheight);
+    tokenContainer->DefineIntToken("{daynumeric}", (int)eCeMenuSchedulesIT::daynumeric);
+    tokenContainer->DefineIntToken("{month}", (int)eCeMenuSchedulesIT::month);
+    tokenContainer->DefineIntToken("{year}", (int)eCeMenuSchedulesIT::year);
+    tokenContainer->DefineIntToken("{running}", (int)eCeMenuSchedulesIT::running);
+    tokenContainer->DefineIntToken("{elapsed}", (int)eCeMenuSchedulesIT::elapsed);
+    tokenContainer->DefineIntToken("{duration}", (int)eCeMenuSchedulesIT::duration);
+    tokenContainer->DefineIntToken("{durationhours}", (int)eCeMenuSchedulesIT::durationhours);
+    tokenContainer->DefineIntToken("{durationminutes}", (int)eCeMenuSchedulesIT::durationminutes);
+    tokenContainer->DefineIntToken("{channelnumber}", (int)eCeMenuSchedulesIT::channelnumber);
+    tokenContainer->DefineIntToken("{channellogoexists}", (int)eCeMenuSchedulesIT::channellogoexists);
+    tokenContainer->DefineIntToken("{hasposter}", (int)eCeMenuSchedulesIT::hasposter);
+    tokenContainer->DefineIntToken("{posterwidth}", (int)eCeMenuSchedulesIT::posterwidth);
+    tokenContainer->DefineIntToken("{posterheight}", (int)eCeMenuSchedulesIT::posterheight);
+    tokenContainer->DefineIntToken("{hasbanner}", (int)eCeMenuSchedulesIT::hasbanner);
+    tokenContainer->DefineIntToken("{bannerwidth}", (int)eCeMenuSchedulesIT::bannerwidth);
+    tokenContainer->DefineIntToken("{bannerheight}", (int)eCeMenuSchedulesIT::bannerheight);
+    tokenContainer->DefineIntToken("{whatson}", (int)eCeMenuSchedulesIT::whatson);
+    tokenContainer->DefineIntToken("{whatsonnow}", (int)eCeMenuSchedulesIT::whatsonnow);
+    tokenContainer->DefineIntToken("{whatsonnext}", (int)eCeMenuSchedulesIT::whatsonnext);
+    tokenContainer->DefineIntToken("{whatsonfavorites}", (int)eCeMenuSchedulesIT::whatsonfavorites);
+    tokenContainer->DefineIntToken("{timerpartitial}", (int)eCeMenuSchedulesIT::timerpartitial);
+    tokenContainer->DefineIntToken("{timerfull}", (int)eCeMenuSchedulesIT::timerfull);
+    tokenContainer->DefineLoopToken("{schedule[title]}", (int)eCeMenuSchedulesLT::title);
+    tokenContainer->DefineLoopToken("{schedule[shorttext]}", (int)eCeMenuSchedulesLT::shorttext);
+    tokenContainer->DefineLoopToken("{schedule[start]}", (int)eCeMenuSchedulesLT::start);
+    tokenContainer->DefineLoopToken("{schedule[stop]}", (int)eCeMenuSchedulesLT::stop);
+    schedulesIndex = tokenContainer->LoopIndex("schedule");
+    InheritTokenContainer();    
+}
+
+void cCeMenuSchedules::Set(const cEvent *event, const cChannel *channel, bool withDate, eTimerMatch timerMatch, eMenuCategory menuCat) {
+    dirty = true;
+    this->menuCat = menuCat;
+    this->event = event;
+    this->channel = channel;
+    this->withDate = withDate;
+    this->timerMatch = timerMatch;
+}
+
+bool cCeMenuSchedules::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    if (!dirty)
+        return false;
+    tokenContainer->Clear();
+    SetListTokens(tokenContainer);
+    tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::whatson, (menuCat == mcSchedule && !epgSearchFav) ? true : false);
+    tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::whatsonnow, menuCat == mcScheduleNow ? true : false);
+    tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::whatsonnext, menuCat == mcScheduleNext ? true : false);
+    tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::whatsonfavorites, epgSearchFav);
+    if (timerMatch == tmFull) {
+        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerpartitial, false);
+        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerfull, true);
+    } else if (timerMatch == tmPartial) {
+        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerpartitial, true);
+        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerfull, false);
+    } else {
+        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerpartitial, false);
+        tokenContainer->AddIntToken((int)eLeMenuSchedulesIT::timerfull, false);
+    }
+
+    if (event) {
+        tokenContainer->AddStringToken((int)eCeMenuSchedulesST::title, event->Title());
+        tokenContainer->AddStringToken((int)eCeMenuSchedulesST::shorttext, event->ShortText());
+        tokenContainer->AddStringToken((int)eCeMenuSchedulesST::description, event->Description());
+        tokenContainer->AddStringToken((int)eCeMenuSchedulesST::start, *(event->GetTimeString()));
+        tokenContainer->AddStringToken((int)eCeMenuSchedulesST::stop, *(event->GetEndTimeString()));
+        time_t startTime = event->StartTime();
+        struct tm * sStartTime = localtime(&startTime);
+        tokenContainer->AddStringToken((int)eCeMenuSchedulesST::day, *WeekDayName(startTime));
+        tokenContainer->AddStringToken((int)eCeMenuSchedulesST::date, *ShortDateString(startTime));
+        tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::year, sStartTime->tm_year + 1900);
+        tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::daynumeric, sStartTime->tm_mday);
+        tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::month, sStartTime->tm_mon+1);
+        bool isRunning = false;
+        time_t now = time(NULL);
+        if ((now >= event->StartTime()) && (now <= event->EndTime()))
+            isRunning = true;
+        tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::running, isRunning);
+        if (isRunning) {
+            tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::elapsed, (now - event->StartTime())/60);
+        } else {
+            tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::elapsed, 0);
+        }
+        tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::duration, event->Duration() / 60);
+        tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::durationhours, event->Duration() / 3600);
+        if (LoadFullScrapInfo(event, NULL))
+            SetScraperPosterBanner(tokenContainer);
+    }
+    if (channel) {
+        tokenContainer->AddStringToken((int)eCeMenuSchedulesST::channelname, channel->Name());
+        cString channelID = channel->GetChannelID().ToString();
+        tokenContainer->AddStringToken((int)eCeMenuSchedulesST::channelid, *channelID);
+        tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::channelnumber, channel->Number());
+        tokenContainer->AddIntToken((int)eCeMenuSchedulesIT::channellogoexists, imgCache->LogoExists(*channelID));
+    }
+
+    if (menuCat == mcScheduleNow || menuCat == mcScheduleNext) {
+        int eventsAvailable = 0;
+        cSchedulesLock schedulesLock;
+        const cSchedules *schedules = cSchedules::Schedules(schedulesLock);
+        const cSchedule *schedule = NULL;
+        schedule = schedules->GetSchedule(channel);
+        if (schedule) {
+            for (const cEvent *e = schedule->GetPresentEvent(); e; e = schedule->Events()->Next(e)) {
+                eventsAvailable++;
+                if (eventsAvailable == 10)
+                    break;
+            }
+        }
+        vector<int> loopInfo;
+        loopInfo.push_back(eventsAvailable);
+        tokenContainer->CreateLoopTokenContainer(&loopInfo);        
+
+        if (schedule) {
+            int num = 0;
+            for (const cEvent *e = schedule->GetPresentEvent(); e; e = schedule->Events()->Next(e)) {
+                if (num < 2) {
+                    num++;
+                    continue;
+                }
+                tokenContainer->AddLoopToken(schedulesIndex, num-2, (int)eCeMenuChannelsLT::title, e->Title());
+                tokenContainer->AddLoopToken(schedulesIndex, num-2, (int)eCeMenuChannelsLT::shorttext, e->ShortText());
+                tokenContainer->AddLoopToken(schedulesIndex, num-2, (int)eCeMenuChannelsLT::start, *(e->GetTimeString()));
+                tokenContainer->AddLoopToken(schedulesIndex, num-2, (int)eCeMenuChannelsLT::stop, *(e->GetEndTimeString()));
+                num++;
+                if (num > 11)
+                    break;
+            }            
+        }
+    }
+    return true;
+}
+
+/******************************************************************
+* cLeMenuChannels
+******************************************************************/
+cLeMenuChannels::cLeMenuChannels(void) {
+    currentChannel = NULL;
+    channel = NULL;
+    withProvider = false;
+}
+
+cLeMenuChannels::cLeMenuChannels(const cLeMenuChannels &other) : cListElement(other) {
+    currentChannel = NULL;
+    channel = NULL;
+    withProvider = false;
+}
+
+cLeMenuChannels::~cLeMenuChannels(void) {
+}
+
+void cLeMenuChannels::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{name}", (int)eLeMenuChannelsST::name);
+    tokenContainer->DefineStringToken("{channelid}", (int)eLeMenuChannelsST::channelid);
+    tokenContainer->DefineStringToken("{source}", (int)eLeMenuChannelsST::source);
+    tokenContainer->DefineStringToken("{sourcedescription}", (int)eLeMenuChannelsST::sourcedescription);
+    tokenContainer->DefineStringToken("{position}", (int)eLeMenuChannelsST::position);
+    tokenContainer->DefineStringToken("{presenteventtitle}", (int)eLeMenuChannelsST::presenteventtitle);
+    tokenContainer->DefineStringToken("{presenteventstart}", (int)eLeMenuChannelsST::presenteventstart);
+    tokenContainer->DefineStringToken("{presenteventstop}", (int)eLeMenuChannelsST::presenteventstop);
+    tokenContainer->DefineIntToken("{nummenuitem}", (int)eLeMenuChannelsIT::nummenuitem);
+    tokenContainer->DefineIntToken("{current}", (int)eLeMenuChannelsIT::current);
+    tokenContainer->DefineIntToken("{separator}", (int)eLeMenuChannelsIT::separator);
+    tokenContainer->DefineIntToken("{number}", (int)eLeMenuChannelsIT::number);
+    tokenContainer->DefineIntToken("{transponder}", (int)eLeMenuChannelsIT::transponder);
+    tokenContainer->DefineIntToken("{frequency}", (int)eLeMenuChannelsIT::frequency);
+    tokenContainer->DefineIntToken("{channellogoexists}", (int)eLeMenuChannelsIT::channellogoexists);
+    tokenContainer->DefineIntToken("{isAtsc}", (int)eLeMenuChannelsIT::isAtsc);
+    tokenContainer->DefineIntToken("{isCable}", (int)eLeMenuChannelsIT::isCable);
+    tokenContainer->DefineIntToken("{isSat}", (int)eLeMenuChannelsIT::isSat);
+    tokenContainer->DefineIntToken("{isTerr}", (int)eLeMenuChannelsIT::isTerr);
+    InheritTokenContainer();    
+}
+
+void cLeMenuChannels::ClearCurrentElement(void) {
+    if (wasCurrent && currentChannel) {
+        currentChannel->Close();
+    }
+}
+
+void cLeMenuChannels::Set(const cChannel *channel, bool withProvider) {
+    dirty = true;
+    this->channel = channel;
+    this->withProvider = withProvider;
+}
+
+bool cLeMenuChannels::Parse(bool forced) {
+    if (!dirty)
+        return false;
+
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eLeMenuChannelsIT::nummenuitem, num);
+    tokenContainer->AddIntToken((int)eLeMenuChannelsIT::current, current);
+    tokenContainer->AddIntToken((int)eLeMenuChannelsIT::separator, !selectable);
+    tokenContainer->AddIntToken((int)eLeMenuChannelsIT::number, channel->Number());
+    tokenContainer->AddIntToken((int)eLeMenuChannelsIT::transponder, channel->Transponder());
+    tokenContainer->AddIntToken((int)eLeMenuChannelsIT::frequency, channel->Frequency());
+
+    tokenContainer->AddStringToken((int)eLeMenuChannelsST::name, channel->Name());
+    cString channelID = channel->GetChannelID().ToString();
+    tokenContainer->AddStringToken((int)eLeMenuChannelsST::channelid, *channelID);
+    tokenContainer->AddIntToken((int)eLeMenuChannelsIT::channellogoexists, imgCache->LogoExists(*channelID));
+
+    //Channel Source Information
+    const cSource *source = Sources.Get(channel->Source());
+    if (source) {
+        tokenContainer->AddStringToken((int)eLeMenuChannelsST::source, *cSource::ToString(source->Code()));
+        tokenContainer->AddStringToken((int)eLeMenuChannelsST::sourcedescription, source->Description());
+        tokenContainer->AddIntToken((int)eLeMenuChannelsIT::isAtsc, source->IsAtsc(source->Code()));
+        tokenContainer->AddIntToken((int)eLeMenuChannelsIT::isCable, source->IsCable(source->Code()));
+        tokenContainer->AddIntToken((int)eLeMenuChannelsIT::isSat, source->IsSat(source->Code()));
+        tokenContainer->AddIntToken((int)eLeMenuChannelsIT::isTerr, source->IsTerr(source->Code()));
+    }
+
+    //current schedule
+    cSchedulesLock schedulesLock;
+    const cSchedules *schedules = cSchedules::Schedules(schedulesLock);
+    const cSchedule *schedule = NULL;
+    schedule = schedules->GetSchedule(channel);
+    if (schedule) {
+        const cEvent *presentEvent = schedule->GetPresentEvent();
+        if (presentEvent) {
+            tokenContainer->AddStringToken((int)eLeMenuChannelsST::presenteventtitle, presentEvent->Title());
+            tokenContainer->AddStringToken((int)eLeMenuChannelsST::presenteventstart, *presentEvent->GetTimeString());
+            tokenContainer->AddStringToken((int)eLeMenuChannelsST::presenteventstop, *presentEvent->GetEndTimeString());
+        }
+    }
+    return true;
+}
+
+void cLeMenuChannels::RenderCurrent(void) {
+    if (!currentChannel)
+        return;
+    currentChannel->Set(channel, withProvider);
+    currentChannel->SetListPosition(container.X(), container.Y(), container.Width(), container.Height());
+    currentChannel->Parse();
+}
+
+/******************************************************************
+* cCeMenuChannels
+******************************************************************/
+cCeMenuChannels::cCeMenuChannels(void) {
+    schedulesIndex = -1;
+    channel = NULL;
+    withProvider = false;
+}
+
+cCeMenuChannels::~cCeMenuChannels(void) {
+}
+
+void cCeMenuChannels::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{name}", (int)eCeMenuChannelsST::name);
+    tokenContainer->DefineStringToken("{channelid}", (int)eCeMenuChannelsST::channelid);
+    tokenContainer->DefineStringToken("{source}", (int)eCeMenuChannelsST::source);
+    tokenContainer->DefineStringToken("{sourcedescription}", (int)eCeMenuChannelsST::sourcedescription);
+    tokenContainer->DefineStringToken("{position}", (int)eCeMenuChannelsST::position);
+    tokenContainer->DefineStringToken("{presenteventtitle}", (int)eCeMenuChannelsST::presenteventtitle);
+    tokenContainer->DefineStringToken("{presenteventstart}", (int)eCeMenuChannelsST::presenteventstart);
+    tokenContainer->DefineStringToken("{presenteventstop}", (int)eCeMenuChannelsST::presenteventstop);
+    tokenContainer->DefineStringToken("{presenteventshorttext}", (int)eCeMenuChannelsST::presenteventshorttext);
+    tokenContainer->DefineStringToken("{presenteventdescription}", (int)eCeMenuChannelsST::presenteventdescription);
+    tokenContainer->DefineStringToken("{presenteventday}", (int)eCeMenuChannelsST::presenteventday);
+    tokenContainer->DefineStringToken("{presenteventdate}", (int)eCeMenuChannelsST::presenteventdate);
+    tokenContainer->DefineStringToken("{presenteventdurationminutes}", (int)eCeMenuChannelsST::presenteventdurationminutes);
+    tokenContainer->DefineStringToken("{posterpath}", (int)eCeMenuChannelsST::posterpath);
+    tokenContainer->DefineStringToken("{nexteventtitle}", (int)eCeMenuChannelsST::nexteventtitle);
+    tokenContainer->DefineStringToken("{nexteventstart}", (int)eCeMenuChannelsST::nexteventstart);
+    tokenContainer->DefineStringToken("{nexteventstop}", (int)eCeMenuChannelsST::nexteventstop);
+    tokenContainer->DefineStringToken("{nexteventshorttext}", (int)eCeMenuChannelsST::nexteventshorttext);
+    tokenContainer->DefineStringToken("{nexteventdescription}", (int)eCeMenuChannelsST::nexteventdescription);
+    tokenContainer->DefineStringToken("{nexteventdurationminutes}", (int)eCeMenuChannelsST::nexteventdurationminutes);
+    tokenContainer->DefineStringToken("{nexteventday}", (int)eCeMenuChannelsST::nexteventday);
+    tokenContainer->DefineStringToken("{nexteventdate}", (int)eCeMenuChannelsST::nexteventdate);
+    tokenContainer->DefineIntToken("{menuitemx}", (int)eCeMenuChannelsIT::menuitemx);
+    tokenContainer->DefineIntToken("{menuitemy}", (int)eCeMenuChannelsIT::menuitemy);
+    tokenContainer->DefineIntToken("{menuitemwidth}", (int)eCeMenuChannelsIT::menuitemwidth);
+    tokenContainer->DefineIntToken("{menuitemheight}", (int)eCeMenuChannelsIT::menuitemheight);
+    tokenContainer->DefineIntToken("{number}", (int)eCeMenuChannelsIT::number);
+    tokenContainer->DefineIntToken("{transponder}", (int)eCeMenuChannelsIT::transponder);
+    tokenContainer->DefineIntToken("{frequency}", (int)eCeMenuChannelsIT::frequency);
+    tokenContainer->DefineIntToken("{channellogoexists}", (int)eCeMenuChannelsIT::channellogoexists);
+    tokenContainer->DefineIntToken("{isAtsc}", (int)eCeMenuChannelsIT::isAtsc);
+    tokenContainer->DefineIntToken("{isCable}", (int)eCeMenuChannelsIT::isCable);
+    tokenContainer->DefineIntToken("{isSat}", (int)eCeMenuChannelsIT::isSat);
+    tokenContainer->DefineIntToken("{isTerr}", (int)eCeMenuChannelsIT::isTerr);
+    tokenContainer->DefineIntToken("{presenteventelapsed}", (int)eCeMenuChannelsIT::presenteventelapsed);
+    tokenContainer->DefineIntToken("{presenteventduration}", (int)eCeMenuChannelsIT::presenteventduration);
+    tokenContainer->DefineIntToken("{presenteventdurationhours}", (int)eCeMenuChannelsIT::presenteventdurationhours);
+    tokenContainer->DefineIntToken("{hasposter}", (int)eCeMenuChannelsIT::hasposter);
+    tokenContainer->DefineIntToken("{posterwidth}", (int)eCeMenuChannelsIT::posterwidth);
+    tokenContainer->DefineIntToken("{posterheight}", (int)eCeMenuChannelsIT::posterheight);
+    tokenContainer->DefineIntToken("{nexteventduration}", (int)eCeMenuChannelsIT::nexteventduration);
+    tokenContainer->DefineIntToken("{nexteventdurationhours}", (int)eCeMenuChannelsIT::nexteventdurationhours);
+    tokenContainer->DefineLoopToken("{schedule[title]}", (int)eCeMenuChannelsLT::title);
+    tokenContainer->DefineLoopToken("{schedule[shorttext]}", (int)eCeMenuChannelsLT::shorttext);
+    tokenContainer->DefineLoopToken("{schedule[start]}", (int)eCeMenuChannelsLT::start);
+    tokenContainer->DefineLoopToken("{schedule[stop]}", (int)eCeMenuChannelsLT::stop);
+    schedulesIndex = tokenContainer->LoopIndex("schedule");
+    InheritTokenContainer();
+}
+
+void cCeMenuChannels::Set(const cChannel *channel, bool withProvider) {
+    dirty = true;
+    this->channel = channel;
+    this->withProvider = withProvider;
+}
+
+bool cCeMenuChannels::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    if (!dirty)
+        return false;
+
+    tokenContainer->Clear();
+
+    SetListTokens(tokenContainer);
+
+    tokenContainer->AddIntToken((int)eCeMenuChannelsIT::number, channel->Number());
+    tokenContainer->AddIntToken((int)eCeMenuChannelsIT::transponder, channel->Transponder());
+    tokenContainer->AddIntToken((int)eCeMenuChannelsIT::frequency, channel->Frequency());
+
+    tokenContainer->AddStringToken((int)eCeMenuChannelsST::name, channel->Name());
+    cString channelID = channel->GetChannelID().ToString();
+    tokenContainer->AddStringToken((int)eCeMenuChannelsST::channelid, *channelID);
+    tokenContainer->AddIntToken((int)eCeMenuChannelsIT::channellogoexists, imgCache->LogoExists(*channelID));
+
+    //Channel Source Information
+    const cSource *source = Sources.Get(channel->Source());
+    if (source) {
+        tokenContainer->AddStringToken((int)eCeMenuChannelsST::source, *cSource::ToString(source->Code()));
+        tokenContainer->AddStringToken((int)eCeMenuChannelsST::sourcedescription, source->Description());
+        tokenContainer->AddIntToken((int)eCeMenuChannelsIT::isAtsc, source->IsAtsc(source->Code()));
+        tokenContainer->AddIntToken((int)eCeMenuChannelsIT::isCable, source->IsCable(source->Code()));
+        tokenContainer->AddIntToken((int)eCeMenuChannelsIT::isSat, source->IsSat(source->Code()));
+        tokenContainer->AddIntToken((int)eCeMenuChannelsIT::isTerr, source->IsTerr(source->Code()));
+    }
+
+    cSchedulesLock schedulesLock;
+    const cSchedules *schedules = cSchedules::Schedules(schedulesLock);
+    const cSchedule *schedule = NULL;
+    schedule = schedules->GetSchedule(channel);
+    if (schedule) {
+        const cEvent *presentEvent = schedule->GetPresentEvent();
+        if (presentEvent) {
+            tokenContainer->AddStringToken((int)eCeMenuChannelsST::presenteventtitle, presentEvent->Title());
+            tokenContainer->AddStringToken((int)eCeMenuChannelsST::presenteventshorttext, presentEvent->ShortText());
+            tokenContainer->AddStringToken((int)eCeMenuChannelsST::presenteventdescription, presentEvent->Description());
+            tokenContainer->AddStringToken((int)eCeMenuChannelsST::presenteventstart, *presentEvent->GetTimeString());
+            tokenContainer->AddStringToken((int)eCeMenuChannelsST::presenteventstop, *presentEvent->GetEndTimeString());
+            tokenContainer->AddStringToken((int)eCeMenuChannelsST::presenteventday, *WeekDayName(presentEvent->StartTime()));
+            tokenContainer->AddStringToken((int)eCeMenuChannelsST::presenteventdate, *ShortDateString(presentEvent->StartTime()));
+            tokenContainer->AddIntToken((int)eCeMenuChannelsIT::presenteventelapsed, (time(0) - presentEvent->StartTime())/60);
+            tokenContainer->AddIntToken((int)eCeMenuChannelsIT::presenteventduration, presentEvent->Duration() / 60);
+            tokenContainer->AddIntToken((int)eCeMenuChannelsIT::presenteventdurationhours, presentEvent->Duration() / 3600);
+            tokenContainer->AddStringToken((int)eCeMenuChannelsST::presenteventdurationminutes, *cString::sprintf("%.2d", (presentEvent->Duration() / 60)%60));
+            //SetScraperPoster(presentEvent);
+        }
+        const cList<cEvent> *events = schedule->Events();
+        if (events && presentEvent) {
+            const cEvent *nextEvent = events->Next(presentEvent);
+            if (nextEvent) {
+                tokenContainer->AddStringToken((int)eCeMenuChannelsST::nexteventtitle, nextEvent->Title());
+                tokenContainer->AddStringToken((int)eCeMenuChannelsST::nexteventshorttext, nextEvent->ShortText());
+                tokenContainer->AddStringToken((int)eCeMenuChannelsST::nexteventdescription, nextEvent->Description());
+                tokenContainer->AddStringToken((int)eCeMenuChannelsST::nexteventstart, *nextEvent->GetTimeString());
+                tokenContainer->AddStringToken((int)eCeMenuChannelsST::nexteventstop, *nextEvent->GetEndTimeString());
+                tokenContainer->AddStringToken((int)eCeMenuChannelsST::nexteventday, *WeekDayName(nextEvent->StartTime()));
+                tokenContainer->AddStringToken((int)eCeMenuChannelsST::nexteventdate, *ShortDateString(nextEvent->StartTime()));
+                tokenContainer->AddIntToken((int)eCeMenuChannelsIT::nexteventduration, nextEvent->Duration() / 60);
+                tokenContainer->AddIntToken((int)eCeMenuChannelsIT::nexteventdurationhours, nextEvent->Duration() / 3600);
+                tokenContainer->AddStringToken((int)eCeMenuChannelsST::nexteventdurationminutes, *cString::sprintf("%.2d", (nextEvent->Duration() / 60)%60));
+            }
+        }
+    }
+    
+    vector<int> loopInfo;
+    int eventsAvailable = 0;
+    if (schedule) {
+        for (const cEvent *e = schedule->GetPresentEvent(); e; e = schedule->Events()->Next(e)) {
+            eventsAvailable++;
+            if (eventsAvailable == 10)
+                break;
+        }
+    }
+    loopInfo.push_back(eventsAvailable);
+    tokenContainer->CreateLoopTokenContainer(&loopInfo);        
+
+    if (schedule) {
+        int num = 0;
+        for (const cEvent *e = schedule->GetPresentEvent(); e; e = schedule->Events()->Next(e)) {
+            if (num < 2) {
+                num++;
+                continue;
+            }
+            tokenContainer->AddLoopToken(schedulesIndex, num-2, (int)eCeMenuChannelsLT::title, e->Title());
+            tokenContainer->AddLoopToken(schedulesIndex, num-2, (int)eCeMenuChannelsLT::shorttext, e->ShortText());
+            tokenContainer->AddLoopToken(schedulesIndex, num-2, (int)eCeMenuChannelsLT::start, *(e->GetTimeString()));
+            tokenContainer->AddLoopToken(schedulesIndex, num-2, (int)eCeMenuChannelsLT::stop, *(e->GetEndTimeString()));
+            num++;
+            if (num > 11)
+                break;
+        }            
+    }
+    return true;
+}
+
+/******************************************************************
+* cLeMenuTimers
+******************************************************************/
+cLeMenuTimers::cLeMenuTimers(void) {
+    currentTimer = NULL;
+    timer = NULL;
+}
+
+cLeMenuTimers::cLeMenuTimers(const cLeMenuTimers &other) : cListElement(other) {
+    currentTimer = NULL;
+    timer = NULL;
+}
+
+cLeMenuTimers::~cLeMenuTimers(void) {
+}
+
+void cLeMenuTimers::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{title}", (int)eLeMenuTimersST::title);
+    tokenContainer->DefineStringToken("{timerstart}", (int)eLeMenuTimersST::timerstart);
+    tokenContainer->DefineStringToken("{timerstop}", (int)eLeMenuTimersST::timerstop);
+    tokenContainer->DefineStringToken("{day}", (int)eLeMenuTimersST::day);
+    tokenContainer->DefineStringToken("{dayname}", (int)eLeMenuTimersST::dayname);
+    tokenContainer->DefineStringToken("{monthname}", (int)eLeMenuTimersST::monthname);
+    tokenContainer->DefineStringToken("{channelname}", (int)eLeMenuTimersST::channelname);
+    tokenContainer->DefineStringToken("{channelid}", (int)eLeMenuTimersST::channelid);
+    tokenContainer->DefineStringToken("{eventtitle}", (int)eLeMenuTimersST::eventtitle);
+    tokenContainer->DefineStringToken("{eventstart}", (int)eLeMenuTimersST::eventstart);
+    tokenContainer->DefineStringToken("{eventstop}", (int)eLeMenuTimersST::eventstop);
+    tokenContainer->DefineIntToken("{nummenuitem}", (int)eLeMenuTimersIT::nummenuitem);
+    tokenContainer->DefineIntToken("{current}", (int)eLeMenuTimersIT::current);
+    tokenContainer->DefineIntToken("{separator}", (int)eLeMenuTimersIT::separator);
+    tokenContainer->DefineIntToken("{month}", (int)eLeMenuTimersIT::month);
+    tokenContainer->DefineIntToken("{year}", (int)eLeMenuTimersIT::year);
+    tokenContainer->DefineIntToken("{channellogoexists}", (int)eLeMenuTimersIT::channellogoexists);
+    tokenContainer->DefineIntToken("{channelnumber}", (int)eLeMenuTimersIT::channelnumber);
+    tokenContainer->DefineIntToken("{flagactive}", (int)eLeMenuTimersIT::flagactive);
+    tokenContainer->DefineIntToken("{flaginstant}", (int)eLeMenuTimersIT::flaginstant);
+    tokenContainer->DefineIntToken("{flagvps}", (int)eLeMenuTimersIT::flagvps);
+    tokenContainer->DefineIntToken("{flagrecording}", (int)eLeMenuTimersIT::flagrecording);
+    tokenContainer->DefineIntToken("{flagpending}", (int)eLeMenuTimersIT::flagpending);
+    InheritTokenContainer();    
+}
+
+void cLeMenuTimers::ClearCurrentElement(void) {
+   if (wasCurrent && currentTimer) {
+        currentTimer->Close();
+    }
+}
+
+void cLeMenuTimers::Set(const cTimer *timer) {
+    this->timer = timer;
+    dirty = true;
+}
+
+bool cLeMenuTimers::Parse(bool forced) {
+    if (!dirty)
+        return false;
+
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eLeMenuTimersIT::nummenuitem, num);
+    tokenContainer->AddIntToken((int)eLeMenuTimersIT::current, current);
+    tokenContainer->AddIntToken((int)eLeMenuTimersIT::separator, !selectable);
+    tokenContainer->AddIntToken((int)eLeMenuTimersIT::flagactive, timer->HasFlags(tfActive));
+    tokenContainer->AddIntToken((int)eLeMenuTimersIT::flaginstant, timer->HasFlags(tfInstant));
+    tokenContainer->AddIntToken((int)eLeMenuTimersIT::flagvps, timer->HasFlags(tfVps));
+    tokenContainer->AddIntToken((int)eLeMenuTimersIT::flagrecording, timer->Recording());
+    tokenContainer->AddIntToken((int)eLeMenuTimersIT::flagpending, timer->Pending());
+    
+    const char *file = Setup.FoldersInTimerMenu ? NULL : strrchr(timer->File(), FOLDERDELIMCHAR);
+    if (file && strcmp(file + 1, TIMERMACRO_TITLE) && strcmp(file + 1, TIMERMACRO_EPISODE))
+        file++;
+    else
+        file = timer->File();
+    tokenContainer->AddStringToken((int)eLeMenuTimersST::title, file);
+    tokenContainer->AddStringToken((int)eLeMenuTimersST::timerstart, *cString::sprintf("%02d:%02d", timer->Start() / 100, timer->Start() % 100));
+    tokenContainer->AddStringToken((int)eLeMenuTimersST::timerstop, *cString::sprintf("%02d:%02d", timer->Stop() / 100, timer->Stop() % 100));
+    
+    cString day("");
+    cString dayName("");
+    if (timer->WeekDays())
+        day = timer->PrintDay(0, timer->WeekDays(), false);
+    else if (timer->Day() - time(NULL) < 28 * SECSINDAY) {
+        day = itoa(timer->GetMDay(timer->Day()));
+        dayName = WeekDayName(timer->Day());
+    } else {
+        struct tm tm_r;
+        time_t Day = timer->Day();
+        localtime_r(&Day, &tm_r);
+        char buffer[16];
+        strftime(buffer, sizeof(buffer), "%Y%m%d", &tm_r);
+        day = buffer;
+    }
+    
+    struct tm tm_r;
+    time_t timerDate = timer->Day();
+    localtime_r(&timerDate, &tm_r);
+    char buffer[4];
+    strftime(buffer, sizeof(buffer), "%m", &tm_r);
+    int month = atoi(buffer);
+    char buffer2[6];
+    strftime(buffer2, sizeof(buffer2), "%b", &tm_r);
+    char buffer3[6];
+    strftime(buffer3, sizeof(buffer3), "%Y", &tm_r);
+    int year = atoi(buffer3);
+
+    tokenContainer->AddStringToken((int)eLeMenuTimersST::day, *day);
+    tokenContainer->AddStringToken((int)eLeMenuTimersST::dayname, *dayName);
+    tokenContainer->AddIntToken((int)eLeMenuTimersIT::month, month);
+    tokenContainer->AddStringToken((int)eLeMenuTimersST::monthname, buffer2);
+    tokenContainer->AddIntToken((int)eLeMenuTimersIT::year, year);
+
+    const cChannel *channel = timer->Channel();
+    if (channel) {
+        tokenContainer->AddStringToken((int)eLeMenuTimersST::channelname, channel->Name());
+        cString channelID = channel->GetChannelID().ToString();
+        tokenContainer->AddStringToken((int)eLeMenuTimersST::channelid, *channelID);
+        tokenContainer->AddIntToken((int)eLeMenuTimersIT::channellogoexists, imgCache->LogoExists(*channelID));
+        tokenContainer->AddIntToken((int)eLeMenuTimersIT::channelnumber, channel->Number());
+    }
+
+    const cEvent *event = timer->Event();
+    if (event) {
+        tokenContainer->AddStringToken((int)eLeMenuTimersST::eventtitle, event->Title());
+        tokenContainer->AddStringToken((int)eLeMenuTimersST::eventstart, *event->GetTimeString());
+        tokenContainer->AddStringToken((int)eLeMenuTimersST::eventstop, *event->GetEndTimeString());
+    }
+    return true;
+}
+
+void cLeMenuTimers::RenderCurrent(void) {
+    if (!currentTimer)
+        return;
+    currentTimer->Set(timer);
+    currentTimer->SetListPosition(container.X(), container.Y(), container.Width(), container.Height());
+    currentTimer->Parse();
+}
+
+/******************************************************************
+* cCeMenuTimers
+******************************************************************/
+cCeMenuTimers::cCeMenuTimers(void) {
+    timer = NULL;
+}
+
+cCeMenuTimers::~cCeMenuTimers(void) {
+
+}
+
+void cCeMenuTimers::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{title}", (int)eCeMenuTimersST::title);
+    tokenContainer->DefineStringToken("{timerstart}", (int)eCeMenuTimersST::timerstart);
+    tokenContainer->DefineStringToken("{timerstop}", (int)eCeMenuTimersST::timerstop);
+    tokenContainer->DefineStringToken("{day}", (int)eCeMenuTimersST::day);
+    tokenContainer->DefineStringToken("{dayname}", (int)eCeMenuTimersST::dayname);
+    tokenContainer->DefineStringToken("{monthname}", (int)eCeMenuTimersST::monthname);
+    tokenContainer->DefineStringToken("{channelname}", (int)eCeMenuTimersST::channelname);
+    tokenContainer->DefineStringToken("{channelid}", (int)eCeMenuTimersST::channelid);
+    tokenContainer->DefineStringToken("{eventtitle}", (int)eCeMenuTimersST::eventtitle);
+    tokenContainer->DefineStringToken("{eventstart}", (int)eCeMenuTimersST::eventstart);
+    tokenContainer->DefineStringToken("{eventstop}", (int)eCeMenuTimersST::eventstop);
+    tokenContainer->DefineStringToken("{eventshorttext}", (int)eCeMenuTimersST::eventshorttext);
+    tokenContainer->DefineStringToken("{eventdescription}", (int)eCeMenuTimersST::eventdescription);
+    tokenContainer->DefineStringToken("{posterpath}", (int)eCeMenuTimersST::posterpath);
+    tokenContainer->DefineIntToken("{menuitemx}", (int)eCeMenuTimersIT::menuitemx);
+    tokenContainer->DefineIntToken("{menuitemy}", (int)eCeMenuTimersIT::menuitemy);
+    tokenContainer->DefineIntToken("{menuitemwidth}", (int)eCeMenuTimersIT::menuitemwidth);
+    tokenContainer->DefineIntToken("{menuitemheight}", (int)eCeMenuTimersIT::menuitemheight);
+    tokenContainer->DefineIntToken("{month}", (int)eCeMenuTimersIT::month);
+    tokenContainer->DefineIntToken("{year}", (int)eCeMenuTimersIT::year);
+    tokenContainer->DefineIntToken("{channellogoexists}", (int)eCeMenuTimersIT::channellogoexists);
+    tokenContainer->DefineIntToken("{channelnumber}", (int)eCeMenuTimersIT::channelnumber);
+    tokenContainer->DefineIntToken("{flagactive}", (int)eCeMenuTimersIT::flagactive);
+    tokenContainer->DefineIntToken("{flaginstant}", (int)eCeMenuTimersIT::flaginstant);
+    tokenContainer->DefineIntToken("{flagvps}", (int)eCeMenuTimersIT::flagvps);
+    tokenContainer->DefineIntToken("{flagrecording}", (int)eCeMenuTimersIT::flagrecording);
+    tokenContainer->DefineIntToken("{flagpending}", (int)eCeMenuTimersIT::flagpending);
+    tokenContainer->DefineIntToken("{hasposter}", (int)eCeMenuTimersIT::hasposter);
+    tokenContainer->DefineIntToken("{posterwidth}", (int)eCeMenuTimersIT::posterwidth);
+    tokenContainer->DefineIntToken("{posterheight}", (int)eCeMenuTimersIT::posterheight);
+    InheritTokenContainer();
+}
+
+void cCeMenuTimers::Set(const cTimer *timer) {
+    dirty = true;
+    this->timer = timer;
+}
+
+bool cCeMenuTimers::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    if (!dirty)
+        return false;
+
+    tokenContainer->Clear();
+
+    SetListTokens(tokenContainer);
+    tokenContainer->AddIntToken((int)eCeMenuTimersIT::flagactive, timer->HasFlags(tfActive));
+    tokenContainer->AddIntToken((int)eCeMenuTimersIT::flaginstant, timer->HasFlags(tfInstant));
+    tokenContainer->AddIntToken((int)eCeMenuTimersIT::flagvps, timer->HasFlags(tfVps));
+    tokenContainer->AddIntToken((int)eCeMenuTimersIT::flagrecording, timer->Recording());
+    tokenContainer->AddIntToken((int)eCeMenuTimersIT::flagpending, timer->Pending());
+    
+    const char *file = Setup.FoldersInTimerMenu ? NULL : strrchr(timer->File(), FOLDERDELIMCHAR);
+    if (file && strcmp(file + 1, TIMERMACRO_TITLE) && strcmp(file + 1, TIMERMACRO_EPISODE))
+        file++;
+    else
+        file = timer->File();
+    tokenContainer->AddStringToken((int)eCeMenuTimersST::title, file);
+    tokenContainer->AddStringToken((int)eCeMenuTimersST::timerstart, *cString::sprintf("%02d:%02d", timer->Start() / 100, timer->Start() % 100));
+    tokenContainer->AddStringToken((int)eCeMenuTimersST::timerstop, *cString::sprintf("%02d:%02d", timer->Stop() / 100, timer->Stop() % 100));
+    
+    cString day("");
+    cString dayName("");
+    if (timer->WeekDays())
+        day = timer->PrintDay(0, timer->WeekDays(), false);
+    else if (timer->Day() - time(NULL) < 28 * SECSINDAY) {
+        day = itoa(timer->GetMDay(timer->Day()));
+        dayName = WeekDayName(timer->Day());
+    } else {
+        struct tm tm_r;
+        time_t Day = timer->Day();
+        localtime_r(&Day, &tm_r);
+        char buffer[16];
+        strftime(buffer, sizeof(buffer), "%Y%m%d", &tm_r);
+        day = buffer;
+    }
+    
+    struct tm tm_r;
+    time_t timerDate = timer->Day();
+    localtime_r(&timerDate, &tm_r);
+    char buffer[4];
+    strftime(buffer, sizeof(buffer), "%m", &tm_r);
+    int month = atoi(buffer);
+    char buffer2[6];
+    strftime(buffer2, sizeof(buffer2), "%b", &tm_r);
+    char buffer3[6];
+    strftime(buffer3, sizeof(buffer3), "%Y", &tm_r);
+    int year = atoi(buffer3);
+
+    tokenContainer->AddStringToken((int)eCeMenuTimersST::day, *day);
+    tokenContainer->AddStringToken((int)eCeMenuTimersST::dayname, *dayName);
+    tokenContainer->AddIntToken((int)eCeMenuTimersIT::month, month);
+    tokenContainer->AddStringToken((int)eCeMenuTimersST::monthname, buffer2);
+    tokenContainer->AddIntToken((int)eCeMenuTimersIT::year, year);
+
+    const cChannel *channel = timer->Channel();
+    if (channel) {
+        tokenContainer->AddStringToken((int)eCeMenuTimersST::channelname, channel->Name());
+        cString channelID = channel->GetChannelID().ToString();
+        tokenContainer->AddStringToken((int)eCeMenuTimersST::channelid, *channelID);
+        tokenContainer->AddIntToken((int)eCeMenuTimersIT::channellogoexists, imgCache->LogoExists(*channelID));
+        tokenContainer->AddIntToken((int)eCeMenuTimersIT::channelnumber, channel->Number());
+    }
+
+    const cEvent *event = timer->Event();
+    if (event) {
+        tokenContainer->AddStringToken((int)eCeMenuTimersST::eventtitle, event->Title());
+        tokenContainer->AddStringToken((int)eCeMenuTimersST::eventstart, *event->GetTimeString());
+        tokenContainer->AddStringToken((int)eCeMenuTimersST::eventstop, *event->GetEndTimeString());
+        tokenContainer->AddStringToken((int)eCeMenuTimersST::eventshorttext, event->ShortText());
+        tokenContainer->AddStringToken((int)eCeMenuTimersST::eventdescription, event->Description());
+    }
+    return true;
+}
+
+/******************************************************************
+* cLeMenuRecordings
+******************************************************************/
+cLeMenuRecordings::cLeMenuRecordings(void) {
+    currentRecording = NULL;
+    recording = NULL;
+    level = 0;
+    total = 0;
+    New = 0;
+}
+
+cLeMenuRecordings::cLeMenuRecordings(const cLeMenuRecordings &other) : cListElement(other) {
+    currentRecording = NULL;
+    recording = NULL;
+    level = 0;
+    total = 0;
+    New = 0;
+}
+
+cLeMenuRecordings::~cLeMenuRecordings(void) {
+}
+
+void cLeMenuRecordings::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{name}", (int)eLeMenuRecordingsST::name);
+    tokenContainer->DefineStringToken("{epgname}", (int)eLeMenuRecordingsST::epgname);
+    tokenContainer->DefineStringToken("{shorttext}", (int)eLeMenuRecordingsST::shorttext);
+    tokenContainer->DefineStringToken("{description}", (int)eLeMenuRecordingsST::description);
+    tokenContainer->DefineStringToken("{date}", (int)eLeMenuRecordingsST::date);
+    tokenContainer->DefineStringToken("{time}", (int)eLeMenuRecordingsST::time);
+    tokenContainer->DefineStringToken("{durationminutes}", (int)eLeMenuRecordingsST::durationminutes);
+    tokenContainer->DefineStringToken("{durationeventminutes}", (int)eLeMenuRecordingsST::durationeventminutes);
+    tokenContainer->DefineStringToken("{thumbnailpath}", (int)eLeMenuRecordingsST::thumbnailpath);
+    tokenContainer->DefineStringToken("{posterpath}", (int)eLeMenuRecordingsST::posterpath);
+    tokenContainer->DefineIntToken("{nummenuitem}", (int)eLeMenuRecordingsIT::nummenuitem);
+    tokenContainer->DefineIntToken("{current}", (int)eLeMenuRecordingsIT::current);
+    tokenContainer->DefineIntToken("{new}", (int)eLeMenuRecordingsIT::isnew);
+    tokenContainer->DefineIntToken("{percentseen}", (int)eLeMenuRecordingsIT::percentseen);
+    tokenContainer->DefineIntToken("{watched}", (int)eLeMenuRecordingsIT::watched);
+    tokenContainer->DefineIntToken("{cutted}", (int)eLeMenuRecordingsIT::cutted);
+    tokenContainer->DefineIntToken("{folder}", (int)eLeMenuRecordingsIT::folder);
+    tokenContainer->DefineIntToken("{daynumeric}", (int)eLeMenuRecordingsIT::daynumeric);
+    tokenContainer->DefineIntToken("{month}", (int)eLeMenuRecordingsIT::month);
+    tokenContainer->DefineIntToken("{year}", (int)eLeMenuRecordingsIT::year);
+    tokenContainer->DefineIntToken("{duration}", (int)eLeMenuRecordingsIT::duration);
+    tokenContainer->DefineIntToken("{durationhours}", (int)eLeMenuRecordingsIT::durationhours);
+    tokenContainer->DefineIntToken("{durationevent}", (int)eLeMenuRecordingsIT::durationevent);
+    tokenContainer->DefineIntToken("{durationeventhours}", (int)eLeMenuRecordingsIT::durationeventhours);
+    tokenContainer->DefineIntToken("{numrecordingsfolder}", (int)eLeMenuRecordingsIT::numrecordingsfolder);
+    tokenContainer->DefineIntToken("{newrecordingsfolder}", (int)eLeMenuRecordingsIT::newrecordingsfolder);
+    tokenContainer->DefineIntToken("{hasposterthumbnail}", (int)eLeMenuRecordingsIT::hasposterthumbnail);
+    tokenContainer->DefineIntToken("{thumbnailwidth}", (int)eLeMenuRecordingsIT::thumbnailwidth);
+    tokenContainer->DefineIntToken("{thumbnailheight}", (int)eLeMenuRecordingsIT::thumbnailheight);
+    tokenContainer->DefineIntToken("{hasposter}", (int)eLeMenuRecordingsIT::hasposter);
+    tokenContainer->DefineIntToken("{posterwidth}", (int)eLeMenuRecordingsIT::posterwidth);
+    tokenContainer->DefineIntToken("{posterheight}", (int)eLeMenuRecordingsIT::posterheight);
+    InheritTokenContainer();
+}
+
+void cLeMenuRecordings::ClearCurrentElement(void) {
+   if (wasCurrent && currentRecording) {
+        currentRecording->Close();
+    }
+}
+
+void cLeMenuRecordings::Set(const cRecording *recording, int level, int total, int New) {
+    this->recording = recording;
+    this->level = level;
+    this->total = total;
+    this->New = New;
+    dirty = true;
+}
+
+bool cLeMenuRecordings::Parse(bool forced) {
+    if (!dirty)
+        return false;
+
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::nummenuitem, num);
+    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::current, current);
+    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::separator, !selectable);
+    bool isFolder = (total > 0) ? true : false;
+    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::folder, isFolder);
+
+    char *recName = RecName(recording->Name(), level);
+    tokenContainer->AddStringToken((int)eLeMenuRecordingsST::name, recName);
+    delete[] recName;
+
+    const cRecording *usedRecording = recording;
+
+    if (isFolder) {
+        char *folderName = FolderName(recording->Name(), level);
+        cRecordingsFolderInfo::cFolderInfo *folderInfo = recFolderInfo.Get(folderName);
+        delete[] folderName;
+        if (folderInfo) {
+            cRecording *newestRec = Recordings.GetByName(*folderInfo->LatestFileName);
+            if (newestRec) {
+                usedRecording = newestRec;
+            }
+            delete folderInfo;
+        }
+    }
+    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::isnew, usedRecording->IsNew());
+
+    int percSeen = 0;
+#if APIVERSNUM < 20108
+    percSeen = -1;
+#else
+    percSeen = 0;
+    int framesSeen = usedRecording->GetResume();
+    int framesTotal = usedRecording->NumFrames();
+    if (framesTotal > 0) {
+        percSeen = (double)framesSeen / (double)framesTotal * 100;
+    }
+#endif
+    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::percentseen, percSeen);
+    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::newrecordingsfolder, New);
+    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::numrecordingsfolder, total);
+    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::cutted, usedRecording->IsEdited());
+
+    int recDuration = usedRecording->LengthInSeconds();
+    bool watched = false;
+    if (usedRecording->IsEdited()) {
+        if (percSeen >= 85)
+            watched = true;
+    } else {
+        int watchedLimit = recDuration * 85 / 100 - (Setup.MarginStop + 5)*60;
+        int watchedTime = percSeen * recDuration / 100;
+        if (watchedLimit > 0 && watchedTime > 0 && (watchedTime > watchedLimit))
+            watched = true;
+    }
+    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::watched, watched);
+
+    const cEvent *event = NULL;
+    const cRecordingInfo *info = usedRecording->Info();
+    if (!info) return true;
+    event = info->GetEvent();
+    if (!event) return true;
+
+    cString recDate = event->GetDateString();
+    cString recTime = event->GetTimeString();
+    if (strstr(*recDate, "1970")) {
+        time_t start = usedRecording->Start();
+        recDate = DateString(start);
+        recTime = TimeString(start);
+    }
+
+    time_t startTime = event->StartTime();
+    if (!startTime)
+        startTime = usedRecording->Start();
+    struct tm * sStartTime = localtime(&startTime);
+    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::year, sStartTime->tm_year + 1900);
+    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::daynumeric, sStartTime->tm_mday);
+    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::month, sStartTime->tm_mon+1);
+
+    int duration = event->Duration() / 60;
+    recDuration = (recDuration>0)?(recDuration / 60):0;
+    tokenContainer->AddStringToken((int)eLeMenuRecordingsST::date, *recDate);
+    tokenContainer->AddStringToken((int)eLeMenuRecordingsST::time, *recTime);
+    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::duration, recDuration);
+    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::durationhours, recDuration / 60);
+    tokenContainer->AddStringToken((int)eLeMenuRecordingsST::durationminutes, *cString::sprintf("%.2d", recDuration%60));
+    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::durationevent, duration);
+    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::durationeventhours, duration / 60);
+    tokenContainer->AddStringToken((int)eLeMenuRecordingsST::durationeventminutes, *cString::sprintf("%.2d", duration%60));
+
+    tokenContainer->AddStringToken((int)eLeMenuRecordingsST::shorttext, info->ShortText());
+    tokenContainer->AddStringToken((int)eLeMenuRecordingsST::description, info->Description());
+
+    SetScraperRecordingPoster(tokenContainer, usedRecording, true);
+
+    return true;
+}
+
+void cLeMenuRecordings::RenderCurrent(void) {
+    if (!currentRecording)
+        return;
+    currentRecording->Set(recording, level, total, New);
+    currentRecording->SetListPosition(container.X(), container.Y(), container.Width(), container.Height());
+    currentRecording->Parse();
+}
+
+char *cLeMenuRecordings::RecName(const char *path, int level) {
+    char *recName;
+    const char *startName = path;
+    for (int i = 0; i < level; i++) {
+        startName = strchr(startName, FOLDERDELIMCHAR);
+        startName++;
+    }
+    const char *endName = startName;
+    if (endName = strchr(endName, FOLDERDELIMCHAR)) {
+        int len = endName - startName;
+        recName = new char[len+1];
+        strncpy(recName, startName, len);
+        recName[len] = 0;
+    } else {
+        recName = strdup(startName);
+    }
+    return recName;
+}
+
+char *cLeMenuRecordings::FolderName(const char *path, int level) {
+    char *folderName;
+    const char *endName = path;
+    bool foundEnd = false;
+    for (int i = 0; i <= level; i++) {
+        endName = strchr(endName, FOLDERDELIMCHAR);
+        if (!endName) {
+            foundEnd = false;
+        }
+        foundEnd = true;
+        endName++;
+    }
+    if (foundEnd) {
+        int len = endName - path - 1;
+        folderName = new char[len+1];
+        strncpy(folderName, path, len);
+        folderName[len] = 0;
+    } else {
+        folderName = strdup(path);
+    }
+    return folderName;
+}
+
+/******************************************************************
+* cCeMenuRecordings
+******************************************************************/
+cCeMenuRecordings::cCeMenuRecordings(void) {
+    recording = NULL;
+    level = 0;
+    total = 0;
+    New = 0;
+}
+
+cCeMenuRecordings::~cCeMenuRecordings(void) {
+}
+
+void cCeMenuRecordings::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{name}", (int)eCeMenuRecordingsST::name);
+    tokenContainer->DefineStringToken("{epgname}", (int)eCeMenuRecordingsST::epgname);
+    tokenContainer->DefineStringToken("{shorttext}", (int)eCeMenuRecordingsST::shorttext);
+    tokenContainer->DefineStringToken("{description}", (int)eCeMenuRecordingsST::description);
+    tokenContainer->DefineStringToken("{date}", (int)eCeMenuRecordingsST::date);
+    tokenContainer->DefineStringToken("{time}", (int)eCeMenuRecordingsST::time);
+    tokenContainer->DefineStringToken("{durationminutes}", (int)eCeMenuRecordingsST::durationminutes);
+    tokenContainer->DefineStringToken("{durationeventminutes}", (int)eCeMenuRecordingsST::durationeventminutes);
+    tokenContainer->DefineStringToken("{thumbnailpath}", (int)eCeMenuRecordingsST::thumbnailpath);
+    tokenContainer->DefineStringToken("{posterpath}", (int)eCeMenuRecordingsST::posterpath);
+    tokenContainer->DefineIntToken("{menuitemx}", (int)eCeMenuRecordingsIT::menuitemx);
+    tokenContainer->DefineIntToken("{menuitemy}", (int)eCeMenuRecordingsIT::menuitemy);
+    tokenContainer->DefineIntToken("{menuitemwidth}", (int)eCeMenuRecordingsIT::menuitemwidth);
+    tokenContainer->DefineIntToken("{menuitemheight}", (int)eCeMenuRecordingsIT::menuitemheight);
+    tokenContainer->DefineIntToken("{new}", (int)eCeMenuRecordingsIT::isnew);
+    tokenContainer->DefineIntToken("{percentseen}", (int)eCeMenuRecordingsIT::percentseen);
+    tokenContainer->DefineIntToken("{watched}", (int)eCeMenuRecordingsIT::watched);
+    tokenContainer->DefineIntToken("{cutted}", (int)eCeMenuRecordingsIT::cutted);
+    tokenContainer->DefineIntToken("{folder}", (int)eCeMenuRecordingsIT::folder);
+    tokenContainer->DefineIntToken("{daynumeric}", (int)eCeMenuRecordingsIT::daynumeric);
+    tokenContainer->DefineIntToken("{month}", (int)eCeMenuRecordingsIT::month);
+    tokenContainer->DefineIntToken("{year}", (int)eCeMenuRecordingsIT::year);
+    tokenContainer->DefineIntToken("{duration}", (int)eCeMenuRecordingsIT::duration);
+    tokenContainer->DefineIntToken("{durationhours}", (int)eCeMenuRecordingsIT::durationhours);
+    tokenContainer->DefineIntToken("{durationevent}", (int)eCeMenuRecordingsIT::durationevent);
+    tokenContainer->DefineIntToken("{durationeventhours}", (int)eCeMenuRecordingsIT::durationeventhours);
+    tokenContainer->DefineIntToken("{numrecordingsfolder}", (int)eCeMenuRecordingsIT::numrecordingsfolder);
+    tokenContainer->DefineIntToken("{newrecordingsfolder}", (int)eCeMenuRecordingsIT::newrecordingsfolder);
+    tokenContainer->DefineIntToken("{hasposterthumbnail}", (int)eCeMenuRecordingsIT::hasposterthumbnail);
+    tokenContainer->DefineIntToken("{thumbnailwidth}", (int)eCeMenuRecordingsIT::thumbnailwidth);
+    tokenContainer->DefineIntToken("{thumbnailheight}", (int)eCeMenuRecordingsIT::thumbnailheight);
+    tokenContainer->DefineIntToken("{hasposter}", (int)eCeMenuRecordingsIT::hasposter);
+    tokenContainer->DefineIntToken("{posterwidth}", (int)eCeMenuRecordingsIT::posterwidth);
+    tokenContainer->DefineIntToken("{posterheight}", (int)eCeMenuRecordingsIT::posterheight);
+    InheritTokenContainer();
+}
+
+void cCeMenuRecordings::Set(const cRecording *recording, int level, int total, int New) {
+    this->recording = recording;
+    this->level = level;
+    this->total = total;
+    this->New = New;
+    dirty = true;
+}
+
+bool cCeMenuRecordings::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    if (!dirty)
+        return false;
+
+    tokenContainer->Clear();
+    SetListTokens(tokenContainer);
+    bool isFolder = (total > 0) ? true : false;
+    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::folder, isFolder);
+
+    string name = recording->Name() ? recording->Name() : "";
+    string buffer = "";
+    stringstream folderName;
+    try {
+        vector<string> tokens;
+        istringstream f(name.c_str());
+        string s;
+        int i=0;
+        while (getline(f, s, FOLDERDELIMCHAR)) {
+            tokens.push_back(s);
+            if (isFolder && i <= level) {
+                if (i > 0)
+                    folderName << FOLDERDELIMCHAR;
+                folderName << s;
+                i++;
+            }
+        }
+        buffer = tokens.at(level);
+        if (!isFolder && recording->IsEdited()) {
+            buffer = buffer.substr(1);
+        }
+    } catch (...) {
+        buffer = name.c_str();
+    }
+
+    const cRecording *usedRecording = recording;
+
+    if (isFolder) {
+        cRecordingsFolderInfo::cFolderInfo *folderInfo = recFolderInfo.Get(folderName.str().c_str());
+        if (folderInfo) {
+            cRecording *newestRec = Recordings.GetByName(*folderInfo->LatestFileName);
+            if (newestRec) {
+                usedRecording = newestRec;
+            }
+            delete folderInfo;
+        }
+    }
+
+    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::name, buffer.c_str());
+    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::isnew, usedRecording->IsNew());
+
+    int percSeen = 0;
+#if APIVERSNUM < 20108
+    percSeen = -1;
+#else
+    percSeen = 0;
+    int framesSeen = usedRecording->GetResume();
+    int framesTotal = usedRecording->NumFrames();
+    if (framesTotal > 0) {
+        percSeen = (double)framesSeen / (double)framesTotal * 100;
+    }
+#endif
+    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::percentseen, percSeen);
+    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::newrecordingsfolder, New);
+    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::numrecordingsfolder, total);
+    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::cutted, usedRecording->IsEdited());
+
+    int recDuration = usedRecording->LengthInSeconds();
+    bool watched = false;
+    if (usedRecording->IsEdited()) {
+        if (percSeen >= 85)
+            watched = true;
+    } else {
+        int watchedLimit = recDuration * 85 / 100 - (Setup.MarginStop + 5)*60;
+        int watchedTime = percSeen * recDuration / 100;
+        if (watchedLimit > 0 && watchedTime > 0 && (watchedTime > watchedLimit))
+            watched = true;
+    }
+    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::watched, watched);
+
+    const cEvent *event = NULL;
+    const cRecordingInfo *info = usedRecording->Info();
+    if (!info) return true;
+    event = info->GetEvent();
+    if (!event) return true;
+
+    cString recDate = event->GetDateString();
+    cString recTime = event->GetTimeString();
+    if (strstr(*recDate, "1970")) {
+        time_t start = usedRecording->Start();
+        recDate = DateString(start);
+        recTime = TimeString(start);
+    }
+
+    time_t startTime = event->StartTime();
+    if (!startTime)
+        startTime = usedRecording->Start();
+    struct tm * sStartTime = localtime(&startTime);
+    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::year, sStartTime->tm_year + 1900);
+    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::daynumeric, sStartTime->tm_mday);
+    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::month, sStartTime->tm_mon+1);
+
+    int duration = event->Duration() / 60;
+    recDuration = (recDuration>0)?(recDuration / 60):0;
+    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::date, *recDate);
+    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::time, *recTime);
+    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::duration, recDuration);
+    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::durationhours, recDuration / 60);
+    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::durationminutes, *cString::sprintf("%.2d", recDuration%60));
+    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::durationevent, duration);
+    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::durationeventhours, duration / 60);
+    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::durationeventminutes, *cString::sprintf("%.2d", duration%60));
+    
+    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::shorttext, info->ShortText());
+    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::description, info->Description());
+
+    SetScraperRecordingPoster(tokenContainer, usedRecording, false);
+
+    return true;
+}
+
+/******************************************************************
+* cLeMenuPlugin
+******************************************************************/
+cLeMenuPlugin::cLeMenuPlugin(void) {
+    currentPlugin = NULL;
+    plugId = -1;
+    plugMenuId = -1;
+}
+
+cLeMenuPlugin::cLeMenuPlugin(const cLeMenuPlugin &other) : cListElement(other) {
+    currentPlugin = NULL;
+    plugId = -1;
+    plugMenuId = -1;
+}
+
+cLeMenuPlugin::~cLeMenuPlugin(void) {
+}
+
+void cLeMenuPlugin::SetTokenContainer(void) {
+    if (plugId == -1 || plugMenuId == -1)
+        return;
+    skindesignerapi::cTokenContainer *tkPlugMenu = plgManager->GetTokenContainer(plugId, plugMenuId);
+    tokenContainer = new skindesignerapi::cTokenContainer(*tkPlugMenu);
+    InheritTokenContainer();
+}
+
+void cLeMenuPlugin::ClearCurrentElement(void) {
+    if (wasCurrent && currentPlugin) {
+        currentPlugin->Close();
+    }
+}
+
+void cLeMenuPlugin::Set(skindesignerapi::cTokenContainer *tk) {
+    tokenContainer->Clear();
+    tokenContainer->SetTokens(tk);
+    dirty = true;
+}
+
+bool cLeMenuPlugin::Parse(bool forced) {
+    if (!dirty)
+        return false;
+    tokenContainer->AddIntToken(0, current);
+    return true;
+}
+
+void cLeMenuPlugin::RenderCurrent(void) {
+    if (!currentPlugin)
+        return;
+    currentPlugin->Set(tokenContainer);
+    currentPlugin->SetListPosition(container.X(), container.Y(), container.Width(), container.Height());
+    currentPlugin->Parse();
+}
+
+/******************************************************************
+* cCeMenuPlugin
+******************************************************************/
+cCeMenuPlugin::cCeMenuPlugin(void) {
+    plugId = -1;
+    plugMenuId = -1;
+}
+
+cCeMenuPlugin::~cCeMenuPlugin(void) {
+}
+
+void cCeMenuPlugin::SetTokenContainer(void) {
+    if (plugId == -1 || plugMenuId == -1)
+        return;
+    skindesignerapi::cTokenContainer *tkPlugMenu = plgManager->GetTokenContainer(plugId, plugMenuId);
+    tokenContainer = new skindesignerapi::cTokenContainer(*tkPlugMenu);
+    InheritTokenContainer();
+}
+
+void cCeMenuPlugin::Set(skindesignerapi::cTokenContainer *tk) {
+    tokenContainer->Clear();
+    tokenContainer->SetTokens(tk);
+    dirty = true;
+}
+
+bool cCeMenuPlugin::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    if (!dirty)
+        return false;
+    return true;
+}
+
+/******************************************************************
+* cLeAudioTracks
+******************************************************************/
+cLeAudioTracks::cLeAudioTracks(void) {
+    text = NULL;
+}
+
+cLeAudioTracks::~cLeAudioTracks(void) {
+    free(text);
+}
+
+void cLeAudioTracks::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{title}", (int)eLeDisplayTracksST::title);
+    tokenContainer->DefineIntToken("{nummenuitem}", (int)eLeDisplayTracksIT::nummenuitem);
+    tokenContainer->DefineIntToken("{current}", (int)eLeDisplayTracksIT::current);
+    InheritTokenContainer();
+}
+
+void cLeAudioTracks::Set(const char *text) {
+    if (!text)
+        return;
+    free(this->text);
+    this->text = strdup(text);
+    dirty = true;
+}
+
+bool cLeAudioTracks::Parse(bool forced) {
+    if (!dirty)
+        return false;
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eLeDisplayTracksIT::nummenuitem, num);
+    tokenContainer->AddIntToken((int)eLeDisplayTracksIT::current, current);
+    tokenContainer->AddStringToken((int)eLeDisplayTracksST::title, text);
+    return true;
 }
\ No newline at end of file
diff --git a/coreengine/listelements.h b/coreengine/listelements.h
index 1917b81..9b3dd78 100644
--- a/coreengine/listelements.h
+++ b/coreengine/listelements.h
@@ -1,340 +1,340 @@
-#ifndef __LISTELEMENTS_H

-#define __LISTELEMENTS_H

-

-#include "viewelement.h"

-#include "../extensions/scrapmanager.h"

-

-#define MAX_TABS 6

-/******************************************************************

-* cListElement

-******************************************************************/

-class cListElement : public cViewElement {

-protected:

-    eMenuCategory menuCat;

-    int num;

-    bool current;

-    bool wasCurrent;

-    bool selectable;

-    cViewElement *currentElement;

-    char *ParseSeparator(const char *text);

-public:

-    cListElement(void);

-    cListElement(const cListElement &other);

-    virtual ~cListElement(void) {};

-    void SetMenuCategory(eMenuCategory menuCat) { this->menuCat = menuCat; };

-    void SetNumber(int number) { num = number; };

-    void SetCurrent(bool cur);

-    bool Current(void) { return current; };

-    void WakeCurrent(void);

-    void SetSelectable(bool sel) { selectable = sel; };

-    bool DoScroll(void) { return current; };

-    virtual void RenderCurrent(void) { };

-    void Close(void);

-    void Clear(void);

-};

-

-/******************************************************************

-* cCurrentElement

-******************************************************************/

-class cCurrentElement : public cViewElement {

-protected:

-    int listX;

-    int listY;

-    int listWidth;

-    int listHeight;

-public:

-    cCurrentElement(void);

-    virtual ~cCurrentElement(void) {};

-    void SetListPosition(int x, int y, int width, int height);

-    void SetListTokens(skindesignerapi::cTokenContainer *tokenContainer);

-};

-

-/******************************************************************

-* cLeMenuDefault

-******************************************************************/

-class cLeMenuDefault : public cListElement {

-private:

-    char *text;

-    int *colX;

-    int *colWidths;

-    const char *plugName;

-    const char *GetTabbedText(const char *s, int tab);

-    void SetMenuCategory(void);

-    void CheckProgressBar(const char *text, int tab);

-public:

-    cLeMenuDefault(void);

-    cLeMenuDefault(const cLeMenuDefault &other);

-    virtual ~cLeMenuDefault(void);

-    void SetListInfo(int *colX, int *colWidths);

-    void SetText(const char *text);

-    void SetPlugin(const char *plugName) { this->plugName = plugName; };

-    void SetTokenContainer(void);

-    bool Parse(bool forced = true);

-};

-

-/******************************************************************

-* cVeMenuMain

-******************************************************************/

-class cVeMenuMain {

-protected:

-    char *text;

-    char *number;

-    char *label;

-    void SplitText(void);

-public:

-    cVeMenuMain(void);

-    virtual ~cVeMenuMain(void);

-    void SetText(const char *text);

-};

-

-/******************************************************************

-* cLeMenuMain

-******************************************************************/

-class cCeMenuMain;

-class cLeMenuMain : public cListElement, public cVeMenuMain {

-private:

-    cCeMenuMain *currentMain;

-public:

-    cLeMenuMain(void);

-    cLeMenuMain(const cLeMenuMain &other);

-    virtual ~cLeMenuMain(void);

-    void SetTokenContainer(void);

-    void SetCurrentElement(cCeMenuMain *cur) { currentMain = cur; currentElement = (cViewElement*)cur; };

-    void ClearCurrentElement(void);

-    void SetText(const char *text);

-    bool Parse(bool forced = true);

-    void RenderCurrent(void);

-    const char *PluginName(void);

-};

-

-/******************************************************************

-* cCeMenuMain

-******************************************************************/

-class cCeMenuMain : public cCurrentElement, public cVeMenuMain {

-private:

-public:

-    cCeMenuMain(void);

-    virtual ~cCeMenuMain(void);

-    void SetTokenContainer(void);

-    void SetText(const char *text);

-    bool Parse(bool forced = true);

-};

-

-/******************************************************************

-* cVeMenuSchedules

-******************************************************************/

-class cVeMenuSchedules {

-protected:

-    const cEvent *event;

-    const cChannel *channel;

-    bool withDate;

-    eTimerMatch timerMatch;

-    bool epgSearchFav;

-public:

-    cVeMenuSchedules(void);

-    virtual ~cVeMenuSchedules(void){};

-    void SetEpgSearchFav(bool isFav) { epgSearchFav = isFav; };

-};

-

-/******************************************************************

-* cLeMenuSchedules

-******************************************************************/

-class cCeMenuSchedules;

-class cLeMenuSchedules : public cListElement, public cVeMenuSchedules {

-private:

-    cCeMenuSchedules *currentSchedules;

-public:

-    cLeMenuSchedules(void);

-    cLeMenuSchedules(const cLeMenuSchedules &other);

-    virtual ~cLeMenuSchedules(void);

-    void SetTokenContainer(void);

-    void SetCurrentElement(cCeMenuSchedules *cur) { currentSchedules = cur; currentElement = (cViewElement*)cur; };

-    void ClearCurrentElement(void);

-    void Set(const cEvent *event, const cChannel *channel, bool withDate, eTimerMatch timerMatch);

-    bool Parse(bool forced = true);

-    void RenderCurrent(void);

-};

-

-/******************************************************************

-* cCeMenuSchedules

-******************************************************************/

-class cCeMenuSchedules : public cCurrentElement, public cVeMenuSchedules, public cScrapManager {

-private:

-    eMenuCategory menuCat;

-    int schedulesIndex;

-public:

-    cCeMenuSchedules(void);

-    virtual ~cCeMenuSchedules(void);

-    void SetTokenContainer(void);

-    void Set(const cEvent *event, const cChannel *channel, bool withDate, eTimerMatch timerMatch, eMenuCategory menuCat);

-    bool Parse(bool forced = true);

-};

-

-/******************************************************************

-* cLeMenuChannels

-******************************************************************/

-class cCeMenuChannels;

-class cLeMenuChannels : public cListElement {

-private:

-    cCeMenuChannels *currentChannel;

-    const cChannel *channel;

-    bool withProvider;

-public:

-    cLeMenuChannels(void);

-    cLeMenuChannels(const cLeMenuChannels &other);

-    virtual ~cLeMenuChannels(void);

-    void SetTokenContainer(void);

-    void SetCurrentElement(cCeMenuChannels *cur) { currentChannel = cur; currentElement = (cViewElement*)cur; };

-    void ClearCurrentElement(void);

-    void Set(const cChannel *channel, bool withProvider);

-    bool Parse(bool forced = true);

-    void RenderCurrent(void);

-};

-

-/******************************************************************

-* cCeMenuChannels

-******************************************************************/

-class cCeMenuChannels : public cCurrentElement {

-private:

-    const cChannel *channel;

-    bool withProvider;

-    int schedulesIndex;

-public:

-    cCeMenuChannels(void);

-    virtual ~cCeMenuChannels(void);

-    void SetTokenContainer(void);

-    void Set(const cChannel *channel, bool withProvider);

-    bool Parse(bool forced = true);

-};

-

-/******************************************************************

-* cLeMenuTimers

-******************************************************************/

-class cCeMenuTimers;

-class cLeMenuTimers : public cListElement {

-private:

-    cCeMenuTimers *currentTimer;

-    const cTimer *timer;

-public:

-    cLeMenuTimers(void);

-    cLeMenuTimers(const cLeMenuTimers &other);

-    virtual ~cLeMenuTimers(void);

-    void SetTokenContainer(void);

-    void SetCurrentElement(cCeMenuTimers *cur) { currentTimer = cur; currentElement = (cViewElement*)cur; };

-    void ClearCurrentElement(void);

-    void Set(const cTimer *timer);

-    bool Parse(bool forced = true);

-    void RenderCurrent(void);

-};

-

-/******************************************************************

-* cCeMenuTimers

-******************************************************************/

-class cCeMenuTimers : public cCurrentElement {

-private:

-    const cTimer *timer;

-public:

-    cCeMenuTimers(void);

-    virtual ~cCeMenuTimers(void);

-    void SetTokenContainer(void);

-    void Set(const cTimer *timer);

-    bool Parse(bool forced = true);

-};

-

-/******************************************************************

-* cLeMenuRecordings

-******************************************************************/

-class cCeMenuRecordings;

-class cLeMenuRecordings : public cListElement, public cScrapManager {

-private:

-    cCeMenuRecordings *currentRecording;

-    const cRecording *recording;

-    int level;

-    int total;

-    int New;

-    char *RecName(const char *path, int level);

-    char *FolderName(const char *path, int level);

-public:

-    cLeMenuRecordings(void);

-    cLeMenuRecordings(const cLeMenuRecordings &other);

-    virtual ~cLeMenuRecordings(void);

-    void SetTokenContainer(void);

-    void SetCurrentElement(cCeMenuRecordings *cur) { currentRecording = cur; currentElement = (cViewElement*)cur; };

-    void ClearCurrentElement(void);

-    void Set(const cRecording *recording, int level, int total, int New);

-    bool Parse(bool forced = true);

-    void RenderCurrent(void);

-};

-

-/******************************************************************

-* cCeMenuRecordings

-******************************************************************/

-class cCeMenuRecordings : public cCurrentElement, public cScrapManager {

-private:

-    const cRecording *recording;

-    int level;

-    int total;

-    int New;

-public:

-    cCeMenuRecordings(void);

-    virtual ~cCeMenuRecordings(void);

-    void SetTokenContainer(void);

-    void Set(const cRecording *recording, int level, int total, int New);

-    bool Parse(bool forced = true);

-};

-

-/******************************************************************

-* cLeMenuPlugin

-******************************************************************/

-class cCeMenuPlugin;

-class cLeMenuPlugin : public cListElement {

-private:

-    int plugId;

-    int plugMenuId;

-    cCeMenuPlugin *currentPlugin;

-public:

-    cLeMenuPlugin(void);

-    cLeMenuPlugin(const cLeMenuPlugin &other);

-    virtual ~cLeMenuPlugin(void);

-    void SetTokenContainer(void);

-    void SetPlugId(int id) { plugId = id; };

-    void SetPlugMenuId(int id) { plugMenuId = id; };

-    void SetCurrentElement(cCeMenuPlugin *cur) { currentPlugin = cur; currentElement = (cViewElement*)cur; };

-    void ClearCurrentElement(void);

-    void Set(skindesignerapi::cTokenContainer *tk);

-    bool Parse(bool forced = true);

-    void RenderCurrent(void);

-};

-

-/******************************************************************

-* cCeMenuPlugin

-******************************************************************/

-class cCeMenuPlugin : public cCurrentElement {

-private:

-    int plugId;

-    int plugMenuId;

-public:

-    cCeMenuPlugin(void);

-    virtual ~cCeMenuPlugin(void);

-    void SetTokenContainer(void);

-    void SetPlugId(int id) { plugId = id; };

-    void SetPlugMenuId(int id) { plugMenuId = id; };

-    void Set(skindesignerapi::cTokenContainer *tk);

-    bool Parse(bool forced = true);

-};

-

-/******************************************************************

-* cLeAudioTracks

-******************************************************************/

-class cLeAudioTracks : public cListElement {

-private:

-    char *text;

-public:

-    cLeAudioTracks(void);

-    virtual ~cLeAudioTracks(void);

-    void SetTokenContainer(void);

-    void Set(const char *text);

-    bool Parse(bool forced = true);

-};

-

+#ifndef __LISTELEMENTS_H
+#define __LISTELEMENTS_H
+
+#include "viewelement.h"
+#include "../extensions/scrapmanager.h"
+
+#define MAX_TABS 6
+/******************************************************************
+* cListElement
+******************************************************************/
+class cListElement : public cViewElement {
+protected:
+    eMenuCategory menuCat;
+    int num;
+    bool current;
+    bool wasCurrent;
+    bool selectable;
+    cViewElement *currentElement;
+    char *ParseSeparator(const char *text);
+public:
+    cListElement(void);
+    cListElement(const cListElement &other);
+    virtual ~cListElement(void) {};
+    void SetMenuCategory(eMenuCategory menuCat) { this->menuCat = menuCat; };
+    void SetNumber(int number) { num = number; };
+    void SetCurrent(bool cur);
+    bool Current(void) { return current; };
+    void WakeCurrent(void);
+    void SetSelectable(bool sel) { selectable = sel; };
+    bool DoScroll(void) { return current; };
+    virtual void RenderCurrent(void) { };
+    void Close(void);
+    void Clear(void);
+};
+
+/******************************************************************
+* cCurrentElement
+******************************************************************/
+class cCurrentElement : public cViewElement {
+protected:
+    int listX;
+    int listY;
+    int listWidth;
+    int listHeight;
+public:
+    cCurrentElement(void);
+    virtual ~cCurrentElement(void) {};
+    void SetListPosition(int x, int y, int width, int height);
+    void SetListTokens(skindesignerapi::cTokenContainer *tokenContainer);
+};
+
+/******************************************************************
+* cLeMenuDefault
+******************************************************************/
+class cLeMenuDefault : public cListElement {
+private:
+    char *text;
+    int *colX;
+    int *colWidths;
+    const char *plugName;
+    const char *GetTabbedText(const char *s, int tab);
+    void SetMenuCategory(void);
+    void CheckProgressBar(const char *text, int tab);
+public:
+    cLeMenuDefault(void);
+    cLeMenuDefault(const cLeMenuDefault &other);
+    virtual ~cLeMenuDefault(void);
+    void SetListInfo(int *colX, int *colWidths);
+    void SetText(const char *text);
+    void SetPlugin(const char *plugName) { this->plugName = plugName; };
+    void SetTokenContainer(void);
+    bool Parse(bool forced = true);
+};
+
+/******************************************************************
+* cVeMenuMain
+******************************************************************/
+class cVeMenuMain {
+protected:
+    char *text;
+    char *number;
+    char *label;
+    void SplitText(void);
+public:
+    cVeMenuMain(void);
+    virtual ~cVeMenuMain(void);
+    void SetText(const char *text);
+};
+
+/******************************************************************
+* cLeMenuMain
+******************************************************************/
+class cCeMenuMain;
+class cLeMenuMain : public cListElement, public cVeMenuMain {
+private:
+    cCeMenuMain *currentMain;
+public:
+    cLeMenuMain(void);
+    cLeMenuMain(const cLeMenuMain &other);
+    virtual ~cLeMenuMain(void);
+    void SetTokenContainer(void);
+    void SetCurrentElement(cCeMenuMain *cur) { currentMain = cur; currentElement = (cViewElement*)cur; };
+    void ClearCurrentElement(void);
+    void SetText(const char *text);
+    bool Parse(bool forced = true);
+    void RenderCurrent(void);
+    const char *PluginName(void);
+};
+
+/******************************************************************
+* cCeMenuMain
+******************************************************************/
+class cCeMenuMain : public cCurrentElement, public cVeMenuMain {
+private:
+public:
+    cCeMenuMain(void);
+    virtual ~cCeMenuMain(void);
+    void SetTokenContainer(void);
+    void SetText(const char *text);
+    bool Parse(bool forced = true);
+};
+
+/******************************************************************
+* cVeMenuSchedules
+******************************************************************/
+class cVeMenuSchedules {
+protected:
+    const cEvent *event;
+    const cChannel *channel;
+    bool withDate;
+    eTimerMatch timerMatch;
+    bool epgSearchFav;
+public:
+    cVeMenuSchedules(void);
+    virtual ~cVeMenuSchedules(void){};
+    void SetEpgSearchFav(bool isFav) { epgSearchFav = isFav; };
+};
+
+/******************************************************************
+* cLeMenuSchedules
+******************************************************************/
+class cCeMenuSchedules;
+class cLeMenuSchedules : public cListElement, public cVeMenuSchedules {
+private:
+    cCeMenuSchedules *currentSchedules;
+public:
+    cLeMenuSchedules(void);
+    cLeMenuSchedules(const cLeMenuSchedules &other);
+    virtual ~cLeMenuSchedules(void);
+    void SetTokenContainer(void);
+    void SetCurrentElement(cCeMenuSchedules *cur) { currentSchedules = cur; currentElement = (cViewElement*)cur; };
+    void ClearCurrentElement(void);
+    void Set(const cEvent *event, const cChannel *channel, bool withDate, eTimerMatch timerMatch);
+    bool Parse(bool forced = true);
+    void RenderCurrent(void);
+};
+
+/******************************************************************
+* cCeMenuSchedules
+******************************************************************/
+class cCeMenuSchedules : public cCurrentElement, public cVeMenuSchedules, public cScrapManager {
+private:
+    eMenuCategory menuCat;
+    int schedulesIndex;
+public:
+    cCeMenuSchedules(void);
+    virtual ~cCeMenuSchedules(void);
+    void SetTokenContainer(void);
+    void Set(const cEvent *event, const cChannel *channel, bool withDate, eTimerMatch timerMatch, eMenuCategory menuCat);
+    bool Parse(bool forced = true);
+};
+
+/******************************************************************
+* cLeMenuChannels
+******************************************************************/
+class cCeMenuChannels;
+class cLeMenuChannels : public cListElement {
+private:
+    cCeMenuChannels *currentChannel;
+    const cChannel *channel;
+    bool withProvider;
+public:
+    cLeMenuChannels(void);
+    cLeMenuChannels(const cLeMenuChannels &other);
+    virtual ~cLeMenuChannels(void);
+    void SetTokenContainer(void);
+    void SetCurrentElement(cCeMenuChannels *cur) { currentChannel = cur; currentElement = (cViewElement*)cur; };
+    void ClearCurrentElement(void);
+    void Set(const cChannel *channel, bool withProvider);
+    bool Parse(bool forced = true);
+    void RenderCurrent(void);
+};
+
+/******************************************************************
+* cCeMenuChannels
+******************************************************************/
+class cCeMenuChannels : public cCurrentElement {
+private:
+    const cChannel *channel;
+    bool withProvider;
+    int schedulesIndex;
+public:
+    cCeMenuChannels(void);
+    virtual ~cCeMenuChannels(void);
+    void SetTokenContainer(void);
+    void Set(const cChannel *channel, bool withProvider);
+    bool Parse(bool forced = true);
+};
+
+/******************************************************************
+* cLeMenuTimers
+******************************************************************/
+class cCeMenuTimers;
+class cLeMenuTimers : public cListElement {
+private:
+    cCeMenuTimers *currentTimer;
+    const cTimer *timer;
+public:
+    cLeMenuTimers(void);
+    cLeMenuTimers(const cLeMenuTimers &other);
+    virtual ~cLeMenuTimers(void);
+    void SetTokenContainer(void);
+    void SetCurrentElement(cCeMenuTimers *cur) { currentTimer = cur; currentElement = (cViewElement*)cur; };
+    void ClearCurrentElement(void);
+    void Set(const cTimer *timer);
+    bool Parse(bool forced = true);
+    void RenderCurrent(void);
+};
+
+/******************************************************************
+* cCeMenuTimers
+******************************************************************/
+class cCeMenuTimers : public cCurrentElement {
+private:
+    const cTimer *timer;
+public:
+    cCeMenuTimers(void);
+    virtual ~cCeMenuTimers(void);
+    void SetTokenContainer(void);
+    void Set(const cTimer *timer);
+    bool Parse(bool forced = true);
+};
+
+/******************************************************************
+* cLeMenuRecordings
+******************************************************************/
+class cCeMenuRecordings;
+class cLeMenuRecordings : public cListElement, public cScrapManager {
+private:
+    cCeMenuRecordings *currentRecording;
+    const cRecording *recording;
+    int level;
+    int total;
+    int New;
+    char *RecName(const char *path, int level);
+    char *FolderName(const char *path, int level);
+public:
+    cLeMenuRecordings(void);
+    cLeMenuRecordings(const cLeMenuRecordings &other);
+    virtual ~cLeMenuRecordings(void);
+    void SetTokenContainer(void);
+    void SetCurrentElement(cCeMenuRecordings *cur) { currentRecording = cur; currentElement = (cViewElement*)cur; };
+    void ClearCurrentElement(void);
+    void Set(const cRecording *recording, int level, int total, int New);
+    bool Parse(bool forced = true);
+    void RenderCurrent(void);
+};
+
+/******************************************************************
+* cCeMenuRecordings
+******************************************************************/
+class cCeMenuRecordings : public cCurrentElement, public cScrapManager {
+private:
+    const cRecording *recording;
+    int level;
+    int total;
+    int New;
+public:
+    cCeMenuRecordings(void);
+    virtual ~cCeMenuRecordings(void);
+    void SetTokenContainer(void);
+    void Set(const cRecording *recording, int level, int total, int New);
+    bool Parse(bool forced = true);
+};
+
+/******************************************************************
+* cLeMenuPlugin
+******************************************************************/
+class cCeMenuPlugin;
+class cLeMenuPlugin : public cListElement {
+private:
+    int plugId;
+    int plugMenuId;
+    cCeMenuPlugin *currentPlugin;
+public:
+    cLeMenuPlugin(void);
+    cLeMenuPlugin(const cLeMenuPlugin &other);
+    virtual ~cLeMenuPlugin(void);
+    void SetTokenContainer(void);
+    void SetPlugId(int id) { plugId = id; };
+    void SetPlugMenuId(int id) { plugMenuId = id; };
+    void SetCurrentElement(cCeMenuPlugin *cur) { currentPlugin = cur; currentElement = (cViewElement*)cur; };
+    void ClearCurrentElement(void);
+    void Set(skindesignerapi::cTokenContainer *tk);
+    bool Parse(bool forced = true);
+    void RenderCurrent(void);
+};
+
+/******************************************************************
+* cCeMenuPlugin
+******************************************************************/
+class cCeMenuPlugin : public cCurrentElement {
+private:
+    int plugId;
+    int plugMenuId;
+public:
+    cCeMenuPlugin(void);
+    virtual ~cCeMenuPlugin(void);
+    void SetTokenContainer(void);
+    void SetPlugId(int id) { plugId = id; };
+    void SetPlugMenuId(int id) { plugMenuId = id; };
+    void Set(skindesignerapi::cTokenContainer *tk);
+    bool Parse(bool forced = true);
+};
+
+/******************************************************************
+* cLeAudioTracks
+******************************************************************/
+class cLeAudioTracks : public cListElement {
+private:
+    char *text;
+public:
+    cLeAudioTracks(void);
+    virtual ~cLeAudioTracks(void);
+    void SetTokenContainer(void);
+    void Set(const char *text);
+    bool Parse(bool forced = true);
+};
+
 #endif //__LISTELEMENTS_H
\ No newline at end of file
diff --git a/coreengine/osdwrapper.c b/coreengine/osdwrapper.c
index ec1119c..76b5bf7 100644
--- a/coreengine/osdwrapper.c
+++ b/coreengine/osdwrapper.c
@@ -1,71 +1,71 @@
-#include "osdwrapper.h"

-

-cSdOsd::cSdOsd(void) {

-    osd = NULL;

-    flushLocked = false;

-}

-

-cSdOsd::~cSdOsd(void) {

-    DeleteOsd();

-}

-

-void cSdOsd::Lock(void) {

-    mutex.Lock();

-}

-

-void cSdOsd::Unlock(void) {

-    mutex.Unlock();

-}

-

-void cSdOsd::LockFlush(void) {

-    Lock();

-    flushLocked = true;

-    Unlock();

-}

-

-void cSdOsd::UnlockFlush(void) {

-    Lock();

-    flushLocked = false;

-    Unlock();

-}

-

-bool cSdOsd::CreateOsd(int x, int y, int width, int height) {

-    cOsd *newOsd = cOsdProvider::NewOsd(cOsd::OsdLeft() + x, cOsd::OsdTop() + y);

-    if (newOsd) {

-        tArea Area = { 0, 0, width - 1, height - 1,  32 };

-        if (newOsd->SetAreas(&Area, 1) == oeOk) {

-            Lock();

-            osd = newOsd;

-            Unlock();

-            return true;

-        }

-    }

-    return false;

-}

-

-void cSdOsd::DeleteOsd(void) {

-    Lock();

-    delete osd;

-    osd = NULL;

-    Unlock();

-}

-

-cPixmap *cSdOsd::CreatePixmap(int layer, cRect &viewPort, cRect &drawPort) {

-    if (osd) {

-        return osd->CreatePixmap(layer, viewPort, drawPort);

-    }

-    return NULL;

-}

-

-void cSdOsd::DestroyPixmap(cPixmap *pix) {

-    if (osd) {

-        osd->DestroyPixmap(pix);

-    }

-}

-

-void cSdOsd::Flush(void) {

-    Lock();

-    if (osd && !flushLocked)

-        osd->Flush();

-    Unlock();    

-}

+#include "osdwrapper.h"
+
+cSdOsd::cSdOsd(void) {
+    osd = NULL;
+    flushLocked = false;
+}
+
+cSdOsd::~cSdOsd(void) {
+    DeleteOsd();
+}
+
+void cSdOsd::Lock(void) {
+    mutex.Lock();
+}
+
+void cSdOsd::Unlock(void) {
+    mutex.Unlock();
+}
+
+void cSdOsd::LockFlush(void) {
+    Lock();
+    flushLocked = true;
+    Unlock();
+}
+
+void cSdOsd::UnlockFlush(void) {
+    Lock();
+    flushLocked = false;
+    Unlock();
+}
+
+bool cSdOsd::CreateOsd(int x, int y, int width, int height) {
+    cOsd *newOsd = cOsdProvider::NewOsd(cOsd::OsdLeft() + x, cOsd::OsdTop() + y);
+    if (newOsd) {
+        tArea Area = { 0, 0, width - 1, height - 1,  32 };
+        if (newOsd->SetAreas(&Area, 1) == oeOk) {
+            Lock();
+            osd = newOsd;
+            Unlock();
+            return true;
+        }
+    }
+    return false;
+}
+
+void cSdOsd::DeleteOsd(void) {
+    Lock();
+    delete osd;
+    osd = NULL;
+    Unlock();
+}
+
+cPixmap *cSdOsd::CreatePixmap(int layer, cRect &viewPort, cRect &drawPort) {
+    if (osd) {
+        return osd->CreatePixmap(layer, viewPort, drawPort);
+    }
+    return NULL;
+}
+
+void cSdOsd::DestroyPixmap(cPixmap *pix) {
+    if (osd) {
+        osd->DestroyPixmap(pix);
+    }
+}
+
+void cSdOsd::Flush(void) {
+    Lock();
+    if (osd && !flushLocked)
+        osd->Flush();
+    Unlock();    
+}
diff --git a/coreengine/osdwrapper.h b/coreengine/osdwrapper.h
index ad0394d..fce9fa0 100644
--- a/coreengine/osdwrapper.h
+++ b/coreengine/osdwrapper.h
@@ -1,26 +1,26 @@
-#ifndef __OSDWRAPPER_H

-#define __OSDWRAPPER_H

-

-#include <vdr/osd.h>

-#include <vdr/thread.h>

-

-class cSdOsd {

-private:

-    cOsd *osd;

-    cMutex mutex;

-    bool flushLocked;

-public:

-    cSdOsd(void);

-    virtual ~cSdOsd(void);

-    void Lock(void);

-    void Unlock(void);

-    void LockFlush(void);

-    void UnlockFlush(void);

-    bool CreateOsd(int x, int y, int width, int height);

-    void DeleteOsd(void);

-    cPixmap *CreatePixmap(int layer, cRect &viewPort, cRect &drawPort);

-    void DestroyPixmap(cPixmap *pix);

-    void Flush(void);

-};

-

+#ifndef __OSDWRAPPER_H
+#define __OSDWRAPPER_H
+
+#include <vdr/osd.h>
+#include <vdr/thread.h>
+
+class cSdOsd {
+private:
+    cOsd *osd;
+    cMutex mutex;
+    bool flushLocked;
+public:
+    cSdOsd(void);
+    virtual ~cSdOsd(void);
+    void Lock(void);
+    void Unlock(void);
+    void LockFlush(void);
+    void UnlockFlush(void);
+    bool CreateOsd(int x, int y, int width, int height);
+    void DeleteOsd(void);
+    cPixmap *CreatePixmap(int layer, cRect &viewPort, cRect &drawPort);
+    void DestroyPixmap(cPixmap *pix);
+    void Flush(void);
+};
+
 #endif //__OSDWRAPPER_H
\ No newline at end of file
diff --git a/coreengine/viewdetail.c b/coreengine/viewdetail.c
index 334cf5d..85bf947 100644
--- a/coreengine/viewdetail.c
+++ b/coreengine/viewdetail.c
@@ -1,978 +1,978 @@
-#include "viewdetail.h"

-#include "../config.h"

-/******************************************************************

-* cViewDetail

-******************************************************************/

-cViewDetail::cViewDetail(void) {

-    activeTab = NULL;

-    activeTabIndex = -1;

-    numTabs = 0;

-    plugId = -1;

-    plugMenuId = -1;

-}

-

-cViewDetail::~cViewDetail(void) {

-}

-

-void cViewDetail::SetActiveTab(void) {

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        if (node->ActiveTab()) {

-            activeTab = dynamic_cast<cArea*>(node);

-            activeTabIndex = 0;

-            return;

-        }

-    }

-}

-

-int cViewDetail::GetWidth(void) {

-    cAreaNode *node = areaNodes.First();

-    if (!node)

-        return 0;

-    return node->GetWidth();

-}

-

-void cViewDetail::ResetTabs(void) {

-    activeTab = NULL;

-    activeTabIndex = -1;

-}

-

-void cViewDetail::Clear(void) {

-    cViewElement::Close();    

-}

-

-void cViewDetail::Close(void) {

-    cViewElement::Close();    

-    activeTab = NULL;

-    activeTabIndex = -1;

-    numTabs = 0;

-}

-

-void cViewDetail::Render(void) {

-    if (!dirty || blocked)

-        return;

-

-    if (attribs->DoDebug())

-        Debug();

-    

-    if (!activeTab)

-        SetActiveTab();

-    if (!activeTab)

-        return;

-

-    activeTab->Clear();

-    if (activeTab->Execute()) {

-        activeTab->Render();

-    }

-

-    dirty = false;

-}

-

-void cViewDetail::Scrollbar(int &barheight, int &offset, bool &end) {

-    if (!activeTab)

-        return;

-    cRect tabViewPort = activeTab->ViewPort();

-    cRect tabDrawPort = activeTab->DrawPort();

-    int totalHeight = tabDrawPort.Height();

-    int screenHeight = tabViewPort.Height();

-    int y = (-1)*tabDrawPort.Y();

-    if (totalHeight == 0) {

-        return;

-    }

-    if (totalHeight <= screenHeight)

-        barheight = 1000;

-    else {

-        barheight = (double)screenHeight / (double) totalHeight * 1000; 

-    }

-    offset = (double)y / (double) totalHeight * 1000;

-    end = true;

-}

-

-bool cViewDetail::ScrollUp(bool page) {

-    if (!activeTab)

-        return false;

-    cRect tabDrawPort = activeTab->DrawPort();

-    int scrollStep = activeTab->ScrollStep();

-    if (page) {

-        cRect tabViewPort = activeTab->ViewPort();

-        scrollStep = tabViewPort.Height();

-    }

-    int aktHeight = tabDrawPort.Y();

-    if (aktHeight >= 0) {

-        return false;

-    }

-    int newY = aktHeight + scrollStep;

-    if (newY > 0)

-        newY = 0;

-    cPoint dp(0, newY);

-    activeTab->SetDrawPort(dp);

-    return true;

-}

-

-bool cViewDetail::ScrollDown(bool page) {

-    if (!activeTab)

-        return false;

-    cRect tabViewPort = activeTab->ViewPort();

-    cRect tabDrawPort = activeTab->DrawPort();

-    int scrollStep = activeTab->ScrollStep();

-    if (page) {

-        scrollStep = tabViewPort.Height();

-    }

-    int aktHeight = tabDrawPort.Y();

-    int totalHeight = tabDrawPort.Height();

-    int screenHeight = tabViewPort.Height();

-

-    if (totalHeight - ((-1)*aktHeight) == screenHeight) {

-        return false;

-    }

-    int newY = aktHeight - scrollStep;

-    if ((-1)*newY > totalHeight - screenHeight)

-        newY = (-1)*(totalHeight - screenHeight);

-    cPoint dp(0, newY);

-    activeTab->SetDrawPort(dp);

-    return true;

-}

-

-int cViewDetail::GetTabs(vector<const char*> &tabs) {

-    int i=0;

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        if (!node->Execute())

-            continue;

-        tabs.push_back(node->Name());

-        if (node->ActiveTab()) {

-            activeTabIndex = i;

-        }

-        i++;

-    }

-    numTabs = i;

-    return activeTabIndex;

-}

-

-void cViewDetail::NextTab(void) {

-    cArea *nextActiveTab = NULL;

-    for (cAreaNode *node = areaNodes.Next(activeTab); node; node = areaNodes.Next(node)) {

-        if (node->Execute()) {

-            nextActiveTab = dynamic_cast<cArea*>(node);

-            activeTabIndex++;

-            break;

-        }

-    }

-    if (!nextActiveTab) {

-        nextActiveTab = dynamic_cast<cArea*>(areaNodes.First());

-        activeTabIndex = 0;

-    }

-    activeTab = nextActiveTab;

-}

-

-void cViewDetail::PrevTab(void) {

-    cArea *prevActiveTab = NULL;

-    for (cAreaNode *node = areaNodes.Prev(activeTab); node; node = areaNodes.Prev(node)) {

-        if (node->Execute()) {

-            prevActiveTab = dynamic_cast<cArea*>(node);

-            activeTabIndex--;

-            break;

-        }

-    }

-    if (!prevActiveTab) {

-        int numActiveTabs = 0;

-        for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-            if (node->Execute()) {

-                numActiveTabs++;

-            }

-        }

-        for (cAreaNode *node = areaNodes.Last(); node; node = areaNodes.Prev(node)) {

-            if (node->Execute()) {

-                prevActiveTab = dynamic_cast<cArea*>(node);

-                activeTabIndex = numActiveTabs-1;

-                break;

-            }

-        }

-    }

-    activeTab = prevActiveTab;

-}

-

-void cViewDetail::SetTransparency(int transparency, bool forceDetached) {

-    if (activeTab)

-        activeTab->SetTransparency(transparency);

-}

-

-/******************************************************************

-* cViewDetailEpg

-******************************************************************/

-cViewDetailEpg::cViewDetailEpg(void) {

-    event = NULL;

-    rerunsIndex = -1;

-    actorsIndex = -1;

-}

-

-cViewDetailEpg::~cViewDetailEpg(void) {

-}

-

-void cViewDetailEpg::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{title}", (int)eDmDetailedEpgST::title);

-    tokenContainer->DefineStringToken("{shorttext}", (int)eDmDetailedEpgST::shorttext);

-    tokenContainer->DefineStringToken("{description}", (int)eDmDetailedEpgST::description);

-    tokenContainer->DefineStringToken("{start}", (int)eDmDetailedEpgST::start);

-    tokenContainer->DefineStringToken("{stop}", (int)eDmDetailedEpgST::stop);

-    tokenContainer->DefineStringToken("{day}", (int)eDmDetailedEpgST::day);

-    tokenContainer->DefineStringToken("{date}", (int)eDmDetailedEpgST::date);

-    tokenContainer->DefineStringToken("{durationminutes}", (int)eDmDetailedEpgST::durationminutes);

-    tokenContainer->DefineStringToken("{vps}", (int)eDmDetailedEpgST::vps);

-    tokenContainer->DefineStringToken("{channelname}", (int)eDmDetailedEpgST::channelname);

-    tokenContainer->DefineStringToken("{channelid}", (int)eDmDetailedEpgST::channelid);

-    tokenContainer->DefineStringToken("{epgpic1path}", (int)eDmDetailedEpgST::epgpic1path);

-    tokenContainer->DefineStringToken("{epgpic2path}", (int)eDmDetailedEpgST::epgpic2path);

-    tokenContainer->DefineStringToken("{epgpic3path}", (int)eDmDetailedEpgST::epgpic3path);

-    tokenContainer->DefineStringToken("{movietitle}", (int)eScraperST::movietitle);

-    tokenContainer->DefineStringToken("{movieoriginalTitle}", (int)eScraperST::movieoriginalTitle);

-    tokenContainer->DefineStringToken("{movietagline}", (int)eScraperST::movietagline);

-    tokenContainer->DefineStringToken("{movieoverview}", (int)eScraperST::movieoverview);

-    tokenContainer->DefineStringToken("{moviegenres}", (int)eScraperST::moviegenres);

-    tokenContainer->DefineStringToken("{moviehomepage}", (int)eScraperST::moviehomepage);

-    tokenContainer->DefineStringToken("{moviereleasedate}", (int)eScraperST::moviereleasedate);

-    tokenContainer->DefineStringToken("{moviepopularity}", (int)eScraperST::moviepopularity);

-    tokenContainer->DefineStringToken("{movievoteaverage}", (int)eScraperST::movievoteaverage);

-    tokenContainer->DefineStringToken("{posterpath}", (int)eScraperST::posterpath);

-    tokenContainer->DefineStringToken("{fanartpath}", (int)eScraperST::fanartpath);

-    tokenContainer->DefineStringToken("{moviecollectionName}", (int)eScraperST::moviecollectionName);

-    tokenContainer->DefineStringToken("{collectionposterpath}", (int)eScraperST::collectionposterpath);

-    tokenContainer->DefineStringToken("{collectionfanartpath}", (int)eScraperST::collectionfanartpath);

-    tokenContainer->DefineStringToken("{seriesname}", (int)eScraperST::seriesname);

-    tokenContainer->DefineStringToken("{seriesoverview}", (int)eScraperST::seriesoverview);

-    tokenContainer->DefineStringToken("{seriesfirstaired}", (int)eScraperST::seriesfirstaired);

-    tokenContainer->DefineStringToken("{seriesnetwork}", (int)eScraperST::seriesnetwork);

-    tokenContainer->DefineStringToken("{seriesgenre}", (int)eScraperST::seriesgenre);

-    tokenContainer->DefineStringToken("{seriesrating}", (int)eScraperST::seriesrating);

-    tokenContainer->DefineStringToken("{seriesstatus}", (int)eScraperST::seriesstatus);

-    tokenContainer->DefineStringToken("{episodetitle}", (int)eScraperST::episodetitle);

-    tokenContainer->DefineStringToken("{episodefirstaired}", (int)eScraperST::episodefirstaired);

-    tokenContainer->DefineStringToken("{episodegueststars}", (int)eScraperST::episodegueststars);

-    tokenContainer->DefineStringToken("{episodeoverview}", (int)eScraperST::episodeoverview);

-    tokenContainer->DefineStringToken("{episoderating}", (int)eScraperST::episoderating);

-    tokenContainer->DefineStringToken("{episodeimagepath}", (int)eScraperST::episodeimagepath);

-    tokenContainer->DefineStringToken("{seasonposterpath}", (int)eScraperST::seasonposterpath);

-    tokenContainer->DefineStringToken("{seriesposter1path}", (int)eScraperST::seriesposter1path);

-    tokenContainer->DefineStringToken("{seriesposter2path}", (int)eScraperST::seriesposter2path);

-    tokenContainer->DefineStringToken("{seriesposter3path}", (int)eScraperST::seriesposter3path);

-    tokenContainer->DefineStringToken("{seriesfanart1path}", (int)eScraperST::seriesfanart1path);

-    tokenContainer->DefineStringToken("{seriesfanart2path}", (int)eScraperST::seriesfanart2path);

-    tokenContainer->DefineStringToken("{seriesfanart3path}", (int)eScraperST::seriesfanart3path);

-    tokenContainer->DefineStringToken("{seriesbanner1path}", (int)eScraperST::seriesbanner1path);

-    tokenContainer->DefineStringToken("{seriesbanner2path}", (int)eScraperST::seriesbanner2path);

-    tokenContainer->DefineStringToken("{seriesbanner3path}", (int)eScraperST::seriesbanner3path);

-    tokenContainer->DefineIntToken("{daynumeric}", (int)eDmDetailedEpgIT::daynumeric);

-    tokenContainer->DefineIntToken("{month}", (int)eDmDetailedEpgIT::month);

-    tokenContainer->DefineIntToken("{year}", (int)eDmDetailedEpgIT::year);

-    tokenContainer->DefineIntToken("{running}", (int)eDmDetailedEpgIT::running);

-    tokenContainer->DefineIntToken("{elapsed}", (int)eDmDetailedEpgIT::elapsed);

-    tokenContainer->DefineIntToken("{duration}", (int)eDmDetailedEpgIT::duration);

-    tokenContainer->DefineIntToken("{durationhours}", (int)eDmDetailedEpgIT::durationhours);

-    tokenContainer->DefineIntToken("{channelnumber}", (int)eDmDetailedEpgIT::channelnumber);

-    tokenContainer->DefineIntToken("{channellogoexists}", (int)eDmDetailedEpgIT::channellogoexists);

-    tokenContainer->DefineIntToken("{hasreruns}", (int)eDmDetailedEpgIT::hasreruns);

-    tokenContainer->DefineIntToken("{epgpic1avaialble}", (int)eDmDetailedEpgIT::epgpic1avaialble);

-    tokenContainer->DefineIntToken("{epgpic2avaialble}", (int)eDmDetailedEpgIT::epgpic2avaialble);

-    tokenContainer->DefineIntToken("{epgpic3avaialble}", (int)eDmDetailedEpgIT::epgpic3avaialble);

-    tokenContainer->DefineIntToken("{ismovie}", (int)eScraperIT::ismovie);

-    tokenContainer->DefineIntToken("{moviebudget}", (int)eScraperIT::moviebudget);

-    tokenContainer->DefineIntToken("{movierevenue}", (int)eScraperIT::movierevenue);

-    tokenContainer->DefineIntToken("{movieadult}", (int)eScraperIT::movieadult);

-    tokenContainer->DefineIntToken("{movieruntime}", (int)eScraperIT::movieruntime);

-    tokenContainer->DefineIntToken("{isseries}", (int)eScraperIT::isseries);

-    tokenContainer->DefineIntToken("{posterwidth}", (int)eScraperIT::posterwidth);

-    tokenContainer->DefineIntToken("{posterheight}", (int)eScraperIT::posterheight);

-    tokenContainer->DefineIntToken("{fanartwidth}", (int)eScraperIT::fanartwidth);

-    tokenContainer->DefineIntToken("{fanartheight}", (int)eScraperIT::fanartheight);

-    tokenContainer->DefineIntToken("{movieiscollection}", (int)eScraperIT::movieiscollection);

-    tokenContainer->DefineIntToken("{collectionposterwidth}", (int)eScraperIT::collectionposterwidth);

-    tokenContainer->DefineIntToken("{collectionposterheight}", (int)eScraperIT::collectionposterheight);

-    tokenContainer->DefineIntToken("{collectionfanartwidth}", (int)eScraperIT::collectionfanartwidth);

-    tokenContainer->DefineIntToken("{collectionfanartheight}", (int)eScraperIT::collectionfanartheight);

-    tokenContainer->DefineIntToken("{epgpicavailable}", (int)eScraperIT::epgpicavailable);

-    tokenContainer->DefineIntToken("{episodenumber}", (int)eScraperIT::episodenumber);

-    tokenContainer->DefineIntToken("{episodeseason}", (int)eScraperIT::episodeseason);

-    tokenContainer->DefineIntToken("{episodeimagewidth}", (int)eScraperIT::episodeimagewidth);

-    tokenContainer->DefineIntToken("{episodeimageheight}", (int)eScraperIT::episodeimageheight);

-    tokenContainer->DefineIntToken("{seasonposterwidth}", (int)eScraperIT::seasonposterwidth);

-    tokenContainer->DefineIntToken("{seasonposterheight}", (int)eScraperIT::seasonposterheight);

-    tokenContainer->DefineIntToken("{seriesposter1width}", (int)eScraperIT::seriesposter1width);

-    tokenContainer->DefineIntToken("{seriesposter1height}", (int)eScraperIT::seriesposter1height);

-    tokenContainer->DefineIntToken("{seriesposter2width}", (int)eScraperIT::seriesposter2width);

-    tokenContainer->DefineIntToken("{seriesposter2height}", (int)eScraperIT::seriesposter2height);

-    tokenContainer->DefineIntToken("{seriesposter3width}", (int)eScraperIT::seriesposter3width);

-    tokenContainer->DefineIntToken("{seriesposter3height}", (int)eScraperIT::seriesposter3height);

-    tokenContainer->DefineIntToken("{seriesfanart1width}", (int)eScraperIT::seriesfanart1width);

-    tokenContainer->DefineIntToken("{seriesfanart1height}", (int)eScraperIT::seriesfanart1height);

-    tokenContainer->DefineIntToken("{seriesfanart2width}", (int)eScraperIT::seriesfanart2width);

-    tokenContainer->DefineIntToken("{seriesfanart2height}", (int)eScraperIT::seriesfanart2height);

-    tokenContainer->DefineIntToken("{seriesfanart3width}", (int)eScraperIT::seriesfanart3width);

-    tokenContainer->DefineIntToken("{seriesfanart3height}", (int)eScraperIT::seriesfanart3height);

-    tokenContainer->DefineIntToken("{seriesbanner1width}", (int)eScraperIT::seriesbanner1width);

-    tokenContainer->DefineIntToken("{seriesbanner1height}", (int)eScraperIT::seriesbanner1height);

-    tokenContainer->DefineIntToken("{seriesbanner2width}", (int)eScraperIT::seriesbanner2width);

-    tokenContainer->DefineIntToken("{seriesbanner2height}", (int)eScraperIT::seriesbanner2height);

-    tokenContainer->DefineIntToken("{seriesbanner3width}", (int)eScraperIT::seriesbanner3width);

-    tokenContainer->DefineIntToken("{seriesbanner3height}", (int)eScraperIT::seriesbanner3height);

-    tokenContainer->DefineLoopToken("{reruns[title]}", (int)eRerunsLT::title);

-    tokenContainer->DefineLoopToken("{reruns[shorttext]}", (int)eRerunsLT::shorttext);

-    tokenContainer->DefineLoopToken("{reruns[date]}", (int)eRerunsLT::date);

-    tokenContainer->DefineLoopToken("{reruns[day]}", (int)eRerunsLT::day);

-    tokenContainer->DefineLoopToken("{reruns[start]}", (int)eRerunsLT::start);

-    tokenContainer->DefineLoopToken("{reruns[stop]}", (int)eRerunsLT::stop);

-    tokenContainer->DefineLoopToken("{reruns[channelname]}", (int)eRerunsLT::channelname);

-    tokenContainer->DefineLoopToken("{reruns[channelnumber]}", (int)eRerunsLT::channelnumber);

-    tokenContainer->DefineLoopToken("{reruns[channelid]}", (int)eRerunsLT::channelid);

-    tokenContainer->DefineLoopToken("{reruns[channellogoexists]}", (int)eRerunsLT::channellogoexists);

-    tokenContainer->DefineLoopToken("{actors[name]}", (int)eScraperLT::name);

-    tokenContainer->DefineLoopToken("{actors[role]}", (int)eScraperLT::role);

-    tokenContainer->DefineLoopToken("{actors[thumb]}", (int)eScraperLT::thumb);

-    tokenContainer->DefineLoopToken("{actors[thumbwidth]}", (int)eScraperLT::thumbwidth);

-    tokenContainer->DefineLoopToken("{actors[thumbheight]}", (int)eScraperLT::thumbheight);

-    rerunsIndex = tokenContainer->LoopIndex("reruns");

-    actorsIndex = tokenContainer->LoopIndex("actors");

-    InheritTokenContainer();

-}

-

-bool cViewDetailEpg::Parse(bool forced) {

-    if (!cViewElement::Parse())

-        return false;

-    if (!event)

-        return false;

-

-    tokenContainer->Clear();

-    tokenContainer->AddStringToken((int)eDmDetailedEpgST::title, event->Title());

-    tokenContainer->AddStringToken((int)eDmDetailedEpgST::shorttext, event->ShortText());

-    tokenContainer->AddStringToken((int)eDmDetailedEpgST::description, event->Description());

-    tokenContainer->AddStringToken((int)eDmDetailedEpgST::start, *(event->GetTimeString()));

-    tokenContainer->AddStringToken((int)eDmDetailedEpgST::stop, *(event->GetEndTimeString()));

-    time_t startTime = event->StartTime();

-    tokenContainer->AddStringToken((int)eDmDetailedEpgST::day, *WeekDayName(startTime));

-    tokenContainer->AddStringToken((int)eDmDetailedEpgST::date, *ShortDateString(startTime));

-    struct tm * sStartTime = localtime(&startTime);

-    tokenContainer->AddIntToken((int)eDmDetailedEpgIT::year, sStartTime->tm_year + 1900);

-    tokenContainer->AddIntToken((int)eDmDetailedEpgIT::daynumeric, sStartTime->tm_mday);

-    tokenContainer->AddIntToken((int)eDmDetailedEpgIT::month, sStartTime->tm_mon+1);

-    const cChannel *channel = Channels.GetByChannelID(event->ChannelID());

-    if (channel) {

-        tokenContainer->AddStringToken((int)eDmDetailedEpgST::channelname, channel->Name());

-        tokenContainer->AddIntToken((int)eDmDetailedEpgIT::channelnumber, channel->Number());

-    }

-    cString channelID = event->ChannelID().ToString();

-    tokenContainer->AddStringToken((int)eDmDetailedEpgST::channelid, *channelID);

-    tokenContainer->AddIntToken((int)eDmDetailedEpgIT::channellogoexists, imgCache->LogoExists(*channelID));

-

-    bool isRunning = false;

-    time_t now = time(NULL);

-    if ((now >= event->StartTime()) && (now <= event->EndTime()))

-        isRunning = true;

-    tokenContainer->AddIntToken((int)eDmDetailedEpgIT::running, isRunning);

-    if (isRunning) {

-        tokenContainer->AddIntToken((int)eDmDetailedEpgIT::elapsed, (now - event->StartTime())/60);

-    } else {

-        tokenContainer->AddIntToken((int)eDmDetailedEpgIT::elapsed, 0);

-    }

-    tokenContainer->AddIntToken((int)eDmDetailedEpgIT::duration, event->Duration() / 60);

-    tokenContainer->AddIntToken((int)eDmDetailedEpgIT::durationhours, event->Duration() / 3600);

-    tokenContainer->AddStringToken((int)eDmDetailedEpgST::durationminutes, *cString::sprintf("%.2d", (event->Duration() / 60)%60));

-    if (event->Vps())

-        tokenContainer->AddStringToken((int)eDmDetailedEpgST::vps, *event->GetVpsString());

-

-    cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *reruns = LoadReruns();

-    int numReruns = NumReruns(reruns);

-    vector<int> loopInfo;

-    //num reruns

-    loopInfo.push_back(numReruns);

-    //num actors

-    bool scrapInfoAvailable = LoadFullScrapInfo(event, NULL);

-    int numActors = NumActors();

-    loopInfo.push_back(numActors);

-    tokenContainer->CreateLoopTokenContainer(&loopInfo);

-    if (numReruns > 0) {

-        tokenContainer->AddIntToken((int)eDmDetailedEpgIT::hasreruns, 1);

-        SetReruns(reruns);

-    }

-    if (scrapInfoAvailable) {

-        SetFullScrapInfo(tokenContainer, actorsIndex);

-    }

-    SetDirty();

-    return true;

-}

-

-cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *cViewDetailEpg::LoadReruns(void) {

-    cPlugin *epgSearchPlugin = cPluginManager::GetPlugin("epgsearch");

-    if (!epgSearchPlugin)

-        return NULL;

-

-    if (isempty(event->Title()))

-        return NULL;

-

-    Epgsearch_searchresults_v1_0 data;

-    data.query = (char*)event->Title();

-    data.mode = 0;

-    data.channelNr = 0;

-    data.useTitle = true;

-    data.useSubTitle = true;

-    data.useDescription = false;

-

-    cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *result = NULL;

-    if (epgSearchPlugin->Service("Epgsearch-searchresults-v1.0", &data))

-        result = data.pResultList;

-    return result;

-}

-

-int cViewDetailEpg::NumReruns(cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *reruns) {

-    if (!reruns || reruns->Count() < 2)

-        return 0;

-

-    int maxNumReruns = config.rerunAmount;

-    int rerunDistance = config.rerunDistance * 3600;

-    int rerunMaxChannel = config.rerunMaxChannel;

-

-    int i = 0;

-    for (Epgsearch_searchresults_v1_0::cServiceSearchResult *r = reruns->First(); r && i < maxNumReruns; r = reruns->Next(r)) {

-        time_t eventStart = event->StartTime();

-        time_t rerunStart = r->event->StartTime();

-        cChannel *channel = Channels.GetByChannelID(r->event->ChannelID(), true, true);

-        //check for identical event

-        if ((event->ChannelID() == r->event->ChannelID()) && (eventStart == rerunStart))

-            continue;

-        //check for timely distance

-        if (rerunDistance > 0)

-            if (rerunStart - eventStart < rerunDistance)

-                continue;

-        //check for maxchannel

-        if (rerunMaxChannel > 0)

-            if (channel && channel->Number() > rerunMaxChannel)

-                continue;

-        i++;

-    }

-    return i;

-}

-

-void cViewDetailEpg::SetReruns(cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *reruns) {

-    if (!reruns || reruns->Count() < 2)

-        return;

-

-    int maxNumReruns = config.rerunAmount;

-    int rerunDistance = config.rerunDistance * 3600;

-    int rerunMaxChannel = config.rerunMaxChannel;

-

-    int i = 0;

-    for (Epgsearch_searchresults_v1_0::cServiceSearchResult *r = reruns->First(); r && i < maxNumReruns; r = reruns->Next(r)) {

-        time_t eventStart = event->StartTime();

-        time_t rerunStart = r->event->StartTime();

-        cChannel *channel = Channels.GetByChannelID(r->event->ChannelID(), true, true);

-        //check for identical event

-        if ((event->ChannelID() == r->event->ChannelID()) && (eventStart == rerunStart))

-            continue;

-        //check for timely distance

-        if (rerunDistance > 0)

-            if (rerunStart - eventStart < rerunDistance)

-                continue;

-        //check for maxchannel

-        if (rerunMaxChannel > 0)

-            if (channel && channel->Number() > rerunMaxChannel)

-                continue;

-        tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::title, r->event->Title());

-        tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::shorttext, r->event->ShortText());

-        tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::start, *(r->event->GetTimeString()));

-        tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::stop, *(r->event->GetEndTimeString()));

-        tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::date, *ShortDateString(r->event->StartTime()));

-        tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::day, *WeekDayName(r->event->StartTime()));

-        cString channelID = r->event->ChannelID().ToString();

-        tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::channelid, *channelID);

-        bool logoExists = imgCache->LogoExists(*channelID);

-        tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::channellogoexists, logoExists ? "1" : "0");

-        if (channel) {

-            cString channelNumber = cString::sprintf("%d", channel->Number());

-            tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::channelname, channel->ShortName(true));

-            tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::channelnumber, *channelNumber);

-        } else {

-            tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::channelname, "");

-            tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::channelnumber, "");

-        }

-        i++;

-    }

-}

-

-/******************************************************************

-* cViewDetailRec

-******************************************************************/

-cViewDetailRec::cViewDetailRec(void) {

-    recording = NULL;

-    actorsIndex = -1;

-}

-

-cViewDetailRec::~cViewDetailRec(void) {

-}

-

-void cViewDetailRec::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{name}", (int)eDmDetailedRecST::name);

-    tokenContainer->DefineStringToken("{epgname}", (int)eDmDetailedRecST::epgname);

-    tokenContainer->DefineStringToken("{shorttext}", (int)eDmDetailedRecST::shorttext);

-    tokenContainer->DefineStringToken("{description}", (int)eDmDetailedRecST::description);

-    tokenContainer->DefineStringToken("{day}", (int)eDmDetailedRecST::day);

-    tokenContainer->DefineStringToken("{date}", (int)eDmDetailedRecST::date);

-    tokenContainer->DefineStringToken("{time}", (int)eDmDetailedRecST::time);

-    tokenContainer->DefineStringToken("{durationminutes}", (int)eDmDetailedRecST::durationminutes);

-    tokenContainer->DefineStringToken("{durationeventminutes}", (int)eDmDetailedRecST::durationeventminutes);

-    tokenContainer->DefineStringToken("{recchannelname}", (int)eDmDetailedRecST::recchannelname);

-    tokenContainer->DefineStringToken("{recchannelid}", (int)eDmDetailedRecST::recchannelid);

-    tokenContainer->DefineStringToken("{recordingsize}", (int)eDmDetailedRecST::recordingsize);

-    tokenContainer->DefineStringToken("{recordingsizecutted}", (int)eDmDetailedRecST::recordingsizecutted);

-    tokenContainer->DefineStringToken("{recordinglength}", (int)eDmDetailedRecST::recordinglength);

-    tokenContainer->DefineStringToken("{recordinglengthcutted}", (int)eDmDetailedRecST::recordinglengthcutted);

-    tokenContainer->DefineStringToken("{recordingbitrate}", (int)eDmDetailedRecST::recordingbitrate);

-    tokenContainer->DefineStringToken("{recordingformat}", (int)eDmDetailedRecST::recordingformat);

-    tokenContainer->DefineStringToken("{searchtimer}", (int)eDmDetailedRecST::searchtimer);

-    tokenContainer->DefineStringToken("{recimg1path}", (int)eDmDetailedRecST::recimg1path);

-    tokenContainer->DefineStringToken("{recimg2path}", (int)eDmDetailedRecST::recimg2path);

-    tokenContainer->DefineStringToken("{recimg3path}", (int)eDmDetailedRecST::recimg3path);

-    tokenContainer->DefineStringToken("{movietitle}", (int)eScraperST::movietitle);

-    tokenContainer->DefineStringToken("{movieoriginalTitle}", (int)eScraperST::movieoriginalTitle);

-    tokenContainer->DefineStringToken("{movietagline}", (int)eScraperST::movietagline);

-    tokenContainer->DefineStringToken("{movieoverview}", (int)eScraperST::movieoverview);

-    tokenContainer->DefineStringToken("{moviegenres}", (int)eScraperST::moviegenres);

-    tokenContainer->DefineStringToken("{moviehomepage}", (int)eScraperST::moviehomepage);

-    tokenContainer->DefineStringToken("{moviereleasedate}", (int)eScraperST::moviereleasedate);

-    tokenContainer->DefineStringToken("{moviepopularity}", (int)eScraperST::moviepopularity);

-    tokenContainer->DefineStringToken("{movievoteaverage}", (int)eScraperST::movievoteaverage);

-    tokenContainer->DefineStringToken("{posterpath}", (int)eScraperST::posterpath);

-    tokenContainer->DefineStringToken("{fanartpath}", (int)eScraperST::fanartpath);

-    tokenContainer->DefineStringToken("{moviecollectionName}", (int)eScraperST::moviecollectionName);

-    tokenContainer->DefineStringToken("{collectionposterpath}", (int)eScraperST::collectionposterpath);

-    tokenContainer->DefineStringToken("{collectionfanartpath}", (int)eScraperST::collectionfanartpath);

-    tokenContainer->DefineStringToken("{seriesname}", (int)eScraperST::seriesname);

-    tokenContainer->DefineStringToken("{seriesoverview}", (int)eScraperST::seriesoverview);

-    tokenContainer->DefineStringToken("{seriesfirstaired}", (int)eScraperST::seriesfirstaired);

-    tokenContainer->DefineStringToken("{seriesnetwork}", (int)eScraperST::seriesnetwork);

-    tokenContainer->DefineStringToken("{seriesgenre}", (int)eScraperST::seriesgenre);

-    tokenContainer->DefineStringToken("{seriesrating}", (int)eScraperST::seriesrating);

-    tokenContainer->DefineStringToken("{seriesstatus}", (int)eScraperST::seriesstatus);

-    tokenContainer->DefineStringToken("{episodetitle}", (int)eScraperST::episodetitle);

-    tokenContainer->DefineStringToken("{episodefirstaired}", (int)eScraperST::episodefirstaired);

-    tokenContainer->DefineStringToken("{episodegueststars}", (int)eScraperST::episodegueststars);

-    tokenContainer->DefineStringToken("{episodeoverview}", (int)eScraperST::episodeoverview);

-    tokenContainer->DefineStringToken("{episoderating}", (int)eScraperST::episoderating);

-    tokenContainer->DefineStringToken("{episodeimagepath}", (int)eScraperST::episodeimagepath);

-    tokenContainer->DefineStringToken("{seasonposterpath}", (int)eScraperST::seasonposterpath);

-    tokenContainer->DefineStringToken("{seriesposter1path}", (int)eScraperST::seriesposter1path);

-    tokenContainer->DefineStringToken("{seriesposter2path}", (int)eScraperST::seriesposter2path);

-    tokenContainer->DefineStringToken("{seriesposter3path}", (int)eScraperST::seriesposter3path);

-    tokenContainer->DefineStringToken("{seriesfanart1path}", (int)eScraperST::seriesfanart1path);

-    tokenContainer->DefineStringToken("{seriesfanart2path}", (int)eScraperST::seriesfanart2path);

-    tokenContainer->DefineStringToken("{seriesfanart3path}", (int)eScraperST::seriesfanart3path);

-    tokenContainer->DefineStringToken("{seriesbanner1path}", (int)eScraperST::seriesbanner1path);

-    tokenContainer->DefineStringToken("{seriesbanner2path}", (int)eScraperST::seriesbanner2path);

-    tokenContainer->DefineStringToken("{seriesbanner3path}", (int)eScraperST::seriesbanner3path);

-    tokenContainer->DefineIntToken("{daynumeric}", (int)eDmDetailedRecIT::daynumeric);

-    tokenContainer->DefineIntToken("{month}", (int)eDmDetailedRecIT::month);

-    tokenContainer->DefineIntToken("{year}", (int)eDmDetailedRecIT::year);

-    tokenContainer->DefineIntToken("{duration}", (int)eDmDetailedRecIT::duration);

-    tokenContainer->DefineIntToken("{durationhours}", (int)eDmDetailedRecIT::durationhours);

-    tokenContainer->DefineIntToken("{durationevent}", (int)eDmDetailedRecIT::durationevent);

-    tokenContainer->DefineIntToken("{durationeventhours}", (int)eDmDetailedRecIT::durationeventhours);

-    tokenContainer->DefineIntToken("{recchannelnumber}", (int)eDmDetailedRecIT::recchannelnumber);

-    tokenContainer->DefineIntToken("{cutted}", (int)eDmDetailedRecIT::cutted);

-    tokenContainer->DefineIntToken("{recimg1avaialble}", (int)eDmDetailedRecIT::recimg1avaialble);

-    tokenContainer->DefineIntToken("{recimg2avaialble}", (int)eDmDetailedRecIT::recimg2avaialble);

-    tokenContainer->DefineIntToken("{recimg3avaialble}", (int)eDmDetailedRecIT::recimg3avaialble);

-    tokenContainer->DefineIntToken("{ismovie}", (int)eScraperIT::ismovie);

-    tokenContainer->DefineIntToken("{moviebudget}", (int)eScraperIT::moviebudget);

-    tokenContainer->DefineIntToken("{movierevenue}", (int)eScraperIT::movierevenue);

-    tokenContainer->DefineIntToken("{movieadult}", (int)eScraperIT::movieadult);

-    tokenContainer->DefineIntToken("{movieruntime}", (int)eScraperIT::movieruntime);

-    tokenContainer->DefineIntToken("{isseries}", (int)eScraperIT::isseries);

-    tokenContainer->DefineIntToken("{posterwidth}", (int)eScraperIT::posterwidth);

-    tokenContainer->DefineIntToken("{posterheight}", (int)eScraperIT::posterheight);

-    tokenContainer->DefineIntToken("{fanartwidth}", (int)eScraperIT::fanartwidth);

-    tokenContainer->DefineIntToken("{fanartheight}", (int)eScraperIT::fanartheight);

-    tokenContainer->DefineIntToken("{movieiscollection}", (int)eScraperIT::movieiscollection);

-    tokenContainer->DefineIntToken("{collectionposterwidth}", (int)eScraperIT::collectionposterwidth);

-    tokenContainer->DefineIntToken("{collectionposterheight}", (int)eScraperIT::collectionposterheight);

-    tokenContainer->DefineIntToken("{collectionfanartwidth}", (int)eScraperIT::collectionfanartwidth);

-    tokenContainer->DefineIntToken("{collectionfanartheight}", (int)eScraperIT::collectionfanartheight);

-    tokenContainer->DefineIntToken("{epgpicavailable}", (int)eScraperIT::epgpicavailable);

-    tokenContainer->DefineIntToken("{episodenumber}", (int)eScraperIT::episodenumber);

-    tokenContainer->DefineIntToken("{episodeseason}", (int)eScraperIT::episodeseason);

-    tokenContainer->DefineIntToken("{episodeimagewidth}", (int)eScraperIT::episodeimagewidth);

-    tokenContainer->DefineIntToken("{episodeimageheight}", (int)eScraperIT::episodeimageheight);

-    tokenContainer->DefineIntToken("{seasonposterwidth}", (int)eScraperIT::seasonposterwidth);

-    tokenContainer->DefineIntToken("{seasonposterheight}", (int)eScraperIT::seasonposterheight);

-    tokenContainer->DefineIntToken("{seriesposter1width}", (int)eScraperIT::seriesposter1width);

-    tokenContainer->DefineIntToken("{seriesposter1height}", (int)eScraperIT::seriesposter1height);

-    tokenContainer->DefineIntToken("{seriesposter2width}", (int)eScraperIT::seriesposter2width);

-    tokenContainer->DefineIntToken("{seriesposter2height}", (int)eScraperIT::seriesposter2height);

-    tokenContainer->DefineIntToken("{seriesposter3width}", (int)eScraperIT::seriesposter3width);

-    tokenContainer->DefineIntToken("{seriesposter3height}", (int)eScraperIT::seriesposter3height);

-    tokenContainer->DefineIntToken("{seriesfanart1width}", (int)eScraperIT::seriesfanart1width);

-    tokenContainer->DefineIntToken("{seriesfanart1height}", (int)eScraperIT::seriesfanart1height);

-    tokenContainer->DefineIntToken("{seriesfanart2width}", (int)eScraperIT::seriesfanart2width);

-    tokenContainer->DefineIntToken("{seriesfanart2height}", (int)eScraperIT::seriesfanart2height);

-    tokenContainer->DefineIntToken("{seriesfanart3width}", (int)eScraperIT::seriesfanart3width);

-    tokenContainer->DefineIntToken("{seriesfanart3height}", (int)eScraperIT::seriesfanart3height);

-    tokenContainer->DefineIntToken("{seriesbanner1width}", (int)eScraperIT::seriesbanner1width);

-    tokenContainer->DefineIntToken("{seriesbanner1height}", (int)eScraperIT::seriesbanner1height);

-    tokenContainer->DefineIntToken("{seriesbanner2width}", (int)eScraperIT::seriesbanner2width);

-    tokenContainer->DefineIntToken("{seriesbanner2height}", (int)eScraperIT::seriesbanner2height);

-    tokenContainer->DefineIntToken("{seriesbanner3width}", (int)eScraperIT::seriesbanner3width);

-    tokenContainer->DefineIntToken("{seriesbanner3height}", (int)eScraperIT::seriesbanner3height);

-    tokenContainer->DefineLoopToken("{actors[name]}", (int)eScraperLT::name);

-    tokenContainer->DefineLoopToken("{actors[role]}", (int)eScraperLT::role);

-    tokenContainer->DefineLoopToken("{actors[thumb]}", (int)eScraperLT::thumb);

-    tokenContainer->DefineLoopToken("{actors[thumbwidth]}", (int)eScraperLT::thumbwidth);

-    tokenContainer->DefineLoopToken("{actors[thumbheight]}", (int)eScraperLT::thumbheight);

-    actorsIndex = tokenContainer->LoopIndex("actors");

-    InheritTokenContainer();

-}

-

-bool cViewDetailRec::Parse(bool forced) {

-    if (!cViewElement::Parse())

-        return false;

-    if (!recording)

-        return false;

-    tokenContainer->Clear();

-    tokenContainer->AddStringToken((int)eDmDetailedRecST::name, recording->Name());

-    tokenContainer->AddIntToken((int)eDmDetailedRecIT::cutted, recording->IsEdited());

-

-    const cRecordingInfo *info = recording->Info();

-    if (info) {

-        tokenContainer->AddStringToken((int)eDmDetailedRecST::epgname, info->Title());

-        tokenContainer->AddStringToken((int)eDmDetailedRecST::shorttext, info->ShortText());

-        tokenContainer->AddStringToken((int)eDmDetailedRecST::description, info->Description());

-        const cEvent *event = info->GetEvent();

-        if (event) {

-            cString recDate = event->GetDateString();

-            cString recTime = event->GetTimeString();

-            if (strstr(*recDate, "1970")) {

-                time_t start = recording->Start();

-                recDate = DateString(start);

-                recTime = TimeString(start);

-            }

-            int duration = event->Duration() / 60;

-            int recDuration = recording->LengthInSeconds();

-            recDuration = (recDuration>0) ? (recDuration / 60) : 0;

-            tokenContainer->AddStringToken((int)eDmDetailedRecST::date, *recDate);

-            tokenContainer->AddStringToken((int)eDmDetailedRecST::time, *recTime);

-            time_t startTime = event->StartTime();

-            struct tm * sStartTime = localtime(&startTime);

-            tokenContainer->AddIntToken((int)eDmDetailedRecIT::year, sStartTime->tm_year + 1900);

-            tokenContainer->AddIntToken((int)eDmDetailedRecIT::daynumeric, sStartTime->tm_mday);

-            tokenContainer->AddIntToken((int)eDmDetailedRecIT::month, sStartTime->tm_mon+1);

-            tokenContainer->AddIntToken((int)eDmDetailedRecIT::duration, recDuration);

-            tokenContainer->AddIntToken((int)eDmDetailedRecIT::durationhours, recDuration / 60);

-            tokenContainer->AddStringToken((int)eDmDetailedRecST::durationminutes, *cString::sprintf("%.2d", recDuration%60));

-            tokenContainer->AddIntToken((int)eDmDetailedRecIT::durationevent, duration);

-            tokenContainer->AddIntToken((int)eDmDetailedRecIT::durationeventhours, duration / 60);

-            tokenContainer->AddStringToken((int)eDmDetailedRecST::durationeventminutes, *cString::sprintf("%.2d", duration%60));

-        }

-    }

-    SetRecInfos();

-    SetRecordingImages(recording->FileName());

-

-    vector<int> loopInfo;

-    bool scrapInfoAvailable = LoadFullScrapInfo(NULL, recording);

-    int numActors = NumActors();

-    loopInfo.push_back(numActors);

-    tokenContainer->CreateLoopTokenContainer(&loopInfo);

-    if (scrapInfoAvailable) {

-        SetFullScrapInfo(tokenContainer, actorsIndex);

-    }

-

-    SetDirty();

-    return true;

-}

-

-void cViewDetailRec::SetRecInfos(void) {

-    unsigned long long nRecSize = -1;

-    unsigned long long nFileSize[1000];

-    nFileSize[0] = 0;

-    int i = 0;

-    struct stat filebuf;

-    cString filename;

-    int rc = 0;

-    do {

-        if (recording->IsPesRecording())

-            filename = cString::sprintf("%s/%03d.vdr", recording->FileName(), ++i);

-        else

-            filename = cString::sprintf("%s/%05d.ts", recording->FileName(), ++i);

-        rc = stat(filename, &filebuf);

-        if (rc == 0)

-            nFileSize[i] = nFileSize[i-1] + filebuf.st_size;

-        else

-            if (ENOENT != errno) {

-                nRecSize = -1;

-            }

-    } while (i <= 999 && !rc);

-    nRecSize = nFileSize[i-1];

-

-    cMarks marks;

-    bool fHasMarks = marks.Load(recording->FileName(), recording->FramesPerSecond(), recording->IsPesRecording()) && marks.Count();

-    cIndexFile *index = new cIndexFile(recording->FileName(), false, recording->IsPesRecording());

-

-    int nCutLength = 0;

-    long nCutInFrame = 0;

-    unsigned long long nRecSizeCut = nRecSize < 0 ? -1 : 0;

-    unsigned long long nCutInOffset = 0;

-

-    if (fHasMarks && index) {

-        uint16_t FileNumber;

-        off_t FileOffset;

-

-        bool fCutIn = true;

-        cMark *mark = marks.First();

-        while (mark) {

-            int pos = mark->Position();

-            index->Get(pos, &FileNumber, &FileOffset); //TODO: will disc spin up?

-            if (fCutIn) {

-                nCutInFrame = pos;

-                fCutIn = false;

-                if (nRecSize >= 0)

-                    nCutInOffset = nFileSize[FileNumber-1] + FileOffset;

-            } else {

-                nCutLength += pos - nCutInFrame;

-                fCutIn = true;

-                if (nRecSize >= 0)

-                    nRecSizeCut += nFileSize[FileNumber-1] + FileOffset - nCutInOffset;

-            }

-            cMark *nextmark = marks.Next(mark);

-            mark = nextmark;

-        }

-        if (!fCutIn) {

-            nCutLength += index->Last() - nCutInFrame;

-            index->Get(index->Last() - 1, &FileNumber, &FileOffset);

-            if (nRecSize >= 0)

-                nRecSizeCut += nFileSize[FileNumber-1] + FileOffset - nCutInOffset;

-        }

-    }

-

-    if (nRecSize < 0) {

-        if ((nRecSize = ReadSizeVdr(recording->FileName())) < 0) {

-            nRecSize = DirSizeMB(recording->FileName());

-        }

-    }

-    if (nRecSize >= 0) {

-        cString strRecSize = "";

-        cString strRecSizeCut = "";

-

-        if (fHasMarks) {

-            if (nRecSize > MEGABYTE(1023)) {

-                strRecSize = cString::sprintf("%.2f GB", (float)nRecSize / MEGABYTE(1024));

-                strRecSizeCut = cString::sprintf("%.2f GB", (float)nRecSizeCut / MEGABYTE(1024));

-            } else {

-                strRecSize = cString::sprintf("%lld MB", nRecSize / MEGABYTE(1));

-                strRecSizeCut = cString::sprintf("%lld MB", nRecSizeCut / MEGABYTE(1));

-            }

-        } else {

-            if (nRecSize > MEGABYTE(1023)) {

-                strRecSize = cString::sprintf("%.2f GB", (float)nRecSize / MEGABYTE(1024));

-                strRecSizeCut = strRecSize;

-            } else {

-                strRecSize = cString::sprintf("%lld MB", nRecSize / MEGABYTE(1));

-                strRecSizeCut = strRecSize;

-            }

-        }

-        tokenContainer->AddStringToken((int)eDmDetailedRecST::recordingsize, *strRecSize);

-        tokenContainer->AddStringToken((int)eDmDetailedRecST::recordingsizecutted, *strRecSizeCut);

-    }

-

-    const cRecordingInfo *info = recording->Info();

-    if (info) {

-        cChannel *channel = Channels.GetByChannelID(info->ChannelID());

-        if (channel) {

-            tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelname, channel->Name());

-            tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelid, *channel->GetChannelID().ToString());

-            tokenContainer->AddIntToken((int)eDmDetailedRecIT::recchannelnumber, channel->Number());

-        }        

-    }

-

-

-    if (index) {

-        int nLastIndex = index->Last();

-        if (nLastIndex) {

-            string strLength = *IndexToHMSF(nLastIndex, false, recording->FramesPerSecond());

-            string strLengthCutted = "";

-            if (fHasMarks) {

-                strLengthCutted = *IndexToHMSF(nCutLength, false, recording->FramesPerSecond());

-            } else {

-                strLengthCutted = strLength;

-            }

-            string strBitrate = *cString::sprintf("%.2f MBit/s", (float)nRecSize / nLastIndex * recording->FramesPerSecond() * 8 / MEGABYTE(1));

-            tokenContainer->AddStringToken((int)eDmDetailedRecST::recordinglength, strLength.c_str());

-            tokenContainer->AddStringToken((int)eDmDetailedRecST::recordinglengthcutted, strLengthCutted.c_str());

-            tokenContainer->AddStringToken((int)eDmDetailedRecST::recordingbitrate, strBitrate.c_str());

-        }

-        delete index;

-    }

-    

-    tokenContainer->AddStringToken((int)eDmDetailedRecST::recordingformat, recording->IsPesRecording() ? "PES" : "TS");

-    

-    bool searchTimerFound = false;

-    if (info) {

-        const char *aux = NULL;

-        aux = info->Aux();

-        if (aux) {

-            string strAux = aux;

-            string auxEpgsearch = StripXmlTag(strAux, "epgsearch");

-            if (!auxEpgsearch.empty()) {

-                string searchTimer = StripXmlTag(auxEpgsearch, "searchtimer");

-                if (!searchTimer.empty()) {

-                    tokenContainer->AddStringToken((int)eDmDetailedRecST::searchtimer, searchTimer.c_str());

-                    searchTimerFound = true;

-                }

-            }

-        }

-    }

-    if (!searchTimerFound)

-        tokenContainer->AddStringToken((int)eDmDetailedRecST::searchtimer, "n.a.");

-}

-

-int cViewDetailRec::ReadSizeVdr(const char *strPath) {

-    int dirSize = -1;

-    char buffer[20];

-    char *strFilename = NULL;

-    if (-1 != asprintf(&strFilename, "%s/size.vdr", strPath)) {

-        struct stat st;

-        if (stat(strFilename, &st) == 0) {

-                int fd = open(strFilename, O_RDONLY);

-            if (fd >= 0) {

-                if (safe_read(fd, &buffer, sizeof(buffer)) >= 0) {

-                    dirSize = atoi(buffer);

-                }

-                close(fd);

-            }

-        }

-        free(strFilename);

-    }

-    return dirSize;

-}

-

-string cViewDetailRec::StripXmlTag(string &Line, const char *Tag) {

-        // set the search strings

-        stringstream strStart, strStop;

-        strStart << "<" << Tag << ">";

-        strStop << "</" << Tag << ">";

-        // find the strings

-        string::size_type locStart = Line.find(strStart.str());

-        string::size_type locStop = Line.find(strStop.str());

-        if (locStart == string::npos || locStop == string::npos)

-                return "";

-        // extract relevant text

-        int pos = locStart + strStart.str().size();

-        int len = locStop - pos;

-        return len < 0 ? "" : Line.substr(pos, len);

-}

-

-void cViewDetailRec::SetRecordingImages(const char *recPath) {

-    if (!recPath) {

-        return;

-    }

-    DIR *dirHandle;

-    struct dirent *dirEntry;

-    dirHandle = opendir(recPath);

-    if (!dirHandle) {

-        return;        

-    }

-    int picsFound = 0;

-    int indexStr = (int)eDmDetailedRecST::recimg1path;

-    int indexInt = (int)eDmDetailedRecIT::recimg1avaialble;

-    while ( 0 != (dirEntry = readdir(dirHandle))) {

-        if (endswith(dirEntry->d_name, "jpg")) {

-            tokenContainer->AddStringToken(indexStr, *cString::sprintf("%s/%s", recPath, dirEntry->d_name));

-            tokenContainer->AddIntToken(indexInt, 1);

-            picsFound++;

-        }

-        if (picsFound == 3) {

-            break;

-        }

-    }

-    closedir(dirHandle);

-}

-

-/******************************************************************

-* cViewDetailText

-******************************************************************/

-cViewDetailText::cViewDetailText(void) {

-    text = NULL;

-}

-

-cViewDetailText::~cViewDetailText(void) {

-}

-

-void cViewDetailText::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{text}", (int)eDmDetailedTextST::text);

-    InheritTokenContainer();    

-}

-

-bool cViewDetailText::Parse(bool forced) {

-    if (!cViewElement::Parse())

-        return false;

-    if (!text)

-        return false;

-    tokenContainer->Clear();

-    tokenContainer->AddStringToken((int)eDmDetailedTextST::text, text);

-    SetDirty();

-    return true;

-}

-

-/******************************************************************

-* cViewDetailPlugin

-******************************************************************/

-cViewDetailPlugin::cViewDetailPlugin(void) {

-}

-

-cViewDetailPlugin::~cViewDetailPlugin(void) {

-}

-

-void cViewDetailPlugin::SetTokenContainer(void) {

-    if (plugId == -1 || plugMenuId == -1)

-        return;

-    skindesignerapi::cTokenContainer *tkPlugMenu = plgManager->GetTokenContainer(plugId, plugMenuId);

-    tokenContainer = new skindesignerapi::cTokenContainer(*tkPlugMenu);

-    InheritTokenContainer();

-}

-

-void cViewDetailPlugin::Set(skindesignerapi::cTokenContainer *tk) {

-    tokenContainer->Clear();

-    tokenContainer->SetTokens(tk);

-}

-

-bool cViewDetailPlugin::Parse(bool forced) {

-    if (!cViewElement::Parse())

-        return false;

-    SetDirty();

-    return true;

-}

-

-/******************************************************************

-* cViewDetailAdvancedPlugin

-******************************************************************/

-cViewDetailAdvancedPlugin::cViewDetailAdvancedPlugin(int viewId, int plugId) {

-    this->plugId = plugId;

-    plugViewId = viewId;

-}

-

-cViewDetailAdvancedPlugin::~cViewDetailAdvancedPlugin(void) {

-}

-

-void cViewDetailAdvancedPlugin::SetTokenContainer(void) {

-    if (plugId == -1 || plugViewId == -1)

-        return;

-    skindesignerapi::cTokenContainer *tkDetail = plgManager->GetTokenContainerTab(plugId, plugViewId);

-    tokenContainer = new skindesignerapi::cTokenContainer(*tkDetail);

-    InheritTokenContainer();

-}

-

-void cViewDetailAdvancedPlugin::Set(skindesignerapi::cTokenContainer *tk) {

-    tokenContainer->Clear();

-    tokenContainer->SetTokens(tk);

-}

-

-bool cViewDetailAdvancedPlugin::Parse(bool forced) {

-    if (!cViewElement::Parse())

-        return false;

-    SetDirty();

-    return true;

-}

+#include "viewdetail.h"
+#include "../config.h"
+/******************************************************************
+* cViewDetail
+******************************************************************/
+cViewDetail::cViewDetail(void) {
+    activeTab = NULL;
+    activeTabIndex = -1;
+    numTabs = 0;
+    plugId = -1;
+    plugMenuId = -1;
+}
+
+cViewDetail::~cViewDetail(void) {
+}
+
+void cViewDetail::SetActiveTab(void) {
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        if (node->ActiveTab()) {
+            activeTab = dynamic_cast<cArea*>(node);
+            activeTabIndex = 0;
+            return;
+        }
+    }
+}
+
+int cViewDetail::GetWidth(void) {
+    cAreaNode *node = areaNodes.First();
+    if (!node)
+        return 0;
+    return node->GetWidth();
+}
+
+void cViewDetail::ResetTabs(void) {
+    activeTab = NULL;
+    activeTabIndex = -1;
+}
+
+void cViewDetail::Clear(void) {
+    cViewElement::Close();    
+}
+
+void cViewDetail::Close(void) {
+    cViewElement::Close();    
+    activeTab = NULL;
+    activeTabIndex = -1;
+    numTabs = 0;
+}
+
+void cViewDetail::Render(void) {
+    if (!dirty || blocked)
+        return;
+
+    if (attribs->DoDebug())
+        Debug();
+    
+    if (!activeTab)
+        SetActiveTab();
+    if (!activeTab)
+        return;
+
+    activeTab->Clear();
+    if (activeTab->Execute()) {
+        activeTab->Render();
+    }
+
+    dirty = false;
+}
+
+void cViewDetail::Scrollbar(int &barheight, int &offset, bool &end) {
+    if (!activeTab)
+        return;
+    cRect tabViewPort = activeTab->ViewPort();
+    cRect tabDrawPort = activeTab->DrawPort();
+    int totalHeight = tabDrawPort.Height();
+    int screenHeight = tabViewPort.Height();
+    int y = (-1)*tabDrawPort.Y();
+    if (totalHeight == 0) {
+        return;
+    }
+    if (totalHeight <= screenHeight)
+        barheight = 1000;
+    else {
+        barheight = (double)screenHeight / (double) totalHeight * 1000; 
+    }
+    offset = (double)y / (double) totalHeight * 1000;
+    end = true;
+}
+
+bool cViewDetail::ScrollUp(bool page) {
+    if (!activeTab)
+        return false;
+    cRect tabDrawPort = activeTab->DrawPort();
+    int scrollStep = activeTab->ScrollStep();
+    if (page) {
+        cRect tabViewPort = activeTab->ViewPort();
+        scrollStep = tabViewPort.Height();
+    }
+    int aktHeight = tabDrawPort.Y();
+    if (aktHeight >= 0) {
+        return false;
+    }
+    int newY = aktHeight + scrollStep;
+    if (newY > 0)
+        newY = 0;
+    cPoint dp(0, newY);
+    activeTab->SetDrawPort(dp);
+    return true;
+}
+
+bool cViewDetail::ScrollDown(bool page) {
+    if (!activeTab)
+        return false;
+    cRect tabViewPort = activeTab->ViewPort();
+    cRect tabDrawPort = activeTab->DrawPort();
+    int scrollStep = activeTab->ScrollStep();
+    if (page) {
+        scrollStep = tabViewPort.Height();
+    }
+    int aktHeight = tabDrawPort.Y();
+    int totalHeight = tabDrawPort.Height();
+    int screenHeight = tabViewPort.Height();
+
+    if (totalHeight - ((-1)*aktHeight) == screenHeight) {
+        return false;
+    }
+    int newY = aktHeight - scrollStep;
+    if ((-1)*newY > totalHeight - screenHeight)
+        newY = (-1)*(totalHeight - screenHeight);
+    cPoint dp(0, newY);
+    activeTab->SetDrawPort(dp);
+    return true;
+}
+
+int cViewDetail::GetTabs(vector<const char*> &tabs) {
+    int i=0;
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        if (!node->Execute())
+            continue;
+        tabs.push_back(node->Name());
+        if (node->ActiveTab()) {
+            activeTabIndex = i;
+        }
+        i++;
+    }
+    numTabs = i;
+    return activeTabIndex;
+}
+
+void cViewDetail::NextTab(void) {
+    cArea *nextActiveTab = NULL;
+    for (cAreaNode *node = areaNodes.Next(activeTab); node; node = areaNodes.Next(node)) {
+        if (node->Execute()) {
+            nextActiveTab = dynamic_cast<cArea*>(node);
+            activeTabIndex++;
+            break;
+        }
+    }
+    if (!nextActiveTab) {
+        nextActiveTab = dynamic_cast<cArea*>(areaNodes.First());
+        activeTabIndex = 0;
+    }
+    activeTab = nextActiveTab;
+}
+
+void cViewDetail::PrevTab(void) {
+    cArea *prevActiveTab = NULL;
+    for (cAreaNode *node = areaNodes.Prev(activeTab); node; node = areaNodes.Prev(node)) {
+        if (node->Execute()) {
+            prevActiveTab = dynamic_cast<cArea*>(node);
+            activeTabIndex--;
+            break;
+        }
+    }
+    if (!prevActiveTab) {
+        int numActiveTabs = 0;
+        for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+            if (node->Execute()) {
+                numActiveTabs++;
+            }
+        }
+        for (cAreaNode *node = areaNodes.Last(); node; node = areaNodes.Prev(node)) {
+            if (node->Execute()) {
+                prevActiveTab = dynamic_cast<cArea*>(node);
+                activeTabIndex = numActiveTabs-1;
+                break;
+            }
+        }
+    }
+    activeTab = prevActiveTab;
+}
+
+void cViewDetail::SetTransparency(int transparency, bool forceDetached) {
+    if (activeTab)
+        activeTab->SetTransparency(transparency);
+}
+
+/******************************************************************
+* cViewDetailEpg
+******************************************************************/
+cViewDetailEpg::cViewDetailEpg(void) {
+    event = NULL;
+    rerunsIndex = -1;
+    actorsIndex = -1;
+}
+
+cViewDetailEpg::~cViewDetailEpg(void) {
+}
+
+void cViewDetailEpg::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{title}", (int)eDmDetailedEpgST::title);
+    tokenContainer->DefineStringToken("{shorttext}", (int)eDmDetailedEpgST::shorttext);
+    tokenContainer->DefineStringToken("{description}", (int)eDmDetailedEpgST::description);
+    tokenContainer->DefineStringToken("{start}", (int)eDmDetailedEpgST::start);
+    tokenContainer->DefineStringToken("{stop}", (int)eDmDetailedEpgST::stop);
+    tokenContainer->DefineStringToken("{day}", (int)eDmDetailedEpgST::day);
+    tokenContainer->DefineStringToken("{date}", (int)eDmDetailedEpgST::date);
+    tokenContainer->DefineStringToken("{durationminutes}", (int)eDmDetailedEpgST::durationminutes);
+    tokenContainer->DefineStringToken("{vps}", (int)eDmDetailedEpgST::vps);
+    tokenContainer->DefineStringToken("{channelname}", (int)eDmDetailedEpgST::channelname);
+    tokenContainer->DefineStringToken("{channelid}", (int)eDmDetailedEpgST::channelid);
+    tokenContainer->DefineStringToken("{epgpic1path}", (int)eDmDetailedEpgST::epgpic1path);
+    tokenContainer->DefineStringToken("{epgpic2path}", (int)eDmDetailedEpgST::epgpic2path);
+    tokenContainer->DefineStringToken("{epgpic3path}", (int)eDmDetailedEpgST::epgpic3path);
+    tokenContainer->DefineStringToken("{movietitle}", (int)eScraperST::movietitle);
+    tokenContainer->DefineStringToken("{movieoriginalTitle}", (int)eScraperST::movieoriginalTitle);
+    tokenContainer->DefineStringToken("{movietagline}", (int)eScraperST::movietagline);
+    tokenContainer->DefineStringToken("{movieoverview}", (int)eScraperST::movieoverview);
+    tokenContainer->DefineStringToken("{moviegenres}", (int)eScraperST::moviegenres);
+    tokenContainer->DefineStringToken("{moviehomepage}", (int)eScraperST::moviehomepage);
+    tokenContainer->DefineStringToken("{moviereleasedate}", (int)eScraperST::moviereleasedate);
+    tokenContainer->DefineStringToken("{moviepopularity}", (int)eScraperST::moviepopularity);
+    tokenContainer->DefineStringToken("{movievoteaverage}", (int)eScraperST::movievoteaverage);
+    tokenContainer->DefineStringToken("{posterpath}", (int)eScraperST::posterpath);
+    tokenContainer->DefineStringToken("{fanartpath}", (int)eScraperST::fanartpath);
+    tokenContainer->DefineStringToken("{moviecollectionName}", (int)eScraperST::moviecollectionName);
+    tokenContainer->DefineStringToken("{collectionposterpath}", (int)eScraperST::collectionposterpath);
+    tokenContainer->DefineStringToken("{collectionfanartpath}", (int)eScraperST::collectionfanartpath);
+    tokenContainer->DefineStringToken("{seriesname}", (int)eScraperST::seriesname);
+    tokenContainer->DefineStringToken("{seriesoverview}", (int)eScraperST::seriesoverview);
+    tokenContainer->DefineStringToken("{seriesfirstaired}", (int)eScraperST::seriesfirstaired);
+    tokenContainer->DefineStringToken("{seriesnetwork}", (int)eScraperST::seriesnetwork);
+    tokenContainer->DefineStringToken("{seriesgenre}", (int)eScraperST::seriesgenre);
+    tokenContainer->DefineStringToken("{seriesrating}", (int)eScraperST::seriesrating);
+    tokenContainer->DefineStringToken("{seriesstatus}", (int)eScraperST::seriesstatus);
+    tokenContainer->DefineStringToken("{episodetitle}", (int)eScraperST::episodetitle);
+    tokenContainer->DefineStringToken("{episodefirstaired}", (int)eScraperST::episodefirstaired);
+    tokenContainer->DefineStringToken("{episodegueststars}", (int)eScraperST::episodegueststars);
+    tokenContainer->DefineStringToken("{episodeoverview}", (int)eScraperST::episodeoverview);
+    tokenContainer->DefineStringToken("{episoderating}", (int)eScraperST::episoderating);
+    tokenContainer->DefineStringToken("{episodeimagepath}", (int)eScraperST::episodeimagepath);
+    tokenContainer->DefineStringToken("{seasonposterpath}", (int)eScraperST::seasonposterpath);
+    tokenContainer->DefineStringToken("{seriesposter1path}", (int)eScraperST::seriesposter1path);
+    tokenContainer->DefineStringToken("{seriesposter2path}", (int)eScraperST::seriesposter2path);
+    tokenContainer->DefineStringToken("{seriesposter3path}", (int)eScraperST::seriesposter3path);
+    tokenContainer->DefineStringToken("{seriesfanart1path}", (int)eScraperST::seriesfanart1path);
+    tokenContainer->DefineStringToken("{seriesfanart2path}", (int)eScraperST::seriesfanart2path);
+    tokenContainer->DefineStringToken("{seriesfanart3path}", (int)eScraperST::seriesfanart3path);
+    tokenContainer->DefineStringToken("{seriesbanner1path}", (int)eScraperST::seriesbanner1path);
+    tokenContainer->DefineStringToken("{seriesbanner2path}", (int)eScraperST::seriesbanner2path);
+    tokenContainer->DefineStringToken("{seriesbanner3path}", (int)eScraperST::seriesbanner3path);
+    tokenContainer->DefineIntToken("{daynumeric}", (int)eDmDetailedEpgIT::daynumeric);
+    tokenContainer->DefineIntToken("{month}", (int)eDmDetailedEpgIT::month);
+    tokenContainer->DefineIntToken("{year}", (int)eDmDetailedEpgIT::year);
+    tokenContainer->DefineIntToken("{running}", (int)eDmDetailedEpgIT::running);
+    tokenContainer->DefineIntToken("{elapsed}", (int)eDmDetailedEpgIT::elapsed);
+    tokenContainer->DefineIntToken("{duration}", (int)eDmDetailedEpgIT::duration);
+    tokenContainer->DefineIntToken("{durationhours}", (int)eDmDetailedEpgIT::durationhours);
+    tokenContainer->DefineIntToken("{channelnumber}", (int)eDmDetailedEpgIT::channelnumber);
+    tokenContainer->DefineIntToken("{channellogoexists}", (int)eDmDetailedEpgIT::channellogoexists);
+    tokenContainer->DefineIntToken("{hasreruns}", (int)eDmDetailedEpgIT::hasreruns);
+    tokenContainer->DefineIntToken("{epgpic1avaialble}", (int)eDmDetailedEpgIT::epgpic1avaialble);
+    tokenContainer->DefineIntToken("{epgpic2avaialble}", (int)eDmDetailedEpgIT::epgpic2avaialble);
+    tokenContainer->DefineIntToken("{epgpic3avaialble}", (int)eDmDetailedEpgIT::epgpic3avaialble);
+    tokenContainer->DefineIntToken("{ismovie}", (int)eScraperIT::ismovie);
+    tokenContainer->DefineIntToken("{moviebudget}", (int)eScraperIT::moviebudget);
+    tokenContainer->DefineIntToken("{movierevenue}", (int)eScraperIT::movierevenue);
+    tokenContainer->DefineIntToken("{movieadult}", (int)eScraperIT::movieadult);
+    tokenContainer->DefineIntToken("{movieruntime}", (int)eScraperIT::movieruntime);
+    tokenContainer->DefineIntToken("{isseries}", (int)eScraperIT::isseries);
+    tokenContainer->DefineIntToken("{posterwidth}", (int)eScraperIT::posterwidth);
+    tokenContainer->DefineIntToken("{posterheight}", (int)eScraperIT::posterheight);
+    tokenContainer->DefineIntToken("{fanartwidth}", (int)eScraperIT::fanartwidth);
+    tokenContainer->DefineIntToken("{fanartheight}", (int)eScraperIT::fanartheight);
+    tokenContainer->DefineIntToken("{movieiscollection}", (int)eScraperIT::movieiscollection);
+    tokenContainer->DefineIntToken("{collectionposterwidth}", (int)eScraperIT::collectionposterwidth);
+    tokenContainer->DefineIntToken("{collectionposterheight}", (int)eScraperIT::collectionposterheight);
+    tokenContainer->DefineIntToken("{collectionfanartwidth}", (int)eScraperIT::collectionfanartwidth);
+    tokenContainer->DefineIntToken("{collectionfanartheight}", (int)eScraperIT::collectionfanartheight);
+    tokenContainer->DefineIntToken("{epgpicavailable}", (int)eScraperIT::epgpicavailable);
+    tokenContainer->DefineIntToken("{episodenumber}", (int)eScraperIT::episodenumber);
+    tokenContainer->DefineIntToken("{episodeseason}", (int)eScraperIT::episodeseason);
+    tokenContainer->DefineIntToken("{episodeimagewidth}", (int)eScraperIT::episodeimagewidth);
+    tokenContainer->DefineIntToken("{episodeimageheight}", (int)eScraperIT::episodeimageheight);
+    tokenContainer->DefineIntToken("{seasonposterwidth}", (int)eScraperIT::seasonposterwidth);
+    tokenContainer->DefineIntToken("{seasonposterheight}", (int)eScraperIT::seasonposterheight);
+    tokenContainer->DefineIntToken("{seriesposter1width}", (int)eScraperIT::seriesposter1width);
+    tokenContainer->DefineIntToken("{seriesposter1height}", (int)eScraperIT::seriesposter1height);
+    tokenContainer->DefineIntToken("{seriesposter2width}", (int)eScraperIT::seriesposter2width);
+    tokenContainer->DefineIntToken("{seriesposter2height}", (int)eScraperIT::seriesposter2height);
+    tokenContainer->DefineIntToken("{seriesposter3width}", (int)eScraperIT::seriesposter3width);
+    tokenContainer->DefineIntToken("{seriesposter3height}", (int)eScraperIT::seriesposter3height);
+    tokenContainer->DefineIntToken("{seriesfanart1width}", (int)eScraperIT::seriesfanart1width);
+    tokenContainer->DefineIntToken("{seriesfanart1height}", (int)eScraperIT::seriesfanart1height);
+    tokenContainer->DefineIntToken("{seriesfanart2width}", (int)eScraperIT::seriesfanart2width);
+    tokenContainer->DefineIntToken("{seriesfanart2height}", (int)eScraperIT::seriesfanart2height);
+    tokenContainer->DefineIntToken("{seriesfanart3width}", (int)eScraperIT::seriesfanart3width);
+    tokenContainer->DefineIntToken("{seriesfanart3height}", (int)eScraperIT::seriesfanart3height);
+    tokenContainer->DefineIntToken("{seriesbanner1width}", (int)eScraperIT::seriesbanner1width);
+    tokenContainer->DefineIntToken("{seriesbanner1height}", (int)eScraperIT::seriesbanner1height);
+    tokenContainer->DefineIntToken("{seriesbanner2width}", (int)eScraperIT::seriesbanner2width);
+    tokenContainer->DefineIntToken("{seriesbanner2height}", (int)eScraperIT::seriesbanner2height);
+    tokenContainer->DefineIntToken("{seriesbanner3width}", (int)eScraperIT::seriesbanner3width);
+    tokenContainer->DefineIntToken("{seriesbanner3height}", (int)eScraperIT::seriesbanner3height);
+    tokenContainer->DefineLoopToken("{reruns[title]}", (int)eRerunsLT::title);
+    tokenContainer->DefineLoopToken("{reruns[shorttext]}", (int)eRerunsLT::shorttext);
+    tokenContainer->DefineLoopToken("{reruns[date]}", (int)eRerunsLT::date);
+    tokenContainer->DefineLoopToken("{reruns[day]}", (int)eRerunsLT::day);
+    tokenContainer->DefineLoopToken("{reruns[start]}", (int)eRerunsLT::start);
+    tokenContainer->DefineLoopToken("{reruns[stop]}", (int)eRerunsLT::stop);
+    tokenContainer->DefineLoopToken("{reruns[channelname]}", (int)eRerunsLT::channelname);
+    tokenContainer->DefineLoopToken("{reruns[channelnumber]}", (int)eRerunsLT::channelnumber);
+    tokenContainer->DefineLoopToken("{reruns[channelid]}", (int)eRerunsLT::channelid);
+    tokenContainer->DefineLoopToken("{reruns[channellogoexists]}", (int)eRerunsLT::channellogoexists);
+    tokenContainer->DefineLoopToken("{actors[name]}", (int)eScraperLT::name);
+    tokenContainer->DefineLoopToken("{actors[role]}", (int)eScraperLT::role);
+    tokenContainer->DefineLoopToken("{actors[thumb]}", (int)eScraperLT::thumb);
+    tokenContainer->DefineLoopToken("{actors[thumbwidth]}", (int)eScraperLT::thumbwidth);
+    tokenContainer->DefineLoopToken("{actors[thumbheight]}", (int)eScraperLT::thumbheight);
+    rerunsIndex = tokenContainer->LoopIndex("reruns");
+    actorsIndex = tokenContainer->LoopIndex("actors");
+    InheritTokenContainer();
+}
+
+bool cViewDetailEpg::Parse(bool forced) {
+    if (!cViewElement::Parse())
+        return false;
+    if (!event)
+        return false;
+
+    tokenContainer->Clear();
+    tokenContainer->AddStringToken((int)eDmDetailedEpgST::title, event->Title());
+    tokenContainer->AddStringToken((int)eDmDetailedEpgST::shorttext, event->ShortText());
+    tokenContainer->AddStringToken((int)eDmDetailedEpgST::description, event->Description());
+    tokenContainer->AddStringToken((int)eDmDetailedEpgST::start, *(event->GetTimeString()));
+    tokenContainer->AddStringToken((int)eDmDetailedEpgST::stop, *(event->GetEndTimeString()));
+    time_t startTime = event->StartTime();
+    tokenContainer->AddStringToken((int)eDmDetailedEpgST::day, *WeekDayName(startTime));
+    tokenContainer->AddStringToken((int)eDmDetailedEpgST::date, *ShortDateString(startTime));
+    struct tm * sStartTime = localtime(&startTime);
+    tokenContainer->AddIntToken((int)eDmDetailedEpgIT::year, sStartTime->tm_year + 1900);
+    tokenContainer->AddIntToken((int)eDmDetailedEpgIT::daynumeric, sStartTime->tm_mday);
+    tokenContainer->AddIntToken((int)eDmDetailedEpgIT::month, sStartTime->tm_mon+1);
+    const cChannel *channel = Channels.GetByChannelID(event->ChannelID());
+    if (channel) {
+        tokenContainer->AddStringToken((int)eDmDetailedEpgST::channelname, channel->Name());
+        tokenContainer->AddIntToken((int)eDmDetailedEpgIT::channelnumber, channel->Number());
+    }
+    cString channelID = event->ChannelID().ToString();
+    tokenContainer->AddStringToken((int)eDmDetailedEpgST::channelid, *channelID);
+    tokenContainer->AddIntToken((int)eDmDetailedEpgIT::channellogoexists, imgCache->LogoExists(*channelID));
+
+    bool isRunning = false;
+    time_t now = time(NULL);
+    if ((now >= event->StartTime()) && (now <= event->EndTime()))
+        isRunning = true;
+    tokenContainer->AddIntToken((int)eDmDetailedEpgIT::running, isRunning);
+    if (isRunning) {
+        tokenContainer->AddIntToken((int)eDmDetailedEpgIT::elapsed, (now - event->StartTime())/60);
+    } else {
+        tokenContainer->AddIntToken((int)eDmDetailedEpgIT::elapsed, 0);
+    }
+    tokenContainer->AddIntToken((int)eDmDetailedEpgIT::duration, event->Duration() / 60);
+    tokenContainer->AddIntToken((int)eDmDetailedEpgIT::durationhours, event->Duration() / 3600);
+    tokenContainer->AddStringToken((int)eDmDetailedEpgST::durationminutes, *cString::sprintf("%.2d", (event->Duration() / 60)%60));
+    if (event->Vps())
+        tokenContainer->AddStringToken((int)eDmDetailedEpgST::vps, *event->GetVpsString());
+
+    cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *reruns = LoadReruns();
+    int numReruns = NumReruns(reruns);
+    vector<int> loopInfo;
+    //num reruns
+    loopInfo.push_back(numReruns);
+    //num actors
+    bool scrapInfoAvailable = LoadFullScrapInfo(event, NULL);
+    int numActors = NumActors();
+    loopInfo.push_back(numActors);
+    tokenContainer->CreateLoopTokenContainer(&loopInfo);
+    if (numReruns > 0) {
+        tokenContainer->AddIntToken((int)eDmDetailedEpgIT::hasreruns, 1);
+        SetReruns(reruns);
+    }
+    if (scrapInfoAvailable) {
+        SetFullScrapInfo(tokenContainer, actorsIndex);
+    }
+    SetDirty();
+    return true;
+}
+
+cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *cViewDetailEpg::LoadReruns(void) {
+    cPlugin *epgSearchPlugin = cPluginManager::GetPlugin("epgsearch");
+    if (!epgSearchPlugin)
+        return NULL;
+
+    if (isempty(event->Title()))
+        return NULL;
+
+    Epgsearch_searchresults_v1_0 data;
+    data.query = (char*)event->Title();
+    data.mode = 0;
+    data.channelNr = 0;
+    data.useTitle = true;
+    data.useSubTitle = true;
+    data.useDescription = false;
+
+    cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *result = NULL;
+    if (epgSearchPlugin->Service("Epgsearch-searchresults-v1.0", &data))
+        result = data.pResultList;
+    return result;
+}
+
+int cViewDetailEpg::NumReruns(cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *reruns) {
+    if (!reruns || reruns->Count() < 2)
+        return 0;
+
+    int maxNumReruns = config.rerunAmount;
+    int rerunDistance = config.rerunDistance * 3600;
+    int rerunMaxChannel = config.rerunMaxChannel;
+
+    int i = 0;
+    for (Epgsearch_searchresults_v1_0::cServiceSearchResult *r = reruns->First(); r && i < maxNumReruns; r = reruns->Next(r)) {
+        time_t eventStart = event->StartTime();
+        time_t rerunStart = r->event->StartTime();
+        cChannel *channel = Channels.GetByChannelID(r->event->ChannelID(), true, true);
+        //check for identical event
+        if ((event->ChannelID() == r->event->ChannelID()) && (eventStart == rerunStart))
+            continue;
+        //check for timely distance
+        if (rerunDistance > 0)
+            if (rerunStart - eventStart < rerunDistance)
+                continue;
+        //check for maxchannel
+        if (rerunMaxChannel > 0)
+            if (channel && channel->Number() > rerunMaxChannel)
+                continue;
+        i++;
+    }
+    return i;
+}
+
+void cViewDetailEpg::SetReruns(cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *reruns) {
+    if (!reruns || reruns->Count() < 2)
+        return;
+
+    int maxNumReruns = config.rerunAmount;
+    int rerunDistance = config.rerunDistance * 3600;
+    int rerunMaxChannel = config.rerunMaxChannel;
+
+    int i = 0;
+    for (Epgsearch_searchresults_v1_0::cServiceSearchResult *r = reruns->First(); r && i < maxNumReruns; r = reruns->Next(r)) {
+        time_t eventStart = event->StartTime();
+        time_t rerunStart = r->event->StartTime();
+        cChannel *channel = Channels.GetByChannelID(r->event->ChannelID(), true, true);
+        //check for identical event
+        if ((event->ChannelID() == r->event->ChannelID()) && (eventStart == rerunStart))
+            continue;
+        //check for timely distance
+        if (rerunDistance > 0)
+            if (rerunStart - eventStart < rerunDistance)
+                continue;
+        //check for maxchannel
+        if (rerunMaxChannel > 0)
+            if (channel && channel->Number() > rerunMaxChannel)
+                continue;
+        tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::title, r->event->Title());
+        tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::shorttext, r->event->ShortText());
+        tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::start, *(r->event->GetTimeString()));
+        tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::stop, *(r->event->GetEndTimeString()));
+        tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::date, *ShortDateString(r->event->StartTime()));
+        tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::day, *WeekDayName(r->event->StartTime()));
+        cString channelID = r->event->ChannelID().ToString();
+        tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::channelid, *channelID);
+        bool logoExists = imgCache->LogoExists(*channelID);
+        tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::channellogoexists, logoExists ? "1" : "0");
+        if (channel) {
+            cString channelNumber = cString::sprintf("%d", channel->Number());
+            tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::channelname, channel->ShortName(true));
+            tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::channelnumber, *channelNumber);
+        } else {
+            tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::channelname, "");
+            tokenContainer->AddLoopToken(rerunsIndex, i, (int)eRerunsLT::channelnumber, "");
+        }
+        i++;
+    }
+}
+
+/******************************************************************
+* cViewDetailRec
+******************************************************************/
+cViewDetailRec::cViewDetailRec(void) {
+    recording = NULL;
+    actorsIndex = -1;
+}
+
+cViewDetailRec::~cViewDetailRec(void) {
+}
+
+void cViewDetailRec::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{name}", (int)eDmDetailedRecST::name);
+    tokenContainer->DefineStringToken("{epgname}", (int)eDmDetailedRecST::epgname);
+    tokenContainer->DefineStringToken("{shorttext}", (int)eDmDetailedRecST::shorttext);
+    tokenContainer->DefineStringToken("{description}", (int)eDmDetailedRecST::description);
+    tokenContainer->DefineStringToken("{day}", (int)eDmDetailedRecST::day);
+    tokenContainer->DefineStringToken("{date}", (int)eDmDetailedRecST::date);
+    tokenContainer->DefineStringToken("{time}", (int)eDmDetailedRecST::time);
+    tokenContainer->DefineStringToken("{durationminutes}", (int)eDmDetailedRecST::durationminutes);
+    tokenContainer->DefineStringToken("{durationeventminutes}", (int)eDmDetailedRecST::durationeventminutes);
+    tokenContainer->DefineStringToken("{recchannelname}", (int)eDmDetailedRecST::recchannelname);
+    tokenContainer->DefineStringToken("{recchannelid}", (int)eDmDetailedRecST::recchannelid);
+    tokenContainer->DefineStringToken("{recordingsize}", (int)eDmDetailedRecST::recordingsize);
+    tokenContainer->DefineStringToken("{recordingsizecutted}", (int)eDmDetailedRecST::recordingsizecutted);
+    tokenContainer->DefineStringToken("{recordinglength}", (int)eDmDetailedRecST::recordinglength);
+    tokenContainer->DefineStringToken("{recordinglengthcutted}", (int)eDmDetailedRecST::recordinglengthcutted);
+    tokenContainer->DefineStringToken("{recordingbitrate}", (int)eDmDetailedRecST::recordingbitrate);
+    tokenContainer->DefineStringToken("{recordingformat}", (int)eDmDetailedRecST::recordingformat);
+    tokenContainer->DefineStringToken("{searchtimer}", (int)eDmDetailedRecST::searchtimer);
+    tokenContainer->DefineStringToken("{recimg1path}", (int)eDmDetailedRecST::recimg1path);
+    tokenContainer->DefineStringToken("{recimg2path}", (int)eDmDetailedRecST::recimg2path);
+    tokenContainer->DefineStringToken("{recimg3path}", (int)eDmDetailedRecST::recimg3path);
+    tokenContainer->DefineStringToken("{movietitle}", (int)eScraperST::movietitle);
+    tokenContainer->DefineStringToken("{movieoriginalTitle}", (int)eScraperST::movieoriginalTitle);
+    tokenContainer->DefineStringToken("{movietagline}", (int)eScraperST::movietagline);
+    tokenContainer->DefineStringToken("{movieoverview}", (int)eScraperST::movieoverview);
+    tokenContainer->DefineStringToken("{moviegenres}", (int)eScraperST::moviegenres);
+    tokenContainer->DefineStringToken("{moviehomepage}", (int)eScraperST::moviehomepage);
+    tokenContainer->DefineStringToken("{moviereleasedate}", (int)eScraperST::moviereleasedate);
+    tokenContainer->DefineStringToken("{moviepopularity}", (int)eScraperST::moviepopularity);
+    tokenContainer->DefineStringToken("{movievoteaverage}", (int)eScraperST::movievoteaverage);
+    tokenContainer->DefineStringToken("{posterpath}", (int)eScraperST::posterpath);
+    tokenContainer->DefineStringToken("{fanartpath}", (int)eScraperST::fanartpath);
+    tokenContainer->DefineStringToken("{moviecollectionName}", (int)eScraperST::moviecollectionName);
+    tokenContainer->DefineStringToken("{collectionposterpath}", (int)eScraperST::collectionposterpath);
+    tokenContainer->DefineStringToken("{collectionfanartpath}", (int)eScraperST::collectionfanartpath);
+    tokenContainer->DefineStringToken("{seriesname}", (int)eScraperST::seriesname);
+    tokenContainer->DefineStringToken("{seriesoverview}", (int)eScraperST::seriesoverview);
+    tokenContainer->DefineStringToken("{seriesfirstaired}", (int)eScraperST::seriesfirstaired);
+    tokenContainer->DefineStringToken("{seriesnetwork}", (int)eScraperST::seriesnetwork);
+    tokenContainer->DefineStringToken("{seriesgenre}", (int)eScraperST::seriesgenre);
+    tokenContainer->DefineStringToken("{seriesrating}", (int)eScraperST::seriesrating);
+    tokenContainer->DefineStringToken("{seriesstatus}", (int)eScraperST::seriesstatus);
+    tokenContainer->DefineStringToken("{episodetitle}", (int)eScraperST::episodetitle);
+    tokenContainer->DefineStringToken("{episodefirstaired}", (int)eScraperST::episodefirstaired);
+    tokenContainer->DefineStringToken("{episodegueststars}", (int)eScraperST::episodegueststars);
+    tokenContainer->DefineStringToken("{episodeoverview}", (int)eScraperST::episodeoverview);
+    tokenContainer->DefineStringToken("{episoderating}", (int)eScraperST::episoderating);
+    tokenContainer->DefineStringToken("{episodeimagepath}", (int)eScraperST::episodeimagepath);
+    tokenContainer->DefineStringToken("{seasonposterpath}", (int)eScraperST::seasonposterpath);
+    tokenContainer->DefineStringToken("{seriesposter1path}", (int)eScraperST::seriesposter1path);
+    tokenContainer->DefineStringToken("{seriesposter2path}", (int)eScraperST::seriesposter2path);
+    tokenContainer->DefineStringToken("{seriesposter3path}", (int)eScraperST::seriesposter3path);
+    tokenContainer->DefineStringToken("{seriesfanart1path}", (int)eScraperST::seriesfanart1path);
+    tokenContainer->DefineStringToken("{seriesfanart2path}", (int)eScraperST::seriesfanart2path);
+    tokenContainer->DefineStringToken("{seriesfanart3path}", (int)eScraperST::seriesfanart3path);
+    tokenContainer->DefineStringToken("{seriesbanner1path}", (int)eScraperST::seriesbanner1path);
+    tokenContainer->DefineStringToken("{seriesbanner2path}", (int)eScraperST::seriesbanner2path);
+    tokenContainer->DefineStringToken("{seriesbanner3path}", (int)eScraperST::seriesbanner3path);
+    tokenContainer->DefineIntToken("{daynumeric}", (int)eDmDetailedRecIT::daynumeric);
+    tokenContainer->DefineIntToken("{month}", (int)eDmDetailedRecIT::month);
+    tokenContainer->DefineIntToken("{year}", (int)eDmDetailedRecIT::year);
+    tokenContainer->DefineIntToken("{duration}", (int)eDmDetailedRecIT::duration);
+    tokenContainer->DefineIntToken("{durationhours}", (int)eDmDetailedRecIT::durationhours);
+    tokenContainer->DefineIntToken("{durationevent}", (int)eDmDetailedRecIT::durationevent);
+    tokenContainer->DefineIntToken("{durationeventhours}", (int)eDmDetailedRecIT::durationeventhours);
+    tokenContainer->DefineIntToken("{recchannelnumber}", (int)eDmDetailedRecIT::recchannelnumber);
+    tokenContainer->DefineIntToken("{cutted}", (int)eDmDetailedRecIT::cutted);
+    tokenContainer->DefineIntToken("{recimg1avaialble}", (int)eDmDetailedRecIT::recimg1avaialble);
+    tokenContainer->DefineIntToken("{recimg2avaialble}", (int)eDmDetailedRecIT::recimg2avaialble);
+    tokenContainer->DefineIntToken("{recimg3avaialble}", (int)eDmDetailedRecIT::recimg3avaialble);
+    tokenContainer->DefineIntToken("{ismovie}", (int)eScraperIT::ismovie);
+    tokenContainer->DefineIntToken("{moviebudget}", (int)eScraperIT::moviebudget);
+    tokenContainer->DefineIntToken("{movierevenue}", (int)eScraperIT::movierevenue);
+    tokenContainer->DefineIntToken("{movieadult}", (int)eScraperIT::movieadult);
+    tokenContainer->DefineIntToken("{movieruntime}", (int)eScraperIT::movieruntime);
+    tokenContainer->DefineIntToken("{isseries}", (int)eScraperIT::isseries);
+    tokenContainer->DefineIntToken("{posterwidth}", (int)eScraperIT::posterwidth);
+    tokenContainer->DefineIntToken("{posterheight}", (int)eScraperIT::posterheight);
+    tokenContainer->DefineIntToken("{fanartwidth}", (int)eScraperIT::fanartwidth);
+    tokenContainer->DefineIntToken("{fanartheight}", (int)eScraperIT::fanartheight);
+    tokenContainer->DefineIntToken("{movieiscollection}", (int)eScraperIT::movieiscollection);
+    tokenContainer->DefineIntToken("{collectionposterwidth}", (int)eScraperIT::collectionposterwidth);
+    tokenContainer->DefineIntToken("{collectionposterheight}", (int)eScraperIT::collectionposterheight);
+    tokenContainer->DefineIntToken("{collectionfanartwidth}", (int)eScraperIT::collectionfanartwidth);
+    tokenContainer->DefineIntToken("{collectionfanartheight}", (int)eScraperIT::collectionfanartheight);
+    tokenContainer->DefineIntToken("{epgpicavailable}", (int)eScraperIT::epgpicavailable);
+    tokenContainer->DefineIntToken("{episodenumber}", (int)eScraperIT::episodenumber);
+    tokenContainer->DefineIntToken("{episodeseason}", (int)eScraperIT::episodeseason);
+    tokenContainer->DefineIntToken("{episodeimagewidth}", (int)eScraperIT::episodeimagewidth);
+    tokenContainer->DefineIntToken("{episodeimageheight}", (int)eScraperIT::episodeimageheight);
+    tokenContainer->DefineIntToken("{seasonposterwidth}", (int)eScraperIT::seasonposterwidth);
+    tokenContainer->DefineIntToken("{seasonposterheight}", (int)eScraperIT::seasonposterheight);
+    tokenContainer->DefineIntToken("{seriesposter1width}", (int)eScraperIT::seriesposter1width);
+    tokenContainer->DefineIntToken("{seriesposter1height}", (int)eScraperIT::seriesposter1height);
+    tokenContainer->DefineIntToken("{seriesposter2width}", (int)eScraperIT::seriesposter2width);
+    tokenContainer->DefineIntToken("{seriesposter2height}", (int)eScraperIT::seriesposter2height);
+    tokenContainer->DefineIntToken("{seriesposter3width}", (int)eScraperIT::seriesposter3width);
+    tokenContainer->DefineIntToken("{seriesposter3height}", (int)eScraperIT::seriesposter3height);
+    tokenContainer->DefineIntToken("{seriesfanart1width}", (int)eScraperIT::seriesfanart1width);
+    tokenContainer->DefineIntToken("{seriesfanart1height}", (int)eScraperIT::seriesfanart1height);
+    tokenContainer->DefineIntToken("{seriesfanart2width}", (int)eScraperIT::seriesfanart2width);
+    tokenContainer->DefineIntToken("{seriesfanart2height}", (int)eScraperIT::seriesfanart2height);
+    tokenContainer->DefineIntToken("{seriesfanart3width}", (int)eScraperIT::seriesfanart3width);
+    tokenContainer->DefineIntToken("{seriesfanart3height}", (int)eScraperIT::seriesfanart3height);
+    tokenContainer->DefineIntToken("{seriesbanner1width}", (int)eScraperIT::seriesbanner1width);
+    tokenContainer->DefineIntToken("{seriesbanner1height}", (int)eScraperIT::seriesbanner1height);
+    tokenContainer->DefineIntToken("{seriesbanner2width}", (int)eScraperIT::seriesbanner2width);
+    tokenContainer->DefineIntToken("{seriesbanner2height}", (int)eScraperIT::seriesbanner2height);
+    tokenContainer->DefineIntToken("{seriesbanner3width}", (int)eScraperIT::seriesbanner3width);
+    tokenContainer->DefineIntToken("{seriesbanner3height}", (int)eScraperIT::seriesbanner3height);
+    tokenContainer->DefineLoopToken("{actors[name]}", (int)eScraperLT::name);
+    tokenContainer->DefineLoopToken("{actors[role]}", (int)eScraperLT::role);
+    tokenContainer->DefineLoopToken("{actors[thumb]}", (int)eScraperLT::thumb);
+    tokenContainer->DefineLoopToken("{actors[thumbwidth]}", (int)eScraperLT::thumbwidth);
+    tokenContainer->DefineLoopToken("{actors[thumbheight]}", (int)eScraperLT::thumbheight);
+    actorsIndex = tokenContainer->LoopIndex("actors");
+    InheritTokenContainer();
+}
+
+bool cViewDetailRec::Parse(bool forced) {
+    if (!cViewElement::Parse())
+        return false;
+    if (!recording)
+        return false;
+    tokenContainer->Clear();
+    tokenContainer->AddStringToken((int)eDmDetailedRecST::name, recording->Name());
+    tokenContainer->AddIntToken((int)eDmDetailedRecIT::cutted, recording->IsEdited());
+
+    const cRecordingInfo *info = recording->Info();
+    if (info) {
+        tokenContainer->AddStringToken((int)eDmDetailedRecST::epgname, info->Title());
+        tokenContainer->AddStringToken((int)eDmDetailedRecST::shorttext, info->ShortText());
+        tokenContainer->AddStringToken((int)eDmDetailedRecST::description, info->Description());
+        const cEvent *event = info->GetEvent();
+        if (event) {
+            cString recDate = event->GetDateString();
+            cString recTime = event->GetTimeString();
+            if (strstr(*recDate, "1970")) {
+                time_t start = recording->Start();
+                recDate = DateString(start);
+                recTime = TimeString(start);
+            }
+            int duration = event->Duration() / 60;
+            int recDuration = recording->LengthInSeconds();
+            recDuration = (recDuration>0) ? (recDuration / 60) : 0;
+            tokenContainer->AddStringToken((int)eDmDetailedRecST::date, *recDate);
+            tokenContainer->AddStringToken((int)eDmDetailedRecST::time, *recTime);
+            time_t startTime = event->StartTime();
+            struct tm * sStartTime = localtime(&startTime);
+            tokenContainer->AddIntToken((int)eDmDetailedRecIT::year, sStartTime->tm_year + 1900);
+            tokenContainer->AddIntToken((int)eDmDetailedRecIT::daynumeric, sStartTime->tm_mday);
+            tokenContainer->AddIntToken((int)eDmDetailedRecIT::month, sStartTime->tm_mon+1);
+            tokenContainer->AddIntToken((int)eDmDetailedRecIT::duration, recDuration);
+            tokenContainer->AddIntToken((int)eDmDetailedRecIT::durationhours, recDuration / 60);
+            tokenContainer->AddStringToken((int)eDmDetailedRecST::durationminutes, *cString::sprintf("%.2d", recDuration%60));
+            tokenContainer->AddIntToken((int)eDmDetailedRecIT::durationevent, duration);
+            tokenContainer->AddIntToken((int)eDmDetailedRecIT::durationeventhours, duration / 60);
+            tokenContainer->AddStringToken((int)eDmDetailedRecST::durationeventminutes, *cString::sprintf("%.2d", duration%60));
+        }
+    }
+    SetRecInfos();
+    SetRecordingImages(recording->FileName());
+
+    vector<int> loopInfo;
+    bool scrapInfoAvailable = LoadFullScrapInfo(NULL, recording);
+    int numActors = NumActors();
+    loopInfo.push_back(numActors);
+    tokenContainer->CreateLoopTokenContainer(&loopInfo);
+    if (scrapInfoAvailable) {
+        SetFullScrapInfo(tokenContainer, actorsIndex);
+    }
+
+    SetDirty();
+    return true;
+}
+
+void cViewDetailRec::SetRecInfos(void) {
+    unsigned long long nRecSize = -1;
+    unsigned long long nFileSize[1000];
+    nFileSize[0] = 0;
+    int i = 0;
+    struct stat filebuf;
+    cString filename;
+    int rc = 0;
+    do {
+        if (recording->IsPesRecording())
+            filename = cString::sprintf("%s/%03d.vdr", recording->FileName(), ++i);
+        else
+            filename = cString::sprintf("%s/%05d.ts", recording->FileName(), ++i);
+        rc = stat(filename, &filebuf);
+        if (rc == 0)
+            nFileSize[i] = nFileSize[i-1] + filebuf.st_size;
+        else
+            if (ENOENT != errno) {
+                nRecSize = -1;
+            }
+    } while (i <= 999 && !rc);
+    nRecSize = nFileSize[i-1];
+
+    cMarks marks;
+    bool fHasMarks = marks.Load(recording->FileName(), recording->FramesPerSecond(), recording->IsPesRecording()) && marks.Count();
+    cIndexFile *index = new cIndexFile(recording->FileName(), false, recording->IsPesRecording());
+
+    int nCutLength = 0;
+    long nCutInFrame = 0;
+    unsigned long long nRecSizeCut = nRecSize < 0 ? -1 : 0;
+    unsigned long long nCutInOffset = 0;
+
+    if (fHasMarks && index) {
+        uint16_t FileNumber;
+        off_t FileOffset;
+
+        bool fCutIn = true;
+        cMark *mark = marks.First();
+        while (mark) {
+            int pos = mark->Position();
+            index->Get(pos, &FileNumber, &FileOffset); //TODO: will disc spin up?
+            if (fCutIn) {
+                nCutInFrame = pos;
+                fCutIn = false;
+                if (nRecSize >= 0)
+                    nCutInOffset = nFileSize[FileNumber-1] + FileOffset;
+            } else {
+                nCutLength += pos - nCutInFrame;
+                fCutIn = true;
+                if (nRecSize >= 0)
+                    nRecSizeCut += nFileSize[FileNumber-1] + FileOffset - nCutInOffset;
+            }
+            cMark *nextmark = marks.Next(mark);
+            mark = nextmark;
+        }
+        if (!fCutIn) {
+            nCutLength += index->Last() - nCutInFrame;
+            index->Get(index->Last() - 1, &FileNumber, &FileOffset);
+            if (nRecSize >= 0)
+                nRecSizeCut += nFileSize[FileNumber-1] + FileOffset - nCutInOffset;
+        }
+    }
+
+    if (nRecSize < 0) {
+        if ((nRecSize = ReadSizeVdr(recording->FileName())) < 0) {
+            nRecSize = DirSizeMB(recording->FileName());
+        }
+    }
+    if (nRecSize >= 0) {
+        cString strRecSize = "";
+        cString strRecSizeCut = "";
+
+        if (fHasMarks) {
+            if (nRecSize > MEGABYTE(1023)) {
+                strRecSize = cString::sprintf("%.2f GB", (float)nRecSize / MEGABYTE(1024));
+                strRecSizeCut = cString::sprintf("%.2f GB", (float)nRecSizeCut / MEGABYTE(1024));
+            } else {
+                strRecSize = cString::sprintf("%lld MB", nRecSize / MEGABYTE(1));
+                strRecSizeCut = cString::sprintf("%lld MB", nRecSizeCut / MEGABYTE(1));
+            }
+        } else {
+            if (nRecSize > MEGABYTE(1023)) {
+                strRecSize = cString::sprintf("%.2f GB", (float)nRecSize / MEGABYTE(1024));
+                strRecSizeCut = strRecSize;
+            } else {
+                strRecSize = cString::sprintf("%lld MB", nRecSize / MEGABYTE(1));
+                strRecSizeCut = strRecSize;
+            }
+        }
+        tokenContainer->AddStringToken((int)eDmDetailedRecST::recordingsize, *strRecSize);
+        tokenContainer->AddStringToken((int)eDmDetailedRecST::recordingsizecutted, *strRecSizeCut);
+    }
+
+    const cRecordingInfo *info = recording->Info();
+    if (info) {
+        cChannel *channel = Channels.GetByChannelID(info->ChannelID());
+        if (channel) {
+            tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelname, channel->Name());
+            tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelid, *channel->GetChannelID().ToString());
+            tokenContainer->AddIntToken((int)eDmDetailedRecIT::recchannelnumber, channel->Number());
+        }        
+    }
+
+
+    if (index) {
+        int nLastIndex = index->Last();
+        if (nLastIndex) {
+            string strLength = *IndexToHMSF(nLastIndex, false, recording->FramesPerSecond());
+            string strLengthCutted = "";
+            if (fHasMarks) {
+                strLengthCutted = *IndexToHMSF(nCutLength, false, recording->FramesPerSecond());
+            } else {
+                strLengthCutted = strLength;
+            }
+            string strBitrate = *cString::sprintf("%.2f MBit/s", (float)nRecSize / nLastIndex * recording->FramesPerSecond() * 8 / MEGABYTE(1));
+            tokenContainer->AddStringToken((int)eDmDetailedRecST::recordinglength, strLength.c_str());
+            tokenContainer->AddStringToken((int)eDmDetailedRecST::recordinglengthcutted, strLengthCutted.c_str());
+            tokenContainer->AddStringToken((int)eDmDetailedRecST::recordingbitrate, strBitrate.c_str());
+        }
+        delete index;
+    }
+    
+    tokenContainer->AddStringToken((int)eDmDetailedRecST::recordingformat, recording->IsPesRecording() ? "PES" : "TS");
+    
+    bool searchTimerFound = false;
+    if (info) {
+        const char *aux = NULL;
+        aux = info->Aux();
+        if (aux) {
+            string strAux = aux;
+            string auxEpgsearch = StripXmlTag(strAux, "epgsearch");
+            if (!auxEpgsearch.empty()) {
+                string searchTimer = StripXmlTag(auxEpgsearch, "searchtimer");
+                if (!searchTimer.empty()) {
+                    tokenContainer->AddStringToken((int)eDmDetailedRecST::searchtimer, searchTimer.c_str());
+                    searchTimerFound = true;
+                }
+            }
+        }
+    }
+    if (!searchTimerFound)
+        tokenContainer->AddStringToken((int)eDmDetailedRecST::searchtimer, "n.a.");
+}
+
+int cViewDetailRec::ReadSizeVdr(const char *strPath) {
+    int dirSize = -1;
+    char buffer[20];
+    char *strFilename = NULL;
+    if (-1 != asprintf(&strFilename, "%s/size.vdr", strPath)) {
+        struct stat st;
+        if (stat(strFilename, &st) == 0) {
+                int fd = open(strFilename, O_RDONLY);
+            if (fd >= 0) {
+                if (safe_read(fd, &buffer, sizeof(buffer)) >= 0) {
+                    dirSize = atoi(buffer);
+                }
+                close(fd);
+            }
+        }
+        free(strFilename);
+    }
+    return dirSize;
+}
+
+string cViewDetailRec::StripXmlTag(string &Line, const char *Tag) {
+        // set the search strings
+        stringstream strStart, strStop;
+        strStart << "<" << Tag << ">";
+        strStop << "</" << Tag << ">";
+        // find the strings
+        string::size_type locStart = Line.find(strStart.str());
+        string::size_type locStop = Line.find(strStop.str());
+        if (locStart == string::npos || locStop == string::npos)
+                return "";
+        // extract relevant text
+        int pos = locStart + strStart.str().size();
+        int len = locStop - pos;
+        return len < 0 ? "" : Line.substr(pos, len);
+}
+
+void cViewDetailRec::SetRecordingImages(const char *recPath) {
+    if (!recPath) {
+        return;
+    }
+    DIR *dirHandle;
+    struct dirent *dirEntry;
+    dirHandle = opendir(recPath);
+    if (!dirHandle) {
+        return;        
+    }
+    int picsFound = 0;
+    int indexStr = (int)eDmDetailedRecST::recimg1path;
+    int indexInt = (int)eDmDetailedRecIT::recimg1avaialble;
+    while ( 0 != (dirEntry = readdir(dirHandle))) {
+        if (endswith(dirEntry->d_name, "jpg")) {
+            tokenContainer->AddStringToken(indexStr, *cString::sprintf("%s/%s", recPath, dirEntry->d_name));
+            tokenContainer->AddIntToken(indexInt, 1);
+            picsFound++;
+        }
+        if (picsFound == 3) {
+            break;
+        }
+    }
+    closedir(dirHandle);
+}
+
+/******************************************************************
+* cViewDetailText
+******************************************************************/
+cViewDetailText::cViewDetailText(void) {
+    text = NULL;
+}
+
+cViewDetailText::~cViewDetailText(void) {
+}
+
+void cViewDetailText::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{text}", (int)eDmDetailedTextST::text);
+    InheritTokenContainer();    
+}
+
+bool cViewDetailText::Parse(bool forced) {
+    if (!cViewElement::Parse())
+        return false;
+    if (!text)
+        return false;
+    tokenContainer->Clear();
+    tokenContainer->AddStringToken((int)eDmDetailedTextST::text, text);
+    SetDirty();
+    return true;
+}
+
+/******************************************************************
+* cViewDetailPlugin
+******************************************************************/
+cViewDetailPlugin::cViewDetailPlugin(void) {
+}
+
+cViewDetailPlugin::~cViewDetailPlugin(void) {
+}
+
+void cViewDetailPlugin::SetTokenContainer(void) {
+    if (plugId == -1 || plugMenuId == -1)
+        return;
+    skindesignerapi::cTokenContainer *tkPlugMenu = plgManager->GetTokenContainer(plugId, plugMenuId);
+    tokenContainer = new skindesignerapi::cTokenContainer(*tkPlugMenu);
+    InheritTokenContainer();
+}
+
+void cViewDetailPlugin::Set(skindesignerapi::cTokenContainer *tk) {
+    tokenContainer->Clear();
+    tokenContainer->SetTokens(tk);
+}
+
+bool cViewDetailPlugin::Parse(bool forced) {
+    if (!cViewElement::Parse())
+        return false;
+    SetDirty();
+    return true;
+}
+
+/******************************************************************
+* cViewDetailAdvancedPlugin
+******************************************************************/
+cViewDetailAdvancedPlugin::cViewDetailAdvancedPlugin(int viewId, int plugId) {
+    this->plugId = plugId;
+    plugViewId = viewId;
+}
+
+cViewDetailAdvancedPlugin::~cViewDetailAdvancedPlugin(void) {
+}
+
+void cViewDetailAdvancedPlugin::SetTokenContainer(void) {
+    if (plugId == -1 || plugViewId == -1)
+        return;
+    skindesignerapi::cTokenContainer *tkDetail = plgManager->GetTokenContainerTab(plugId, plugViewId);
+    tokenContainer = new skindesignerapi::cTokenContainer(*tkDetail);
+    InheritTokenContainer();
+}
+
+void cViewDetailAdvancedPlugin::Set(skindesignerapi::cTokenContainer *tk) {
+    tokenContainer->Clear();
+    tokenContainer->SetTokens(tk);
+}
+
+bool cViewDetailAdvancedPlugin::Parse(bool forced) {
+    if (!cViewElement::Parse())
+        return false;
+    SetDirty();
+    return true;
+}
diff --git a/coreengine/viewdetail.h b/coreengine/viewdetail.h
index 9fb63e6..0de7209 100644
--- a/coreengine/viewdetail.h
+++ b/coreengine/viewdetail.h
@@ -1,114 +1,114 @@
-#ifndef __VIEWDETAIL_H

-#define __VIEWDETAIL_H

-

-#include "../services/epgsearch.h"

-#include "../extensions/scrapmanager.h"

-#include "viewelement.h"

-/******************************************************************

-* cViewDetail

-******************************************************************/

-class cViewDetail : public cViewElement, public cScrapManager {

-protected:

-    int plugId;

-    int plugMenuId;

-    cArea *activeTab;

-    int activeTabIndex;

-    int numTabs;

-    void SetActiveTab(void);

-public:

-    cViewDetail(void);

-    virtual ~cViewDetail(void);

-    void SetPlugId(int id) { plugId = id; };

-    void SetPlugMenuId(int id) { plugMenuId = id; };

-    int GetWidth(void);

-    void ResetTabs(void);

-    void Clear(void);

-    void Close(void);

-    void Render(void);

-    void Scrollbar(int &barheight, int &offset, bool &end);

-    bool ScrollUp(bool page = false);

-    bool ScrollDown(bool page = false);

-    int GetTabs(vector<const char*> &tabs);

-    int NumTabs(void) { return numTabs; };

-    int ActiveTab(void) { return activeTabIndex; };

-    void NextTab(void);

-    void PrevTab(void);

-    void SetTransparency(int transparency, bool forceDetached = false);

-};

-/******************************************************************

-* cViewDetailEpg

-******************************************************************/

-class cViewDetailEpg : public cViewDetail {

-protected:

-    const cEvent *event;

-    int rerunsIndex;

-    int actorsIndex;

-    cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *LoadReruns(void);

-    int NumReruns(cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *reruns);

-    void SetReruns(cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *reruns);

-public:

-    cViewDetailEpg(void);

-    virtual ~cViewDetailEpg(void);

-    void SetTokenContainer(void);

-    void SetEvent(const cEvent *event) { this->event = event; };

-    bool Parse(bool forced = false);

-};

-/******************************************************************

-* cViewDetailRec

-******************************************************************/

-class cViewDetailRec : public cViewDetail {

-protected:

-    const cRecording *recording;

-    int actorsIndex;

-    void SetRecInfos(void);

-    int ReadSizeVdr(const char *strPath);

-    string StripXmlTag(string &Line, const char *Tag);

-    void SetRecordingImages(const char *recPath);

-public:

-    cViewDetailRec(void);

-    virtual ~cViewDetailRec(void);

-    void SetTokenContainer(void);

-    void SetRecording(const cRecording *recording) { this->recording = recording; };

-    bool Parse(bool forced = false);

-};

-/******************************************************************

-* cViewDetailText

-******************************************************************/

-class cViewDetailText : public cViewDetail {

-protected:

-    const char *text;

-public:

-    cViewDetailText(void);

-    virtual ~cViewDetailText(void);

-    void SetTokenContainer(void);

-    void SetText(const char *text) { this->text = text; };

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cViewDetailPlugin

-******************************************************************/

-class cViewDetailPlugin : public cViewDetail {

-protected:

-public:

-    cViewDetailPlugin(void);

-    virtual ~cViewDetailPlugin(void);

-    void SetTokenContainer(void);

-    void Set(skindesignerapi::cTokenContainer *tk);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cViewDetailAdvancedPlugin

-******************************************************************/

-class cViewDetailAdvancedPlugin : public cViewDetail {

-protected:

-    int plugViewId;

-public:

-    cViewDetailAdvancedPlugin(int viewId, int plugId);

-    virtual ~cViewDetailAdvancedPlugin(void);

-    void SetTokenContainer(void);

-    void Set(skindesignerapi::cTokenContainer *tk);

-    bool Parse(bool forced = false);

-};

+#ifndef __VIEWDETAIL_H
+#define __VIEWDETAIL_H
+
+#include "../services/epgsearch.h"
+#include "../extensions/scrapmanager.h"
+#include "viewelement.h"
+/******************************************************************
+* cViewDetail
+******************************************************************/
+class cViewDetail : public cViewElement, public cScrapManager {
+protected:
+    int plugId;
+    int plugMenuId;
+    cArea *activeTab;
+    int activeTabIndex;
+    int numTabs;
+    void SetActiveTab(void);
+public:
+    cViewDetail(void);
+    virtual ~cViewDetail(void);
+    void SetPlugId(int id) { plugId = id; };
+    void SetPlugMenuId(int id) { plugMenuId = id; };
+    int GetWidth(void);
+    void ResetTabs(void);
+    void Clear(void);
+    void Close(void);
+    void Render(void);
+    void Scrollbar(int &barheight, int &offset, bool &end);
+    bool ScrollUp(bool page = false);
+    bool ScrollDown(bool page = false);
+    int GetTabs(vector<const char*> &tabs);
+    int NumTabs(void) { return numTabs; };
+    int ActiveTab(void) { return activeTabIndex; };
+    void NextTab(void);
+    void PrevTab(void);
+    void SetTransparency(int transparency, bool forceDetached = false);
+};
+/******************************************************************
+* cViewDetailEpg
+******************************************************************/
+class cViewDetailEpg : public cViewDetail {
+protected:
+    const cEvent *event;
+    int rerunsIndex;
+    int actorsIndex;
+    cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *LoadReruns(void);
+    int NumReruns(cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *reruns);
+    void SetReruns(cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *reruns);
+public:
+    cViewDetailEpg(void);
+    virtual ~cViewDetailEpg(void);
+    void SetTokenContainer(void);
+    void SetEvent(const cEvent *event) { this->event = event; };
+    bool Parse(bool forced = false);
+};
+/******************************************************************
+* cViewDetailRec
+******************************************************************/
+class cViewDetailRec : public cViewDetail {
+protected:
+    const cRecording *recording;
+    int actorsIndex;
+    void SetRecInfos(void);
+    int ReadSizeVdr(const char *strPath);
+    string StripXmlTag(string &Line, const char *Tag);
+    void SetRecordingImages(const char *recPath);
+public:
+    cViewDetailRec(void);
+    virtual ~cViewDetailRec(void);
+    void SetTokenContainer(void);
+    void SetRecording(const cRecording *recording) { this->recording = recording; };
+    bool Parse(bool forced = false);
+};
+/******************************************************************
+* cViewDetailText
+******************************************************************/
+class cViewDetailText : public cViewDetail {
+protected:
+    const char *text;
+public:
+    cViewDetailText(void);
+    virtual ~cViewDetailText(void);
+    void SetTokenContainer(void);
+    void SetText(const char *text) { this->text = text; };
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cViewDetailPlugin
+******************************************************************/
+class cViewDetailPlugin : public cViewDetail {
+protected:
+public:
+    cViewDetailPlugin(void);
+    virtual ~cViewDetailPlugin(void);
+    void SetTokenContainer(void);
+    void Set(skindesignerapi::cTokenContainer *tk);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cViewDetailAdvancedPlugin
+******************************************************************/
+class cViewDetailAdvancedPlugin : public cViewDetail {
+protected:
+    int plugViewId;
+public:
+    cViewDetailAdvancedPlugin(int viewId, int plugId);
+    virtual ~cViewDetailAdvancedPlugin(void);
+    void SetTokenContainer(void);
+    void Set(skindesignerapi::cTokenContainer *tk);
+    bool Parse(bool forced = false);
+};
 #endif //__VIEWDETAIL_H
\ No newline at end of file
diff --git a/coreengine/viewdisplaychannel.c b/coreengine/viewdisplaychannel.c
index 9be9393..ba05ba6 100644
--- a/coreengine/viewdisplaychannel.c
+++ b/coreengine/viewdisplaychannel.c
@@ -1,199 +1,199 @@
-#include "viewdisplaychannel.h"

-#include "../config.h"

-

-/************************************************************************************

-* cViewChannel

-************************************************************************************/

-

-cViewChannel::cViewChannel(void) {

-    veCustomTokens = NULL;

-    ClearVariables();

-    viewId = eViewType::DisplayChannel;

-    viewName = strdup("displaychannel");

-    numViewElements = (int)eVeDisplayChannel::count;

-    viewElements = new cViewElement*[numViewElements];

-    for (int i=0; i < numViewElements; i++) {

-        viewElements[i] = NULL;

-    }

-    SetViewElements();

-    veMessage = NULL;

-    veChannelInfo = NULL;

-    veChannelGroup = NULL;

-    veEpgInfo = NULL;

-    veProgressBar = NULL;

-    veStatusInfo = NULL;

-    veScraperContent = NULL;

-    veEcmInfo = NULL;

-}

-

-cViewChannel::~cViewChannel() {

-}

-

-void cViewChannel::SetViewElements(void) {

-    viewElementNames.insert(pair<string, int>("background", (int)eVeDisplayChannel::background));

-    viewElementNames.insert(pair<string, int>("channelgroup", (int)eVeDisplayChannel::channelgroup));

-    viewElementNames.insert(pair<string, int>("channelinfo", (int)eVeDisplayChannel::channelinfo));

-    viewElementNames.insert(pair<string, int>("epginfo", (int)eVeDisplayChannel::epginfo));

-    viewElementNames.insert(pair<string, int>("progressbar", (int)eVeDisplayChannel::progressbar));

-    viewElementNames.insert(pair<string, int>("statusinfo", (int)eVeDisplayChannel::statusinfo));

-    viewElementNames.insert(pair<string, int>("audioinfo", (int)eVeDisplayChannel::audioinfo));

-    viewElementNames.insert(pair<string, int>("ecminfo", (int)eVeDisplayChannel::ecminfo));

-    viewElementNames.insert(pair<string, int>("screenresolution", (int)eVeDisplayChannel::screenresolution));

-    viewElementNames.insert(pair<string, int>("signalquality", (int)eVeDisplayChannel::signalquality));

-    viewElementNames.insert(pair<string, int>("devices", (int)eVeDisplayChannel::devices));

-    viewElementNames.insert(pair<string, int>("currentweather", (int)eVeDisplayChannel::currentweather));

-    viewElementNames.insert(pair<string, int>("scrapercontent", (int)eVeDisplayChannel::scrapercontent));

-    viewElementNames.insert(pair<string, int>("datetime", (int)eVeDisplayChannel::datetime));

-    viewElementNames.insert(pair<string, int>("time", (int)eVeDisplayChannel::time));

-    viewElementNames.insert(pair<string, int>("message", (int)eVeDisplayChannel::message));

-    viewElementNames.insert(pair<string, int>("customtokens", (int)eVeDisplayChannel::customtokens));

-}

-

-void cViewChannel::SetViewElementObjects(void) {

-    for (int i = 0; i < numViewElements; i++) {

-        if (!viewElements[i])

-            continue;

-        if (dynamic_cast<cVeMessage*>(viewElements[i])) 

-        {

-            veMessage = dynamic_cast<cVeMessage*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDcChannelInfo*>(viewElements[i])) {

-

-            veChannelInfo = dynamic_cast<cVeDcChannelInfo*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDcChannelGroup*>(viewElements[i])) 

-        {

-            veChannelGroup = dynamic_cast<cVeDcChannelGroup*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDcEpgInfo*>(viewElements[i])) 

-        {

-            veEpgInfo = dynamic_cast<cVeDcEpgInfo*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDcProgressBar*>(viewElements[i])) 

-        {

-            veProgressBar = dynamic_cast<cVeDcProgressBar*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDcStatusInfo*>(viewElements[i])) 

-        {

-            veStatusInfo = dynamic_cast<cVeDcStatusInfo*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDcScraperContent*>(viewElements[i])) 

-        {

-            veScraperContent = dynamic_cast<cVeDcScraperContent*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDcEcmInfo*>(viewElements[i])) 

-        {

-            veEcmInfo = dynamic_cast<cVeDcEcmInfo*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeCustomTokens*>(viewElements[i])) 

-        {

-            veCustomTokens = dynamic_cast<cVeCustomTokens*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDevices*>(viewElements[i])) 

-        {

-            viewElements[i]->SetDetached();

-        }

-    }

-}

-

-void cViewChannel::ClearVariables(void) {

-    cView::ClearVariables();

-    channelChange = false;

-    displayChannelGroups = false;

-    if (veCustomTokens)

-        veCustomTokens->Reset();

-}

-

-void cViewChannel::SetChannel(const cChannel *channel, int number) {

-    channelChange = true;

-    bool wasChannelGroups = displayChannelGroups;

-    displayChannelGroups = false;

-

-    if (veChannelInfo) {

-        veChannelInfo->Set(channel, number);

-    }

-

-    if (channel) {

-        if (!channel->GroupSep()) {

-            if (wasChannelGroups)

-                Clear((int)eVeDisplayChannel::channelgroup);

-            if (veStatusInfo)

-                veStatusInfo->Set(channel);

-            if (veEcmInfo)

-                veEcmInfo->Set(channel);

-        } else {

-            displayChannelGroups = true;

-            Clear((int)eVeDisplayChannel::channelinfo);

-            Clear((int)eVeDisplayChannel::epginfo);

-            Clear((int)eVeDisplayChannel::statusinfo);

-            Clear((int)eVeDisplayChannel::progressbar);

-            Clear((int)eVeDisplayChannel::screenresolution);

-            Clear((int)eVeDisplayChannel::signalquality);

-            Clear((int)eVeDisplayChannel::audioinfo);

-            Clear((int)eVeDisplayChannel::ecminfo);

-            Clear((int)eVeDisplayChannel::devices);

-            Clear((int)eVeDisplayChannel::customtokens);

-            if (veChannelGroup)

-                veChannelGroup->Set(channel);

-        }

-    }

-}

-

-void cViewChannel::SetEvents(const cEvent *present, const cEvent *following) {

-    Clear((int)eVeDisplayChannel::epginfo);

-    Clear((int)eVeDisplayChannel::progressbar);

-    Clear((int)eVeDisplayChannel::scrapercontent);

-    if (veProgressBar)

-        veProgressBar->Set(present);

-

-    if (!present && !following)

-        return;

-    

-    if (veEpgInfo)

-        veEpgInfo->Set(present, following);

-

-    if (veScraperContent)

-        veScraperContent->Set(present);

-}

-

-void cViewChannel::SetMessage(eMessageType type, const char *text) {

-    if (veMessage) {

-        if (text)

-            veMessage->Set(type, text);

-        else

-            veMessage->Clear();

-    }

-}

-

-void cViewChannel::Flush(void) {

-    if (init) {

-        sdOsd.LockFlush();

-        Render((int)eVeDisplayChannel::background);

-        Render((int)eVeDisplayChannel::progressbar);

-        Render((int)eVeDisplayChannel::currentweather);

-    }

-    

-    if (!displayChannelGroups) {

-        //normal display

-        Render((int)eVeDisplayChannel::channelinfo);

-        Render((int)eVeDisplayChannel::epginfo);

-        Render((int)eVeDisplayChannel::statusinfo);

-        Render((int)eVeDisplayChannel::scrapercontent);

-        Render((int)eVeDisplayChannel::progressbar, channelChange);

-        Render((int)eVeDisplayChannel::screenresolution);

-        Render((int)eVeDisplayChannel::signalquality);

-        Render((int)eVeDisplayChannel::audioinfo);

-        Render((int)eVeDisplayChannel::ecminfo);

-        Render((int)eVeDisplayChannel::devices);

-        Render((int)eVeDisplayChannel::customtokens);

-        Render((int)eVeDisplayChannel::message);

-    } else {

-        //channelgroup display

-        Render((int)eVeDisplayChannel::channelgroup);

-    }

-    Render((int)eVeDisplayChannel::datetime);

-    Render((int)eVeDisplayChannel::time);

-    channelChange = false;

-    cView::Flush();

-}

-

+#include "viewdisplaychannel.h"
+#include "../config.h"
+
+/************************************************************************************
+* cViewChannel
+************************************************************************************/
+
+cViewChannel::cViewChannel(void) {
+    veCustomTokens = NULL;
+    ClearVariables();
+    viewId = eViewType::DisplayChannel;
+    viewName = strdup("displaychannel");
+    numViewElements = (int)eVeDisplayChannel::count;
+    viewElements = new cViewElement*[numViewElements];
+    for (int i=0; i < numViewElements; i++) {
+        viewElements[i] = NULL;
+    }
+    SetViewElements();
+    veMessage = NULL;
+    veChannelInfo = NULL;
+    veChannelGroup = NULL;
+    veEpgInfo = NULL;
+    veProgressBar = NULL;
+    veStatusInfo = NULL;
+    veScraperContent = NULL;
+    veEcmInfo = NULL;
+}
+
+cViewChannel::~cViewChannel() {
+}
+
+void cViewChannel::SetViewElements(void) {
+    viewElementNames.insert(pair<string, int>("background", (int)eVeDisplayChannel::background));
+    viewElementNames.insert(pair<string, int>("channelgroup", (int)eVeDisplayChannel::channelgroup));
+    viewElementNames.insert(pair<string, int>("channelinfo", (int)eVeDisplayChannel::channelinfo));
+    viewElementNames.insert(pair<string, int>("epginfo", (int)eVeDisplayChannel::epginfo));
+    viewElementNames.insert(pair<string, int>("progressbar", (int)eVeDisplayChannel::progressbar));
+    viewElementNames.insert(pair<string, int>("statusinfo", (int)eVeDisplayChannel::statusinfo));
+    viewElementNames.insert(pair<string, int>("audioinfo", (int)eVeDisplayChannel::audioinfo));
+    viewElementNames.insert(pair<string, int>("ecminfo", (int)eVeDisplayChannel::ecminfo));
+    viewElementNames.insert(pair<string, int>("screenresolution", (int)eVeDisplayChannel::screenresolution));
+    viewElementNames.insert(pair<string, int>("signalquality", (int)eVeDisplayChannel::signalquality));
+    viewElementNames.insert(pair<string, int>("devices", (int)eVeDisplayChannel::devices));
+    viewElementNames.insert(pair<string, int>("currentweather", (int)eVeDisplayChannel::currentweather));
+    viewElementNames.insert(pair<string, int>("scrapercontent", (int)eVeDisplayChannel::scrapercontent));
+    viewElementNames.insert(pair<string, int>("datetime", (int)eVeDisplayChannel::datetime));
+    viewElementNames.insert(pair<string, int>("time", (int)eVeDisplayChannel::time));
+    viewElementNames.insert(pair<string, int>("message", (int)eVeDisplayChannel::message));
+    viewElementNames.insert(pair<string, int>("customtokens", (int)eVeDisplayChannel::customtokens));
+}
+
+void cViewChannel::SetViewElementObjects(void) {
+    for (int i = 0; i < numViewElements; i++) {
+        if (!viewElements[i])
+            continue;
+        if (dynamic_cast<cVeMessage*>(viewElements[i])) 
+        {
+            veMessage = dynamic_cast<cVeMessage*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDcChannelInfo*>(viewElements[i])) {
+
+            veChannelInfo = dynamic_cast<cVeDcChannelInfo*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDcChannelGroup*>(viewElements[i])) 
+        {
+            veChannelGroup = dynamic_cast<cVeDcChannelGroup*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDcEpgInfo*>(viewElements[i])) 
+        {
+            veEpgInfo = dynamic_cast<cVeDcEpgInfo*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDcProgressBar*>(viewElements[i])) 
+        {
+            veProgressBar = dynamic_cast<cVeDcProgressBar*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDcStatusInfo*>(viewElements[i])) 
+        {
+            veStatusInfo = dynamic_cast<cVeDcStatusInfo*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDcScraperContent*>(viewElements[i])) 
+        {
+            veScraperContent = dynamic_cast<cVeDcScraperContent*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDcEcmInfo*>(viewElements[i])) 
+        {
+            veEcmInfo = dynamic_cast<cVeDcEcmInfo*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeCustomTokens*>(viewElements[i])) 
+        {
+            veCustomTokens = dynamic_cast<cVeCustomTokens*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDevices*>(viewElements[i])) 
+        {
+            viewElements[i]->SetDetached();
+        }
+    }
+}
+
+void cViewChannel::ClearVariables(void) {
+    cView::ClearVariables();
+    channelChange = false;
+    displayChannelGroups = false;
+    if (veCustomTokens)
+        veCustomTokens->Reset();
+}
+
+void cViewChannel::SetChannel(const cChannel *channel, int number) {
+    channelChange = true;
+    bool wasChannelGroups = displayChannelGroups;
+    displayChannelGroups = false;
+
+    if (veChannelInfo) {
+        veChannelInfo->Set(channel, number);
+    }
+
+    if (channel) {
+        if (!channel->GroupSep()) {
+            if (wasChannelGroups)
+                Clear((int)eVeDisplayChannel::channelgroup);
+            if (veStatusInfo)
+                veStatusInfo->Set(channel);
+            if (veEcmInfo)
+                veEcmInfo->Set(channel);
+        } else {
+            displayChannelGroups = true;
+            Clear((int)eVeDisplayChannel::channelinfo);
+            Clear((int)eVeDisplayChannel::epginfo);
+            Clear((int)eVeDisplayChannel::statusinfo);
+            Clear((int)eVeDisplayChannel::progressbar);
+            Clear((int)eVeDisplayChannel::screenresolution);
+            Clear((int)eVeDisplayChannel::signalquality);
+            Clear((int)eVeDisplayChannel::audioinfo);
+            Clear((int)eVeDisplayChannel::ecminfo);
+            Clear((int)eVeDisplayChannel::devices);
+            Clear((int)eVeDisplayChannel::customtokens);
+            if (veChannelGroup)
+                veChannelGroup->Set(channel);
+        }
+    }
+}
+
+void cViewChannel::SetEvents(const cEvent *present, const cEvent *following) {
+    Clear((int)eVeDisplayChannel::epginfo);
+    Clear((int)eVeDisplayChannel::progressbar);
+    Clear((int)eVeDisplayChannel::scrapercontent);
+    if (veProgressBar)
+        veProgressBar->Set(present);
+
+    if (!present && !following)
+        return;
+    
+    if (veEpgInfo)
+        veEpgInfo->Set(present, following);
+
+    if (veScraperContent)
+        veScraperContent->Set(present);
+}
+
+void cViewChannel::SetMessage(eMessageType type, const char *text) {
+    if (veMessage) {
+        if (text)
+            veMessage->Set(type, text);
+        else
+            veMessage->Clear();
+    }
+}
+
+void cViewChannel::Flush(void) {
+    if (init) {
+        sdOsd.LockFlush();
+        Render((int)eVeDisplayChannel::background);
+        Render((int)eVeDisplayChannel::progressbar);
+        Render((int)eVeDisplayChannel::currentweather);
+    }
+    
+    if (!displayChannelGroups) {
+        //normal display
+        Render((int)eVeDisplayChannel::channelinfo);
+        Render((int)eVeDisplayChannel::epginfo);
+        Render((int)eVeDisplayChannel::statusinfo);
+        Render((int)eVeDisplayChannel::scrapercontent);
+        Render((int)eVeDisplayChannel::progressbar, channelChange);
+        Render((int)eVeDisplayChannel::screenresolution);
+        Render((int)eVeDisplayChannel::signalquality);
+        Render((int)eVeDisplayChannel::audioinfo);
+        Render((int)eVeDisplayChannel::ecminfo);
+        Render((int)eVeDisplayChannel::devices);
+        Render((int)eVeDisplayChannel::customtokens);
+        Render((int)eVeDisplayChannel::message);
+    } else {
+        //channelgroup display
+        Render((int)eVeDisplayChannel::channelgroup);
+    }
+    Render((int)eVeDisplayChannel::datetime);
+    Render((int)eVeDisplayChannel::time);
+    channelChange = false;
+    cView::Flush();
+}
+
diff --git a/coreengine/viewdisplaychannel.h b/coreengine/viewdisplaychannel.h
index d42f8ce..9a53dc0 100644
--- a/coreengine/viewdisplaychannel.h
+++ b/coreengine/viewdisplaychannel.h
@@ -1,31 +1,31 @@
-#ifndef __VIEWDISPLAYCHANNEL_H

-#define __VIEWDISPLAYCHANNEL_H

-

-#include "view.h"

-

-class cViewChannel : public cView {

-private:

-    cVeMessage             *veMessage;

-    cVeCustomTokens        *veCustomTokens;

-    cVeDcChannelInfo       *veChannelInfo;

-    cVeDcChannelGroup      *veChannelGroup;

-    cVeDcEpgInfo           *veEpgInfo;

-    cVeDcProgressBar       *veProgressBar;

-    cVeDcStatusInfo        *veStatusInfo;

-    cVeDcScraperContent    *veScraperContent;

-    cVeDcEcmInfo           *veEcmInfo;

-    bool channelChange;

-    bool displayChannelGroups;

-    void SetViewElements(void);

-    void ClearVariables(void);

-    void SetViewElementObjects(void);

-public:

-    cViewChannel(void);

-    virtual ~cViewChannel(void);

-    void SetChannel(const cChannel *channel, int number);

-    void SetEvents(const cEvent *present, const cEvent *following);

-    void SetMessage(eMessageType type, const char *text);

-    void Flush(void);

-};

-

+#ifndef __VIEWDISPLAYCHANNEL_H
+#define __VIEWDISPLAYCHANNEL_H
+
+#include "view.h"
+
+class cViewChannel : public cView {
+private:
+    cVeMessage             *veMessage;
+    cVeCustomTokens        *veCustomTokens;
+    cVeDcChannelInfo       *veChannelInfo;
+    cVeDcChannelGroup      *veChannelGroup;
+    cVeDcEpgInfo           *veEpgInfo;
+    cVeDcProgressBar       *veProgressBar;
+    cVeDcStatusInfo        *veStatusInfo;
+    cVeDcScraperContent    *veScraperContent;
+    cVeDcEcmInfo           *veEcmInfo;
+    bool channelChange;
+    bool displayChannelGroups;
+    void SetViewElements(void);
+    void ClearVariables(void);
+    void SetViewElementObjects(void);
+public:
+    cViewChannel(void);
+    virtual ~cViewChannel(void);
+    void SetChannel(const cChannel *channel, int number);
+    void SetEvents(const cEvent *present, const cEvent *following);
+    void SetMessage(eMessageType type, const char *text);
+    void Flush(void);
+};
+
 #endif //__VIEWDISPLAYCHANNEL_H
\ No newline at end of file
diff --git a/coreengine/viewdisplaymenu.c b/coreengine/viewdisplaymenu.c
index 07933b6..82ebf5d 100644
--- a/coreengine/viewdisplaymenu.c
+++ b/coreengine/viewdisplaymenu.c
@@ -1,1707 +1,1707 @@
-#include "viewdisplaymenu.h"

-#include "../config.h"

-

-/************************************************************************************

-* cViewMenu

-************************************************************************************/

-cViewMenu::cViewMenu(void) {

-    menuDefault = NULL;

-    menuMain = NULL;

-    menuSetup = NULL;

-    menuSchedules = NULL;

-    menuChannels = NULL;

-    menuTimers = NULL;

-    menuRecordings = NULL;

-    menuDetailedEpg = NULL;

-    menuDetailedRec = NULL;

-    menuDetailedText = NULL;

-    ClearVariables();

-    viewId = eViewType::DisplayMenu;

-    viewName = strdup("displaymenu");

-    numViewElements = (int)eVeDisplayMenu::count;

-    viewElements = new cViewElement*[numViewElements];

-    for (int i=0; i < numViewElements; i++) {

-        viewElements[i] = NULL;

-    }

-    viewElementsHorizontal = new cViewElement*[numViewElements];

-    for (int i=0; i < numViewElements; i++) {

-        viewElementsHorizontal[i] = NULL;

-    }

-    SetViewElements();

-    int numPluginMenus = plgManager->GetNumPluginMenus();

-    numSubviews = (int)eSvDisplayMenu::count + numPluginMenus;

-    subViews = new cSubView*[numSubviews];

-    for (int i=0; i < numSubviews; i++) {

-        subViews[i] = NULL;

-    }

-    SetSubViews();

-    menuCat = mcUnknown;

-    plugName = NULL;

-}

-

-cViewMenu::~cViewMenu() {

-    for (int i=0; i< numSubviews; i++)

-        delete subViews[i];

-    delete[] subViews;

-}

-

-void cViewMenu::SetGlobals(cGlobals *globals) {

-    cView::SetGlobals(globals);

-    for (int i=0; i < numSubviews; ++i) {

-        if (subViews[i]) {

-            subViews[i]->SetGlobals(globals);

-        }

-    }

-}

-

-void cViewMenu::PreCache(void) {

-    cView::PreCache();

-    for (int i=0; i < numSubviews; i++) {

-        if (subViews[i]) {

-            subViews[i]->SetContainer(0, 0, attribs->Width(), attribs->Height());

-            subViews[i]->PreCache();

-            //setting default viewelements for subviews

-            for (int ve = (int)eVeDisplayMenu::background; ve < (int)eVeDisplayMenu::count; ve++) {

-                if (viewElements[ve] && !subViews[i]->ViewElementSet(ve)) {

-                    subViews[i]->SetViewElement((eVeDisplayMenu)ve, viewElements[ve]);

-                }

-            }

-            for (int ve = (int)eVeDisplayMenu::background; ve < (int)eVeDisplayMenu::count; ve++) {

-                if (viewElementsHorizontal[ve] && !subViews[i]->ViewElementHorizontalSet(ve)) {

-                    subViews[i]->SetViewElementHorizontal((eVeDisplayMenu)ve, viewElementsHorizontal[ve]);

-                }

-            }

-        }

-    }

-}

-

-void cViewMenu::SetViewElementObjects(void) {

-    //setting subviews

-    for (int i=0; i < numSubviews; i++) {

-        if (!subViews[i])

-            continue;

-        if (i == (int)eSvDisplayMenu::menudefault)

-            menuDefault = dynamic_cast<cViewMenuDefault*>(subViews[i]);

-        else if (i == (int)eSvDisplayMenu::main)

-            menuMain = dynamic_cast<cViewMenuMain*>(subViews[i]);

-        else if (i == (int)eSvDisplayMenu::setup)

-            menuSetup = dynamic_cast<cViewMenuSetup*>(subViews[i]);

-        else if (i == (int)eSvDisplayMenu::schedules)

-            menuSchedules = dynamic_cast<cViewMenuSchedules*>(subViews[i]);

-        else if (i == (int)eSvDisplayMenu::channels)

-            menuChannels = dynamic_cast<cViewMenuChannels*>(subViews[i]);

-        else if (i == (int)eSvDisplayMenu::timers)

-            menuTimers = dynamic_cast<cViewMenuTimers*>(subViews[i]);

-        else if (i == (int)eSvDisplayMenu::recordings)

-            menuRecordings = dynamic_cast<cViewMenuRecordings*>(subViews[i]);

-        else if (i == (int)eSvDisplayMenu::detailepg)

-            menuDetailedEpg = dynamic_cast<cViewMenuDetail*>(subViews[i]);

-        else if (i == (int)eSvDisplayMenu::detailrec)

-            menuDetailedRec = dynamic_cast<cViewMenuDetail*>(subViews[i]);

-        else if (i == (int)eSvDisplayMenu::detailtext)

-            menuDetailedText = dynamic_cast<cViewMenuDetail*>(subViews[i]);

-    }

-}

-

-void cViewMenu::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>("time", (int)eVeDisplayMenu::time));

-    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));

-    viewElementNames.insert(pair<string, int>("sortmode", (int)eVeDisplayMenu::sortmode));

-}

-

-void cViewMenu::SetSubViews(void) {

-    //adding VDR submenus

-    subviewNames.insert(pair<string, int>("menudefault", (int)eSvDisplayMenu::menudefault));

-    subviewNames.insert(pair<string, int>("menumain", (int)eSvDisplayMenu::main));

-    subviewNames.insert(pair<string, int>("menusetup", (int)eSvDisplayMenu::setup));

-    subviewNames.insert(pair<string, int>("menuschedules", (int)eSvDisplayMenu::schedules));

-    subviewNames.insert(pair<string, int>("menuchannels", (int)eSvDisplayMenu::channels));

-    subviewNames.insert(pair<string, int>("menutimers", (int)eSvDisplayMenu::timers));

-    subviewNames.insert(pair<string, int>("menurecordings", (int)eSvDisplayMenu::recordings));

-    subviewNames.insert(pair<string, int>("menudetailedepg", (int)eSvDisplayMenu::detailepg));

-    subviewNames.insert(pair<string, int>("menudetailedrecording", (int)eSvDisplayMenu::detailrec));

-    subviewNames.insert(pair<string, int>("menudetailedtext", (int)eSvDisplayMenu::detailtext));

-    //adding additional plugin subviews

-    int subViewNumber = (int)eSvDisplayMenu::count;

-    map <int,skindesignerapi::sPlugMenu> *plugMenus = NULL;

-    string plugName = "";

-    int plugId = -1;

-    plgManager->InitPluginMenuIterator();

-    while ( plugMenus = plgManager->GetPluginMenus(plugName, plugId) ) {

-        for (map <int,skindesignerapi::sPlugMenu>::iterator it = plugMenus->begin(); it != plugMenus->end(); it++) {

-            int menuNumber = it->first;

-            cString menuName = cString::sprintf("menuplugin-%s-%d", plugName.c_str(), menuNumber);

-            subviewNames.insert(pair<string, int>(*menuName, subViewNumber));

-            plgManager->AddSubviewMapping(plugId, menuNumber, subViewNumber);

-            subViewNumber++;

-        }

-    }

-}

-

-void cViewMenu::ClearVariables(void) {

-    cView::ClearVariables();

-    menuChange = true;

-    listChange = true;

-    detailViewInit = false;

-    menuCat = mcUnknown;

-    pluginIdSet = false;

-    plugId = -1;

-    plugMenuId = -1;

-    activeSubview = NULL;

-    activeSubviewLast = NULL;

-}

-

-int cViewMenu::SubviewId(const char *name) {

-    map<string, int>::iterator hit = subviewNames.find(name);

-    if (hit != subviewNames.end())

-        return (int)hit->second;

-    return ATTR_UNKNOWN;

-}

-

-bool cViewMenu::ValidSubView(const char *subView) {

-    if (SubviewId(subView) != ATTR_UNKNOWN)

-        return true;

-    return false;

-}

-

-cSubView *cViewMenu::CreateSubview(const char *name) {

-    cSubView *sv = NULL;

-    if (!strcmp(name, "menudefault"))

-        sv = new cViewMenuDefault(name);

-    else if (!strcmp(name, "menumain"))

-        sv = new cViewMenuMain(name);

-    else if (!strcmp(name, "menusetup"))

-        sv = new cViewMenuSetup(name);

-    else if (!strcmp(name, "menuschedules"))

-        sv = new cViewMenuSchedules(name);

-    else if (!strcmp(name, "menuchannels"))

-        sv = new cViewMenuChannels(name);

-    else if (!strcmp(name, "menutimers"))

-        sv = new cViewMenuTimers(name);

-    else if (!strcmp(name, "menurecordings"))

-        sv = new cViewMenuRecordings(name);

-    else if (!strcmp(name, "menudetailedepg"))

-        sv = new cViewMenuDetail(name);

-    else if (!strcmp(name, "menudetailedrecording"))

-        sv = new cViewMenuDetail(name);

-    else if (!strcmp(name, "menudetailedtext"))

-        sv = new cViewMenuDetail(name);

-    return sv;

-}

-

-cSubView *cViewMenu::CreatePluginview(const char *plugname, int plugId, int menuNumber, int menuType) {

-    cString menuName = cString::sprintf("menuplugin-%s-%d", plugname, menuNumber);

-    cSubView *pv = NULL;

-    if (menuType == skindesignerapi::mtList)

-        pv = new cViewMenuPlugin(*menuName);

-    else if (menuType == skindesignerapi::mtText)

-        pv = new cViewMenuDetail(*menuName);

-    if (pv) {

-        pv->SetPlugId(plugId);

-        pv->SetPlugMenuId(menuNumber);

-    }

-    return pv;

-}

-

-

-void cViewMenu::AddPluginview(cSubView *plugView) {

-    int id = SubviewId(plugView->GetViewName());

-    if (id == ATTR_UNKNOWN)

-        return;

-    subViews[id] = plugView;

-}

-

-void cViewMenu::AddSubview(const char *sSubView, cSubView *subView) {

-    int id = SubviewId(sSubView);

-    if (id == ATTR_UNKNOWN)

-        return;

-    subViews[id] = subView;

-}

-

-/* eMenuCategory:

-    -1 mcUndefined,

-    0  mcUnknown,

-    1  mcMain,

-    2  mcSchedule,

-    3  mcScheduleNow,

-    4  mcScheduleNext,

-    5  mcChannel,

-    6  mcChannelEdit,

-    7  mcTimer,

-    8  mcTimerEdit,

-    9  mcRecording,

-    10 mcRecordingInfo,

-    11 mcRecordingEdit,

-    12 mcPlugin,

-    13 mcPluginSetup,

-    14 mcSetup,

-    15 mcSetupOsd,

-    16 mcSetupEpg,

-    17 mcSetupDvb,

-    18 mcSetupLnb,

-    19 mcSetupCam,

-    20 mcSetupRecord,

-    21 mcSetupReplay,

-    22 mcSetupMisc,

-    23 mcSetupPlugins,

-    24 mcCommand,

-    25 mcEvent,

-    26 mcText,

-    27 mcFolder,

-    28 mcCam

-*/

-void cViewMenu::SetSubView(eMenuCategory MenuCat) {

-    //menuCat --> old menucat

-    //MenuCat --> new menucat

-    if (menuCat == mcMain) {

-        cViewMenuMain *menuMain = dynamic_cast<cViewMenuMain*>(activeSubview);

-        if (menuMain) {

-            plugName = menuMain->GetPlugin();

-        }

-    }

-    //first check plugin menu

-    if (MenuCat == mcPlugin) {

-        bool plugMenuFound = SetPluginSubView(MenuCat);

-        if (plugMenuFound) {

-            menuCat = MenuCat;

-            return;

-        }

-    }

-    //then check regular menus

-    bool catChange = false;

-    if (menuCat != MenuCat) {

-        catChange = true;

-    } else {

-        return;

-    }

-    cSubView *newSubview = NULL;

-    menuCat = MenuCat;

-    switch (MenuCat) {

-        case mcMain:

-            newSubview = subViews[(int)eSvDisplayMenu::main];

-            break;

-        case mcSchedule:

-        case mcScheduleNow:

-        case mcScheduleNext:

-            newSubview = subViews[(int)eSvDisplayMenu::schedules];

-            break;

-        case mcChannel:

-            newSubview = subViews[(int)eSvDisplayMenu::channels];

-            break;

-        case mcTimer:

-            newSubview = subViews[(int)eSvDisplayMenu::timers];

-            break;

-        case mcRecording:

-            newSubview = subViews[(int)eSvDisplayMenu::recordings];

-            break;

-        case mcSetup:

-            newSubview = subViews[(int)eSvDisplayMenu::setup];

-            break;

-        case mcEvent:

-            newSubview = subViews[(int)eSvDisplayMenu::detailepg];

-            break;

-        case mcRecordingInfo:

-            newSubview = subViews[(int)eSvDisplayMenu::detailrec];

-            break;

-        case mcText:

-            newSubview = subViews[(int)eSvDisplayMenu::detailtext];

-            break;

-        default:

-            newSubview = subViews[(int)eSvDisplayMenu::menudefault];

-            //setting plugin name for detecting plugins in default menus

-            cViewMenuDefault *menuDefault = dynamic_cast<cViewMenuDefault*>(newSubview);

-            if (menuDefault) {

-                menuDefault->SetPlugin(plugName);

-            }

-            break;

-    };

-    if (catChange) {

-        menuChange = true;

-        activeSubview->Clear();

-        activeSubviewLast = activeSubview;

-        activeSubview = newSubview;

-        if (!activeSubview)

-            activeSubview = subViews[(int)eSvDisplayMenu::menudefault];    

-        activeSubview->SetMenuCategory(MenuCat);

-    }

-}

-

-bool cViewMenu::SetPluginSubView(eMenuCategory menuCat) {

-    if (!pluginIdSet)

-        return false;

-    cSubView *newSubview = NULL;

-    if (plugId >= 0 && plugMenuId >= 0) {

-        int subViewId = plgManager->GetSubviewId(plugId, plugMenuId);

-        if (subViewId >= 0 && subViews[subViewId]) {

-            newSubview = subViews[subViewId];

-            menuChange = true;

-            activeSubview->Clear();

-            activeSubviewLast = activeSubview;

-            activeSubview = newSubview;

-            activeSubview->SetMenuCategory(menuCat);

-            return true;

-        }

-    } 

-    return false;

-}

-

-void cViewMenu::WakeViewElements(void) {

-    cView::WakeViewElements();

-    if (activeSubview)

-        activeSubview->WakeViewElements();    

-}

-

-

-void cViewMenu::SetSortMode(eMenuSortMode sortMode) {

-    if (activeSubview)

-        activeSubview->SetSortMode(sortMode);

-}

-

-void cViewMenu::SetPluginMenu(int plugId, int plugMenuId) { 

-    this->plugId = plugId; 

-    this->plugMenuId = plugMenuId;

-    pluginIdSet = true;

-}

-

-int cViewMenu::NumListItems(void) {

-    return activeSubview->NumListItems();

-}

-

-eMenuOrientation cViewMenu::MenuOrientation(void) {

-    return activeSubview->MenuOrientation();    

-}

-

-const cFont *cViewMenu::GetTextAreaFont(void) {

-    return activeSubview->GetTextAreaFont();

-}

-

-int cViewMenu::GetTextAreaWidth(void) {

-    if (!menuDetailedText)

-        return 0;

-    return menuDetailedText->GetWidth();

-}

-

-int cViewMenu::GetListWidth(void) {

-    return activeSubview->GetListWidth();

-}

-

-void cViewMenu::SetTitleHeader(const char *title) {

-    activeSubview->SetTitle(title);

-}

-

-void cViewMenu::SetMessage(eMessageType type, const char *text) {

-    activeSubview->SetMessage(type, text);    

-}

-

-void cViewMenu::SetChannelHeader(const cEvent *event) {

-    if (menuChange && menuCat == mcSchedule) {

-        const cChannel *channel = Channels.GetByChannelID(event->ChannelID());

-        if (channel)

-            activeSubview->SetChannel(channel);

-    }

-}

-

-void cViewMenu::SetMenuButtons(const char *red, const char *green, const char *yellow, const char *blue) {

-    activeSubview->SetMenuButtons(red, green, yellow, blue);

-}

-

-void cViewMenu::SetScrollbar(int total, int offset) {

-    activeSubview->SetScrollbar(total, offset);    

-}

-

-void cViewMenu::SetTabs(int tab1, int tab2, int tab3, int tab4, int tab5) {

-    menuDefault->SetTabs(tab1, tab2, tab3, tab4, tab5);

-}

-

-void cViewMenu::SetItem(const char *text, int index, bool current, bool selectable) {

-    if (menuCat == mcMain && menuMain) {

-        menuMain->SetItem(text, index, current, selectable);

-    } else if (menuCat == mcSetup && menuSetup) {

-        menuSetup->SetItem(text, index, current, selectable);

-    } else {

-        menuDefault->SetItem(text, index, current, selectable);

-    }

-    listChange = true;

-}

-

-bool cViewMenu::SetItemEvent(const cEvent *event, int index, bool current, bool selectable, 

-                             const cChannel *channel, bool withDate, eTimerMatch timerMatch) {

-    if (!menuSchedules)

-        return false;

-    menuSchedules->SetItem(event, index, current, selectable, channel, withDate, timerMatch);

-    listChange = true;

-    return true;

-}

-

-bool cViewMenu::SetItemTimer(const cTimer *timer, int index, bool current, bool selectable) {

-    if (!menuTimers)

-        return false;

-    menuTimers->SetItem(timer, index, current, selectable);

-    listChange = true;

-    return true;

-}

-

-bool cViewMenu::SetItemChannel(const cChannel *channel, int index, bool current, bool selectable, bool withProvider) {

-    if (!menuChannels)

-        return false;

-    menuChannels->SetItem(channel, index, current, selectable, withProvider);

-    listChange = true;

-    return true;

-}

-

-bool cViewMenu::SetItemRecording(const cRecording *recording, int index, bool current, bool selectable, int level, int total, int New) {

-    if (!menuRecordings)

-        return false;

-    menuRecordings->SetItem(recording, index, current, selectable, level, total, New);    

-    listChange = true;

-    return true;

-}

-

-bool cViewMenu::SetItemPlugin(skindesignerapi::cTokenContainer *tk, int index, bool current, bool selectable) {

-    cViewMenuPlugin *menuPlugin = dynamic_cast<cViewMenuPlugin*>(activeSubview);

-    if (!menuPlugin) {

-        return false;

-    }

-    menuPlugin->SetItem(tk, index, current, selectable);    

-    listChange = true;

-    return true;    

-}

-

-void cViewMenu::SetEvent(const cEvent *event) {

-    menuDetailedEpg->SetEvent(event);

-    detailViewInit = true;

-}

-

-void cViewMenu::SetRecording(const cRecording *recording) {

-    menuDetailedRec->SetRecording(recording);

-    detailViewInit = true;    

-}

-

-void cViewMenu::SetText(const char *text) {

-    menuDetailedText->SetText(text);

-    detailViewInit = true;    

-}

-

-bool cViewMenu::SetPluginText(skindesignerapi::cTokenContainer *tk) {

-    cViewMenuDetail *menuPlugin = dynamic_cast<cViewMenuDetail*>(activeSubview);

-    if (!menuPlugin) {

-        return false;

-    }

-    menuPlugin->SetPluginText(tk);  

-    detailViewInit = true;

-    return true;

-}

-

-void cViewMenu::SetCurrentRecording(const char *currentRec) {

-    if (menuMain) {

-        menuMain->SetCurrentRecording(currentRec);    }

-}

-

-void cViewMenu::KeyDetailView(bool up, bool page) {

-    cViewMenuDetail *detailView = dynamic_cast<cViewMenuDetail*>(activeSubview);

-    if (!detailView)

-        return;

-    if (up && page) {

-        detailView->KeyLeft();

-    } else if (!up && page) {

-        detailView->KeyRight();

-    } else if (up && !page) {

-        detailView->KeyUp();

-    } else if (!up && !page) {

-        detailView->KeyDown();

-    }

-}

-

-bool cViewMenu::Init(void) {

-    activeSubview = subViews[(int)eSvDisplayMenu::main];

-    return cView::Init(); 

-}

-

-void cViewMenu::Close(void) {

-    delete fader;

-    fader = NULL;

-    if (FadeTime() > 0) {

-        fader = new cAnimation((cFadable*)this, false);

-        fader->Fade();

-        delete fader;

-        fader = NULL;

-    }

-    for (int i=0; i < numSubviews; i++) {

-        if (subViews[i]) {

-            subViews[i]->Close();

-        }

-    }

-    for (int i=0; i < numViewElements; i++) {

-        if (viewElements[i]) {

-            viewElements[i]->Close();

-        }

-        if (viewElementsHorizontal[i]) {

-            viewElementsHorizontal[i]->Close();

-        }

-    }

-    UnScaleTv();

-    ClearVariables();

-    sdOsd.DeleteOsd();

-}

-

-void cViewMenu::Clear(void) {

-    activeSubview->ClearViewList();

-}

-

-void cViewMenu::Flush(void) {

-    if (init) {

-        sdOsd.LockFlush();

-    }

-    bool staticInitiated = false;

-    if (menuChange) {

-        newTvFrame = activeSubview->GetTvFrame();

-        menuInit = true;

-        activeSubview->DrawStaticVEs();

-        pluginIdSet = false;

-        menuChange = false;

-        staticInitiated = true;

-    }

-    if (listChange) {

-        activeSubview->DrawList();

-        listChange = false;

-    }

-    if (detailViewInit) {

-        if (!staticInitiated)

-            activeSubview->DrawStaticVEs();

-        activeSubview->DrawDetailedView();

-        pluginIdSet = false;

-        detailViewInit = false;

-    }

-    activeSubview->DrawDynamicVEs();

-    cView::Flush();

-}

-

-void cViewMenu::SetTransparency(int transparency, bool forceDetached) {

-    activeSubview->SetTransparency(transparency, forceDetached);

-    if (menuDetailedEpg)

-        menuDetailedEpg->SetTransparency(transparency);

-    if (menuDetailedRec)

-        menuDetailedRec->SetTransparency(transparency);

-    if (menuDetailedText)

-        menuDetailedText->SetTransparency(transparency);

-}

-

-void cViewMenu::Debug(void) {

-    cView::Debug();

-    for (int i=0; i < numSubviews; i++) {

-        if (subViews[i]) {

-            subViews[i]->Debug();

-        }

-    }

-}

-

-/***********************************************************

-* cSubView

-***********************************************************/

-cSubView::cSubView(const char *name) {

-    menuCat = mcUnknown;

-    plugId = -1;

-    plugMenuId = -1;

-    this->viewName = strdup(name);

-    numViewElements = (int)eVeDisplayMenu::count;

-    viewElements = new cViewElement*[numViewElements];

-    for (int i=0; i < numViewElements; i++) {

-        viewElements[i] = NULL;

-    }

-    viewElementsHorizontal = new cViewElement*[numViewElements];

-    for (int i=0; i < numViewElements; i++) {

-        viewElementsHorizontal[i] = NULL;

-    }

-    background = NULL;

-    header = NULL;

-    datetime = NULL;

-    time = NULL;

-    message = NULL;

-    sortmode = NULL;

-    colorbuttons = NULL;

-    scrollbar = NULL;

-    viewList = NULL;

-    viewListVertical = NULL;

-    viewListHorizontal = NULL;

-    SetViewElements();

-}

-

-cSubView::~cSubView(void) {

-    delete viewListHorizontal;

-    delete viewListVertical;

-}

-

-void cSubView::SetGlobals(cGlobals *globals) {

-    cView::SetGlobals(globals);

-    if (viewListVertical)

-        viewListVertical->SetGlobals(globals);

-    if (viewListHorizontal)

-        viewListHorizontal->SetGlobals(globals);

-}

-

-void cSubView::PreCache(void) {

-    attribs->SetContainer(container.X(), container.Y(), container.Width(), container.Height());

-    attribs->Cache();

-    cView::PreCache();

-    if (viewListVertical) {

-        viewListVertical->SetPlugId(plugId);

-        viewListVertical->SetPlugMenuId(plugMenuId);

-        viewListVertical->SetContainer(attribs->X(), attribs->Y(), attribs->Width(), attribs->Height());

-        viewListVertical->PreCache();        

-    }

-    if (viewListHorizontal) {

-        viewListHorizontal->SetPlugId(plugId);

-        viewListHorizontal->SetPlugMenuId(plugMenuId);

-        viewListHorizontal->SetContainer(attribs->X(), attribs->Y(), attribs->Width(), attribs->Height());

-        viewListHorizontal->PreCache();        

-    }

-}

-

-bool cSubView::ViewElementSet(int ve) {

-    if (ve >= 0 && ve < (int)eVeDisplayMenu::count && viewElements[ve])

-        return true;

-    return false;

-}

-

-bool cSubView::ViewElementHorizontalSet(int ve) {

-    if (ve >= 0 && ve < (int)eVeDisplayMenu::count && viewElementsHorizontal[ve])

-        return true;

-    return false;

-}

-

-void cSubView::SetViewElement(eVeDisplayMenu ve, cViewElement *viewElement) {

-    switch (ve) {

-        case eVeDisplayMenu::background:

-            if (!background)

-                background = viewElement;

-            break;

-        case eVeDisplayMenu::header:

-            if (!header)

-                header = dynamic_cast<cVeDmHeader*>(viewElement);

-            break;

-        case eVeDisplayMenu::datetime:

-            if (!datetime)

-                datetime = dynamic_cast<cVeDateTime*>(viewElement);

-            break;

-        case eVeDisplayMenu::time:

-            if (!time)

-                time = dynamic_cast<cVeTime*>(viewElement);

-            break;

-        case eVeDisplayMenu::message:

-            if (!message)

-                message = dynamic_cast<cVeMessage*>(viewElement);

-            break;

-        case eVeDisplayMenu::sortmode:

-            if (!sortmode)

-                sortmode = dynamic_cast<cVeDmSortmode*>(viewElement);

-            break;

-        case eVeDisplayMenu::colorbuttons:

-            if (!colorbuttons)

-                colorbuttons = dynamic_cast<cVeDmColorbuttons*>(viewElement);

-            break;

-        case eVeDisplayMenu::scrollbar:

-            if (!scrollbar)

-                scrollbar = dynamic_cast<cVeDmScrollbar*>(viewElement);

-            break;

-        default:

-            break;

-    };

-}

-

-void cSubView::SetViewElementHorizontal(eVeDisplayMenu ve, cViewElement *viewElement) {

-    eOrientation orientation = attribs->Orientation();

-    if (orientation != eOrientation::horizontal)

-        return;

-    switch (ve) {

-        case eVeDisplayMenu::background:

-            if (!background)

-                background = viewElement;

-            break;

-        case eVeDisplayMenu::header:

-            if (!header)

-                header = dynamic_cast<cVeDmHeader*>(viewElement);

-            break;

-        case eVeDisplayMenu::datetime:

-            if (!datetime)

-                datetime = dynamic_cast<cVeDateTime*>(viewElement);

-            break;

-        case eVeDisplayMenu::time:

-            if (!time)

-                time = dynamic_cast<cVeTime*>(viewElement);

-            break;

-        case eVeDisplayMenu::message:

-            if (!message)

-                message = dynamic_cast<cVeMessage*>(viewElement);

-            break;

-        case eVeDisplayMenu::sortmode:

-            if (!sortmode)

-                sortmode = dynamic_cast<cVeDmSortmode*>(viewElement);

-            break;

-        case eVeDisplayMenu::colorbuttons:

-            if (!colorbuttons)

-                colorbuttons = dynamic_cast<cVeDmColorbuttons*>(viewElement);

-            break;

-        case eVeDisplayMenu::scrollbar:

-            if (!scrollbar)

-                scrollbar = dynamic_cast<cVeDmScrollbar*>(viewElement);

-            break;

-        default:

-            break;

-    };

-}

-

-void cSubView::AddViewList(cViewList *viewList) {

-    eOrientation orientation = viewList->Orientation();

-    if (orientation == eOrientation::vertical) {

-        viewListVertical = viewList;

-    } else if (orientation == eOrientation::horizontal) {

-        viewListHorizontal = viewList;

-    } else {

-        viewListVertical = viewList;        

-    }

-}

-

-int cSubView::NumListItems(void) {

-    if (viewList)

-        return viewList->NumItems();

-    return 0;

-}

-

-eMenuOrientation cSubView::MenuOrientation(void) {

-    eOrientation orientation = attribs->Orientation();

-    if (orientation == eOrientation::horizontal)

-        return moHorizontal;

-    return moVertical;

-}

-

-void cSubView::SetTitle(const char *title) {

-    if (header) {

-        header->SetTitle(title);        

-    }     

-}

-

-void cSubView::SetChannel(const cChannel *channel) {

-    if (header) {

-        header->SetChannel(channel);

-    }

-}

-

-void cSubView::SetMessage(eMessageType type, const char *text) {

-    if (!message)

-        return;

-    if (!text) {

-        message->Clear();

-        message->Hide();

-        return;

-    }

-    message->Set(type, text);

-    message->Show();

-    if (message->Parse())

-        message->Render(); 

-}

-

-void cSubView::SetMenuButtons(const char *red, const char *green, const char *yellow, const char *blue) {

-    if (!colorbuttons)

-        return;

-    colorbuttons->SetButtons(red, green, yellow, blue);

-    if (colorbuttons->Parse()) {

-        colorbuttons->Show();

-        colorbuttons->Render();

-    }

-}

-

-void cSubView::SetScrollbar(int total, int offset) {

-    if (!scrollbar)

-        return;

-    scrollbar->SetList(total, offset, NumListItems());

-    if (scrollbar->Parse()) {

-        scrollbar->Show();

-        scrollbar->Render();

-    }

-}

-

-void cSubView::SetSortMode(eMenuSortMode sortMode) {

-    if (!sortmode)

-        return;

-    sortmode->Set(sortMode);

-    if (sortmode->Parse()) {

-        sortmode->Show();

-        sortmode->Render();

-    }

-}

-

-void cSubView::Close(void) {

-    ClearVariables();

-    for (int i=0; i < numViewElements; i++) {

-        if (!viewElements[i])

-            continue;

-        viewElements[i]->Close();

-    }

-    for (int i=0; i < numViewElements; i++) {

-        if (!viewElementsHorizontal[i])

-            continue;

-        viewElementsHorizontal[i]->Close();

-    }

-    if (viewList)

-        viewList->Close();

-}

-

-void cSubView::ClearViewList(void) {

-    if (viewList)

-        viewList->Clear();

-}

-

-void cSubView::WakeViewElements(void) {

-    for (int i = 0; i < numViewElements; i++) {

-        if (viewElements[i]) {

-            viewElements[i]->WakeUp();

-        }

-        if (viewElementsHorizontal[i]) {

-            viewElementsHorizontal[i]->WakeUp();

-        }

-    }

-}

-

-void cSubView::Clear(void) {

-    if (background)   background->Hide();

-    if (datetime)     datetime->Hide();

-    if (time)         time->Hide();

-    if (header)       header->Hide();

-    if (colorbuttons) colorbuttons->Hide();

-    if (scrollbar)    scrollbar->Hide();

-    if (sortmode) {

-        sortmode->Reset(); 

-        sortmode->Hide();

-    }

-

-    if (viewList)     viewList->Close();

-}

-

-void cSubView::DrawStaticVEs(void) {

-    if (background) {

-        background->Show();

-        background->Render();

-    }

-    if (header) {

-        header->Show();

-        header->Set(menuCat);

-        if (header->Parse())

-            header->Render();

-    }

-}

-

-void cSubView::DrawDynamicVEs(void) {

-    if (datetime) {

-        datetime->Show();

-        if (datetime->Parse())

-            datetime->Render();

-    }

-    if (time) {

-        time->Show();

-        if (time->Parse()) {

-            time->Render();

-        }

-    }

-}

-

-void cSubView::DrawList(void) {

-    if (viewList) {

-        viewList->Draw(menuCat);

-    }

-}

-

-void cSubView::SetTransparency(int transparency, bool forceDetached) {

-    for (int i = 0; i < numViewElements; i++) {

-        if (viewElements[i] && (!viewElements[i]->Detached() || forceDetached)) {

-            viewElements[i]->SetTransparency(transparency);

-        }

-        if (viewElementsHorizontal[i] && (!viewElementsHorizontal[i]->Detached() || forceDetached)) {

-            viewElementsHorizontal[i]->SetTransparency(transparency);

-        }

-    }

-    if (viewList)

-        viewList->SetTransparency(transparency);

-}

-/***********************************************************

-* Protected Functions

-***********************************************************/

-void cSubView::SetViewElementObjects(void) {

-    eOrientation orientation = attribs->Orientation();

-

-    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::background])

-        background = viewElementsHorizontal[(int)eVeDisplayMenu::background];

-    else if (viewElements[(int)eVeDisplayMenu::background])

-        background = viewElements[(int)eVeDisplayMenu::background];

-

-    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::header])

-        header = dynamic_cast<cVeDmHeader*>(viewElementsHorizontal[(int)eVeDisplayMenu::header]);

-    else if (viewElements[(int)eVeDisplayMenu::header])

-        header = dynamic_cast<cVeDmHeader*>(viewElements[(int)eVeDisplayMenu::header]);

-

-    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::datetime])

-        datetime = dynamic_cast<cVeDateTime*>(viewElementsHorizontal[(int)eVeDisplayMenu::datetime]);

-    else if (viewElements[(int)eVeDisplayMenu::datetime])

-        datetime = dynamic_cast<cVeDateTime*>(viewElements[(int)eVeDisplayMenu::datetime]);

-

-    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::time])

-        time = dynamic_cast<cVeTime*>(viewElementsHorizontal[(int)eVeDisplayMenu::time]);

-    else if (viewElements[(int)eVeDisplayMenu::time])

-        time = dynamic_cast<cVeTime*>(viewElements[(int)eVeDisplayMenu::time]);

-

-    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::message])

-        message = dynamic_cast<cVeMessage*>(viewElementsHorizontal[(int)eVeDisplayMenu::message]);

-    else if (viewElements[(int)eVeDisplayMenu::message])

-        message = dynamic_cast<cVeMessage*>(viewElements[(int)eVeDisplayMenu::message]);

-

-    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::sortmode])

-        sortmode = dynamic_cast<cVeDmSortmode*>(viewElementsHorizontal[(int)eVeDisplayMenu::sortmode]);

-    else if (viewElements[(int)eVeDisplayMenu::sortmode])

-        sortmode = dynamic_cast<cVeDmSortmode*>(viewElements[(int)eVeDisplayMenu::sortmode]);

-

-    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::colorbuttons])

-        colorbuttons = dynamic_cast<cVeDmColorbuttons*>(viewElementsHorizontal[(int)eVeDisplayMenu::colorbuttons]);

-    else if (viewElements[(int)eVeDisplayMenu::colorbuttons])

-        colorbuttons = dynamic_cast<cVeDmColorbuttons*>(viewElements[(int)eVeDisplayMenu::colorbuttons]);

-

-    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::scrollbar])

-        scrollbar = dynamic_cast<cVeDmScrollbar*>(viewElementsHorizontal[(int)eVeDisplayMenu::scrollbar]);

-    else if (viewElements[(int)eVeDisplayMenu::scrollbar])

-        scrollbar = dynamic_cast<cVeDmScrollbar*>(viewElements[(int)eVeDisplayMenu::scrollbar]);

-

-

-    if (attribs->Orientation() == eOrientation::horizontal)

-        viewList = viewListHorizontal;

-    else

-        viewList = viewListVertical;

-}

-

-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>("time", (int)eVeDisplayMenu::time));

-    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));

-    viewElementNames.insert(pair<string, int>("sortmode", (int)eVeDisplayMenu::sortmode));

-}

-

-/***********************************************************

-* cViewMenuDefault

-***********************************************************/

-cViewMenuDefault::cViewMenuDefault(const char *name) : cSubView(name) {

-    listDefault = NULL;

-}

-

-cViewMenuDefault::~cViewMenuDefault(void) {

-}

-

-void cViewMenuDefault::SetViewElementObjects(void) {

-    cSubView::SetViewElementObjects();

-    listDefault = dynamic_cast<cViewListDefault*>(viewList);

-}

-

-void cViewMenuDefault::SetTabs(int tab1, int tab2, int tab3, int tab4, int tab5) {

-    if (listDefault)

-        listDefault->SetTabs(tab1, tab2, tab3, tab4, tab5);

-}

-

-void cViewMenuDefault::SetPlugin(const char *plugName) {

-    listDefault->SetPlugin(plugName);

-}

-

-void cViewMenuDefault::SetItem(const char *text, int index, bool current, bool selectable) {

-    listDefault->Set(text, index, current, selectable);

-}

-

-const cFont *cViewMenuDefault::GetTextAreaFont(void) {

-    if (!listDefault)

-        return NULL;

-    return listDefault->GetListFont();

-}

-

-int cViewMenuDefault::GetListWidth(void) {

-    if (!listDefault)

-        return 0;

-    return listDefault->GetListWidth();

-}

-

-/************************************************************************************

-* cViewMenuMain

-************************************************************************************/

-cViewMenuMain::cViewMenuMain(const char *name) : cSubView(name) {

-    for (int i=0; i < numViewElements; i++) {

-        delete viewElements[i];

-    }

-    delete[] viewElements;

-    numViewElements = (int)eVeDisplayMenuMain::count;

-    viewElements = new cViewElement*[numViewElements];

-    for (int i=0; i < numViewElements; i++) {

-        viewElements[i] = NULL;

-    }

-    delete[] viewElementsHorizontal;

-    viewElementsHorizontal = new cViewElement*[numViewElements];

-    for (int i=0; i < numViewElements; i++) {

-        viewElementsHorizontal[i] = NULL;

-    }

-    listMain = NULL;

-    timers = NULL;

-    devices = NULL;

-    weather = NULL;

-    discusage = NULL;

-    load = NULL;

-    memory = NULL;

-    vdrstats = NULL;

-    temperatures = NULL;

-    currentSchedule = NULL;

-    lastRecordings = NULL;

-    customTokens = NULL;

-    lastDrawDynamic = 0;

-    SetViewElements();

-}

-

-cViewMenuMain::~cViewMenuMain() {

-}

-

-void cViewMenuMain::ClearVariables(void) {

-    init = true;

-}

-

-void cViewMenuMain::SetViewElements(void) {

-    viewElementNames.insert(pair<string, int>("timers", (int)eVeDisplayMenuMain::timers));

-    viewElementNames.insert(pair<string, int>("devices", (int)eVeDisplayMenuMain::devices));

-    viewElementNames.insert(pair<string, int>("currentweather", (int)eVeDisplayMenuMain::currentweather));

-    viewElementNames.insert(pair<string, int>("currentschedule", (int)eVeDisplayMenuMain::currentschedule));

-    viewElementNames.insert(pair<string, int>("discusage", (int)eVeDisplayMenuMain::discusage));

-    viewElementNames.insert(pair<string, int>("systemload", (int)eVeDisplayMenuMain::systemload));

-    viewElementNames.insert(pair<string, int>("systemmemory", (int)eVeDisplayMenuMain::systemmemory));

-    viewElementNames.insert(pair<string, int>("vdrstatistics", (int)eVeDisplayMenuMain::vdrstatistics));

-    viewElementNames.insert(pair<string, int>("temperatures", (int)eVeDisplayMenuMain::temperatures));

-    viewElementNames.insert(pair<string, int>("lastrecordings", (int)eVeDisplayMenuMain::lastrecordings));

-    viewElementNames.insert(pair<string, int>("customtokens", (int)eVeDisplayMenuMain::customtokens));

-}

-

-void cViewMenuMain::SetViewElementObjects(void) {

-    cSubView::SetViewElementObjects();

-    eOrientation orientation = attribs->Orientation();

-

-    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::timers])

-        timers = dynamic_cast<cVeDmTimers*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::timers]);

-    else if (viewElements[(int)eVeDisplayMenuMain::timers])

-        timers = dynamic_cast<cVeDmTimers*>(viewElements[(int)eVeDisplayMenuMain::timers]);

-    

-    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::devices])

-        devices = dynamic_cast<cVeDevices*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::devices]);

-    else if (viewElements[(int)eVeDisplayMenuMain::devices])

-        devices = dynamic_cast<cVeDevices*>(viewElements[(int)eVeDisplayMenuMain::devices]);

-

-    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::currentweather])

-        weather = dynamic_cast<cVeCurrentWeather*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::currentweather]);

-    else if (viewElements[(int)eVeDisplayMenuMain::currentweather])

-        weather = dynamic_cast<cVeCurrentWeather*>(viewElements[(int)eVeDisplayMenuMain::currentweather]);

-

-    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::currentschedule])

-        currentSchedule = dynamic_cast<cVeDmCurrentschedule*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::currentschedule]);

-    else if (viewElements[(int)eVeDisplayMenuMain::currentschedule])

-        currentSchedule = dynamic_cast<cVeDmCurrentschedule*>(viewElements[(int)eVeDisplayMenuMain::currentschedule]);

-

-    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::discusage])

-        discusage = dynamic_cast<cVeDmDiscusage*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::discusage]);

-    else if (viewElements[(int)eVeDisplayMenuMain::discusage])

-        discusage = dynamic_cast<cVeDmDiscusage*>(viewElements[(int)eVeDisplayMenuMain::discusage]);

-

-    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::systemload])

-        load = dynamic_cast<cVeDmSystemload*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::systemload]);

-    else if (viewElements[(int)eVeDisplayMenuMain::systemload])

-        load = dynamic_cast<cVeDmSystemload*>(viewElements[(int)eVeDisplayMenuMain::systemload]);

-

-    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::systemmemory])

-        memory = dynamic_cast<cVeDmSystemmemory*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::systemmemory]);

-    else if (viewElements[(int)eVeDisplayMenuMain::systemmemory])

-        memory = dynamic_cast<cVeDmSystemmemory*>(viewElements[(int)eVeDisplayMenuMain::systemmemory]);

-

-    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::vdrstatistics])

-        vdrstats = dynamic_cast<cVeDmVdrstatistics*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::vdrstatistics]);

-    else if (viewElements[(int)eVeDisplayMenuMain::vdrstatistics])

-        vdrstats = dynamic_cast<cVeDmVdrstatistics*>(viewElements[(int)eVeDisplayMenuMain::vdrstatistics]);

-

-    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::temperatures])

-        temperatures = dynamic_cast<cVeDmTemperatures*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::temperatures]);

-    else if (viewElements[(int)eVeDisplayMenuMain::temperatures])

-        temperatures = dynamic_cast<cVeDmTemperatures*>(viewElements[(int)eVeDisplayMenuMain::temperatures]);

-

-    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::lastrecordings])

-        lastRecordings = dynamic_cast<cVeDmLastrecordings*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::lastrecordings]);

-    else if (viewElements[(int)eVeDisplayMenuMain::lastrecordings])

-        lastRecordings = dynamic_cast<cVeDmLastrecordings*>(viewElements[(int)eVeDisplayMenuMain::lastrecordings]);

-

-    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::customtokens])

-        customTokens = dynamic_cast<cVeCustomTokens*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::customtokens]);

-    else if (viewElements[(int)eVeDisplayMenuMain::customtokens])

-        customTokens = dynamic_cast<cVeCustomTokens*>(viewElements[(int)eVeDisplayMenuMain::customtokens]);

-

-    if (devices) devices->SetDetached();

-    if (weather) weather->SetDetached();

-    if (discusage) discusage->SetDetached();

-    if (load) load->SetDetached();

-    if (memory) memory->SetDetached();

-    if (vdrstats) vdrstats->SetDetached();

-    if (temperatures) temperatures->SetDetached();

-    if (timers) timers->SetDetached();

-    if (currentSchedule) currentSchedule->SetDetached();

-    if (lastRecordings) lastRecordings->SetDetached();

-    if (customTokens) customTokens->SetDetached();

-

-    listMain = dynamic_cast<cViewListMain*>(viewList);

-}

-

-void cViewMenuMain::Clear(void) {

-    cSubView::Clear();

-    lastDrawDynamic = 0;

-

-    if (devices)

-        devices->Hide();

-

-    if (weather)

-        weather->Hide();

-

-    if (discusage)

-        discusage->Hide();

-    

-    if (load) {

-        load->Reset();

-        load->Hide();

-    }

-    

-    if (memory) {

-        memory->Reset();

-        memory->Hide();

-    }

-    

-    if (vdrstats) {

-        vdrstats->Reset();

-        vdrstats->Hide();

-    }

-    

-    if (temperatures) {

-        temperatures->Reset();

-        temperatures->Hide();

-    }

-    

-    if (timers) {

-        timers->Hide();

-    }

-    

-    if (currentSchedule) {

-        currentSchedule->Hide();

-    }

-    

-    if (lastRecordings) {

-        lastRecordings->Hide();

-    }

-    

-    if (customTokens) {

-        customTokens->Reset();

-        customTokens->Hide();

-    }

-}

-

-void cViewMenuMain::SetItem(const char *text, int index, bool current, bool selectable) {

-    listMain->Set(text, index, current, selectable);

-}

-

-void cViewMenuMain::SetCurrentRecording(const char *currentRec) {

-    if (currentSchedule)

-        currentSchedule->SetRecording(currentRec);

-}

-

-void cViewMenuMain::DrawStaticVEs(void) {

-    cSubView::DrawStaticVEs();

-    if (weather) {

-        weather->Show();

-        if (weather->Parse())

-            weather->Render();

-    }

-    if (discusage) {

-        discusage->Show();

-        if (discusage->Parse())

-            discusage->Render();

-    }

-    if (timers) {

-        timers->Show();

-        if (timers->Parse())

-            timers->Render();

-    }

-    if (currentSchedule) {

-        currentSchedule->Show();

-        if (currentSchedule->Parse())

-            currentSchedule->Render();

-    }

-    if (lastRecordings) {

-        lastRecordings->Show();

-        if (lastRecordings->Parse())

-            lastRecordings->Render();

-    }

-}

-

-void cViewMenuMain::DrawDynamicVEs(void) {

-    cSubView::DrawDynamicVEs();

-    //draw main menu dynamic elements 

-    //only every 3 seconds

-    uint64_t now = cTimeMs::Now();

-    if (now - lastDrawDynamic < 3000)

-        return;

-    else {

-        lastDrawDynamic = now;

-    }

-

-    if (devices) {

-        devices->Show();

-        if (devices->Parse())

-            devices->Render();

-    }

-    if (load) {

-        load->Show();

-        if (load->Parse())

-            load->Render();

-    }

-    if (memory) {

-        memory->Show();

-        if (memory->Parse())

-            memory->Render();

-    }

-    if (vdrstats) {

-        vdrstats->Show();

-        if (vdrstats->Parse())

-            vdrstats->Render();

-    }

-    if (temperatures) {

-        temperatures->Show();

-        if (temperatures->Parse())

-            temperatures->Render();

-    }

-    if (customTokens) {

-        customTokens->Show();

-        if (customTokens->Parse())

-            customTokens->Render();

-    }

-}

-

-const char *cViewMenuMain::GetPlugin(void) {

-    return listMain->GetPlugin();

-}

-

-/***********************************************************

-* cViewMenuSetup

-***********************************************************/

-cViewMenuSetup::cViewMenuSetup(const char *name) : cSubView(name) {

-    listSetup = NULL;

-}

-

-cViewMenuSetup::~cViewMenuSetup(void) {

-    

-}

-

-void cViewMenuSetup::SetViewElementObjects(void) {

-    cSubView::SetViewElementObjects();

-    listSetup = dynamic_cast<cViewListMain*>(viewList);

-}

-

-void cViewMenuSetup::SetItem(const char *text, int index, bool current, bool selectable) {

-    listSetup->Set(text, index, current, selectable);

-}

-

-/***********************************************************

-* cViewMenuSchedules

-***********************************************************/

-cViewMenuSchedules::cViewMenuSchedules(const char *name) : cSubView(name) {

-    listSchedules = NULL;

-}

-

-cViewMenuSchedules::~cViewMenuSchedules(void) {

-}

-

-void cViewMenuSchedules::SetViewElementObjects(void) {

-    cSubView::SetViewElementObjects();

-    listSchedules = dynamic_cast<cViewListSchedules*>(viewList);

-}

-

-void cViewMenuSchedules::SetItem(const cEvent *event, int index, bool current, bool selectable, 

-                             const cChannel *channel, bool withDate, eTimerMatch timerMatch) {

-    

-    bool epgSearchFavMenu = (menuCat == mcSchedule && channel) ? true : false;

-    listSchedules->IsEpgSearchFav(epgSearchFavMenu);

-    if (header) header->IsEpgSearchFav(epgSearchFavMenu);

-    listSchedules->Set(event, index, current, selectable, channel, withDate, timerMatch);

-}

-

-/***********************************************************

-* cViewMenuChannels

-***********************************************************/

-cViewMenuChannels::cViewMenuChannels(const char *name) : cSubView(name) {

-    listChannels = NULL;

-}

-

-cViewMenuChannels::~cViewMenuChannels(void) {

-}

-

-void cViewMenuChannels::SetViewElementObjects(void) {

-    cSubView::SetViewElementObjects();

-    listChannels = dynamic_cast<cViewListChannels*>(viewList);

-}

-

-void cViewMenuChannels::SetItem(const cChannel *channel, int index, bool current, bool selectable, bool withProvider) {

-    listChannels->Set(channel, index, current, selectable, withProvider);

-}

-

-/***********************************************************

-* cViewMenuTimers

-***********************************************************/

-cViewMenuTimers::cViewMenuTimers(const char *name) : cSubView(name) {

-    listTimers = NULL;

-}

-

-cViewMenuTimers::~cViewMenuTimers(void) {    

-}

-

-void cViewMenuTimers::SetViewElementObjects(void) {

-    cSubView::SetViewElementObjects();

-    listTimers = dynamic_cast<cViewListTimers*>(viewList);

-}

-

-void cViewMenuTimers::SetItem(const cTimer *timer, int index, bool current, bool selectable) {

-    listTimers->Set(timer, index, current, selectable);

-}

-

-/***********************************************************

-* cViewMenuRecordings

-***********************************************************/

-cViewMenuRecordings::cViewMenuRecordings(const char *name) : cSubView(name) {

-    listRecordings = NULL;

-}

-

-cViewMenuRecordings::~cViewMenuRecordings(void) {

-}

-

-void cViewMenuRecordings::SetViewElementObjects(void) {

-    cSubView::SetViewElementObjects();

-    listRecordings = dynamic_cast<cViewListRecordings*>(viewList);

-}

-

-void cViewMenuRecordings::SetItem(const cRecording *recording, int index, bool current, bool selectable, int level, int total, int New) {

-    listRecordings->Set(recording, index, current, selectable, level, total, New);

-}

-

-/***********************************************************

-* cViewMenuPlugin

-***********************************************************/

-cViewMenuPlugin::cViewMenuPlugin(const char *name) : cSubView(name) {

-    listPlugin = NULL;

-}

-

-cViewMenuPlugin::~cViewMenuPlugin(void) {

-}

-

-void cViewMenuPlugin::SetViewElementObjects(void) {

-    cSubView::SetViewElementObjects();

-    listPlugin = dynamic_cast<cViewListPlugin*>(viewList);

-}

-

-void cViewMenuPlugin::SetItem(skindesignerapi::cTokenContainer *tk, int index, bool current, bool selectable) {

-    listPlugin->Set(tk, index, current, selectable);

-}

-

-/***********************************************************

-* cViewMenuDetail

-***********************************************************/

-cViewMenuDetail::cViewMenuDetail(const char *name) : cSubView(name) {

-    firstTab = true;

-    for (int i=0; i < numViewElements; i++) {

-        delete viewElements[i];

-    }

-    delete[] viewElements;

-    numViewElements = (int)eVeDisplayDetailedMenu::count;

-    viewElements = new cViewElement*[numViewElements];

-    for (int i=0; i < numViewElements; i++) {

-        viewElements[i] = NULL;

-    }

-    delete[] viewElementsHorizontal;

-    viewElementsHorizontal = new cViewElement*[numViewElements];

-    for (int i=0; i < numViewElements; i++) {

-        viewElementsHorizontal[i] = NULL;

-    }    

-    SetViewElements();

-    detailedheaderEpg = NULL;

-    detailedheaderRec = NULL;

-    detailedheaderPlug = NULL;

-    tablabels = NULL;

-    detailViewEpg = NULL;

-    detailViewRec = NULL;

-    detailViewText = NULL;

-    detailViewPlugin = NULL;

-    SetDetailedView();

-}

-

-cViewMenuDetail::~cViewMenuDetail(void) {

-}

-

-void cViewMenuDetail::SetDetailedView(void) {

-    if (!strcmp(viewName, "menudetailedepg")) {

-        detailViewEpg = new cViewDetailEpg();

-        detailView = detailViewEpg;

-    } else if (!strcmp(viewName, "menudetailedrecording")) {

-        detailViewRec = new cViewDetailRec();

-        detailView = detailViewRec;

-    } else if (!strcmp(viewName, "menudetailedtext")) {

-        detailViewText = new cViewDetailText();

-        detailView = detailViewText;

-    } else if (startswith(viewName, "menuplugin")) {

-        detailViewPlugin = new cViewDetailPlugin();

-        detailView = detailViewPlugin;

-    } else {

-        esyslog("skindesigner: invalid detailedview %s", viewName);

-    }    

-    if (detailView) {

-        detailView->SetOsd(&sdOsd);

-    }

-}

-

-void cViewMenuDetail::AddTab(cArea *tab) {

-    if (firstTab) {

-        tab->SetActiveTab(true);

-        firstTab = false;

-    }

-    detailView->AddArea(tab);

-}

-

-void cViewMenuDetail::SetGlobals(cGlobals *globals) {

-    cView::SetGlobals(globals);

-    detailView->SetGlobals(globals);

-}

-

-void cViewMenuDetail::PreCache(void) {

-    attribs->SetContainer(container.X(), container.Y(), container.Width(), container.Height());

-    attribs->Cache();

-    if (plugId >= 0 && plugMenuId >= 0) {

-        cVeDmDetailheaderPlugin *dhPlug = dynamic_cast<cVeDmDetailheaderPlugin*>(viewElements[(int)eVeDisplayDetailedMenu::detailheader]);

-        dhPlug->SetPlugId(plugId);

-        dhPlug->SetPlugMenuId(plugMenuId);

-        dhPlug->SetTokenContainer();

-    }

-    cView::PreCache();

-    detailView->SetPlugId(plugId);

-    detailView->SetPlugMenuId(plugMenuId);

-    detailView->SetTokenContainer();

-    detailView->SetContainer(attribs->X(), attribs->Y(), attribs->Width(), attribs->Height());

-    detailView->Cache();

-}

-

-int cViewMenuDetail::GetWidth(void) {

-    return detailView->GetWidth();

-}

-

-void cViewMenuDetail::SetViewElements(void) {

-    viewElementNames.insert(pair<string, int>("detailheader", (int)eVeDisplayDetailedMenu::detailheader));

-    viewElementNames.insert(pair<string, int>("tablabels", (int)eVeDisplayDetailedMenu::tablabels));

-}

-

-void cViewMenuDetail::SetViewElementObjects(void) {

-    cSubView::SetViewElementObjects();

-    if (viewElements[(int)eVeDisplayDetailedMenu::detailheader]) {

-        if (!strcmp(viewName, "menudetailedepg"))

-            detailedheaderEpg = dynamic_cast<cVeDmDetailheaderEpg*>(viewElements[(int)eVeDisplayDetailedMenu::detailheader]);

-        else if (!strcmp(viewName, "menudetailedrecording"))

-            detailedheaderRec = dynamic_cast<cVeDmDetailheaderRec*>(viewElements[(int)eVeDisplayDetailedMenu::detailheader]);

-        else if (startswith(viewName, "menuplugin"))

-            detailedheaderPlug = dynamic_cast<cVeDmDetailheaderPlugin*>(viewElements[(int)eVeDisplayDetailedMenu::detailheader]);

-    }

-    

-    if (viewElements[(int)eVeDisplayDetailedMenu::tablabels])

-        tablabels = dynamic_cast<cVeDmTablabels*>(viewElements[(int)eVeDisplayDetailedMenu::tablabels]);

-}

-

-void cViewMenuDetail::SetEvent(const cEvent *event) {

-    if (detailedheaderEpg)

-        detailedheaderEpg->SetEvent(event);

-    if (detailViewEpg)

-        detailViewEpg->SetEvent(event);

-}

-

-void cViewMenuDetail::SetRecording(const cRecording *recording) {

-    if (detailedheaderRec)

-        detailedheaderRec->SetRecording(recording);

-    if (detailViewRec)

-        detailViewRec->SetRecording(recording);

-}

-

-void cViewMenuDetail::SetText(const char *text) {

-    if (detailViewText)

-        detailViewText->SetText(text);

-}

-

-void cViewMenuDetail::SetPluginText(skindesignerapi::cTokenContainer *tk) {

-    if (detailedheaderPlug)

-        detailedheaderPlug->Set(tk);

-    if (detailViewPlugin)

-        detailViewPlugin->Set(tk);

-}

-

-void cViewMenuDetail::Clear(void) {

-    cSubView::Clear();

-    cSubView::Close();

-    if (detailedheaderEpg) {

-        detailedheaderEpg->Close();

-    } else if (detailedheaderRec) {

-        detailedheaderRec->Close();

-    } else if (detailedheaderPlug) {

-        detailedheaderPlug->Close();

-    }

-    if (header) {

-        header->Hide();

-    }

-    if (detailView) {

-        detailView->Close();

-    }

-}

-

-void cViewMenuDetail::Close(void) {

-    cSubView::Clear();

-    cSubView::Close();

-    if (detailView) {

-        detailView->Close();

-    }

-}

-

-void cViewMenuDetail::DrawStaticVEs(void) {

-    cSubView::DrawStaticVEs();

-    if (detailedheaderEpg && detailedheaderEpg->Parse()) {

-        detailedheaderEpg->Render();

-    } else if (detailedheaderRec && detailedheaderRec->Parse()) {

-        detailedheaderRec->Render();

-    } else if (detailedheaderPlug && detailedheaderPlug->Parse()) {

-        detailedheaderPlug->Render();

-    }

-}

-

-void cViewMenuDetail::DrawDynamicVEs(void) {

-    if (datetime) {

-        datetime->Show();

-        if (datetime->Parse())

-            datetime->Render();

-    }

-    if (time) {

-        time->Show();

-        if (time->Parse())

-            time->Render();

-    }

-}

-

-void cViewMenuDetail::DrawDetailedView(void) {

-    detailView->Clear();

-    detailView->ResetTabs();

-    if (detailView->Parse()) {

-        detailView->Render();

-    }

-    if (scrollbar) {

-        scrollbar->Show();

-        DrawScrollbar();

-    }

-    vector<const char*> tabs;

-    int activeTab = detailView->GetTabs(tabs);

-    if (tablabels) {        

-        tablabels->SetTabs(tabs);

-        tablabels->SetActiveTab(activeTab);

-        if (tablabels->Parse())

-            tablabels->Render();

-    }

-}

-

-void cViewMenuDetail::KeyLeft(void) {

-    if (detailView->NumTabs() > 1) {

-        detailView->Clear();

-        detailView->PrevTab();

-        detailView->SetDirty();

-        if (tablabels) {

-            tablabels->Clear();

-            tablabels->SetActiveTab(detailView->ActiveTab());

-            if (tablabels->Parse())

-                tablabels->Render();

-        }

-        sdOsd.Flush();

-        detailView->Render();

-        if (scrollbar) {

-            DrawScrollbar();

-        }

-    } else {

-        //scroll page

-        if (detailView->ScrollUp(true)) {

-            if (scrollbar)

-                DrawScrollbar();

-        }

-    }

-}

-

-void cViewMenuDetail::KeyRight(void) {

-    if (detailView->NumTabs() > 1) {

-        detailView->Clear();

-        detailView->NextTab();

-        detailView->SetDirty();

-        if (tablabels) {

-            tablabels->Clear();

-            tablabels->SetActiveTab(detailView->ActiveTab());

-            if (tablabels->Parse())

-                tablabels->Render();

-        }

-        sdOsd.Flush();

-        detailView->Render();

-        if (scrollbar) {

-            DrawScrollbar();

-        }

-        

-    } else {

-        //scroll page

-        if (detailView->ScrollDown(true)) {

-            if (scrollbar)

-                DrawScrollbar();

-        }

-    }

-}

-

-void cViewMenuDetail::KeyUp(void) {

-    if (detailView->ScrollUp()) {

-        if (scrollbar)

-            DrawScrollbar();

-    }

-}

-

-void cViewMenuDetail::KeyDown(void) {

-    if (scrollbar && detailView->ScrollDown()) {

-        if (scrollbar)

-            DrawScrollbar();

-    }

-}

-

-void cViewMenuDetail::SetTransparency(int transparency, bool forceDetached) {

-    if (detailedheaderEpg)

-        detailedheaderEpg->SetTransparency(transparency);

-    if (detailedheaderRec)

-        detailedheaderRec->SetTransparency(transparency);

-    if (tablabels)

-        tablabels->SetTransparency(transparency);

-    if (detailView)

-        detailView->SetTransparency(transparency);

-}

-

-void cViewMenuDetail::DrawScrollbar(void) {

-    int barheight = 0;

-    int offset = 0;

-    bool end = true;

-    detailView->Scrollbar(barheight, offset, end);

-    scrollbar->SetDetail(barheight, offset, end);

-    scrollbar->Render();    

-}

+#include "viewdisplaymenu.h"
+#include "../config.h"
+
+/************************************************************************************
+* cViewMenu
+************************************************************************************/
+cViewMenu::cViewMenu(void) {
+    menuDefault = NULL;
+    menuMain = NULL;
+    menuSetup = NULL;
+    menuSchedules = NULL;
+    menuChannels = NULL;
+    menuTimers = NULL;
+    menuRecordings = NULL;
+    menuDetailedEpg = NULL;
+    menuDetailedRec = NULL;
+    menuDetailedText = NULL;
+    ClearVariables();
+    viewId = eViewType::DisplayMenu;
+    viewName = strdup("displaymenu");
+    numViewElements = (int)eVeDisplayMenu::count;
+    viewElements = new cViewElement*[numViewElements];
+    for (int i=0; i < numViewElements; i++) {
+        viewElements[i] = NULL;
+    }
+    viewElementsHorizontal = new cViewElement*[numViewElements];
+    for (int i=0; i < numViewElements; i++) {
+        viewElementsHorizontal[i] = NULL;
+    }
+    SetViewElements();
+    int numPluginMenus = plgManager->GetNumPluginMenus();
+    numSubviews = (int)eSvDisplayMenu::count + numPluginMenus;
+    subViews = new cSubView*[numSubviews];
+    for (int i=0; i < numSubviews; i++) {
+        subViews[i] = NULL;
+    }
+    SetSubViews();
+    menuCat = mcUnknown;
+    plugName = NULL;
+}
+
+cViewMenu::~cViewMenu() {
+    for (int i=0; i< numSubviews; i++)
+        delete subViews[i];
+    delete[] subViews;
+}
+
+void cViewMenu::SetGlobals(cGlobals *globals) {
+    cView::SetGlobals(globals);
+    for (int i=0; i < numSubviews; ++i) {
+        if (subViews[i]) {
+            subViews[i]->SetGlobals(globals);
+        }
+    }
+}
+
+void cViewMenu::PreCache(void) {
+    cView::PreCache();
+    for (int i=0; i < numSubviews; i++) {
+        if (subViews[i]) {
+            subViews[i]->SetContainer(0, 0, attribs->Width(), attribs->Height());
+            subViews[i]->PreCache();
+            //setting default viewelements for subviews
+            for (int ve = (int)eVeDisplayMenu::background; ve < (int)eVeDisplayMenu::count; ve++) {
+                if (viewElements[ve] && !subViews[i]->ViewElementSet(ve)) {
+                    subViews[i]->SetViewElement((eVeDisplayMenu)ve, viewElements[ve]);
+                }
+            }
+            for (int ve = (int)eVeDisplayMenu::background; ve < (int)eVeDisplayMenu::count; ve++) {
+                if (viewElementsHorizontal[ve] && !subViews[i]->ViewElementHorizontalSet(ve)) {
+                    subViews[i]->SetViewElementHorizontal((eVeDisplayMenu)ve, viewElementsHorizontal[ve]);
+                }
+            }
+        }
+    }
+}
+
+void cViewMenu::SetViewElementObjects(void) {
+    //setting subviews
+    for (int i=0; i < numSubviews; i++) {
+        if (!subViews[i])
+            continue;
+        if (i == (int)eSvDisplayMenu::menudefault)
+            menuDefault = dynamic_cast<cViewMenuDefault*>(subViews[i]);
+        else if (i == (int)eSvDisplayMenu::main)
+            menuMain = dynamic_cast<cViewMenuMain*>(subViews[i]);
+        else if (i == (int)eSvDisplayMenu::setup)
+            menuSetup = dynamic_cast<cViewMenuSetup*>(subViews[i]);
+        else if (i == (int)eSvDisplayMenu::schedules)
+            menuSchedules = dynamic_cast<cViewMenuSchedules*>(subViews[i]);
+        else if (i == (int)eSvDisplayMenu::channels)
+            menuChannels = dynamic_cast<cViewMenuChannels*>(subViews[i]);
+        else if (i == (int)eSvDisplayMenu::timers)
+            menuTimers = dynamic_cast<cViewMenuTimers*>(subViews[i]);
+        else if (i == (int)eSvDisplayMenu::recordings)
+            menuRecordings = dynamic_cast<cViewMenuRecordings*>(subViews[i]);
+        else if (i == (int)eSvDisplayMenu::detailepg)
+            menuDetailedEpg = dynamic_cast<cViewMenuDetail*>(subViews[i]);
+        else if (i == (int)eSvDisplayMenu::detailrec)
+            menuDetailedRec = dynamic_cast<cViewMenuDetail*>(subViews[i]);
+        else if (i == (int)eSvDisplayMenu::detailtext)
+            menuDetailedText = dynamic_cast<cViewMenuDetail*>(subViews[i]);
+    }
+}
+
+void cViewMenu::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>("time", (int)eVeDisplayMenu::time));
+    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));
+    viewElementNames.insert(pair<string, int>("sortmode", (int)eVeDisplayMenu::sortmode));
+}
+
+void cViewMenu::SetSubViews(void) {
+    //adding VDR submenus
+    subviewNames.insert(pair<string, int>("menudefault", (int)eSvDisplayMenu::menudefault));
+    subviewNames.insert(pair<string, int>("menumain", (int)eSvDisplayMenu::main));
+    subviewNames.insert(pair<string, int>("menusetup", (int)eSvDisplayMenu::setup));
+    subviewNames.insert(pair<string, int>("menuschedules", (int)eSvDisplayMenu::schedules));
+    subviewNames.insert(pair<string, int>("menuchannels", (int)eSvDisplayMenu::channels));
+    subviewNames.insert(pair<string, int>("menutimers", (int)eSvDisplayMenu::timers));
+    subviewNames.insert(pair<string, int>("menurecordings", (int)eSvDisplayMenu::recordings));
+    subviewNames.insert(pair<string, int>("menudetailedepg", (int)eSvDisplayMenu::detailepg));
+    subviewNames.insert(pair<string, int>("menudetailedrecording", (int)eSvDisplayMenu::detailrec));
+    subviewNames.insert(pair<string, int>("menudetailedtext", (int)eSvDisplayMenu::detailtext));
+    //adding additional plugin subviews
+    int subViewNumber = (int)eSvDisplayMenu::count;
+    map <int,skindesignerapi::sPlugMenu> *plugMenus = NULL;
+    string plugName = "";
+    int plugId = -1;
+    plgManager->InitPluginMenuIterator();
+    while ( plugMenus = plgManager->GetPluginMenus(plugName, plugId) ) {
+        for (map <int,skindesignerapi::sPlugMenu>::iterator it = plugMenus->begin(); it != plugMenus->end(); it++) {
+            int menuNumber = it->first;
+            cString menuName = cString::sprintf("menuplugin-%s-%d", plugName.c_str(), menuNumber);
+            subviewNames.insert(pair<string, int>(*menuName, subViewNumber));
+            plgManager->AddSubviewMapping(plugId, menuNumber, subViewNumber);
+            subViewNumber++;
+        }
+    }
+}
+
+void cViewMenu::ClearVariables(void) {
+    cView::ClearVariables();
+    menuChange = true;
+    listChange = true;
+    detailViewInit = false;
+    menuCat = mcUnknown;
+    pluginIdSet = false;
+    plugId = -1;
+    plugMenuId = -1;
+    activeSubview = NULL;
+    activeSubviewLast = NULL;
+}
+
+int cViewMenu::SubviewId(const char *name) {
+    map<string, int>::iterator hit = subviewNames.find(name);
+    if (hit != subviewNames.end())
+        return (int)hit->second;
+    return ATTR_UNKNOWN;
+}
+
+bool cViewMenu::ValidSubView(const char *subView) {
+    if (SubviewId(subView) != ATTR_UNKNOWN)
+        return true;
+    return false;
+}
+
+cSubView *cViewMenu::CreateSubview(const char *name) {
+    cSubView *sv = NULL;
+    if (!strcmp(name, "menudefault"))
+        sv = new cViewMenuDefault(name);
+    else if (!strcmp(name, "menumain"))
+        sv = new cViewMenuMain(name);
+    else if (!strcmp(name, "menusetup"))
+        sv = new cViewMenuSetup(name);
+    else if (!strcmp(name, "menuschedules"))
+        sv = new cViewMenuSchedules(name);
+    else if (!strcmp(name, "menuchannels"))
+        sv = new cViewMenuChannels(name);
+    else if (!strcmp(name, "menutimers"))
+        sv = new cViewMenuTimers(name);
+    else if (!strcmp(name, "menurecordings"))
+        sv = new cViewMenuRecordings(name);
+    else if (!strcmp(name, "menudetailedepg"))
+        sv = new cViewMenuDetail(name);
+    else if (!strcmp(name, "menudetailedrecording"))
+        sv = new cViewMenuDetail(name);
+    else if (!strcmp(name, "menudetailedtext"))
+        sv = new cViewMenuDetail(name);
+    return sv;
+}
+
+cSubView *cViewMenu::CreatePluginview(const char *plugname, int plugId, int menuNumber, int menuType) {
+    cString menuName = cString::sprintf("menuplugin-%s-%d", plugname, menuNumber);
+    cSubView *pv = NULL;
+    if (menuType == skindesignerapi::mtList)
+        pv = new cViewMenuPlugin(*menuName);
+    else if (menuType == skindesignerapi::mtText)
+        pv = new cViewMenuDetail(*menuName);
+    if (pv) {
+        pv->SetPlugId(plugId);
+        pv->SetPlugMenuId(menuNumber);
+    }
+    return pv;
+}
+
+
+void cViewMenu::AddPluginview(cSubView *plugView) {
+    int id = SubviewId(plugView->GetViewName());
+    if (id == ATTR_UNKNOWN)
+        return;
+    subViews[id] = plugView;
+}
+
+void cViewMenu::AddSubview(const char *sSubView, cSubView *subView) {
+    int id = SubviewId(sSubView);
+    if (id == ATTR_UNKNOWN)
+        return;
+    subViews[id] = subView;
+}
+
+/* eMenuCategory:
+    -1 mcUndefined,
+    0  mcUnknown,
+    1  mcMain,
+    2  mcSchedule,
+    3  mcScheduleNow,
+    4  mcScheduleNext,
+    5  mcChannel,
+    6  mcChannelEdit,
+    7  mcTimer,
+    8  mcTimerEdit,
+    9  mcRecording,
+    10 mcRecordingInfo,
+    11 mcRecordingEdit,
+    12 mcPlugin,
+    13 mcPluginSetup,
+    14 mcSetup,
+    15 mcSetupOsd,
+    16 mcSetupEpg,
+    17 mcSetupDvb,
+    18 mcSetupLnb,
+    19 mcSetupCam,
+    20 mcSetupRecord,
+    21 mcSetupReplay,
+    22 mcSetupMisc,
+    23 mcSetupPlugins,
+    24 mcCommand,
+    25 mcEvent,
+    26 mcText,
+    27 mcFolder,
+    28 mcCam
+*/
+void cViewMenu::SetSubView(eMenuCategory MenuCat) {
+    //menuCat --> old menucat
+    //MenuCat --> new menucat
+    if (menuCat == mcMain) {
+        cViewMenuMain *menuMain = dynamic_cast<cViewMenuMain*>(activeSubview);
+        if (menuMain) {
+            plugName = menuMain->GetPlugin();
+        }
+    }
+    //first check plugin menu
+    if (MenuCat == mcPlugin) {
+        bool plugMenuFound = SetPluginSubView(MenuCat);
+        if (plugMenuFound) {
+            menuCat = MenuCat;
+            return;
+        }
+    }
+    //then check regular menus
+    bool catChange = false;
+    if (menuCat != MenuCat) {
+        catChange = true;
+    } else {
+        return;
+    }
+    cSubView *newSubview = NULL;
+    menuCat = MenuCat;
+    switch (MenuCat) {
+        case mcMain:
+            newSubview = subViews[(int)eSvDisplayMenu::main];
+            break;
+        case mcSchedule:
+        case mcScheduleNow:
+        case mcScheduleNext:
+            newSubview = subViews[(int)eSvDisplayMenu::schedules];
+            break;
+        case mcChannel:
+            newSubview = subViews[(int)eSvDisplayMenu::channels];
+            break;
+        case mcTimer:
+            newSubview = subViews[(int)eSvDisplayMenu::timers];
+            break;
+        case mcRecording:
+            newSubview = subViews[(int)eSvDisplayMenu::recordings];
+            break;
+        case mcSetup:
+            newSubview = subViews[(int)eSvDisplayMenu::setup];
+            break;
+        case mcEvent:
+            newSubview = subViews[(int)eSvDisplayMenu::detailepg];
+            break;
+        case mcRecordingInfo:
+            newSubview = subViews[(int)eSvDisplayMenu::detailrec];
+            break;
+        case mcText:
+            newSubview = subViews[(int)eSvDisplayMenu::detailtext];
+            break;
+        default:
+            newSubview = subViews[(int)eSvDisplayMenu::menudefault];
+            //setting plugin name for detecting plugins in default menus
+            cViewMenuDefault *menuDefault = dynamic_cast<cViewMenuDefault*>(newSubview);
+            if (menuDefault) {
+                menuDefault->SetPlugin(plugName);
+            }
+            break;
+    };
+    if (catChange) {
+        menuChange = true;
+        activeSubview->Clear();
+        activeSubviewLast = activeSubview;
+        activeSubview = newSubview;
+        if (!activeSubview)
+            activeSubview = subViews[(int)eSvDisplayMenu::menudefault];    
+        activeSubview->SetMenuCategory(MenuCat);
+    }
+}
+
+bool cViewMenu::SetPluginSubView(eMenuCategory menuCat) {
+    if (!pluginIdSet)
+        return false;
+    cSubView *newSubview = NULL;
+    if (plugId >= 0 && plugMenuId >= 0) {
+        int subViewId = plgManager->GetSubviewId(plugId, plugMenuId);
+        if (subViewId >= 0 && subViews[subViewId]) {
+            newSubview = subViews[subViewId];
+            menuChange = true;
+            activeSubview->Clear();
+            activeSubviewLast = activeSubview;
+            activeSubview = newSubview;
+            activeSubview->SetMenuCategory(menuCat);
+            return true;
+        }
+    } 
+    return false;
+}
+
+void cViewMenu::WakeViewElements(void) {
+    cView::WakeViewElements();
+    if (activeSubview)
+        activeSubview->WakeViewElements();    
+}
+
+
+void cViewMenu::SetSortMode(eMenuSortMode sortMode) {
+    if (activeSubview)
+        activeSubview->SetSortMode(sortMode);
+}
+
+void cViewMenu::SetPluginMenu(int plugId, int plugMenuId) { 
+    this->plugId = plugId; 
+    this->plugMenuId = plugMenuId;
+    pluginIdSet = true;
+}
+
+int cViewMenu::NumListItems(void) {
+    return activeSubview->NumListItems();
+}
+
+eMenuOrientation cViewMenu::MenuOrientation(void) {
+    return activeSubview->MenuOrientation();    
+}
+
+const cFont *cViewMenu::GetTextAreaFont(void) {
+    return activeSubview->GetTextAreaFont();
+}
+
+int cViewMenu::GetTextAreaWidth(void) {
+    if (!menuDetailedText)
+        return 0;
+    return menuDetailedText->GetWidth();
+}
+
+int cViewMenu::GetListWidth(void) {
+    return activeSubview->GetListWidth();
+}
+
+void cViewMenu::SetTitleHeader(const char *title) {
+    activeSubview->SetTitle(title);
+}
+
+void cViewMenu::SetMessage(eMessageType type, const char *text) {
+    activeSubview->SetMessage(type, text);    
+}
+
+void cViewMenu::SetChannelHeader(const cEvent *event) {
+    if (menuChange && menuCat == mcSchedule) {
+        const cChannel *channel = Channels.GetByChannelID(event->ChannelID());
+        if (channel)
+            activeSubview->SetChannel(channel);
+    }
+}
+
+void cViewMenu::SetMenuButtons(const char *red, const char *green, const char *yellow, const char *blue) {
+    activeSubview->SetMenuButtons(red, green, yellow, blue);
+}
+
+void cViewMenu::SetScrollbar(int total, int offset) {
+    activeSubview->SetScrollbar(total, offset);    
+}
+
+void cViewMenu::SetTabs(int tab1, int tab2, int tab3, int tab4, int tab5) {
+    menuDefault->SetTabs(tab1, tab2, tab3, tab4, tab5);
+}
+
+void cViewMenu::SetItem(const char *text, int index, bool current, bool selectable) {
+    if (menuCat == mcMain && menuMain) {
+        menuMain->SetItem(text, index, current, selectable);
+    } else if (menuCat == mcSetup && menuSetup) {
+        menuSetup->SetItem(text, index, current, selectable);
+    } else {
+        menuDefault->SetItem(text, index, current, selectable);
+    }
+    listChange = true;
+}
+
+bool cViewMenu::SetItemEvent(const cEvent *event, int index, bool current, bool selectable, 
+                             const cChannel *channel, bool withDate, eTimerMatch timerMatch) {
+    if (!menuSchedules)
+        return false;
+    menuSchedules->SetItem(event, index, current, selectable, channel, withDate, timerMatch);
+    listChange = true;
+    return true;
+}
+
+bool cViewMenu::SetItemTimer(const cTimer *timer, int index, bool current, bool selectable) {
+    if (!menuTimers)
+        return false;
+    menuTimers->SetItem(timer, index, current, selectable);
+    listChange = true;
+    return true;
+}
+
+bool cViewMenu::SetItemChannel(const cChannel *channel, int index, bool current, bool selectable, bool withProvider) {
+    if (!menuChannels)
+        return false;
+    menuChannels->SetItem(channel, index, current, selectable, withProvider);
+    listChange = true;
+    return true;
+}
+
+bool cViewMenu::SetItemRecording(const cRecording *recording, int index, bool current, bool selectable, int level, int total, int New) {
+    if (!menuRecordings)
+        return false;
+    menuRecordings->SetItem(recording, index, current, selectable, level, total, New);    
+    listChange = true;
+    return true;
+}
+
+bool cViewMenu::SetItemPlugin(skindesignerapi::cTokenContainer *tk, int index, bool current, bool selectable) {
+    cViewMenuPlugin *menuPlugin = dynamic_cast<cViewMenuPlugin*>(activeSubview);
+    if (!menuPlugin) {
+        return false;
+    }
+    menuPlugin->SetItem(tk, index, current, selectable);    
+    listChange = true;
+    return true;    
+}
+
+void cViewMenu::SetEvent(const cEvent *event) {
+    menuDetailedEpg->SetEvent(event);
+    detailViewInit = true;
+}
+
+void cViewMenu::SetRecording(const cRecording *recording) {
+    menuDetailedRec->SetRecording(recording);
+    detailViewInit = true;    
+}
+
+void cViewMenu::SetText(const char *text) {
+    menuDetailedText->SetText(text);
+    detailViewInit = true;    
+}
+
+bool cViewMenu::SetPluginText(skindesignerapi::cTokenContainer *tk) {
+    cViewMenuDetail *menuPlugin = dynamic_cast<cViewMenuDetail*>(activeSubview);
+    if (!menuPlugin) {
+        return false;
+    }
+    menuPlugin->SetPluginText(tk);  
+    detailViewInit = true;
+    return true;
+}
+
+void cViewMenu::SetCurrentRecording(const char *currentRec) {
+    if (menuMain) {
+        menuMain->SetCurrentRecording(currentRec);    }
+}
+
+void cViewMenu::KeyDetailView(bool up, bool page) {
+    cViewMenuDetail *detailView = dynamic_cast<cViewMenuDetail*>(activeSubview);
+    if (!detailView)
+        return;
+    if (up && page) {
+        detailView->KeyLeft();
+    } else if (!up && page) {
+        detailView->KeyRight();
+    } else if (up && !page) {
+        detailView->KeyUp();
+    } else if (!up && !page) {
+        detailView->KeyDown();
+    }
+}
+
+bool cViewMenu::Init(void) {
+    activeSubview = subViews[(int)eSvDisplayMenu::main];
+    return cView::Init(); 
+}
+
+void cViewMenu::Close(void) {
+    delete fader;
+    fader = NULL;
+    if (FadeTime() > 0) {
+        fader = new cAnimation((cFadable*)this, false);
+        fader->Fade();
+        delete fader;
+        fader = NULL;
+    }
+    for (int i=0; i < numSubviews; i++) {
+        if (subViews[i]) {
+            subViews[i]->Close();
+        }
+    }
+    for (int i=0; i < numViewElements; i++) {
+        if (viewElements[i]) {
+            viewElements[i]->Close();
+        }
+        if (viewElementsHorizontal[i]) {
+            viewElementsHorizontal[i]->Close();
+        }
+    }
+    UnScaleTv();
+    ClearVariables();
+    sdOsd.DeleteOsd();
+}
+
+void cViewMenu::Clear(void) {
+    activeSubview->ClearViewList();
+}
+
+void cViewMenu::Flush(void) {
+    if (init) {
+        sdOsd.LockFlush();
+    }
+    bool staticInitiated = false;
+    if (menuChange) {
+        newTvFrame = activeSubview->GetTvFrame();
+        menuInit = true;
+        activeSubview->DrawStaticVEs();
+        pluginIdSet = false;
+        menuChange = false;
+        staticInitiated = true;
+    }
+    if (listChange) {
+        activeSubview->DrawList();
+        listChange = false;
+    }
+    if (detailViewInit) {
+        if (!staticInitiated)
+            activeSubview->DrawStaticVEs();
+        activeSubview->DrawDetailedView();
+        pluginIdSet = false;
+        detailViewInit = false;
+    }
+    activeSubview->DrawDynamicVEs();
+    cView::Flush();
+}
+
+void cViewMenu::SetTransparency(int transparency, bool forceDetached) {
+    activeSubview->SetTransparency(transparency, forceDetached);
+    if (menuDetailedEpg)
+        menuDetailedEpg->SetTransparency(transparency);
+    if (menuDetailedRec)
+        menuDetailedRec->SetTransparency(transparency);
+    if (menuDetailedText)
+        menuDetailedText->SetTransparency(transparency);
+}
+
+void cViewMenu::Debug(void) {
+    cView::Debug();
+    for (int i=0; i < numSubviews; i++) {
+        if (subViews[i]) {
+            subViews[i]->Debug();
+        }
+    }
+}
+
+/***********************************************************
+* cSubView
+***********************************************************/
+cSubView::cSubView(const char *name) {
+    menuCat = mcUnknown;
+    plugId = -1;
+    plugMenuId = -1;
+    this->viewName = strdup(name);
+    numViewElements = (int)eVeDisplayMenu::count;
+    viewElements = new cViewElement*[numViewElements];
+    for (int i=0; i < numViewElements; i++) {
+        viewElements[i] = NULL;
+    }
+    viewElementsHorizontal = new cViewElement*[numViewElements];
+    for (int i=0; i < numViewElements; i++) {
+        viewElementsHorizontal[i] = NULL;
+    }
+    background = NULL;
+    header = NULL;
+    datetime = NULL;
+    time = NULL;
+    message = NULL;
+    sortmode = NULL;
+    colorbuttons = NULL;
+    scrollbar = NULL;
+    viewList = NULL;
+    viewListVertical = NULL;
+    viewListHorizontal = NULL;
+    SetViewElements();
+}
+
+cSubView::~cSubView(void) {
+    delete viewListHorizontal;
+    delete viewListVertical;
+}
+
+void cSubView::SetGlobals(cGlobals *globals) {
+    cView::SetGlobals(globals);
+    if (viewListVertical)
+        viewListVertical->SetGlobals(globals);
+    if (viewListHorizontal)
+        viewListHorizontal->SetGlobals(globals);
+}
+
+void cSubView::PreCache(void) {
+    attribs->SetContainer(container.X(), container.Y(), container.Width(), container.Height());
+    attribs->Cache();
+    cView::PreCache();
+    if (viewListVertical) {
+        viewListVertical->SetPlugId(plugId);
+        viewListVertical->SetPlugMenuId(plugMenuId);
+        viewListVertical->SetContainer(attribs->X(), attribs->Y(), attribs->Width(), attribs->Height());
+        viewListVertical->PreCache();        
+    }
+    if (viewListHorizontal) {
+        viewListHorizontal->SetPlugId(plugId);
+        viewListHorizontal->SetPlugMenuId(plugMenuId);
+        viewListHorizontal->SetContainer(attribs->X(), attribs->Y(), attribs->Width(), attribs->Height());
+        viewListHorizontal->PreCache();        
+    }
+}
+
+bool cSubView::ViewElementSet(int ve) {
+    if (ve >= 0 && ve < (int)eVeDisplayMenu::count && viewElements[ve])
+        return true;
+    return false;
+}
+
+bool cSubView::ViewElementHorizontalSet(int ve) {
+    if (ve >= 0 && ve < (int)eVeDisplayMenu::count && viewElementsHorizontal[ve])
+        return true;
+    return false;
+}
+
+void cSubView::SetViewElement(eVeDisplayMenu ve, cViewElement *viewElement) {
+    switch (ve) {
+        case eVeDisplayMenu::background:
+            if (!background)
+                background = viewElement;
+            break;
+        case eVeDisplayMenu::header:
+            if (!header)
+                header = dynamic_cast<cVeDmHeader*>(viewElement);
+            break;
+        case eVeDisplayMenu::datetime:
+            if (!datetime)
+                datetime = dynamic_cast<cVeDateTime*>(viewElement);
+            break;
+        case eVeDisplayMenu::time:
+            if (!time)
+                time = dynamic_cast<cVeTime*>(viewElement);
+            break;
+        case eVeDisplayMenu::message:
+            if (!message)
+                message = dynamic_cast<cVeMessage*>(viewElement);
+            break;
+        case eVeDisplayMenu::sortmode:
+            if (!sortmode)
+                sortmode = dynamic_cast<cVeDmSortmode*>(viewElement);
+            break;
+        case eVeDisplayMenu::colorbuttons:
+            if (!colorbuttons)
+                colorbuttons = dynamic_cast<cVeDmColorbuttons*>(viewElement);
+            break;
+        case eVeDisplayMenu::scrollbar:
+            if (!scrollbar)
+                scrollbar = dynamic_cast<cVeDmScrollbar*>(viewElement);
+            break;
+        default:
+            break;
+    };
+}
+
+void cSubView::SetViewElementHorizontal(eVeDisplayMenu ve, cViewElement *viewElement) {
+    eOrientation orientation = attribs->Orientation();
+    if (orientation != eOrientation::horizontal)
+        return;
+    switch (ve) {
+        case eVeDisplayMenu::background:
+            if (!background)
+                background = viewElement;
+            break;
+        case eVeDisplayMenu::header:
+            if (!header)
+                header = dynamic_cast<cVeDmHeader*>(viewElement);
+            break;
+        case eVeDisplayMenu::datetime:
+            if (!datetime)
+                datetime = dynamic_cast<cVeDateTime*>(viewElement);
+            break;
+        case eVeDisplayMenu::time:
+            if (!time)
+                time = dynamic_cast<cVeTime*>(viewElement);
+            break;
+        case eVeDisplayMenu::message:
+            if (!message)
+                message = dynamic_cast<cVeMessage*>(viewElement);
+            break;
+        case eVeDisplayMenu::sortmode:
+            if (!sortmode)
+                sortmode = dynamic_cast<cVeDmSortmode*>(viewElement);
+            break;
+        case eVeDisplayMenu::colorbuttons:
+            if (!colorbuttons)
+                colorbuttons = dynamic_cast<cVeDmColorbuttons*>(viewElement);
+            break;
+        case eVeDisplayMenu::scrollbar:
+            if (!scrollbar)
+                scrollbar = dynamic_cast<cVeDmScrollbar*>(viewElement);
+            break;
+        default:
+            break;
+    };
+}
+
+void cSubView::AddViewList(cViewList *viewList) {
+    eOrientation orientation = viewList->Orientation();
+    if (orientation == eOrientation::vertical) {
+        viewListVertical = viewList;
+    } else if (orientation == eOrientation::horizontal) {
+        viewListHorizontal = viewList;
+    } else {
+        viewListVertical = viewList;        
+    }
+}
+
+int cSubView::NumListItems(void) {
+    if (viewList)
+        return viewList->NumItems();
+    return 0;
+}
+
+eMenuOrientation cSubView::MenuOrientation(void) {
+    eOrientation orientation = attribs->Orientation();
+    if (orientation == eOrientation::horizontal)
+        return moHorizontal;
+    return moVertical;
+}
+
+void cSubView::SetTitle(const char *title) {
+    if (header) {
+        header->SetTitle(title);        
+    }     
+}
+
+void cSubView::SetChannel(const cChannel *channel) {
+    if (header) {
+        header->SetChannel(channel);
+    }
+}
+
+void cSubView::SetMessage(eMessageType type, const char *text) {
+    if (!message)
+        return;
+    if (!text) {
+        message->Clear();
+        message->Hide();
+        return;
+    }
+    message->Set(type, text);
+    message->Show();
+    if (message->Parse())
+        message->Render(); 
+}
+
+void cSubView::SetMenuButtons(const char *red, const char *green, const char *yellow, const char *blue) {
+    if (!colorbuttons)
+        return;
+    colorbuttons->SetButtons(red, green, yellow, blue);
+    if (colorbuttons->Parse()) {
+        colorbuttons->Show();
+        colorbuttons->Render();
+    }
+}
+
+void cSubView::SetScrollbar(int total, int offset) {
+    if (!scrollbar)
+        return;
+    scrollbar->SetList(total, offset, NumListItems());
+    if (scrollbar->Parse()) {
+        scrollbar->Show();
+        scrollbar->Render();
+    }
+}
+
+void cSubView::SetSortMode(eMenuSortMode sortMode) {
+    if (!sortmode)
+        return;
+    sortmode->Set(sortMode);
+    if (sortmode->Parse()) {
+        sortmode->Show();
+        sortmode->Render();
+    }
+}
+
+void cSubView::Close(void) {
+    ClearVariables();
+    for (int i=0; i < numViewElements; i++) {
+        if (!viewElements[i])
+            continue;
+        viewElements[i]->Close();
+    }
+    for (int i=0; i < numViewElements; i++) {
+        if (!viewElementsHorizontal[i])
+            continue;
+        viewElementsHorizontal[i]->Close();
+    }
+    if (viewList)
+        viewList->Close();
+}
+
+void cSubView::ClearViewList(void) {
+    if (viewList)
+        viewList->Clear();
+}
+
+void cSubView::WakeViewElements(void) {
+    for (int i = 0; i < numViewElements; i++) {
+        if (viewElements[i]) {
+            viewElements[i]->WakeUp();
+        }
+        if (viewElementsHorizontal[i]) {
+            viewElementsHorizontal[i]->WakeUp();
+        }
+    }
+}
+
+void cSubView::Clear(void) {
+    if (background)   background->Hide();
+    if (datetime)     datetime->Hide();
+    if (time)         time->Hide();
+    if (header)       header->Hide();
+    if (colorbuttons) colorbuttons->Hide();
+    if (scrollbar)    scrollbar->Hide();
+    if (sortmode) {
+        sortmode->Reset(); 
+        sortmode->Hide();
+    }
+
+    if (viewList)     viewList->Close();
+}
+
+void cSubView::DrawStaticVEs(void) {
+    if (background) {
+        background->Show();
+        background->Render();
+    }
+    if (header) {
+        header->Show();
+        header->Set(menuCat);
+        if (header->Parse())
+            header->Render();
+    }
+}
+
+void cSubView::DrawDynamicVEs(void) {
+    if (datetime) {
+        datetime->Show();
+        if (datetime->Parse())
+            datetime->Render();
+    }
+    if (time) {
+        time->Show();
+        if (time->Parse()) {
+            time->Render();
+        }
+    }
+}
+
+void cSubView::DrawList(void) {
+    if (viewList) {
+        viewList->Draw(menuCat);
+    }
+}
+
+void cSubView::SetTransparency(int transparency, bool forceDetached) {
+    for (int i = 0; i < numViewElements; i++) {
+        if (viewElements[i] && (!viewElements[i]->Detached() || forceDetached)) {
+            viewElements[i]->SetTransparency(transparency);
+        }
+        if (viewElementsHorizontal[i] && (!viewElementsHorizontal[i]->Detached() || forceDetached)) {
+            viewElementsHorizontal[i]->SetTransparency(transparency);
+        }
+    }
+    if (viewList)
+        viewList->SetTransparency(transparency);
+}
+/***********************************************************
+* Protected Functions
+***********************************************************/
+void cSubView::SetViewElementObjects(void) {
+    eOrientation orientation = attribs->Orientation();
+
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::background])
+        background = viewElementsHorizontal[(int)eVeDisplayMenu::background];
+    else if (viewElements[(int)eVeDisplayMenu::background])
+        background = viewElements[(int)eVeDisplayMenu::background];
+
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::header])
+        header = dynamic_cast<cVeDmHeader*>(viewElementsHorizontal[(int)eVeDisplayMenu::header]);
+    else if (viewElements[(int)eVeDisplayMenu::header])
+        header = dynamic_cast<cVeDmHeader*>(viewElements[(int)eVeDisplayMenu::header]);
+
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::datetime])
+        datetime = dynamic_cast<cVeDateTime*>(viewElementsHorizontal[(int)eVeDisplayMenu::datetime]);
+    else if (viewElements[(int)eVeDisplayMenu::datetime])
+        datetime = dynamic_cast<cVeDateTime*>(viewElements[(int)eVeDisplayMenu::datetime]);
+
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::time])
+        time = dynamic_cast<cVeTime*>(viewElementsHorizontal[(int)eVeDisplayMenu::time]);
+    else if (viewElements[(int)eVeDisplayMenu::time])
+        time = dynamic_cast<cVeTime*>(viewElements[(int)eVeDisplayMenu::time]);
+
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::message])
+        message = dynamic_cast<cVeMessage*>(viewElementsHorizontal[(int)eVeDisplayMenu::message]);
+    else if (viewElements[(int)eVeDisplayMenu::message])
+        message = dynamic_cast<cVeMessage*>(viewElements[(int)eVeDisplayMenu::message]);
+
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::sortmode])
+        sortmode = dynamic_cast<cVeDmSortmode*>(viewElementsHorizontal[(int)eVeDisplayMenu::sortmode]);
+    else if (viewElements[(int)eVeDisplayMenu::sortmode])
+        sortmode = dynamic_cast<cVeDmSortmode*>(viewElements[(int)eVeDisplayMenu::sortmode]);
+
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::colorbuttons])
+        colorbuttons = dynamic_cast<cVeDmColorbuttons*>(viewElementsHorizontal[(int)eVeDisplayMenu::colorbuttons]);
+    else if (viewElements[(int)eVeDisplayMenu::colorbuttons])
+        colorbuttons = dynamic_cast<cVeDmColorbuttons*>(viewElements[(int)eVeDisplayMenu::colorbuttons]);
+
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenu::scrollbar])
+        scrollbar = dynamic_cast<cVeDmScrollbar*>(viewElementsHorizontal[(int)eVeDisplayMenu::scrollbar]);
+    else if (viewElements[(int)eVeDisplayMenu::scrollbar])
+        scrollbar = dynamic_cast<cVeDmScrollbar*>(viewElements[(int)eVeDisplayMenu::scrollbar]);
+
+
+    if (attribs->Orientation() == eOrientation::horizontal)
+        viewList = viewListHorizontal;
+    else
+        viewList = viewListVertical;
+}
+
+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>("time", (int)eVeDisplayMenu::time));
+    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));
+    viewElementNames.insert(pair<string, int>("sortmode", (int)eVeDisplayMenu::sortmode));
+}
+
+/***********************************************************
+* cViewMenuDefault
+***********************************************************/
+cViewMenuDefault::cViewMenuDefault(const char *name) : cSubView(name) {
+    listDefault = NULL;
+}
+
+cViewMenuDefault::~cViewMenuDefault(void) {
+}
+
+void cViewMenuDefault::SetViewElementObjects(void) {
+    cSubView::SetViewElementObjects();
+    listDefault = dynamic_cast<cViewListDefault*>(viewList);
+}
+
+void cViewMenuDefault::SetTabs(int tab1, int tab2, int tab3, int tab4, int tab5) {
+    if (listDefault)
+        listDefault->SetTabs(tab1, tab2, tab3, tab4, tab5);
+}
+
+void cViewMenuDefault::SetPlugin(const char *plugName) {
+    listDefault->SetPlugin(plugName);
+}
+
+void cViewMenuDefault::SetItem(const char *text, int index, bool current, bool selectable) {
+    listDefault->Set(text, index, current, selectable);
+}
+
+const cFont *cViewMenuDefault::GetTextAreaFont(void) {
+    if (!listDefault)
+        return NULL;
+    return listDefault->GetListFont();
+}
+
+int cViewMenuDefault::GetListWidth(void) {
+    if (!listDefault)
+        return 0;
+    return listDefault->GetListWidth();
+}
+
+/************************************************************************************
+* cViewMenuMain
+************************************************************************************/
+cViewMenuMain::cViewMenuMain(const char *name) : cSubView(name) {
+    for (int i=0; i < numViewElements; i++) {
+        delete viewElements[i];
+    }
+    delete[] viewElements;
+    numViewElements = (int)eVeDisplayMenuMain::count;
+    viewElements = new cViewElement*[numViewElements];
+    for (int i=0; i < numViewElements; i++) {
+        viewElements[i] = NULL;
+    }
+    delete[] viewElementsHorizontal;
+    viewElementsHorizontal = new cViewElement*[numViewElements];
+    for (int i=0; i < numViewElements; i++) {
+        viewElementsHorizontal[i] = NULL;
+    }
+    listMain = NULL;
+    timers = NULL;
+    devices = NULL;
+    weather = NULL;
+    discusage = NULL;
+    load = NULL;
+    memory = NULL;
+    vdrstats = NULL;
+    temperatures = NULL;
+    currentSchedule = NULL;
+    lastRecordings = NULL;
+    customTokens = NULL;
+    lastDrawDynamic = 0;
+    SetViewElements();
+}
+
+cViewMenuMain::~cViewMenuMain() {
+}
+
+void cViewMenuMain::ClearVariables(void) {
+    init = true;
+}
+
+void cViewMenuMain::SetViewElements(void) {
+    viewElementNames.insert(pair<string, int>("timers", (int)eVeDisplayMenuMain::timers));
+    viewElementNames.insert(pair<string, int>("devices", (int)eVeDisplayMenuMain::devices));
+    viewElementNames.insert(pair<string, int>("currentweather", (int)eVeDisplayMenuMain::currentweather));
+    viewElementNames.insert(pair<string, int>("currentschedule", (int)eVeDisplayMenuMain::currentschedule));
+    viewElementNames.insert(pair<string, int>("discusage", (int)eVeDisplayMenuMain::discusage));
+    viewElementNames.insert(pair<string, int>("systemload", (int)eVeDisplayMenuMain::systemload));
+    viewElementNames.insert(pair<string, int>("systemmemory", (int)eVeDisplayMenuMain::systemmemory));
+    viewElementNames.insert(pair<string, int>("vdrstatistics", (int)eVeDisplayMenuMain::vdrstatistics));
+    viewElementNames.insert(pair<string, int>("temperatures", (int)eVeDisplayMenuMain::temperatures));
+    viewElementNames.insert(pair<string, int>("lastrecordings", (int)eVeDisplayMenuMain::lastrecordings));
+    viewElementNames.insert(pair<string, int>("customtokens", (int)eVeDisplayMenuMain::customtokens));
+}
+
+void cViewMenuMain::SetViewElementObjects(void) {
+    cSubView::SetViewElementObjects();
+    eOrientation orientation = attribs->Orientation();
+
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::timers])
+        timers = dynamic_cast<cVeDmTimers*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::timers]);
+    else if (viewElements[(int)eVeDisplayMenuMain::timers])
+        timers = dynamic_cast<cVeDmTimers*>(viewElements[(int)eVeDisplayMenuMain::timers]);
+    
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::devices])
+        devices = dynamic_cast<cVeDevices*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::devices]);
+    else if (viewElements[(int)eVeDisplayMenuMain::devices])
+        devices = dynamic_cast<cVeDevices*>(viewElements[(int)eVeDisplayMenuMain::devices]);
+
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::currentweather])
+        weather = dynamic_cast<cVeCurrentWeather*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::currentweather]);
+    else if (viewElements[(int)eVeDisplayMenuMain::currentweather])
+        weather = dynamic_cast<cVeCurrentWeather*>(viewElements[(int)eVeDisplayMenuMain::currentweather]);
+
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::currentschedule])
+        currentSchedule = dynamic_cast<cVeDmCurrentschedule*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::currentschedule]);
+    else if (viewElements[(int)eVeDisplayMenuMain::currentschedule])
+        currentSchedule = dynamic_cast<cVeDmCurrentschedule*>(viewElements[(int)eVeDisplayMenuMain::currentschedule]);
+
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::discusage])
+        discusage = dynamic_cast<cVeDmDiscusage*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::discusage]);
+    else if (viewElements[(int)eVeDisplayMenuMain::discusage])
+        discusage = dynamic_cast<cVeDmDiscusage*>(viewElements[(int)eVeDisplayMenuMain::discusage]);
+
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::systemload])
+        load = dynamic_cast<cVeDmSystemload*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::systemload]);
+    else if (viewElements[(int)eVeDisplayMenuMain::systemload])
+        load = dynamic_cast<cVeDmSystemload*>(viewElements[(int)eVeDisplayMenuMain::systemload]);
+
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::systemmemory])
+        memory = dynamic_cast<cVeDmSystemmemory*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::systemmemory]);
+    else if (viewElements[(int)eVeDisplayMenuMain::systemmemory])
+        memory = dynamic_cast<cVeDmSystemmemory*>(viewElements[(int)eVeDisplayMenuMain::systemmemory]);
+
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::vdrstatistics])
+        vdrstats = dynamic_cast<cVeDmVdrstatistics*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::vdrstatistics]);
+    else if (viewElements[(int)eVeDisplayMenuMain::vdrstatistics])
+        vdrstats = dynamic_cast<cVeDmVdrstatistics*>(viewElements[(int)eVeDisplayMenuMain::vdrstatistics]);
+
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::temperatures])
+        temperatures = dynamic_cast<cVeDmTemperatures*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::temperatures]);
+    else if (viewElements[(int)eVeDisplayMenuMain::temperatures])
+        temperatures = dynamic_cast<cVeDmTemperatures*>(viewElements[(int)eVeDisplayMenuMain::temperatures]);
+
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::lastrecordings])
+        lastRecordings = dynamic_cast<cVeDmLastrecordings*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::lastrecordings]);
+    else if (viewElements[(int)eVeDisplayMenuMain::lastrecordings])
+        lastRecordings = dynamic_cast<cVeDmLastrecordings*>(viewElements[(int)eVeDisplayMenuMain::lastrecordings]);
+
+    if (orientation == eOrientation::horizontal && viewElementsHorizontal[(int)eVeDisplayMenuMain::customtokens])
+        customTokens = dynamic_cast<cVeCustomTokens*>(viewElementsHorizontal[(int)eVeDisplayMenuMain::customtokens]);
+    else if (viewElements[(int)eVeDisplayMenuMain::customtokens])
+        customTokens = dynamic_cast<cVeCustomTokens*>(viewElements[(int)eVeDisplayMenuMain::customtokens]);
+
+    if (devices) devices->SetDetached();
+    if (weather) weather->SetDetached();
+    if (discusage) discusage->SetDetached();
+    if (load) load->SetDetached();
+    if (memory) memory->SetDetached();
+    if (vdrstats) vdrstats->SetDetached();
+    if (temperatures) temperatures->SetDetached();
+    if (timers) timers->SetDetached();
+    if (currentSchedule) currentSchedule->SetDetached();
+    if (lastRecordings) lastRecordings->SetDetached();
+    if (customTokens) customTokens->SetDetached();
+
+    listMain = dynamic_cast<cViewListMain*>(viewList);
+}
+
+void cViewMenuMain::Clear(void) {
+    cSubView::Clear();
+    lastDrawDynamic = 0;
+
+    if (devices)
+        devices->Hide();
+
+    if (weather)
+        weather->Hide();
+
+    if (discusage)
+        discusage->Hide();
+    
+    if (load) {
+        load->Reset();
+        load->Hide();
+    }
+    
+    if (memory) {
+        memory->Reset();
+        memory->Hide();
+    }
+    
+    if (vdrstats) {
+        vdrstats->Reset();
+        vdrstats->Hide();
+    }
+    
+    if (temperatures) {
+        temperatures->Reset();
+        temperatures->Hide();
+    }
+    
+    if (timers) {
+        timers->Hide();
+    }
+    
+    if (currentSchedule) {
+        currentSchedule->Hide();
+    }
+    
+    if (lastRecordings) {
+        lastRecordings->Hide();
+    }
+    
+    if (customTokens) {
+        customTokens->Reset();
+        customTokens->Hide();
+    }
+}
+
+void cViewMenuMain::SetItem(const char *text, int index, bool current, bool selectable) {
+    listMain->Set(text, index, current, selectable);
+}
+
+void cViewMenuMain::SetCurrentRecording(const char *currentRec) {
+    if (currentSchedule)
+        currentSchedule->SetRecording(currentRec);
+}
+
+void cViewMenuMain::DrawStaticVEs(void) {
+    cSubView::DrawStaticVEs();
+    if (weather) {
+        weather->Show();
+        if (weather->Parse())
+            weather->Render();
+    }
+    if (discusage) {
+        discusage->Show();
+        if (discusage->Parse())
+            discusage->Render();
+    }
+    if (timers) {
+        timers->Show();
+        if (timers->Parse())
+            timers->Render();
+    }
+    if (currentSchedule) {
+        currentSchedule->Show();
+        if (currentSchedule->Parse())
+            currentSchedule->Render();
+    }
+    if (lastRecordings) {
+        lastRecordings->Show();
+        if (lastRecordings->Parse())
+            lastRecordings->Render();
+    }
+}
+
+void cViewMenuMain::DrawDynamicVEs(void) {
+    cSubView::DrawDynamicVEs();
+    //draw main menu dynamic elements 
+    //only every 3 seconds
+    uint64_t now = cTimeMs::Now();
+    if (now - lastDrawDynamic < 3000)
+        return;
+    else {
+        lastDrawDynamic = now;
+    }
+
+    if (devices) {
+        devices->Show();
+        if (devices->Parse())
+            devices->Render();
+    }
+    if (load) {
+        load->Show();
+        if (load->Parse())
+            load->Render();
+    }
+    if (memory) {
+        memory->Show();
+        if (memory->Parse())
+            memory->Render();
+    }
+    if (vdrstats) {
+        vdrstats->Show();
+        if (vdrstats->Parse())
+            vdrstats->Render();
+    }
+    if (temperatures) {
+        temperatures->Show();
+        if (temperatures->Parse())
+            temperatures->Render();
+    }
+    if (customTokens) {
+        customTokens->Show();
+        if (customTokens->Parse())
+            customTokens->Render();
+    }
+}
+
+const char *cViewMenuMain::GetPlugin(void) {
+    return listMain->GetPlugin();
+}
+
+/***********************************************************
+* cViewMenuSetup
+***********************************************************/
+cViewMenuSetup::cViewMenuSetup(const char *name) : cSubView(name) {
+    listSetup = NULL;
+}
+
+cViewMenuSetup::~cViewMenuSetup(void) {
+    
+}
+
+void cViewMenuSetup::SetViewElementObjects(void) {
+    cSubView::SetViewElementObjects();
+    listSetup = dynamic_cast<cViewListMain*>(viewList);
+}
+
+void cViewMenuSetup::SetItem(const char *text, int index, bool current, bool selectable) {
+    listSetup->Set(text, index, current, selectable);
+}
+
+/***********************************************************
+* cViewMenuSchedules
+***********************************************************/
+cViewMenuSchedules::cViewMenuSchedules(const char *name) : cSubView(name) {
+    listSchedules = NULL;
+}
+
+cViewMenuSchedules::~cViewMenuSchedules(void) {
+}
+
+void cViewMenuSchedules::SetViewElementObjects(void) {
+    cSubView::SetViewElementObjects();
+    listSchedules = dynamic_cast<cViewListSchedules*>(viewList);
+}
+
+void cViewMenuSchedules::SetItem(const cEvent *event, int index, bool current, bool selectable, 
+                             const cChannel *channel, bool withDate, eTimerMatch timerMatch) {
+    
+    bool epgSearchFavMenu = (menuCat == mcSchedule && channel) ? true : false;
+    listSchedules->IsEpgSearchFav(epgSearchFavMenu);
+    if (header) header->IsEpgSearchFav(epgSearchFavMenu);
+    listSchedules->Set(event, index, current, selectable, channel, withDate, timerMatch);
+}
+
+/***********************************************************
+* cViewMenuChannels
+***********************************************************/
+cViewMenuChannels::cViewMenuChannels(const char *name) : cSubView(name) {
+    listChannels = NULL;
+}
+
+cViewMenuChannels::~cViewMenuChannels(void) {
+}
+
+void cViewMenuChannels::SetViewElementObjects(void) {
+    cSubView::SetViewElementObjects();
+    listChannels = dynamic_cast<cViewListChannels*>(viewList);
+}
+
+void cViewMenuChannels::SetItem(const cChannel *channel, int index, bool current, bool selectable, bool withProvider) {
+    listChannels->Set(channel, index, current, selectable, withProvider);
+}
+
+/***********************************************************
+* cViewMenuTimers
+***********************************************************/
+cViewMenuTimers::cViewMenuTimers(const char *name) : cSubView(name) {
+    listTimers = NULL;
+}
+
+cViewMenuTimers::~cViewMenuTimers(void) {    
+}
+
+void cViewMenuTimers::SetViewElementObjects(void) {
+    cSubView::SetViewElementObjects();
+    listTimers = dynamic_cast<cViewListTimers*>(viewList);
+}
+
+void cViewMenuTimers::SetItem(const cTimer *timer, int index, bool current, bool selectable) {
+    listTimers->Set(timer, index, current, selectable);
+}
+
+/***********************************************************
+* cViewMenuRecordings
+***********************************************************/
+cViewMenuRecordings::cViewMenuRecordings(const char *name) : cSubView(name) {
+    listRecordings = NULL;
+}
+
+cViewMenuRecordings::~cViewMenuRecordings(void) {
+}
+
+void cViewMenuRecordings::SetViewElementObjects(void) {
+    cSubView::SetViewElementObjects();
+    listRecordings = dynamic_cast<cViewListRecordings*>(viewList);
+}
+
+void cViewMenuRecordings::SetItem(const cRecording *recording, int index, bool current, bool selectable, int level, int total, int New) {
+    listRecordings->Set(recording, index, current, selectable, level, total, New);
+}
+
+/***********************************************************
+* cViewMenuPlugin
+***********************************************************/
+cViewMenuPlugin::cViewMenuPlugin(const char *name) : cSubView(name) {
+    listPlugin = NULL;
+}
+
+cViewMenuPlugin::~cViewMenuPlugin(void) {
+}
+
+void cViewMenuPlugin::SetViewElementObjects(void) {
+    cSubView::SetViewElementObjects();
+    listPlugin = dynamic_cast<cViewListPlugin*>(viewList);
+}
+
+void cViewMenuPlugin::SetItem(skindesignerapi::cTokenContainer *tk, int index, bool current, bool selectable) {
+    listPlugin->Set(tk, index, current, selectable);
+}
+
+/***********************************************************
+* cViewMenuDetail
+***********************************************************/
+cViewMenuDetail::cViewMenuDetail(const char *name) : cSubView(name) {
+    firstTab = true;
+    for (int i=0; i < numViewElements; i++) {
+        delete viewElements[i];
+    }
+    delete[] viewElements;
+    numViewElements = (int)eVeDisplayDetailedMenu::count;
+    viewElements = new cViewElement*[numViewElements];
+    for (int i=0; i < numViewElements; i++) {
+        viewElements[i] = NULL;
+    }
+    delete[] viewElementsHorizontal;
+    viewElementsHorizontal = new cViewElement*[numViewElements];
+    for (int i=0; i < numViewElements; i++) {
+        viewElementsHorizontal[i] = NULL;
+    }    
+    SetViewElements();
+    detailedheaderEpg = NULL;
+    detailedheaderRec = NULL;
+    detailedheaderPlug = NULL;
+    tablabels = NULL;
+    detailViewEpg = NULL;
+    detailViewRec = NULL;
+    detailViewText = NULL;
+    detailViewPlugin = NULL;
+    SetDetailedView();
+}
+
+cViewMenuDetail::~cViewMenuDetail(void) {
+}
+
+void cViewMenuDetail::SetDetailedView(void) {
+    if (!strcmp(viewName, "menudetailedepg")) {
+        detailViewEpg = new cViewDetailEpg();
+        detailView = detailViewEpg;
+    } else if (!strcmp(viewName, "menudetailedrecording")) {
+        detailViewRec = new cViewDetailRec();
+        detailView = detailViewRec;
+    } else if (!strcmp(viewName, "menudetailedtext")) {
+        detailViewText = new cViewDetailText();
+        detailView = detailViewText;
+    } else if (startswith(viewName, "menuplugin")) {
+        detailViewPlugin = new cViewDetailPlugin();
+        detailView = detailViewPlugin;
+    } else {
+        esyslog("skindesigner: invalid detailedview %s", viewName);
+    }    
+    if (detailView) {
+        detailView->SetOsd(&sdOsd);
+    }
+}
+
+void cViewMenuDetail::AddTab(cArea *tab) {
+    if (firstTab) {
+        tab->SetActiveTab(true);
+        firstTab = false;
+    }
+    detailView->AddArea(tab);
+}
+
+void cViewMenuDetail::SetGlobals(cGlobals *globals) {
+    cView::SetGlobals(globals);
+    detailView->SetGlobals(globals);
+}
+
+void cViewMenuDetail::PreCache(void) {
+    attribs->SetContainer(container.X(), container.Y(), container.Width(), container.Height());
+    attribs->Cache();
+    if (plugId >= 0 && plugMenuId >= 0) {
+        cVeDmDetailheaderPlugin *dhPlug = dynamic_cast<cVeDmDetailheaderPlugin*>(viewElements[(int)eVeDisplayDetailedMenu::detailheader]);
+        dhPlug->SetPlugId(plugId);
+        dhPlug->SetPlugMenuId(plugMenuId);
+        dhPlug->SetTokenContainer();
+    }
+    cView::PreCache();
+    detailView->SetPlugId(plugId);
+    detailView->SetPlugMenuId(plugMenuId);
+    detailView->SetTokenContainer();
+    detailView->SetContainer(attribs->X(), attribs->Y(), attribs->Width(), attribs->Height());
+    detailView->Cache();
+}
+
+int cViewMenuDetail::GetWidth(void) {
+    return detailView->GetWidth();
+}
+
+void cViewMenuDetail::SetViewElements(void) {
+    viewElementNames.insert(pair<string, int>("detailheader", (int)eVeDisplayDetailedMenu::detailheader));
+    viewElementNames.insert(pair<string, int>("tablabels", (int)eVeDisplayDetailedMenu::tablabels));
+}
+
+void cViewMenuDetail::SetViewElementObjects(void) {
+    cSubView::SetViewElementObjects();
+    if (viewElements[(int)eVeDisplayDetailedMenu::detailheader]) {
+        if (!strcmp(viewName, "menudetailedepg"))
+            detailedheaderEpg = dynamic_cast<cVeDmDetailheaderEpg*>(viewElements[(int)eVeDisplayDetailedMenu::detailheader]);
+        else if (!strcmp(viewName, "menudetailedrecording"))
+            detailedheaderRec = dynamic_cast<cVeDmDetailheaderRec*>(viewElements[(int)eVeDisplayDetailedMenu::detailheader]);
+        else if (startswith(viewName, "menuplugin"))
+            detailedheaderPlug = dynamic_cast<cVeDmDetailheaderPlugin*>(viewElements[(int)eVeDisplayDetailedMenu::detailheader]);
+    }
+    
+    if (viewElements[(int)eVeDisplayDetailedMenu::tablabels])
+        tablabels = dynamic_cast<cVeDmTablabels*>(viewElements[(int)eVeDisplayDetailedMenu::tablabels]);
+}
+
+void cViewMenuDetail::SetEvent(const cEvent *event) {
+    if (detailedheaderEpg)
+        detailedheaderEpg->SetEvent(event);
+    if (detailViewEpg)
+        detailViewEpg->SetEvent(event);
+}
+
+void cViewMenuDetail::SetRecording(const cRecording *recording) {
+    if (detailedheaderRec)
+        detailedheaderRec->SetRecording(recording);
+    if (detailViewRec)
+        detailViewRec->SetRecording(recording);
+}
+
+void cViewMenuDetail::SetText(const char *text) {
+    if (detailViewText)
+        detailViewText->SetText(text);
+}
+
+void cViewMenuDetail::SetPluginText(skindesignerapi::cTokenContainer *tk) {
+    if (detailedheaderPlug)
+        detailedheaderPlug->Set(tk);
+    if (detailViewPlugin)
+        detailViewPlugin->Set(tk);
+}
+
+void cViewMenuDetail::Clear(void) {
+    cSubView::Clear();
+    cSubView::Close();
+    if (detailedheaderEpg) {
+        detailedheaderEpg->Close();
+    } else if (detailedheaderRec) {
+        detailedheaderRec->Close();
+    } else if (detailedheaderPlug) {
+        detailedheaderPlug->Close();
+    }
+    if (header) {
+        header->Hide();
+    }
+    if (detailView) {
+        detailView->Close();
+    }
+}
+
+void cViewMenuDetail::Close(void) {
+    cSubView::Clear();
+    cSubView::Close();
+    if (detailView) {
+        detailView->Close();
+    }
+}
+
+void cViewMenuDetail::DrawStaticVEs(void) {
+    cSubView::DrawStaticVEs();
+    if (detailedheaderEpg && detailedheaderEpg->Parse()) {
+        detailedheaderEpg->Render();
+    } else if (detailedheaderRec && detailedheaderRec->Parse()) {
+        detailedheaderRec->Render();
+    } else if (detailedheaderPlug && detailedheaderPlug->Parse()) {
+        detailedheaderPlug->Render();
+    }
+}
+
+void cViewMenuDetail::DrawDynamicVEs(void) {
+    if (datetime) {
+        datetime->Show();
+        if (datetime->Parse())
+            datetime->Render();
+    }
+    if (time) {
+        time->Show();
+        if (time->Parse())
+            time->Render();
+    }
+}
+
+void cViewMenuDetail::DrawDetailedView(void) {
+    detailView->Clear();
+    detailView->ResetTabs();
+    if (detailView->Parse()) {
+        detailView->Render();
+    }
+    if (scrollbar) {
+        scrollbar->Show();
+        DrawScrollbar();
+    }
+    vector<const char*> tabs;
+    int activeTab = detailView->GetTabs(tabs);
+    if (tablabels) {        
+        tablabels->SetTabs(tabs);
+        tablabels->SetActiveTab(activeTab);
+        if (tablabels->Parse())
+            tablabels->Render();
+    }
+}
+
+void cViewMenuDetail::KeyLeft(void) {
+    if (detailView->NumTabs() > 1) {
+        detailView->Clear();
+        detailView->PrevTab();
+        detailView->SetDirty();
+        if (tablabels) {
+            tablabels->Clear();
+            tablabels->SetActiveTab(detailView->ActiveTab());
+            if (tablabels->Parse())
+                tablabels->Render();
+        }
+        sdOsd.Flush();
+        detailView->Render();
+        if (scrollbar) {
+            DrawScrollbar();
+        }
+    } else {
+        //scroll page
+        if (detailView->ScrollUp(true)) {
+            if (scrollbar)
+                DrawScrollbar();
+        }
+    }
+}
+
+void cViewMenuDetail::KeyRight(void) {
+    if (detailView->NumTabs() > 1) {
+        detailView->Clear();
+        detailView->NextTab();
+        detailView->SetDirty();
+        if (tablabels) {
+            tablabels->Clear();
+            tablabels->SetActiveTab(detailView->ActiveTab());
+            if (tablabels->Parse())
+                tablabels->Render();
+        }
+        sdOsd.Flush();
+        detailView->Render();
+        if (scrollbar) {
+            DrawScrollbar();
+        }
+        
+    } else {
+        //scroll page
+        if (detailView->ScrollDown(true)) {
+            if (scrollbar)
+                DrawScrollbar();
+        }
+    }
+}
+
+void cViewMenuDetail::KeyUp(void) {
+    if (detailView->ScrollUp()) {
+        if (scrollbar)
+            DrawScrollbar();
+    }
+}
+
+void cViewMenuDetail::KeyDown(void) {
+    if (scrollbar && detailView->ScrollDown()) {
+        if (scrollbar)
+            DrawScrollbar();
+    }
+}
+
+void cViewMenuDetail::SetTransparency(int transparency, bool forceDetached) {
+    if (detailedheaderEpg)
+        detailedheaderEpg->SetTransparency(transparency);
+    if (detailedheaderRec)
+        detailedheaderRec->SetTransparency(transparency);
+    if (tablabels)
+        tablabels->SetTransparency(transparency);
+    if (detailView)
+        detailView->SetTransparency(transparency);
+}
+
+void cViewMenuDetail::DrawScrollbar(void) {
+    int barheight = 0;
+    int offset = 0;
+    bool end = true;
+    detailView->Scrollbar(barheight, offset, end);
+    scrollbar->SetDetail(barheight, offset, end);
+    scrollbar->Render();    
+}
diff --git a/coreengine/viewdisplaymenu.h b/coreengine/viewdisplaymenu.h
index d6d18db..1e3e624 100644
--- a/coreengine/viewdisplaymenu.h
+++ b/coreengine/viewdisplaymenu.h
@@ -1,325 +1,325 @@
-#ifndef __VIEWDISPLAYMENU_H

-#define __VIEWDISPLAYMENU_H

-

-#include "view.h"

-#include "viewdetail.h"

-

-#if defined(APIVERSNUM) && APIVERSNUM < 20301

-#ifndef MENU_ORIENTATION_DEFINED

-enum eMenuOrientation {

-    moVertical = 0,

-    moHorizontal

-};

-#endif

-#endif

-

-/***********************************************************

-* cViewMenu

-***********************************************************/

-class cSubView;

-class cViewMenuDefault;

-class cViewMenuMain;

-class cViewMenuSetup;

-class cViewMenuSchedules;

-class cViewMenuChannels;

-class cViewMenuTimers;

-class cViewMenuRecordings;

-class cViewMenuDetail;

-

-class cViewMenu : public cView {

-protected:

-    map<string,int> subviewNames;

-    cSubView **subViews;

-    int numSubviews;

-    cSubView *activeSubview;

-    cSubView *activeSubviewLast;

-    cViewMenuDefault    *menuDefault;

-    cViewMenuMain       *menuMain;

-    cViewMenuSetup      *menuSetup;

-    cViewMenuSchedules  *menuSchedules;

-    cViewMenuChannels   *menuChannels;

-    cViewMenuTimers     *menuTimers;

-    cViewMenuRecordings *menuRecordings;

-    cViewMenuDetail     *menuDetailedEpg;

-    cViewMenuDetail     *menuDetailedRec;

-    cViewMenuDetail     *menuDetailedText;

-    eMenuCategory menuCat;

-    //name of current plugin for menu icon

-    const char *plugName;

-    //external plugin menus

-    bool pluginIdSet;

-    int plugId;

-    int plugMenuId;

-    //status variables

-    bool menuChange;

-    bool listChange;

-    bool detailViewInit;

-    void SetViewElements(void);

-    void SetViewElementObjects(void);

-    void SetSubViews(void);

-    void ClearVariables(void);

-    int SubviewId(const char *name);

-    bool SetPluginSubView(eMenuCategory menuCat);

-    void WakeViewElements(void);

-public:

-    cViewMenu(void);

-    virtual ~cViewMenu(void);

-    void SetGlobals(cGlobals *globals);

-    void PreCache(void);

-    bool ValidSubView(const char *subView);

-    static cSubView *CreateSubview(const char *name);

-    static cSubView *CreatePluginview(const char *plugname, int plugId, int menuNumber, int menuType);

-    void AddSubview(const char *sSubView, cSubView *subView);

-    void AddPluginview(cSubView *plugView);

-    void SetSubView(eMenuCategory MenuCat);

-    void SetSortMode(eMenuSortMode sortMode);

-    void SetPluginMenu(int plugId, int plugMenuId);

-    int NumListItems(void);

-    eMenuOrientation MenuOrientation(void);

-    const cFont *GetTextAreaFont(void);

-    int GetTextAreaWidth(void);

-    int GetListWidth(void);

-    void SetTitleHeader(const char *title);

-    void SetChannelHeader(const cEvent *event);

-    void SetMessage(eMessageType type, const char *text);

-    void SetMenuButtons(const char *red, const char *green, const char *yellow, const char *blue);

-    void SetScrollbar(int total, int offset);

-    void SetTabs(int tab1, int tab2, int tab3, int tab4, int tab5);

-    void SetItem(const char *text, int index, bool current, bool selectable);

-    bool SetItemEvent(const cEvent *event, int index, bool current, bool selectable, const cChannel *channel, bool withDate, eTimerMatch timerMatch);

-    bool SetItemTimer(const cTimer *timer, int index, bool current, bool selectable);

-    bool SetItemChannel(const cChannel *channel, int index, bool current, bool selectable, bool withProvider);

-    bool SetItemRecording(const cRecording *recording, int index, bool current, bool selectable, int level, int total, int New);

-    bool SetItemPlugin(skindesignerapi::cTokenContainer *tk, int index, bool current, bool selectable);

-    void SetEvent(const cEvent *event);

-    void SetRecording(const cRecording *recording);

-    void SetText(const char *text);

-    bool SetPluginText(skindesignerapi::cTokenContainer *tk);

-    void SetCurrentRecording(const char *currentRec);

-    void KeyDetailView(bool up, bool page);

-    bool Init(void);

-    void Close(void);

-    void Clear(void);

-    void Flush(void);

-    void SetTransparency(int transparency, bool forceDetached = false);

-    void Debug(void);

-};

-

-/***********************************************************

-* cSubView

-***********************************************************/

-class cSubView : public cView {

-protected:

-    eMenuCategory menuCat;

-    int plugId;

-    int plugMenuId;

-    cViewList *viewList;

-    cViewList *viewListVertical;

-    cViewList *viewListHorizontal;

-    cViewElement *background;

-    cVeDmHeader *header;

-    cVeDateTime *datetime;

-    cVeTime *time;

-    cVeMessage *message;

-    cVeDmSortmode *sortmode;

-    cVeDmColorbuttons *colorbuttons;

-    cVeDmScrollbar *scrollbar;

-    virtual void SetViewElementObjects(void);

-    virtual void SetViewElements(void);

-public:

-    cSubView(const char *name);

-    virtual ~cSubView(void);

-    virtual void SetGlobals(cGlobals *globals);

-    virtual void PreCache(void);

-    bool ViewElementSet(int ve);

-    bool ViewElementHorizontalSet(int ve);

-    void SetViewElement(eVeDisplayMenu ve, cViewElement *viewElement);

-    void SetViewElementHorizontal(eVeDisplayMenu ve, cViewElement *viewElement);

-    void AddViewList(cViewList *viewList);

-    virtual void AddTab(cArea *tab) {};

-    int NumListItems(void);

-    eMenuOrientation MenuOrientation(void);

-    void SetMenuCategory(eMenuCategory menuCat) { this->menuCat = menuCat; };

-    void SetPlugId(int id) { plugId = id; };

-    void SetPlugMenuId(int id) { plugMenuId = id; };

-    void SetTitle(const char *title);

-    void SetMessage(eMessageType type, const char *text);

-    void SetChannel(const cChannel *channel);

-    void SetMenuButtons(const char *red, const char *green, const char *yellow, const char *blue);

-    void SetScrollbar(int total, int offset);

-    void SetSortMode(eMenuSortMode sortMode);

-    virtual void Close(void);

-    virtual void Clear(void);

-    void ClearViewList(void);

-    void WakeViewElements(void);

-    virtual void DrawStaticVEs(void);

-    virtual void DrawDynamicVEs(void);

-    void DrawList(void);

-    virtual void DrawDetailedView(void) {};

-    virtual void UpdateDetailedView(void) {};

-    void SetTransparency(int transparency, bool forceDetached = false);

-};

-/***********************************************************

-* cViewMenuDefault

-***********************************************************/

-class cViewMenuDefault : public cSubView {

-private:

-    cViewListDefault *listDefault;

-    void SetViewElementObjects(void);

-public:

-    cViewMenuDefault(const char *name);

-    virtual ~cViewMenuDefault(void);

-    void SetTabs(int tab1, int tab2, int tab3, int tab4, int tab5);

-    void SetPlugin(const char *plugName);

-    void SetItem(const char *text, int index, bool current, bool selectable);

-    const cFont *GetTextAreaFont(void);

-    int GetListWidth(void);

-};

-/***********************************************************

-* cViewMenuMain

-***********************************************************/

-class cViewMenuMain : public cSubView {

-private:

-    cViewListMain *listMain;

-    cVeDmTimers *timers;

-    cVeDevices *devices;

-    cVeCurrentWeather *weather;

-    cVeDmDiscusage *discusage;

-    cVeDmSystemload *load;

-    cVeDmSystemmemory *memory;

-    cVeDmVdrstatistics *vdrstats;

-    cVeDmTemperatures *temperatures;

-    cVeDmCurrentschedule *currentSchedule;

-    cVeDmLastrecordings *lastRecordings;

-    cVeCustomTokens *customTokens;

-    uint64_t lastDrawDynamic;

-    void ClearVariables(void);

-    void SetViewElements(void);

-    void SetViewElementObjects(void);

-public:

-    cViewMenuMain(const char *name);

-    virtual ~cViewMenuMain(void);

-    void Clear(void);

-    void SetItem(const char *text, int index, bool current, bool selectable);

-    void SetCurrentRecording(const char *currentRec);

-    void DrawStaticVEs(void);

-    void DrawDynamicVEs(void);

-    const char *GetPlugin(void);

-};

-/***********************************************************

-* cViewMenuSetup

-***********************************************************/

-class cViewMenuSetup : public cSubView {

-private:

-    cViewListMain *listSetup;

-    void SetViewElementObjects(void);

-public:

-    cViewMenuSetup(const char *name);

-    virtual ~cViewMenuSetup(void);

-    void SetItem(const char *text, int index, bool current, bool selectable);

-};

-/***********************************************************

-* cViewMenuSchedules

-***********************************************************/

-class cViewMenuSchedules : public cSubView {

-private:

-    cViewListSchedules *listSchedules;

-    void SetViewElementObjects(void);

-public:

-    cViewMenuSchedules(const char *name);

-    virtual ~cViewMenuSchedules(void);

-    void SetItem(const cEvent *event, int index, bool current, bool selectable, const cChannel *channel, bool withDate, eTimerMatch timerMatch);

-};

-/***********************************************************

-* cViewMenuChannels

-***********************************************************/

-class cViewMenuChannels : public cSubView {

-private:

-    cViewListChannels *listChannels;

-    void SetViewElementObjects(void);

-public:

-    cViewMenuChannels(const char *name);

-    virtual ~cViewMenuChannels(void);

-    void SetItem(const cChannel *channel, int index, bool current, bool selectable, bool withProvider);

-};

-/***********************************************************

-* cViewMenuTimers

-***********************************************************/

-class cViewMenuTimers : public cSubView {

-private:

-    cViewListTimers *listTimers;

-    void SetViewElementObjects(void);

-public:

-    cViewMenuTimers(const char *name);

-    virtual ~cViewMenuTimers(void);

-    void SetItem(const cTimer *timer, int index, bool current, bool selectable);

-};

-/***********************************************************

-* cViewMenuRecordings

-***********************************************************/

-class cViewMenuRecordings : public cSubView {

-private:

-    cViewListRecordings *listRecordings;

-    void SetViewElementObjects(void);

-public:

-    cViewMenuRecordings(const char *name);

-    virtual ~cViewMenuRecordings(void);

-    void SetItem(const cRecording *recording, int index, bool current, bool selectable, int level, int total, int New);

-};

-

-/***********************************************************

-* cViewMenuPlugins

-***********************************************************/

-class cViewMenuPlugin : public cSubView {

-private:

-    cViewListPlugin *listPlugin;

-    void SetViewElementObjects(void);

-public:

-    cViewMenuPlugin(const char *name);

-    virtual ~cViewMenuPlugin(void);

-    void SetItem(skindesignerapi::cTokenContainer *tk, int index, bool current, bool selectable);

-};

-

-/***********************************************************

-* cViewMenuDetail

-***********************************************************/

-class cViewMenuDetail : public cSubView {

-private:

-    bool firstTab;

-    cVeDmDetailheaderEpg *detailedheaderEpg;

-    cVeDmDetailheaderRec *detailedheaderRec;

-    cVeDmDetailheaderPlugin *detailedheaderPlug;

-    cVeDmTablabels *tablabels;

-    cViewDetail *detailView;

-    cViewDetailEpg *detailViewEpg;

-    cViewDetailRec *detailViewRec;

-    cViewDetailText *detailViewText;

-    cViewDetailPlugin *detailViewPlugin;

-    void SetDetailedView(void);

-    void SetViewElements(void);

-    void SetViewElementObjects(void);

-    void DrawScrollbar(void);

-public:

-    cViewMenuDetail(const char *name);

-    virtual ~cViewMenuDetail(void);

-    void SetGlobals(cGlobals *globals);

-    void AddTab(cArea *tab);

-    void PreCache(void);

-    int GetWidth(void);

-    void SetEvent(const cEvent *event);

-    void SetRecording(const cRecording *recording);

-    void SetText(const char *text);

-    void SetPluginText(skindesignerapi::cTokenContainer *tk);

-    void Clear(void);

-    void Close(void);

-    void DrawStaticVEs(void);

-    void DrawDynamicVEs(void);

-    void DrawDetailedView(void);

-    void KeyLeft(void);

-    void KeyRight(void);

-    void KeyUp(void);

-    void KeyDown(void);

-    void SetTransparency(int transparency, bool forceDetached = false);

-};

-

+#ifndef __VIEWDISPLAYMENU_H
+#define __VIEWDISPLAYMENU_H
+
+#include "view.h"
+#include "viewdetail.h"
+
+#if defined(APIVERSNUM) && APIVERSNUM < 20301
+#ifndef MENU_ORIENTATION_DEFINED
+enum eMenuOrientation {
+    moVertical = 0,
+    moHorizontal
+};
+#endif
+#endif
+
+/***********************************************************
+* cViewMenu
+***********************************************************/
+class cSubView;
+class cViewMenuDefault;
+class cViewMenuMain;
+class cViewMenuSetup;
+class cViewMenuSchedules;
+class cViewMenuChannels;
+class cViewMenuTimers;
+class cViewMenuRecordings;
+class cViewMenuDetail;
+
+class cViewMenu : public cView {
+protected:
+    map<string,int> subviewNames;
+    cSubView **subViews;
+    int numSubviews;
+    cSubView *activeSubview;
+    cSubView *activeSubviewLast;
+    cViewMenuDefault    *menuDefault;
+    cViewMenuMain       *menuMain;
+    cViewMenuSetup      *menuSetup;
+    cViewMenuSchedules  *menuSchedules;
+    cViewMenuChannels   *menuChannels;
+    cViewMenuTimers     *menuTimers;
+    cViewMenuRecordings *menuRecordings;
+    cViewMenuDetail     *menuDetailedEpg;
+    cViewMenuDetail     *menuDetailedRec;
+    cViewMenuDetail     *menuDetailedText;
+    eMenuCategory menuCat;
+    //name of current plugin for menu icon
+    const char *plugName;
+    //external plugin menus
+    bool pluginIdSet;
+    int plugId;
+    int plugMenuId;
+    //status variables
+    bool menuChange;
+    bool listChange;
+    bool detailViewInit;
+    void SetViewElements(void);
+    void SetViewElementObjects(void);
+    void SetSubViews(void);
+    void ClearVariables(void);
+    int SubviewId(const char *name);
+    bool SetPluginSubView(eMenuCategory menuCat);
+    void WakeViewElements(void);
+public:
+    cViewMenu(void);
+    virtual ~cViewMenu(void);
+    void SetGlobals(cGlobals *globals);
+    void PreCache(void);
+    bool ValidSubView(const char *subView);
+    static cSubView *CreateSubview(const char *name);
+    static cSubView *CreatePluginview(const char *plugname, int plugId, int menuNumber, int menuType);
+    void AddSubview(const char *sSubView, cSubView *subView);
+    void AddPluginview(cSubView *plugView);
+    void SetSubView(eMenuCategory MenuCat);
+    void SetSortMode(eMenuSortMode sortMode);
+    void SetPluginMenu(int plugId, int plugMenuId);
+    int NumListItems(void);
+    eMenuOrientation MenuOrientation(void);
+    const cFont *GetTextAreaFont(void);
+    int GetTextAreaWidth(void);
+    int GetListWidth(void);
+    void SetTitleHeader(const char *title);
+    void SetChannelHeader(const cEvent *event);
+    void SetMessage(eMessageType type, const char *text);
+    void SetMenuButtons(const char *red, const char *green, const char *yellow, const char *blue);
+    void SetScrollbar(int total, int offset);
+    void SetTabs(int tab1, int tab2, int tab3, int tab4, int tab5);
+    void SetItem(const char *text, int index, bool current, bool selectable);
+    bool SetItemEvent(const cEvent *event, int index, bool current, bool selectable, const cChannel *channel, bool withDate, eTimerMatch timerMatch);
+    bool SetItemTimer(const cTimer *timer, int index, bool current, bool selectable);
+    bool SetItemChannel(const cChannel *channel, int index, bool current, bool selectable, bool withProvider);
+    bool SetItemRecording(const cRecording *recording, int index, bool current, bool selectable, int level, int total, int New);
+    bool SetItemPlugin(skindesignerapi::cTokenContainer *tk, int index, bool current, bool selectable);
+    void SetEvent(const cEvent *event);
+    void SetRecording(const cRecording *recording);
+    void SetText(const char *text);
+    bool SetPluginText(skindesignerapi::cTokenContainer *tk);
+    void SetCurrentRecording(const char *currentRec);
+    void KeyDetailView(bool up, bool page);
+    bool Init(void);
+    void Close(void);
+    void Clear(void);
+    void Flush(void);
+    void SetTransparency(int transparency, bool forceDetached = false);
+    void Debug(void);
+};
+
+/***********************************************************
+* cSubView
+***********************************************************/
+class cSubView : public cView {
+protected:
+    eMenuCategory menuCat;
+    int plugId;
+    int plugMenuId;
+    cViewList *viewList;
+    cViewList *viewListVertical;
+    cViewList *viewListHorizontal;
+    cViewElement *background;
+    cVeDmHeader *header;
+    cVeDateTime *datetime;
+    cVeTime *time;
+    cVeMessage *message;
+    cVeDmSortmode *sortmode;
+    cVeDmColorbuttons *colorbuttons;
+    cVeDmScrollbar *scrollbar;
+    virtual void SetViewElementObjects(void);
+    virtual void SetViewElements(void);
+public:
+    cSubView(const char *name);
+    virtual ~cSubView(void);
+    virtual void SetGlobals(cGlobals *globals);
+    virtual void PreCache(void);
+    bool ViewElementSet(int ve);
+    bool ViewElementHorizontalSet(int ve);
+    void SetViewElement(eVeDisplayMenu ve, cViewElement *viewElement);
+    void SetViewElementHorizontal(eVeDisplayMenu ve, cViewElement *viewElement);
+    void AddViewList(cViewList *viewList);
+    virtual void AddTab(cArea *tab) {};
+    int NumListItems(void);
+    eMenuOrientation MenuOrientation(void);
+    void SetMenuCategory(eMenuCategory menuCat) { this->menuCat = menuCat; };
+    void SetPlugId(int id) { plugId = id; };
+    void SetPlugMenuId(int id) { plugMenuId = id; };
+    void SetTitle(const char *title);
+    void SetMessage(eMessageType type, const char *text);
+    void SetChannel(const cChannel *channel);
+    void SetMenuButtons(const char *red, const char *green, const char *yellow, const char *blue);
+    void SetScrollbar(int total, int offset);
+    void SetSortMode(eMenuSortMode sortMode);
+    virtual void Close(void);
+    virtual void Clear(void);
+    void ClearViewList(void);
+    void WakeViewElements(void);
+    virtual void DrawStaticVEs(void);
+    virtual void DrawDynamicVEs(void);
+    void DrawList(void);
+    virtual void DrawDetailedView(void) {};
+    virtual void UpdateDetailedView(void) {};
+    void SetTransparency(int transparency, bool forceDetached = false);
+};
+/***********************************************************
+* cViewMenuDefault
+***********************************************************/
+class cViewMenuDefault : public cSubView {
+private:
+    cViewListDefault *listDefault;
+    void SetViewElementObjects(void);
+public:
+    cViewMenuDefault(const char *name);
+    virtual ~cViewMenuDefault(void);
+    void SetTabs(int tab1, int tab2, int tab3, int tab4, int tab5);
+    void SetPlugin(const char *plugName);
+    void SetItem(const char *text, int index, bool current, bool selectable);
+    const cFont *GetTextAreaFont(void);
+    int GetListWidth(void);
+};
+/***********************************************************
+* cViewMenuMain
+***********************************************************/
+class cViewMenuMain : public cSubView {
+private:
+    cViewListMain *listMain;
+    cVeDmTimers *timers;
+    cVeDevices *devices;
+    cVeCurrentWeather *weather;
+    cVeDmDiscusage *discusage;
+    cVeDmSystemload *load;
+    cVeDmSystemmemory *memory;
+    cVeDmVdrstatistics *vdrstats;
+    cVeDmTemperatures *temperatures;
+    cVeDmCurrentschedule *currentSchedule;
+    cVeDmLastrecordings *lastRecordings;
+    cVeCustomTokens *customTokens;
+    uint64_t lastDrawDynamic;
+    void ClearVariables(void);
+    void SetViewElements(void);
+    void SetViewElementObjects(void);
+public:
+    cViewMenuMain(const char *name);
+    virtual ~cViewMenuMain(void);
+    void Clear(void);
+    void SetItem(const char *text, int index, bool current, bool selectable);
+    void SetCurrentRecording(const char *currentRec);
+    void DrawStaticVEs(void);
+    void DrawDynamicVEs(void);
+    const char *GetPlugin(void);
+};
+/***********************************************************
+* cViewMenuSetup
+***********************************************************/
+class cViewMenuSetup : public cSubView {
+private:
+    cViewListMain *listSetup;
+    void SetViewElementObjects(void);
+public:
+    cViewMenuSetup(const char *name);
+    virtual ~cViewMenuSetup(void);
+    void SetItem(const char *text, int index, bool current, bool selectable);
+};
+/***********************************************************
+* cViewMenuSchedules
+***********************************************************/
+class cViewMenuSchedules : public cSubView {
+private:
+    cViewListSchedules *listSchedules;
+    void SetViewElementObjects(void);
+public:
+    cViewMenuSchedules(const char *name);
+    virtual ~cViewMenuSchedules(void);
+    void SetItem(const cEvent *event, int index, bool current, bool selectable, const cChannel *channel, bool withDate, eTimerMatch timerMatch);
+};
+/***********************************************************
+* cViewMenuChannels
+***********************************************************/
+class cViewMenuChannels : public cSubView {
+private:
+    cViewListChannels *listChannels;
+    void SetViewElementObjects(void);
+public:
+    cViewMenuChannels(const char *name);
+    virtual ~cViewMenuChannels(void);
+    void SetItem(const cChannel *channel, int index, bool current, bool selectable, bool withProvider);
+};
+/***********************************************************
+* cViewMenuTimers
+***********************************************************/
+class cViewMenuTimers : public cSubView {
+private:
+    cViewListTimers *listTimers;
+    void SetViewElementObjects(void);
+public:
+    cViewMenuTimers(const char *name);
+    virtual ~cViewMenuTimers(void);
+    void SetItem(const cTimer *timer, int index, bool current, bool selectable);
+};
+/***********************************************************
+* cViewMenuRecordings
+***********************************************************/
+class cViewMenuRecordings : public cSubView {
+private:
+    cViewListRecordings *listRecordings;
+    void SetViewElementObjects(void);
+public:
+    cViewMenuRecordings(const char *name);
+    virtual ~cViewMenuRecordings(void);
+    void SetItem(const cRecording *recording, int index, bool current, bool selectable, int level, int total, int New);
+};
+
+/***********************************************************
+* cViewMenuPlugins
+***********************************************************/
+class cViewMenuPlugin : public cSubView {
+private:
+    cViewListPlugin *listPlugin;
+    void SetViewElementObjects(void);
+public:
+    cViewMenuPlugin(const char *name);
+    virtual ~cViewMenuPlugin(void);
+    void SetItem(skindesignerapi::cTokenContainer *tk, int index, bool current, bool selectable);
+};
+
+/***********************************************************
+* cViewMenuDetail
+***********************************************************/
+class cViewMenuDetail : public cSubView {
+private:
+    bool firstTab;
+    cVeDmDetailheaderEpg *detailedheaderEpg;
+    cVeDmDetailheaderRec *detailedheaderRec;
+    cVeDmDetailheaderPlugin *detailedheaderPlug;
+    cVeDmTablabels *tablabels;
+    cViewDetail *detailView;
+    cViewDetailEpg *detailViewEpg;
+    cViewDetailRec *detailViewRec;
+    cViewDetailText *detailViewText;
+    cViewDetailPlugin *detailViewPlugin;
+    void SetDetailedView(void);
+    void SetViewElements(void);
+    void SetViewElementObjects(void);
+    void DrawScrollbar(void);
+public:
+    cViewMenuDetail(const char *name);
+    virtual ~cViewMenuDetail(void);
+    void SetGlobals(cGlobals *globals);
+    void AddTab(cArea *tab);
+    void PreCache(void);
+    int GetWidth(void);
+    void SetEvent(const cEvent *event);
+    void SetRecording(const cRecording *recording);
+    void SetText(const char *text);
+    void SetPluginText(skindesignerapi::cTokenContainer *tk);
+    void Clear(void);
+    void Close(void);
+    void DrawStaticVEs(void);
+    void DrawDynamicVEs(void);
+    void DrawDetailedView(void);
+    void KeyLeft(void);
+    void KeyRight(void);
+    void KeyUp(void);
+    void KeyDown(void);
+    void SetTransparency(int transparency, bool forceDetached = false);
+};
+
 #endif //__VIEWDISPLAYMENU_H
\ No newline at end of file
diff --git a/coreengine/viewdisplaymessage.c b/coreengine/viewdisplaymessage.c
index a9613fa..760724f 100644
--- a/coreengine/viewdisplaymessage.c
+++ b/coreengine/viewdisplaymessage.c
@@ -1,54 +1,54 @@
-#include "viewdisplaymessage.h"

-#include "../config.h"

-

-/************************************************************************************

-* cViewMessage

-************************************************************************************/

-

-cViewMessage::cViewMessage(void) {

-    ClearVariables();

-    viewId = eViewType::DisplayMessage;

-    viewName = strdup("displaymessage");

-    numViewElements = (int)eVeDisplayMessage::count;

-    viewElements = new cViewElement*[numViewElements];

-    for (int i=0; i < numViewElements; i++) {

-        viewElements[i] = NULL;

-    }

-    SetViewElements();

-    veMessage = NULL;

-}

-

-cViewMessage::~cViewMessage() {

-}

-

-void cViewMessage::SetViewElements(void) {

-    viewElementNames.insert(pair<string, int>("background", (int)eVeDisplayMessage::background));

-    viewElementNames.insert(pair<string, int>("message", (int)eVeDisplayMessage::message));

-}

-

-void cViewMessage::SetViewElementObjects(void) {

-    if (!viewElements[(int)eVeDisplayMessage::message])

-        return;

-    veMessage = dynamic_cast<cVeMessage*>(viewElements[(int)eVeDisplayMessage::message]);

-}

-

-void cViewMessage::ClearVariables(void) {

-    init = true;

-}

-

-void cViewMessage::SetMessage(eMessageType type, const char *text) {

-    if (!text)

-        veMessage->Clear();

-    else

-        veMessage->Set(type, text);

-}

-

-void cViewMessage::Flush(void) {

-    if (init) {

-        sdOsd.LockFlush();

-        Render((int)eVeDisplayMessage::background);

-    }

-    Render((int)eVeDisplayMessage::message);

-    cView::Flush();

-}

-

+#include "viewdisplaymessage.h"
+#include "../config.h"
+
+/************************************************************************************
+* cViewMessage
+************************************************************************************/
+
+cViewMessage::cViewMessage(void) {
+    ClearVariables();
+    viewId = eViewType::DisplayMessage;
+    viewName = strdup("displaymessage");
+    numViewElements = (int)eVeDisplayMessage::count;
+    viewElements = new cViewElement*[numViewElements];
+    for (int i=0; i < numViewElements; i++) {
+        viewElements[i] = NULL;
+    }
+    SetViewElements();
+    veMessage = NULL;
+}
+
+cViewMessage::~cViewMessage() {
+}
+
+void cViewMessage::SetViewElements(void) {
+    viewElementNames.insert(pair<string, int>("background", (int)eVeDisplayMessage::background));
+    viewElementNames.insert(pair<string, int>("message", (int)eVeDisplayMessage::message));
+}
+
+void cViewMessage::SetViewElementObjects(void) {
+    if (!viewElements[(int)eVeDisplayMessage::message])
+        return;
+    veMessage = dynamic_cast<cVeMessage*>(viewElements[(int)eVeDisplayMessage::message]);
+}
+
+void cViewMessage::ClearVariables(void) {
+    init = true;
+}
+
+void cViewMessage::SetMessage(eMessageType type, const char *text) {
+    if (!text)
+        veMessage->Clear();
+    else
+        veMessage->Set(type, text);
+}
+
+void cViewMessage::Flush(void) {
+    if (init) {
+        sdOsd.LockFlush();
+        Render((int)eVeDisplayMessage::background);
+    }
+    Render((int)eVeDisplayMessage::message);
+    cView::Flush();
+}
+
diff --git a/coreengine/viewdisplaymessage.h b/coreengine/viewdisplaymessage.h
index 44f4608..83ee7b0 100644
--- a/coreengine/viewdisplaymessage.h
+++ b/coreengine/viewdisplaymessage.h
@@ -1,19 +1,19 @@
-#ifndef __VIEWDISPLAYMESSAGE_H

-#define __VIEWDISPLAYMESSAGE_H

-

-#include "view.h"

-

-class cViewMessage : public cView {

-private:

-    cVeMessage *veMessage;

-    void SetViewElements(void);

-    void SetViewElementObjects(void);

-    void ClearVariables(void);

-public:

-    cViewMessage(void);

-    virtual ~cViewMessage(void);

-    void SetMessage(eMessageType type, const char *text);

-    void Flush(void);

-};

-

+#ifndef __VIEWDISPLAYMESSAGE_H
+#define __VIEWDISPLAYMESSAGE_H
+
+#include "view.h"
+
+class cViewMessage : public cView {
+private:
+    cVeMessage *veMessage;
+    void SetViewElements(void);
+    void SetViewElementObjects(void);
+    void ClearVariables(void);
+public:
+    cViewMessage(void);
+    virtual ~cViewMessage(void);
+    void SetMessage(eMessageType type, const char *text);
+    void Flush(void);
+};
+
 #endif //__VIEWDISPLAYMESSAGE_H
\ No newline at end of file
diff --git a/coreengine/viewdisplayplugin.c b/coreengine/viewdisplayplugin.c
index 1619944..5808025 100644
--- a/coreengine/viewdisplayplugin.c
+++ b/coreengine/viewdisplayplugin.c
@@ -1,556 +1,556 @@
-#include "viewdisplayplugin.h"

-#include "../config.h"

-/***********************************************************

-* cViewPlugin

-***********************************************************/

-cViewPlugin::cViewPlugin(int id, int plugId) {

-    this->id = id;

-    this->plugId = plugId;

-    viewId = eViewType::DisplayPlugin;

-    viewName = strdup("displayplugin");

-    if (id == 0)

-        numViews = plgManager->GetNumSubviews(plugId) + 1;

-    else

-        numViews = 1;

-    views = new cViewPlugin*[numViews];

-    views[0] = this;

-    for (int i=1; i < numViews; i++) {

-        views[i] = NULL;

-    }

-    numViewElements = plgManager->GetNumViewElements(plugId, id);

-    viewElements = new cViewElement*[numViewElements];

-    for (int i=0; i < numViewElements; i++) {

-        viewElements[i] = NULL;

-    }

-    SetViewElements();

-    numViewGrids = plgManager->GetNumViewGrids(plugId, id);

-    viewGrids = new cViewGrid*[numViewGrids];

-    for (int i=0; i < numViewGrids; i++) {

-        viewGrids[i] = NULL;

-    }

-    SetViewGrids();

-    tabView = NULL;

-    viewChanged = true;

-    newViewId = 0;

-}

-

-cViewPlugin::~cViewPlugin(void) {

-    for (int i=0; i< numViewGrids; i++)

-        delete viewGrids[i];

-    delete[] viewGrids;

-    delete tabView;

-    for (int i=1; i < numViews; i++) {

-        delete views[i];

-    }

-    delete[] views;

-}

-

-/***********************************************************

-* Public Functions

-***********************************************************/

-bool cViewPlugin::ReadFromXML(const char *plugName, const char *tplName, cSdOsd *osd) {

-    cString xmlFile = cString::sprintf("plug-%s-%s", plugName, tplName);

-    cXmlParser parser;

-    if (osd)

-        parser.SetOsd(osd);

-    else

-        parser.SetOsd(&sdOsd);

-    if (!parser.ReadView(this, *xmlFile)) {

-        return false;

-    }

-    if (!parser.ParsePluginView()) {

-        return false;

-    }

-    return true;

-}

-

-bool cViewPlugin::ReadSubViews(const char *plugName) {

-    plgManager->InitPluginSubviewIterator(plugId);

-    int svId = -1;

-    string svTpl = "";

-    while (plgManager->GetNextSubView(svId, svTpl)) {

-        cViewPlugin *plugSubView = new cViewPlugin(svId, plugId);

-        if (!plugSubView->ReadFromXML(plugName, svTpl.c_str(), &sdOsd))

-            return false;

-        views[svId] = plugSubView;

-    }

-    return true;

-}

-

-

-void cViewPlugin::SetGlobals(cGlobals *globals) {

-    cView::SetGlobals(globals);

-    for (int i=0; i < numViewGrids; i++) {

-        if (viewGrids[i])

-            viewGrids[i]->SetGlobals(globals);

-    }

-    for (int i=1; i < numViews; i++) {

-        views[i]->SetGlobals(globals);

-    }

-    if (tabView) {

-        tabView->SetGlobals(globals);

-    }

-}

-

-void cViewPlugin::AddViewElement(cVePlugin *viewElement) {

-    int veId = ViewElementId(viewElement->Name());

-    if (veId == ATTR_UNKNOWN)

-        return;

-    viewElement->SetId(veId);

-    viewElement->SetPluginId(plugId);

-    viewElement->SetViewId(id);

-    viewElement->SetTokenContainer();

-    viewElements[veId] = viewElement;

-}

-

-void cViewPlugin::AddViewGrid(cViewGrid *viewGrid) {

-    int gId = GridId(viewGrid->Name());

-    if (gId == ATTR_UNKNOWN)

-        return;

-    viewGrid->SetId(gId);

-    viewGrid->SetPluginId(plugId);

-    viewGrid->SetViewId(id);

-    viewGrid->SetTokenContainer();

-    viewGrids[gId] = viewGrid;

-}

-

-void cViewPlugin::AddTab(cArea *tab) {

-    if (!tabView) {

-        tabView = new cPluginTabView(id, plugId);

-        tabView->SetOsd(&sdOsd);

-    }

-    tabView->AddTab(tab);

-}

-

-void cViewPlugin::AddScrollbar(cVeDmScrollbar *scrollbar) {

-    if (!tabView) {

-        tabView = new cPluginTabView(id, plugId);

-        tabView->SetOsd(&sdOsd);

-    }

-    int id = ViewElementId("scrollbar");

-    scrollbar->SetId(id);

-    scrollbar->SetTokenContainer();

-    tabView->AddScrollbar(scrollbar);

-}

-

-void cViewPlugin::AddTablabels(cVeDmTablabels *tablabels) {

-    if (!tabView) {

-        tabView = new cPluginTabView(id, plugId);

-        tabView->SetOsd(&sdOsd);

-    }

-    int id = ViewElementId("tablabels");

-    tablabels->SetId(id);

-    tablabels->SetTokenContainer();

-    tabView->AddTablabels(tablabels);

-}

-

-void cViewPlugin::PreCache(void) {

-    if (container.Width() > 0) {

-        attribs->SetContainer(container.X(), container.Y(), container.Width(), container.Height());

-        attribs->Cache();

-    }

-    cView::PreCache();

-    for (int i=0; i < numViewGrids; i++) {

-        if (viewGrids[i]) {

-            viewGrids[i]->SetContainer(0, 0, attribs->Width(), attribs->Height());

-            viewGrids[i]->PreCache();

-        }

-    }

-    for (int i=1; i < numViews; i++) {

-        views[i]->SetContainer(0, 0, attribs->Width(), attribs->Height());

-        views[i]->PreCache();

-    }

-    if (tabView) {

-        tabView->PreCache(0, 0, attribs->Width(), attribs->Height());

-    }

-}

-

-cVePlugin *cViewPlugin::GetViewElement(int veId) {

-    if (!viewElements[veId])

-        return NULL;

-    cVePlugin *ve = dynamic_cast<cVePlugin*>(viewElements[veId]);

-    return ve;

-}

-

-cViewGrid *cViewPlugin::GetViewGrid(int gId) {

-    return viewGrids[gId];

-}

-

-cPluginTabView *cViewPlugin::GetViewTab(void) {

-    return tabView;    

-}

-

-void cViewPlugin::Hide(void) {

-    for (int i=0; i < numViewGrids; i++) {

-        if (viewGrids[i])

-            viewGrids[i]->Hide();

-    }

-    for (int i=0; i < numViewElements; i++) {

-        if (viewElements[i])

-            viewElements[i]->Hide();

-    }

-}

-

-void cViewPlugin::Show(void) {

-    for (int i=0; i < numViewGrids; i++) {

-        if (viewGrids[i])

-            viewGrids[i]->Show();

-    }

-    for (int i=0; i < numViewElements; i++) {

-        if (viewElements[i])

-            viewElements[i]->Show();

-    }

-}

-/***********************************************************

-* libskindesigner api interface

-***********************************************************/

-bool cViewPlugin::InitOsd(void) {

-    return Init();

-}

-

-void cViewPlugin::CloseOsd(void) {

-    viewChanged = true;

-    newViewId = 0;

-    Close();

-    for (int i=0 ; i < numViewGrids; i++) {

-        if (viewGrids[i])

-            viewGrids[i]->Close();

-    }

-    for (int i=1 ; i < numViews; i++) {

-        if (views[i])

-            views[i]->Close();

-    }

-}

-

-void cViewPlugin::Deactivate(int viewId, bool hide) {

-    for (int i=0; i < numViewElements; i++) {

-        if (viewElements[i])

-            viewElements[i]->StopScrolling(false);

-    }

-    if (hide)

-        views[viewId]->Hide();

-}

-

-void cViewPlugin::Activate(int viewId) {

-    viewChanged = true;

-    newViewId = viewId;

-    views[viewId]->Show();

-}

-

-void cViewPlugin::SetViewElementTokens(int veId, int viewId, skindesignerapi::cTokenContainer *tk) {

-    cVePlugin *ve = views[viewId]->GetViewElement(veId);

-    if (!ve)

-        return;

-    ve->Set(tk);

-}

-

-void cViewPlugin::ClearViewElement(int veId, int viewId) {

-    cVePlugin *ve = views[viewId]->GetViewElement(veId);

-    if (!ve)

-        return;

-    ve->StopScrolling();

-    ve->Clear();

-}

-

-void cViewPlugin::DisplayViewElement(int veId, int viewId) {

-    cVePlugin *ve = views[viewId]->GetViewElement(veId);

-    if (!ve)

-        return;

-    if (ve->Parse())

-        ve->Render();

-}

-

-void cViewPlugin::SetGrid(long gId, int viewId, int viewGridId,  double x, double y, double width, double height, skindesignerapi::cTokenContainer *tk){

-    cViewGrid *grid = views[viewId]->GetViewGrid(viewGridId);

-    if (!grid)

-        return;

-    grid->CheckSize(gId);

-    grid->PositionGrid(gId, x, y, width, height);

-    if (tk) {

-        //only set tokens new if necessary

-        grid->SetTokens(gId, tk);

-    }

-}

-

-void cViewPlugin::SetGridCurrent(long gId, int viewId, int viewGridId, bool current) {

-    if (gId < 0)

-        return;

-    cViewGrid *grid = views[viewId]->GetViewGrid(viewGridId);

-    if (!grid)

-        return;

-    grid->SetCurrentGrid(gId, current);    

-}

-

-void cViewPlugin::DeleteGrid(long gId, int viewId, int viewGridId) {

-    cViewGrid *grid = views[viewId]->GetViewGrid(viewGridId);

-    if (!grid)

-        return;

-    grid->DeleteGrid(gId);

-}

-

-void cViewPlugin::DisplayGrids(int viewId, int viewGridId) {

-    cViewGrid *grid = views[viewId]->GetViewGrid(viewGridId);

-    if (!grid)

-        return;

-    grid->Render();

-}

-

-void cViewPlugin::ClearGrids(int viewId, int viewGridId) {

-    cViewGrid *grid = views[viewId]->GetViewGrid(viewGridId);

-    if (!grid)

-        return;

-    grid->ClearGrids();

-}

-

-void cViewPlugin::SetTabTokens(int viewId, skindesignerapi::cTokenContainer *tk) {

-    cPluginTabView *tab = views[viewId]->GetViewTab();

-    if (!tab)

-        return;

-    tab->SetOsd(&sdOsd);

-    tab->Set(tk);

-}

-

-void cViewPlugin::TabLeft(int viewId) {

-    cPluginTabView *tab = views[viewId]->GetViewTab();

-    if (!tab)

-        return;

-    tab->KeyLeft(); 

-}

-

-void cViewPlugin::TabRight(int viewId) {

-    cPluginTabView *tab = views[viewId]->GetViewTab();

-    if (!tab)

-        return;

-    tab->KeyRight(); 

-}

-

-void cViewPlugin::TabUp(int viewId) {

-    cPluginTabView *tab = views[viewId]->GetViewTab();

-    if (!tab)

-        return;

-    tab->KeyUp(); 

-}

-

-void cViewPlugin::TabDown(int viewId) {

-    cPluginTabView *tab = views[viewId]->GetViewTab();

-    if (!tab)

-        return;

-    tab->KeyDown(); 

-}

-

-void cViewPlugin::DisplayTabs(int viewId) {

-    cPluginTabView *tab = views[viewId]->GetViewTab();

-    if (!tab)

-        return;

-    tab->Render();  

-}

-

-void cViewPlugin::ClearTab(int viewId) {

-    cPluginTabView *tab = views[viewId]->GetViewTab();

-    if (!tab)

-        return;

-    tab->Clear(); 

-}

-

-void cViewPlugin::Flush(void) {

-    if (viewChanged) {

-        viewChanged = false;

-        newTvFrame = views[newViewId]->GetTvFrame();

-        menuInit = true;

-    }

-    cView::Flush();

-}

-

-bool cViewPlugin::ChannelLogoExists(string channelId) {

-    return imgCache->LogoExists(channelId);

-}

-

-string cViewPlugin::GetEpgImagePath(void) {

-    return *config.epgImagePath;

-}

-

-/***********************************************************

-* Private Functions

-***********************************************************/

-void cViewPlugin::SetViewElements(void) {

-    plgManager->InitViewElementIterator(plugId, id);

-    int veId = -1;

-    string veName = "";

-    while (plgManager->GetNextViewElement(veId, veName)) {

-        viewElementNames.insert(pair<string, int>(veName, veId));

-    }

-}

-

-void cViewPlugin::SetViewGrids(void) {

-    plgManager->InitViewGridIterator(plugId, id);

-    int gId = -1;

-    string gName = "";

-    while (plgManager->GetNextViewGrid(gId, gName)) {

-        gridNames.insert(pair<string, int>(gName, gId));

-    }

-}

-

-int cViewPlugin::GridId(const char *name) {

-    map<string, int>::iterator hit = gridNames.find(name);

-    if (hit != gridNames.end())

-        return (int)hit->second;

-    return ATTR_UNKNOWN;    

-}

-

-/***********************************************************

-* cPluginTabView

-***********************************************************/

-cPluginTabView::cPluginTabView(int viewId, int plugId) {

-    sdOsd = NULL;

-    init = true;

-    drawScrollbar = true;

-    scrollbar = NULL;

-    tablabels = NULL;

-    detailView = new cViewDetailAdvancedPlugin(viewId, plugId);

-    firstTab = true;

-}

-

-cPluginTabView::~cPluginTabView(void) {

-    delete scrollbar;

-    delete tablabels;

-    delete detailView;

-}

-

-void cPluginTabView::SetGlobals(cGlobals *globals) {

-    detailView->SetGlobals(globals);

-    if (scrollbar)

-        scrollbar->SetGlobals(globals);

-    if (tablabels)

-        tablabels->SetGlobals(globals);

-}

-

-void cPluginTabView::AddTab(cArea *tab) {

-    if (firstTab) {

-        tab->SetActiveTab(true);

-        firstTab = false;

-    }

-    detailView->AddArea(tab);

-}

-

-void cPluginTabView::AddScrollbar(cVeDmScrollbar *scrollbar) {

-    this->scrollbar = scrollbar;

-}

-

-void cPluginTabView::AddTablabels(cVeDmTablabels *tablabels) {

-    this->tablabels = tablabels;

-}

-

-void cPluginTabView::PreCache(int containerX, int containerY, int containerWidth, int containerHeight) {

-    detailView->SetOsd(sdOsd);

-    detailView->SetTokenContainer();

-    detailView->SetContainer(containerX, containerY, containerWidth, containerHeight);

-    detailView->Cache();

-    if (scrollbar) {

-        scrollbar->SetContainer(containerX, containerY, containerWidth, containerHeight);

-        scrollbar->Cache();

-    }

-    if (tablabels) {

-        tablabels->SetContainer(containerX, containerY, containerWidth, containerHeight);

-        tablabels->Cache();        

-    }

-}

-

-void cPluginTabView::Set(skindesignerapi::cTokenContainer *tk) {

-    detailView->Set(tk);

-}

-

-void cPluginTabView::Render(void) {

-    detailView->Render();

-    if (drawScrollbar) {

-        drawScrollbar = false;

-        DrawScrollbar();

-    }

-    if (!init)

-        return;

-    init = false;

-    vector<const char*> tabs;

-    int activeTab = detailView->GetTabs(tabs);

-    if (tablabels) {        

-        tablabels->SetTabs(tabs);

-        tablabels->SetActiveTab(activeTab);

-        if (tablabels->Parse())

-            tablabels->Render();

-    }

-}

-

-void cPluginTabView::Clear(void) {

-    init = true;

-    drawScrollbar = true;

-    detailView->ResetTabs();

-    detailView->Close();

-    if (tablabels)

-        tablabels->Close();

-    if (scrollbar)

-        scrollbar->Close();

-}

-

-void cPluginTabView::KeyLeft(void) {

-    if (detailView->NumTabs() > 1) {

-        detailView->Clear();

-        detailView->PrevTab();

-        detailView->SetDirty();

-        if (tablabels) {

-            tablabels->Clear();

-            tablabels->SetActiveTab(detailView->ActiveTab());

-            if (tablabels->Parse())

-                tablabels->Render();

-        }

-        sdOsd->Flush();

-        drawScrollbar = true;

-    } else {

-        //scroll page

-        if (detailView->ScrollUp(true)) {

-            drawScrollbar = true;

-        }

-    }

-}

-

-void cPluginTabView::KeyRight(void) {

-    if (detailView->NumTabs() > 1) {

-        detailView->Clear();

-        detailView->NextTab();

-        detailView->SetDirty();

-        if (tablabels) {

-            tablabels->Clear();

-            tablabels->SetActiveTab(detailView->ActiveTab());

-            if (tablabels->Parse())

-                tablabels->Render();

-        }

-        sdOsd->Flush();

-        drawScrollbar = true;

-    } else {

-        //scroll page

-        if (detailView->ScrollDown(true)) {

-            drawScrollbar = true;

-        }

-    }

-}

-

-void cPluginTabView::KeyUp(void) {

-    if (detailView->ScrollUp()) {

-        drawScrollbar = true;

-    }

-}

-

-void cPluginTabView::KeyDown(void) {

-    if (detailView->ScrollDown()) {

-        drawScrollbar = true;

-    }

-}

-

-void cPluginTabView::DrawScrollbar(void) {

-    if (!scrollbar)

-        return;

-    int barheight = 0;

-    int offset = 0;

-    bool end = true;

-    detailView->Scrollbar(barheight, offset, end);

-    scrollbar->SetDetail(barheight, offset, end);

-    scrollbar->Render();    

-}

-

+#include "viewdisplayplugin.h"
+#include "../config.h"
+/***********************************************************
+* cViewPlugin
+***********************************************************/
+cViewPlugin::cViewPlugin(int id, int plugId) {
+    this->id = id;
+    this->plugId = plugId;
+    viewId = eViewType::DisplayPlugin;
+    viewName = strdup("displayplugin");
+    if (id == 0)
+        numViews = plgManager->GetNumSubviews(plugId) + 1;
+    else
+        numViews = 1;
+    views = new cViewPlugin*[numViews];
+    views[0] = this;
+    for (int i=1; i < numViews; i++) {
+        views[i] = NULL;
+    }
+    numViewElements = plgManager->GetNumViewElements(plugId, id);
+    viewElements = new cViewElement*[numViewElements];
+    for (int i=0; i < numViewElements; i++) {
+        viewElements[i] = NULL;
+    }
+    SetViewElements();
+    numViewGrids = plgManager->GetNumViewGrids(plugId, id);
+    viewGrids = new cViewGrid*[numViewGrids];
+    for (int i=0; i < numViewGrids; i++) {
+        viewGrids[i] = NULL;
+    }
+    SetViewGrids();
+    tabView = NULL;
+    viewChanged = true;
+    newViewId = 0;
+}
+
+cViewPlugin::~cViewPlugin(void) {
+    for (int i=0; i< numViewGrids; i++)
+        delete viewGrids[i];
+    delete[] viewGrids;
+    delete tabView;
+    for (int i=1; i < numViews; i++) {
+        delete views[i];
+    }
+    delete[] views;
+}
+
+/***********************************************************
+* Public Functions
+***********************************************************/
+bool cViewPlugin::ReadFromXML(const char *plugName, const char *tplName, cSdOsd *osd) {
+    cString xmlFile = cString::sprintf("plug-%s-%s", plugName, tplName);
+    cXmlParser parser;
+    if (osd)
+        parser.SetOsd(osd);
+    else
+        parser.SetOsd(&sdOsd);
+    if (!parser.ReadView(this, *xmlFile)) {
+        return false;
+    }
+    if (!parser.ParsePluginView()) {
+        return false;
+    }
+    return true;
+}
+
+bool cViewPlugin::ReadSubViews(const char *plugName) {
+    plgManager->InitPluginSubviewIterator(plugId);
+    int svId = -1;
+    string svTpl = "";
+    while (plgManager->GetNextSubView(svId, svTpl)) {
+        cViewPlugin *plugSubView = new cViewPlugin(svId, plugId);
+        if (!plugSubView->ReadFromXML(plugName, svTpl.c_str(), &sdOsd))
+            return false;
+        views[svId] = plugSubView;
+    }
+    return true;
+}
+
+
+void cViewPlugin::SetGlobals(cGlobals *globals) {
+    cView::SetGlobals(globals);
+    for (int i=0; i < numViewGrids; i++) {
+        if (viewGrids[i])
+            viewGrids[i]->SetGlobals(globals);
+    }
+    for (int i=1; i < numViews; i++) {
+        views[i]->SetGlobals(globals);
+    }
+    if (tabView) {
+        tabView->SetGlobals(globals);
+    }
+}
+
+void cViewPlugin::AddViewElement(cVePlugin *viewElement) {
+    int veId = ViewElementId(viewElement->Name());
+    if (veId == ATTR_UNKNOWN)
+        return;
+    viewElement->SetId(veId);
+    viewElement->SetPluginId(plugId);
+    viewElement->SetViewId(id);
+    viewElement->SetTokenContainer();
+    viewElements[veId] = viewElement;
+}
+
+void cViewPlugin::AddViewGrid(cViewGrid *viewGrid) {
+    int gId = GridId(viewGrid->Name());
+    if (gId == ATTR_UNKNOWN)
+        return;
+    viewGrid->SetId(gId);
+    viewGrid->SetPluginId(plugId);
+    viewGrid->SetViewId(id);
+    viewGrid->SetTokenContainer();
+    viewGrids[gId] = viewGrid;
+}
+
+void cViewPlugin::AddTab(cArea *tab) {
+    if (!tabView) {
+        tabView = new cPluginTabView(id, plugId);
+        tabView->SetOsd(&sdOsd);
+    }
+    tabView->AddTab(tab);
+}
+
+void cViewPlugin::AddScrollbar(cVeDmScrollbar *scrollbar) {
+    if (!tabView) {
+        tabView = new cPluginTabView(id, plugId);
+        tabView->SetOsd(&sdOsd);
+    }
+    int id = ViewElementId("scrollbar");
+    scrollbar->SetId(id);
+    scrollbar->SetTokenContainer();
+    tabView->AddScrollbar(scrollbar);
+}
+
+void cViewPlugin::AddTablabels(cVeDmTablabels *tablabels) {
+    if (!tabView) {
+        tabView = new cPluginTabView(id, plugId);
+        tabView->SetOsd(&sdOsd);
+    }
+    int id = ViewElementId("tablabels");
+    tablabels->SetId(id);
+    tablabels->SetTokenContainer();
+    tabView->AddTablabels(tablabels);
+}
+
+void cViewPlugin::PreCache(void) {
+    if (container.Width() > 0) {
+        attribs->SetContainer(container.X(), container.Y(), container.Width(), container.Height());
+        attribs->Cache();
+    }
+    cView::PreCache();
+    for (int i=0; i < numViewGrids; i++) {
+        if (viewGrids[i]) {
+            viewGrids[i]->SetContainer(0, 0, attribs->Width(), attribs->Height());
+            viewGrids[i]->PreCache();
+        }
+    }
+    for (int i=1; i < numViews; i++) {
+        views[i]->SetContainer(0, 0, attribs->Width(), attribs->Height());
+        views[i]->PreCache();
+    }
+    if (tabView) {
+        tabView->PreCache(0, 0, attribs->Width(), attribs->Height());
+    }
+}
+
+cVePlugin *cViewPlugin::GetViewElement(int veId) {
+    if (!viewElements[veId])
+        return NULL;
+    cVePlugin *ve = dynamic_cast<cVePlugin*>(viewElements[veId]);
+    return ve;
+}
+
+cViewGrid *cViewPlugin::GetViewGrid(int gId) {
+    return viewGrids[gId];
+}
+
+cPluginTabView *cViewPlugin::GetViewTab(void) {
+    return tabView;    
+}
+
+void cViewPlugin::Hide(void) {
+    for (int i=0; i < numViewGrids; i++) {
+        if (viewGrids[i])
+            viewGrids[i]->Hide();
+    }
+    for (int i=0; i < numViewElements; i++) {
+        if (viewElements[i])
+            viewElements[i]->Hide();
+    }
+}
+
+void cViewPlugin::Show(void) {
+    for (int i=0; i < numViewGrids; i++) {
+        if (viewGrids[i])
+            viewGrids[i]->Show();
+    }
+    for (int i=0; i < numViewElements; i++) {
+        if (viewElements[i])
+            viewElements[i]->Show();
+    }
+}
+/***********************************************************
+* libskindesigner api interface
+***********************************************************/
+bool cViewPlugin::InitOsd(void) {
+    return Init();
+}
+
+void cViewPlugin::CloseOsd(void) {
+    viewChanged = true;
+    newViewId = 0;
+    Close();
+    for (int i=0 ; i < numViewGrids; i++) {
+        if (viewGrids[i])
+            viewGrids[i]->Close();
+    }
+    for (int i=1 ; i < numViews; i++) {
+        if (views[i])
+            views[i]->Close();
+    }
+}
+
+void cViewPlugin::Deactivate(int viewId, bool hide) {
+    for (int i=0; i < numViewElements; i++) {
+        if (viewElements[i])
+            viewElements[i]->StopScrolling(false);
+    }
+    if (hide)
+        views[viewId]->Hide();
+}
+
+void cViewPlugin::Activate(int viewId) {
+    viewChanged = true;
+    newViewId = viewId;
+    views[viewId]->Show();
+}
+
+void cViewPlugin::SetViewElementTokens(int veId, int viewId, skindesignerapi::cTokenContainer *tk) {
+    cVePlugin *ve = views[viewId]->GetViewElement(veId);
+    if (!ve)
+        return;
+    ve->Set(tk);
+}
+
+void cViewPlugin::ClearViewElement(int veId, int viewId) {
+    cVePlugin *ve = views[viewId]->GetViewElement(veId);
+    if (!ve)
+        return;
+    ve->StopScrolling();
+    ve->Clear();
+}
+
+void cViewPlugin::DisplayViewElement(int veId, int viewId) {
+    cVePlugin *ve = views[viewId]->GetViewElement(veId);
+    if (!ve)
+        return;
+    if (ve->Parse())
+        ve->Render();
+}
+
+void cViewPlugin::SetGrid(long gId, int viewId, int viewGridId,  double x, double y, double width, double height, skindesignerapi::cTokenContainer *tk){
+    cViewGrid *grid = views[viewId]->GetViewGrid(viewGridId);
+    if (!grid)
+        return;
+    grid->CheckSize(gId);
+    grid->PositionGrid(gId, x, y, width, height);
+    if (tk) {
+        //only set tokens new if necessary
+        grid->SetTokens(gId, tk);
+    }
+}
+
+void cViewPlugin::SetGridCurrent(long gId, int viewId, int viewGridId, bool current) {
+    if (gId < 0)
+        return;
+    cViewGrid *grid = views[viewId]->GetViewGrid(viewGridId);
+    if (!grid)
+        return;
+    grid->SetCurrentGrid(gId, current);    
+}
+
+void cViewPlugin::DeleteGrid(long gId, int viewId, int viewGridId) {
+    cViewGrid *grid = views[viewId]->GetViewGrid(viewGridId);
+    if (!grid)
+        return;
+    grid->DeleteGrid(gId);
+}
+
+void cViewPlugin::DisplayGrids(int viewId, int viewGridId) {
+    cViewGrid *grid = views[viewId]->GetViewGrid(viewGridId);
+    if (!grid)
+        return;
+    grid->Render();
+}
+
+void cViewPlugin::ClearGrids(int viewId, int viewGridId) {
+    cViewGrid *grid = views[viewId]->GetViewGrid(viewGridId);
+    if (!grid)
+        return;
+    grid->ClearGrids();
+}
+
+void cViewPlugin::SetTabTokens(int viewId, skindesignerapi::cTokenContainer *tk) {
+    cPluginTabView *tab = views[viewId]->GetViewTab();
+    if (!tab)
+        return;
+    tab->SetOsd(&sdOsd);
+    tab->Set(tk);
+}
+
+void cViewPlugin::TabLeft(int viewId) {
+    cPluginTabView *tab = views[viewId]->GetViewTab();
+    if (!tab)
+        return;
+    tab->KeyLeft(); 
+}
+
+void cViewPlugin::TabRight(int viewId) {
+    cPluginTabView *tab = views[viewId]->GetViewTab();
+    if (!tab)
+        return;
+    tab->KeyRight(); 
+}
+
+void cViewPlugin::TabUp(int viewId) {
+    cPluginTabView *tab = views[viewId]->GetViewTab();
+    if (!tab)
+        return;
+    tab->KeyUp(); 
+}
+
+void cViewPlugin::TabDown(int viewId) {
+    cPluginTabView *tab = views[viewId]->GetViewTab();
+    if (!tab)
+        return;
+    tab->KeyDown(); 
+}
+
+void cViewPlugin::DisplayTabs(int viewId) {
+    cPluginTabView *tab = views[viewId]->GetViewTab();
+    if (!tab)
+        return;
+    tab->Render();  
+}
+
+void cViewPlugin::ClearTab(int viewId) {
+    cPluginTabView *tab = views[viewId]->GetViewTab();
+    if (!tab)
+        return;
+    tab->Clear(); 
+}
+
+void cViewPlugin::Flush(void) {
+    if (viewChanged) {
+        viewChanged = false;
+        newTvFrame = views[newViewId]->GetTvFrame();
+        menuInit = true;
+    }
+    cView::Flush();
+}
+
+bool cViewPlugin::ChannelLogoExists(string channelId) {
+    return imgCache->LogoExists(channelId);
+}
+
+string cViewPlugin::GetEpgImagePath(void) {
+    return *config.epgImagePath;
+}
+
+/***********************************************************
+* Private Functions
+***********************************************************/
+void cViewPlugin::SetViewElements(void) {
+    plgManager->InitViewElementIterator(plugId, id);
+    int veId = -1;
+    string veName = "";
+    while (plgManager->GetNextViewElement(veId, veName)) {
+        viewElementNames.insert(pair<string, int>(veName, veId));
+    }
+}
+
+void cViewPlugin::SetViewGrids(void) {
+    plgManager->InitViewGridIterator(plugId, id);
+    int gId = -1;
+    string gName = "";
+    while (plgManager->GetNextViewGrid(gId, gName)) {
+        gridNames.insert(pair<string, int>(gName, gId));
+    }
+}
+
+int cViewPlugin::GridId(const char *name) {
+    map<string, int>::iterator hit = gridNames.find(name);
+    if (hit != gridNames.end())
+        return (int)hit->second;
+    return ATTR_UNKNOWN;    
+}
+
+/***********************************************************
+* cPluginTabView
+***********************************************************/
+cPluginTabView::cPluginTabView(int viewId, int plugId) {
+    sdOsd = NULL;
+    init = true;
+    drawScrollbar = true;
+    scrollbar = NULL;
+    tablabels = NULL;
+    detailView = new cViewDetailAdvancedPlugin(viewId, plugId);
+    firstTab = true;
+}
+
+cPluginTabView::~cPluginTabView(void) {
+    delete scrollbar;
+    delete tablabels;
+    delete detailView;
+}
+
+void cPluginTabView::SetGlobals(cGlobals *globals) {
+    detailView->SetGlobals(globals);
+    if (scrollbar)
+        scrollbar->SetGlobals(globals);
+    if (tablabels)
+        tablabels->SetGlobals(globals);
+}
+
+void cPluginTabView::AddTab(cArea *tab) {
+    if (firstTab) {
+        tab->SetActiveTab(true);
+        firstTab = false;
+    }
+    detailView->AddArea(tab);
+}
+
+void cPluginTabView::AddScrollbar(cVeDmScrollbar *scrollbar) {
+    this->scrollbar = scrollbar;
+}
+
+void cPluginTabView::AddTablabels(cVeDmTablabels *tablabels) {
+    this->tablabels = tablabels;
+}
+
+void cPluginTabView::PreCache(int containerX, int containerY, int containerWidth, int containerHeight) {
+    detailView->SetOsd(sdOsd);
+    detailView->SetTokenContainer();
+    detailView->SetContainer(containerX, containerY, containerWidth, containerHeight);
+    detailView->Cache();
+    if (scrollbar) {
+        scrollbar->SetContainer(containerX, containerY, containerWidth, containerHeight);
+        scrollbar->Cache();
+    }
+    if (tablabels) {
+        tablabels->SetContainer(containerX, containerY, containerWidth, containerHeight);
+        tablabels->Cache();        
+    }
+}
+
+void cPluginTabView::Set(skindesignerapi::cTokenContainer *tk) {
+    detailView->Set(tk);
+}
+
+void cPluginTabView::Render(void) {
+    detailView->Render();
+    if (drawScrollbar) {
+        drawScrollbar = false;
+        DrawScrollbar();
+    }
+    if (!init)
+        return;
+    init = false;
+    vector<const char*> tabs;
+    int activeTab = detailView->GetTabs(tabs);
+    if (tablabels) {        
+        tablabels->SetTabs(tabs);
+        tablabels->SetActiveTab(activeTab);
+        if (tablabels->Parse())
+            tablabels->Render();
+    }
+}
+
+void cPluginTabView::Clear(void) {
+    init = true;
+    drawScrollbar = true;
+    detailView->ResetTabs();
+    detailView->Close();
+    if (tablabels)
+        tablabels->Close();
+    if (scrollbar)
+        scrollbar->Close();
+}
+
+void cPluginTabView::KeyLeft(void) {
+    if (detailView->NumTabs() > 1) {
+        detailView->Clear();
+        detailView->PrevTab();
+        detailView->SetDirty();
+        if (tablabels) {
+            tablabels->Clear();
+            tablabels->SetActiveTab(detailView->ActiveTab());
+            if (tablabels->Parse())
+                tablabels->Render();
+        }
+        sdOsd->Flush();
+        drawScrollbar = true;
+    } else {
+        //scroll page
+        if (detailView->ScrollUp(true)) {
+            drawScrollbar = true;
+        }
+    }
+}
+
+void cPluginTabView::KeyRight(void) {
+    if (detailView->NumTabs() > 1) {
+        detailView->Clear();
+        detailView->NextTab();
+        detailView->SetDirty();
+        if (tablabels) {
+            tablabels->Clear();
+            tablabels->SetActiveTab(detailView->ActiveTab());
+            if (tablabels->Parse())
+                tablabels->Render();
+        }
+        sdOsd->Flush();
+        drawScrollbar = true;
+    } else {
+        //scroll page
+        if (detailView->ScrollDown(true)) {
+            drawScrollbar = true;
+        }
+    }
+}
+
+void cPluginTabView::KeyUp(void) {
+    if (detailView->ScrollUp()) {
+        drawScrollbar = true;
+    }
+}
+
+void cPluginTabView::KeyDown(void) {
+    if (detailView->ScrollDown()) {
+        drawScrollbar = true;
+    }
+}
+
+void cPluginTabView::DrawScrollbar(void) {
+    if (!scrollbar)
+        return;
+    int barheight = 0;
+    int offset = 0;
+    bool end = true;
+    detailView->Scrollbar(barheight, offset, end);
+    scrollbar->SetDetail(barheight, offset, end);
+    scrollbar->Render();    
+}
+
diff --git a/coreengine/viewdisplayplugin.h b/coreengine/viewdisplayplugin.h
index 4d9cd59..85ea4e6 100644
--- a/coreengine/viewdisplayplugin.h
+++ b/coreengine/viewdisplayplugin.h
@@ -1,101 +1,101 @@
-#ifndef __VIEWDISPLAYPLUGIN_H

-#define __VIEWDISPLAYPLUGIN_H

-

-#include "view.h"

-#include "viewdetail.h"

-#include "viewelementsdisplaymenu.h"

-#include "viewgrid.h"

-#include "../libskindesignerapi/skindesignerapi.h"

-

-class cPluginTabView;

-/***********************************************************

-* cViewPlugin

-***********************************************************/

-class cViewPlugin : public cView, public skindesignerapi::ISkinDisplayPlugin {

-private:

-    int id;

-    int plugId;

-    int numViews;

-    cViewPlugin **views;

-    int numViewGrids;

-    cViewGrid **viewGrids;

-    map<string,int> gridNames;

-    cPluginTabView *tabView;

-    bool viewChanged;

-    int newViewId;

-    void SetViewElements(void);

-    void SetViewGrids(void);

-    int GridId(const char *name);

-public:

-    cViewPlugin(int id, int plugId);

-    ~cViewPlugin(void);

-    //Internal Interface

-    bool ReadFromXML(const char *plugName, const char *tplName, cSdOsd *osd = NULL);

-    bool ReadSubViews(const char *plugName);

-    void AddViewElement(cVePlugin *viewElement);

-    void AddViewGrid(cViewGrid *viewGrid);

-    void AddTab(cArea *tab);

-    void AddScrollbar(cVeDmScrollbar *scrollbar);

-    void AddTablabels(cVeDmTablabels *tablabels);

-    void SetGlobals(cGlobals *globals);

-    void PreCache(void);

-    cVePlugin *GetViewElement(int veId);

-    cViewGrid *GetViewGrid(int gId);

-    cPluginTabView *GetViewTab(void);

-    void Hide(void);

-    void Show(void);

-    //libskindesigner api interface

-    bool InitOsd(void);

-    void CloseOsd(void);

-    void Deactivate(int viewId, bool hide);

-    void Activate(int viewId);

-    void SetViewElementTokens(int veId, int viewId, skindesignerapi::cTokenContainer *tk);

-    void ClearViewElement(int veId, int viewId);

-    void DisplayViewElement(int veId, int viewId);

-    void SetGrid(long gId, int viewId, int viewGridId,  double x, double y, double width, double height, skindesignerapi::cTokenContainer *tk);

-    void SetGridCurrent(long gId, int viewId, int viewGridId, bool current);

-    void DeleteGrid(long gId, int viewId, int viewGridId);

-    void DisplayGrids(int viewId, int viewGridId);

-    void ClearGrids(int viewId, int viewGridId);

-    void SetTabTokens(int viewId, skindesignerapi::cTokenContainer *tk);

-    void TabLeft(int viewId);

-    void TabRight(int viewId);

-    void TabUp(int viewId);

-    void TabDown(int viewId);

-    void DisplayTabs(int viewId);

-    void ClearTab(int viewId);

-    void Flush(void);

-    bool ChannelLogoExists(string channelId);

-    string GetEpgImagePath(void);

-};

-/***********************************************************

-* cPluginTabView

-***********************************************************/

-class cPluginTabView {

-private:

-    cSdOsd *sdOsd;

-    bool init;

-    bool drawScrollbar;

-    bool firstTab;

-    cVeDmScrollbar *scrollbar;

-    cVeDmTablabels *tablabels;

-    cViewDetailAdvancedPlugin *detailView;

-    void DrawScrollbar(void);

-public:

-    cPluginTabView(int viewId, int plugId);

-    ~cPluginTabView(void);

-    void SetGlobals(cGlobals *globals);

-    void SetOsd(cSdOsd *osd) { sdOsd = osd; };

-    void AddTab(cArea *tab);

-    void AddScrollbar(cVeDmScrollbar *scrollbar);

-    void AddTablabels(cVeDmTablabels *tablabels);

-    void PreCache(int containerX, int containerY, int containerWidth, int containerHeight);

-    void Set(skindesignerapi::cTokenContainer *tk);

-    void Render(void);

-    void Clear(void);

-    void KeyLeft(void);

-    void KeyRight(void);

-    void KeyUp(void);

-    void KeyDown(void);

-};

+#ifndef __VIEWDISPLAYPLUGIN_H
+#define __VIEWDISPLAYPLUGIN_H
+
+#include "view.h"
+#include "viewdetail.h"
+#include "viewelementsdisplaymenu.h"
+#include "viewgrid.h"
+#include "../libskindesignerapi/skindesignerapi.h"
+
+class cPluginTabView;
+/***********************************************************
+* cViewPlugin
+***********************************************************/
+class cViewPlugin : public cView, public skindesignerapi::ISkinDisplayPlugin {
+private:
+    int id;
+    int plugId;
+    int numViews;
+    cViewPlugin **views;
+    int numViewGrids;
+    cViewGrid **viewGrids;
+    map<string,int> gridNames;
+    cPluginTabView *tabView;
+    bool viewChanged;
+    int newViewId;
+    void SetViewElements(void);
+    void SetViewGrids(void);
+    int GridId(const char *name);
+public:
+    cViewPlugin(int id, int plugId);
+    ~cViewPlugin(void);
+    //Internal Interface
+    bool ReadFromXML(const char *plugName, const char *tplName, cSdOsd *osd = NULL);
+    bool ReadSubViews(const char *plugName);
+    void AddViewElement(cVePlugin *viewElement);
+    void AddViewGrid(cViewGrid *viewGrid);
+    void AddTab(cArea *tab);
+    void AddScrollbar(cVeDmScrollbar *scrollbar);
+    void AddTablabels(cVeDmTablabels *tablabels);
+    void SetGlobals(cGlobals *globals);
+    void PreCache(void);
+    cVePlugin *GetViewElement(int veId);
+    cViewGrid *GetViewGrid(int gId);
+    cPluginTabView *GetViewTab(void);
+    void Hide(void);
+    void Show(void);
+    //libskindesigner api interface
+    bool InitOsd(void);
+    void CloseOsd(void);
+    void Deactivate(int viewId, bool hide);
+    void Activate(int viewId);
+    void SetViewElementTokens(int veId, int viewId, skindesignerapi::cTokenContainer *tk);
+    void ClearViewElement(int veId, int viewId);
+    void DisplayViewElement(int veId, int viewId);
+    void SetGrid(long gId, int viewId, int viewGridId,  double x, double y, double width, double height, skindesignerapi::cTokenContainer *tk);
+    void SetGridCurrent(long gId, int viewId, int viewGridId, bool current);
+    void DeleteGrid(long gId, int viewId, int viewGridId);
+    void DisplayGrids(int viewId, int viewGridId);
+    void ClearGrids(int viewId, int viewGridId);
+    void SetTabTokens(int viewId, skindesignerapi::cTokenContainer *tk);
+    void TabLeft(int viewId);
+    void TabRight(int viewId);
+    void TabUp(int viewId);
+    void TabDown(int viewId);
+    void DisplayTabs(int viewId);
+    void ClearTab(int viewId);
+    void Flush(void);
+    bool ChannelLogoExists(string channelId);
+    string GetEpgImagePath(void);
+};
+/***********************************************************
+* cPluginTabView
+***********************************************************/
+class cPluginTabView {
+private:
+    cSdOsd *sdOsd;
+    bool init;
+    bool drawScrollbar;
+    bool firstTab;
+    cVeDmScrollbar *scrollbar;
+    cVeDmTablabels *tablabels;
+    cViewDetailAdvancedPlugin *detailView;
+    void DrawScrollbar(void);
+public:
+    cPluginTabView(int viewId, int plugId);
+    ~cPluginTabView(void);
+    void SetGlobals(cGlobals *globals);
+    void SetOsd(cSdOsd *osd) { sdOsd = osd; };
+    void AddTab(cArea *tab);
+    void AddScrollbar(cVeDmScrollbar *scrollbar);
+    void AddTablabels(cVeDmTablabels *tablabels);
+    void PreCache(int containerX, int containerY, int containerWidth, int containerHeight);
+    void Set(skindesignerapi::cTokenContainer *tk);
+    void Render(void);
+    void Clear(void);
+    void KeyLeft(void);
+    void KeyRight(void);
+    void KeyUp(void);
+    void KeyDown(void);
+};
 #endif //__VIEWDISPLAYPLUGIN_H
\ No newline at end of file
diff --git a/coreengine/viewdisplayreplay.c b/coreengine/viewdisplayreplay.c
index 503b72f..18f67b0 100644
--- a/coreengine/viewdisplayreplay.c
+++ b/coreengine/viewdisplayreplay.c
@@ -1,314 +1,314 @@
-#include "viewdisplayreplay.h"

-

-/************************************************************************************

-* cViewReplay

-************************************************************************************/

-

-cViewReplay::cViewReplay(void) {

-    veCustomTokens = NULL;

-    veEndTime = NULL;

-    veMessage = NULL;

-    veScraperContent = NULL;

-    veRecTitle = NULL;

-    veRecInfo = NULL;

-    veCurrentTime = NULL;

-    veTotalTime = NULL;

-    veProgressbar = NULL;

-    veCutMarks = NULL;

-    veProgressModeOnly = NULL;

-    veControlIcons = NULL;

-    veControlIconsModeOnly = NULL;

-    veJump = NULL;

-    veOnPause = NULL;

-    veOnPauseModeOnly = NULL;

-    ClearVariables();

-    viewId = eViewType::DisplayReplay;

-    viewName = strdup("displayreplay");

-    numViewElements = (int)eVeDisplayReplay::count;

-    viewElements = new cViewElement*[numViewElements];

-    for (int i=0; i < numViewElements; i++) {

-        viewElements[i] = NULL;

-    }

-    SetViewElements();

-}

-

-cViewReplay::~cViewReplay() {

-}

-

-void cViewReplay::SetViewElements(void) {

-    viewElementNames.insert(pair<string, int>("background", (int)eVeDisplayReplay::background));

-    viewElementNames.insert(pair<string, int>("backgroundmodeonly", (int)eVeDisplayReplay::backgroundmodeonly));

-    viewElementNames.insert(pair<string, int>("datetime", (int)eVeDisplayReplay::datetime));

-    viewElementNames.insert(pair<string, int>("time", (int)eVeDisplayReplay::time));

-    viewElementNames.insert(pair<string, int>("scrapercontent", (int)eVeDisplayReplay::scrapercontent));

-    viewElementNames.insert(pair<string, int>("rectitle", (int)eVeDisplayReplay::rectitle));

-    viewElementNames.insert(pair<string, int>("recinfo", (int)eVeDisplayReplay::recinfo));

-    viewElementNames.insert(pair<string, int>("currenttime", (int)eVeDisplayReplay::currenttime));

-    viewElementNames.insert(pair<string, int>("endtime", (int)eVeDisplayReplay::endtime));

-    viewElementNames.insert(pair<string, int>("totaltime", (int)eVeDisplayReplay::totaltime));

-    viewElementNames.insert(pair<string, int>("progressbar", (int)eVeDisplayReplay::progressbar));

-    viewElementNames.insert(pair<string, int>("cutmarks", (int)eVeDisplayReplay::cutmarks));

-    viewElementNames.insert(pair<string, int>("cutmarks", (int)eVeDisplayReplay::cutmarks));

-    viewElementNames.insert(pair<string, int>("controlicons", (int)eVeDisplayReplay::controlicons));

-    viewElementNames.insert(pair<string, int>("controliconsmodeonly", (int)eVeDisplayReplay::controliconsmodeonly));

-    viewElementNames.insert(pair<string, int>("progressmodeonly", (int)eVeDisplayReplay::progressmodeonly));

-    viewElementNames.insert(pair<string, int>("jump", (int)eVeDisplayReplay::jump));

-    viewElementNames.insert(pair<string, int>("message", (int)eVeDisplayReplay::message));

-    viewElementNames.insert(pair<string, int>("onpause", (int)eVeDisplayReplay::onpause));

-    viewElementNames.insert(pair<string, int>("onpausemodeonly", (int)eVeDisplayReplay::onpausemodeonly));

-    viewElementNames.insert(pair<string, int>("customtokens", (int)eVeDisplayReplay::customtokens));

-}

-

-void cViewReplay::SetViewElementObjects(void) {

-    for (int i = 0; i < numViewElements; i++) {

-        if (!viewElements[i])

-            continue;

-        if (dynamic_cast<cVeMessage*>(viewElements[i])) 

-        {

-            veMessage = dynamic_cast<cVeMessage*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDrScraperContent*>(viewElements[i])) 

-        {

-            veScraperContent = dynamic_cast<cVeDrScraperContent*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeCustomTokens*>(viewElements[i])) 

-        {

-            veCustomTokens = dynamic_cast<cVeCustomTokens*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDrRecTitle*>(viewElements[i])) 

-        {

-            veRecTitle = dynamic_cast<cVeDrRecTitle*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDrRecInfo*>(viewElements[i])) 

-        {

-            veRecInfo = dynamic_cast<cVeDrRecInfo*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDrCurrentTime*>(viewElements[i])) 

-        {

-            veCurrentTime = dynamic_cast<cVeDrCurrentTime*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDrTotalTime*>(viewElements[i])) 

-        {

-            veTotalTime = dynamic_cast<cVeDrTotalTime*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDrEndTime*>(viewElements[i])) 

-        {

-            veEndTime = dynamic_cast<cVeDrEndTime*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDrProgressBar*>(viewElements[i])) 

-        {

-            veProgressbar = dynamic_cast<cVeDrProgressBar*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDrCutMarks*>(viewElements[i])) 

-        {

-            veCutMarks = dynamic_cast<cVeDrCutMarks*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDrProgressModeonly*>(viewElements[i])) 

-        {

-            veProgressModeOnly = dynamic_cast<cVeDrProgressModeonly*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDrControlIcons*>(viewElements[i]) && (i == (int)eVeDisplayReplay::controlicons)) 

-        {

-            veControlIcons = dynamic_cast<cVeDrControlIcons*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDrControlIcons*>(viewElements[i]) && i == (int)eVeDisplayReplay::controliconsmodeonly) 

-        {

-            veControlIconsModeOnly = dynamic_cast<cVeDrControlIcons*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDrJump*>(viewElements[i])) 

-        {

-            veJump = dynamic_cast<cVeDrJump*>(viewElements[i]);

-        }

-        else if (dynamic_cast<cVeDrOnPause*>(viewElements[i]) && i == (int)eVeDisplayReplay::onpause)

-        {

-            veOnPause = dynamic_cast<cVeDrOnPause*>(viewElements[i]);

-            veOnPause->SetDetached();

-            veOnPause->UnsetWaitOnWakeup();

-        }

-        else if (dynamic_cast<cVeDrOnPause*>(viewElements[i])  && i == (int)eVeDisplayReplay::onpausemodeonly) 

-        {

-            veOnPauseModeOnly = dynamic_cast<cVeDrOnPause*>(viewElements[i]);

-            veOnPauseModeOnly->SetDetached();

-            veOnPauseModeOnly->UnsetWaitOnWakeup();

-        }

-    }

-}

-

-void cViewReplay::ClearVariables(void) {

-    cView::ClearVariables();

-    modeOnly = false;

-    lastFlush = 0;

-    message = false;

-    reclength = -1;

-    timeShiftActive = false;

-    timeShiftFramesTotal = -1;

-    timeShiftLength = -1;

-    timeShiftDuration = "";

-    if (veCustomTokens)

-        veCustomTokens->Reset();

-    if (veEndTime)

-        veEndTime->Set(cString(""));

-    if (veCutMarks)

-        veCutMarks->Reset();

-}

-

-void cViewReplay::SetTimeShift(int framesTotal, int timeShiftLength) {

-    timeShiftActive = true;

-    timeShiftFramesTotal = framesTotal;

-    this->timeShiftLength = timeShiftLength;

-    int mins = (timeShiftLength / 60) % 60;

-    int hours = (timeShiftLength / 3600) % 24;

-    timeShiftDuration = cString::sprintf("%d:%02d", hours, mins);

-}

-

-void cViewReplay::SetRecording(const cRecording *recording) {

-    if (veRecTitle) {

-        veRecTitle->Set(recording);

-    }

-    if (veRecInfo) {

-        veRecInfo->Set(recording);

-    }

-    if (veScraperContent) {

-        veScraperContent->Set(recording);

-    }

-}

-

-void cViewReplay::SetTitle(const char *title) {

-    if (veRecTitle) {

-        veRecTitle->Set(title);

-    }    

-}

-

-void cViewReplay::SetCurrent(const char *current) {

-    if (veCurrentTime)

-        veCurrentTime->Set(current);

-    Render((int)eVeDisplayReplay::currenttime);

-    //good place to refresh these viewelements 

-    //since SetCurrent is called every second

-    Render((int)eVeDisplayReplay::datetime);

-    Render((int)eVeDisplayReplay::time);

-    Render((int)eVeDisplayChannel::customtokens);

-}

-

-void cViewReplay::SetTotal(const char *total) {

-    if (veTotalTime)

-        veTotalTime->Set(total, timeShiftActive, *timeShiftDuration);

-    Render((int)eVeDisplayReplay::totaltime);

-}

-

-void cViewReplay::SetEndTime(int current, int total) {

-    if (!veEndTime)

-        return;

-    int totalLength = total;

-    int recordingLength = reclength;

-    if (timeShiftActive && timeShiftFramesTotal > 0) {

-        totalLength = timeShiftFramesTotal;

-        recordingLength = timeShiftLength;

-    }

-    double rest = (double)(totalLength - current) / (double)totalLength;

-    time_t end = time(0) + rest*recordingLength;

-    veEndTime->Set(TimeString(end));

-    Render((int)eVeDisplayReplay::endtime);

-}

-

-void cViewReplay::SetProgressbar(int current, int total) {

-    if (veProgressbar)

-        veProgressbar->Set(current, total, timeShiftActive, timeShiftFramesTotal);

-    Render((int)eVeDisplayReplay::progressbar);

-}

-

-void cViewReplay::SetMarks(const cMarks *marks, int current, int total) {

-    if (veCutMarks)

-        veCutMarks->Set(marks, current, total, timeShiftActive, timeShiftFramesTotal);

-    Render((int)eVeDisplayReplay::cutmarks);

-}

-

-void cViewReplay::SetControlIcons(bool play, bool forward, int speed) {

-    if (!modeOnly) {

-        if (veControlIcons)

-            veControlIcons->Set(play, forward, speed);

-        Render((int)eVeDisplayReplay::controlicons);

-    } else {

-        if (veControlIconsModeOnly)

-            veControlIconsModeOnly->Set(play, forward, speed);

-        Render((int)eVeDisplayReplay::controliconsmodeonly);

-    }

-    

-}

-

-void cViewReplay::SetJump(const char *jump) {

-    if (veJump) {

-        if (!jump)

-            veJump->Clear();

-        else

-            veJump->Set(jump);

-    }

-    Render((int)eVeDisplayReplay::jump);

-}

-

-void cViewReplay::SetMessage(eMessageType type, const char *text) {

-    if (veMessage) {

-        if (text)

-            veMessage->Set(type, text);

-        else

-            veMessage->Clear();

-    }

-    Render((int)eVeDisplayReplay::message);

-}

-

-void cViewReplay::StartOnPause(const char *recfilename) {

-    cVeDrOnPause *onPause = (!modeOnly) ? veOnPause : veOnPauseModeOnly;

-    if (!onPause)

-        return;

-    onPause->Set(recfilename);

-    onPause->Parse(true);

-}

-

-void cViewReplay::ClearOnPause(void) {

-    cVeDrOnPause *onPause = (!modeOnly) ? veOnPause : veOnPauseModeOnly;

-    if (!onPause)

-        return;

-    onPause->Close();

-}

-

-void cViewReplay::Flush(void) {

-    if (init) {

-        sdOsd.LockFlush();

-        if (!modeOnly) {

-            Render((int)eVeDisplayReplay::background);

-            Render((int)eVeDisplayReplay::rectitle);

-            Render((int)eVeDisplayReplay::recinfo);

-            Render((int)eVeDisplayReplay::scrapercontent);

-        } else {

-            Render((int)eVeDisplayReplay::backgroundmodeonly);            

-        } 

-    }

-

-    if (modeOnly) {

-        SetProgressModeOnly();

-    }

-

-    cView::Flush();

-}

-

-void cViewReplay::SetProgressModeOnly(void) {

-    if (!veProgressModeOnly)

-        return;

-    time_t now = time(0);

-    if (now == lastFlush) {

-        return;

-    } 

-    lastFlush = now;

-

-    cControl *control = cControl::Control();

-    if (!control)

-        return;

-    double fps = control->FramesPerSecond();

-    int current = 0;

-    int total = 0;

-    if (!control->GetIndex(current, total))

-        return;

-    veProgressModeOnly->Set(fps, current, total);

-    if (veProgressModeOnly->Parse())

-        veProgressModeOnly->Render();

+#include "viewdisplayreplay.h"
+
+/************************************************************************************
+* cViewReplay
+************************************************************************************/
+
+cViewReplay::cViewReplay(void) {
+    veCustomTokens = NULL;
+    veEndTime = NULL;
+    veMessage = NULL;
+    veScraperContent = NULL;
+    veRecTitle = NULL;
+    veRecInfo = NULL;
+    veCurrentTime = NULL;
+    veTotalTime = NULL;
+    veProgressbar = NULL;
+    veCutMarks = NULL;
+    veProgressModeOnly = NULL;
+    veControlIcons = NULL;
+    veControlIconsModeOnly = NULL;
+    veJump = NULL;
+    veOnPause = NULL;
+    veOnPauseModeOnly = NULL;
+    ClearVariables();
+    viewId = eViewType::DisplayReplay;
+    viewName = strdup("displayreplay");
+    numViewElements = (int)eVeDisplayReplay::count;
+    viewElements = new cViewElement*[numViewElements];
+    for (int i=0; i < numViewElements; i++) {
+        viewElements[i] = NULL;
+    }
+    SetViewElements();
+}
+
+cViewReplay::~cViewReplay() {
+}
+
+void cViewReplay::SetViewElements(void) {
+    viewElementNames.insert(pair<string, int>("background", (int)eVeDisplayReplay::background));
+    viewElementNames.insert(pair<string, int>("backgroundmodeonly", (int)eVeDisplayReplay::backgroundmodeonly));
+    viewElementNames.insert(pair<string, int>("datetime", (int)eVeDisplayReplay::datetime));
+    viewElementNames.insert(pair<string, int>("time", (int)eVeDisplayReplay::time));
+    viewElementNames.insert(pair<string, int>("scrapercontent", (int)eVeDisplayReplay::scrapercontent));
+    viewElementNames.insert(pair<string, int>("rectitle", (int)eVeDisplayReplay::rectitle));
+    viewElementNames.insert(pair<string, int>("recinfo", (int)eVeDisplayReplay::recinfo));
+    viewElementNames.insert(pair<string, int>("currenttime", (int)eVeDisplayReplay::currenttime));
+    viewElementNames.insert(pair<string, int>("endtime", (int)eVeDisplayReplay::endtime));
+    viewElementNames.insert(pair<string, int>("totaltime", (int)eVeDisplayReplay::totaltime));
+    viewElementNames.insert(pair<string, int>("progressbar", (int)eVeDisplayReplay::progressbar));
+    viewElementNames.insert(pair<string, int>("cutmarks", (int)eVeDisplayReplay::cutmarks));
+    viewElementNames.insert(pair<string, int>("cutmarks", (int)eVeDisplayReplay::cutmarks));
+    viewElementNames.insert(pair<string, int>("controlicons", (int)eVeDisplayReplay::controlicons));
+    viewElementNames.insert(pair<string, int>("controliconsmodeonly", (int)eVeDisplayReplay::controliconsmodeonly));
+    viewElementNames.insert(pair<string, int>("progressmodeonly", (int)eVeDisplayReplay::progressmodeonly));
+    viewElementNames.insert(pair<string, int>("jump", (int)eVeDisplayReplay::jump));
+    viewElementNames.insert(pair<string, int>("message", (int)eVeDisplayReplay::message));
+    viewElementNames.insert(pair<string, int>("onpause", (int)eVeDisplayReplay::onpause));
+    viewElementNames.insert(pair<string, int>("onpausemodeonly", (int)eVeDisplayReplay::onpausemodeonly));
+    viewElementNames.insert(pair<string, int>("customtokens", (int)eVeDisplayReplay::customtokens));
+}
+
+void cViewReplay::SetViewElementObjects(void) {
+    for (int i = 0; i < numViewElements; i++) {
+        if (!viewElements[i])
+            continue;
+        if (dynamic_cast<cVeMessage*>(viewElements[i])) 
+        {
+            veMessage = dynamic_cast<cVeMessage*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDrScraperContent*>(viewElements[i])) 
+        {
+            veScraperContent = dynamic_cast<cVeDrScraperContent*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeCustomTokens*>(viewElements[i])) 
+        {
+            veCustomTokens = dynamic_cast<cVeCustomTokens*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDrRecTitle*>(viewElements[i])) 
+        {
+            veRecTitle = dynamic_cast<cVeDrRecTitle*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDrRecInfo*>(viewElements[i])) 
+        {
+            veRecInfo = dynamic_cast<cVeDrRecInfo*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDrCurrentTime*>(viewElements[i])) 
+        {
+            veCurrentTime = dynamic_cast<cVeDrCurrentTime*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDrTotalTime*>(viewElements[i])) 
+        {
+            veTotalTime = dynamic_cast<cVeDrTotalTime*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDrEndTime*>(viewElements[i])) 
+        {
+            veEndTime = dynamic_cast<cVeDrEndTime*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDrProgressBar*>(viewElements[i])) 
+        {
+            veProgressbar = dynamic_cast<cVeDrProgressBar*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDrCutMarks*>(viewElements[i])) 
+        {
+            veCutMarks = dynamic_cast<cVeDrCutMarks*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDrProgressModeonly*>(viewElements[i])) 
+        {
+            veProgressModeOnly = dynamic_cast<cVeDrProgressModeonly*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDrControlIcons*>(viewElements[i]) && (i == (int)eVeDisplayReplay::controlicons)) 
+        {
+            veControlIcons = dynamic_cast<cVeDrControlIcons*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDrControlIcons*>(viewElements[i]) && i == (int)eVeDisplayReplay::controliconsmodeonly) 
+        {
+            veControlIconsModeOnly = dynamic_cast<cVeDrControlIcons*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDrJump*>(viewElements[i])) 
+        {
+            veJump = dynamic_cast<cVeDrJump*>(viewElements[i]);
+        }
+        else if (dynamic_cast<cVeDrOnPause*>(viewElements[i]) && i == (int)eVeDisplayReplay::onpause)
+        {
+            veOnPause = dynamic_cast<cVeDrOnPause*>(viewElements[i]);
+            veOnPause->SetDetached();
+            veOnPause->UnsetWaitOnWakeup();
+        }
+        else if (dynamic_cast<cVeDrOnPause*>(viewElements[i])  && i == (int)eVeDisplayReplay::onpausemodeonly) 
+        {
+            veOnPauseModeOnly = dynamic_cast<cVeDrOnPause*>(viewElements[i]);
+            veOnPauseModeOnly->SetDetached();
+            veOnPauseModeOnly->UnsetWaitOnWakeup();
+        }
+    }
+}
+
+void cViewReplay::ClearVariables(void) {
+    cView::ClearVariables();
+    modeOnly = false;
+    lastFlush = 0;
+    message = false;
+    reclength = -1;
+    timeShiftActive = false;
+    timeShiftFramesTotal = -1;
+    timeShiftLength = -1;
+    timeShiftDuration = "";
+    if (veCustomTokens)
+        veCustomTokens->Reset();
+    if (veEndTime)
+        veEndTime->Set(cString(""));
+    if (veCutMarks)
+        veCutMarks->Reset();
+}
+
+void cViewReplay::SetTimeShift(int framesTotal, int timeShiftLength) {
+    timeShiftActive = true;
+    timeShiftFramesTotal = framesTotal;
+    this->timeShiftLength = timeShiftLength;
+    int mins = (timeShiftLength / 60) % 60;
+    int hours = (timeShiftLength / 3600) % 24;
+    timeShiftDuration = cString::sprintf("%d:%02d", hours, mins);
+}
+
+void cViewReplay::SetRecording(const cRecording *recording) {
+    if (veRecTitle) {
+        veRecTitle->Set(recording);
+    }
+    if (veRecInfo) {
+        veRecInfo->Set(recording);
+    }
+    if (veScraperContent) {
+        veScraperContent->Set(recording);
+    }
+}
+
+void cViewReplay::SetTitle(const char *title) {
+    if (veRecTitle) {
+        veRecTitle->Set(title);
+    }    
+}
+
+void cViewReplay::SetCurrent(const char *current) {
+    if (veCurrentTime)
+        veCurrentTime->Set(current);
+    Render((int)eVeDisplayReplay::currenttime);
+    //good place to refresh these viewelements 
+    //since SetCurrent is called every second
+    Render((int)eVeDisplayReplay::datetime);
+    Render((int)eVeDisplayReplay::time);
+    Render((int)eVeDisplayChannel::customtokens);
+}
+
+void cViewReplay::SetTotal(const char *total) {
+    if (veTotalTime)
+        veTotalTime->Set(total, timeShiftActive, *timeShiftDuration);
+    Render((int)eVeDisplayReplay::totaltime);
+}
+
+void cViewReplay::SetEndTime(int current, int total) {
+    if (!veEndTime)
+        return;
+    int totalLength = total;
+    int recordingLength = reclength;
+    if (timeShiftActive && timeShiftFramesTotal > 0) {
+        totalLength = timeShiftFramesTotal;
+        recordingLength = timeShiftLength;
+    }
+    double rest = (double)(totalLength - current) / (double)totalLength;
+    time_t end = time(0) + rest*recordingLength;
+    veEndTime->Set(TimeString(end));
+    Render((int)eVeDisplayReplay::endtime);
+}
+
+void cViewReplay::SetProgressbar(int current, int total) {
+    if (veProgressbar)
+        veProgressbar->Set(current, total, timeShiftActive, timeShiftFramesTotal);
+    Render((int)eVeDisplayReplay::progressbar);
+}
+
+void cViewReplay::SetMarks(const cMarks *marks, int current, int total) {
+    if (veCutMarks)
+        veCutMarks->Set(marks, current, total, timeShiftActive, timeShiftFramesTotal);
+    Render((int)eVeDisplayReplay::cutmarks);
+}
+
+void cViewReplay::SetControlIcons(bool play, bool forward, int speed) {
+    if (!modeOnly) {
+        if (veControlIcons)
+            veControlIcons->Set(play, forward, speed);
+        Render((int)eVeDisplayReplay::controlicons);
+    } else {
+        if (veControlIconsModeOnly)
+            veControlIconsModeOnly->Set(play, forward, speed);
+        Render((int)eVeDisplayReplay::controliconsmodeonly);
+    }
+    
+}
+
+void cViewReplay::SetJump(const char *jump) {
+    if (veJump) {
+        if (!jump)
+            veJump->Clear();
+        else
+            veJump->Set(jump);
+    }
+    Render((int)eVeDisplayReplay::jump);
+}
+
+void cViewReplay::SetMessage(eMessageType type, const char *text) {
+    if (veMessage) {
+        if (text)
+            veMessage->Set(type, text);
+        else
+            veMessage->Clear();
+    }
+    Render((int)eVeDisplayReplay::message);
+}
+
+void cViewReplay::StartOnPause(const char *recfilename) {
+    cVeDrOnPause *onPause = (!modeOnly) ? veOnPause : veOnPauseModeOnly;
+    if (!onPause)
+        return;
+    onPause->Set(recfilename);
+    onPause->Parse(true);
+}
+
+void cViewReplay::ClearOnPause(void) {
+    cVeDrOnPause *onPause = (!modeOnly) ? veOnPause : veOnPauseModeOnly;
+    if (!onPause)
+        return;
+    onPause->Close();
+}
+
+void cViewReplay::Flush(void) {
+    if (init) {
+        sdOsd.LockFlush();
+        if (!modeOnly) {
+            Render((int)eVeDisplayReplay::background);
+            Render((int)eVeDisplayReplay::rectitle);
+            Render((int)eVeDisplayReplay::recinfo);
+            Render((int)eVeDisplayReplay::scrapercontent);
+        } else {
+            Render((int)eVeDisplayReplay::backgroundmodeonly);            
+        } 
+    }
+
+    if (modeOnly) {
+        SetProgressModeOnly();
+    }
+
+    cView::Flush();
+}
+
+void cViewReplay::SetProgressModeOnly(void) {
+    if (!veProgressModeOnly)
+        return;
+    time_t now = time(0);
+    if (now == lastFlush) {
+        return;
+    } 
+    lastFlush = now;
+
+    cControl *control = cControl::Control();
+    if (!control)
+        return;
+    double fps = control->FramesPerSecond();
+    int current = 0;
+    int total = 0;
+    if (!control->GetIndex(current, total))
+        return;
+    veProgressModeOnly->Set(fps, current, total);
+    if (veProgressModeOnly->Parse())
+        veProgressModeOnly->Render();
 }
\ No newline at end of file
diff --git a/coreengine/viewdisplayreplay.h b/coreengine/viewdisplayreplay.h
index 74ed10b..64fbd51 100644
--- a/coreengine/viewdisplayreplay.h
+++ b/coreengine/viewdisplayreplay.h
@@ -1,57 +1,57 @@
-#ifndef __VIEWDISPLAYREPLAY_H

-#define __VIEWDISPLAYREPLAY_H

-

-#include "view.h"

-

-class cViewReplay : public cView {

-private:

-    cVeMessage             *veMessage;

-    cVeCustomTokens        *veCustomTokens;

-    cVeDrRecTitle          *veRecTitle;

-    cVeDrRecInfo           *veRecInfo;

-    cVeDrScraperContent    *veScraperContent;

-    cVeDrCurrentTime       *veCurrentTime;

-    cVeDrTotalTime         *veTotalTime;

-    cVeDrEndTime           *veEndTime;

-    cVeDrProgressBar       *veProgressbar;

-    cVeDrCutMarks          *veCutMarks;

-    cVeDrProgressModeonly  *veProgressModeOnly;

-    cVeDrControlIcons      *veControlIcons;

-    cVeDrControlIcons      *veControlIconsModeOnly;

-    cVeDrJump              *veJump;

-    cVeDrOnPause           *veOnPause;

-    cVeDrOnPause           *veOnPauseModeOnly;

-    bool modeOnly;

-    time_t lastFlush;

-    bool message;

-    int reclength;

-    bool timeShiftActive;

-    int timeShiftFramesTotal;

-    int timeShiftLength;

-    cString timeShiftDuration;

-    void SetViewElements(void);

-    void ClearVariables(void);

-    void SetViewElementObjects(void);

-    void SetProgressModeOnly(void);

-public:

-    cViewReplay(void);

-    virtual ~cViewReplay(void);

-    void SetModeOnly(bool modeOnly) { this->modeOnly = modeOnly; };

-    void SetRecordingLength(int length) { reclength = length; };

-    void SetTimeShift(int framesTotal, int timeShiftLength);

-    void SetRecording(const cRecording *recording);

-    void SetTitle(const char *title);

-    void SetCurrent(const char *current);

-    void SetTotal(const char *total);

-    void SetEndTime(int current, int total);

-    void SetProgressbar(int current, int total);

-    void SetMarks(const cMarks *marks, int current, int total);

-    void SetControlIcons(bool play, bool forward, int speed);

-    void SetJump(const char *jump);

-    void SetMessage(eMessageType type, const char *text);

-    void StartOnPause(const char *recfilename);

-    void ClearOnPause(void);

-    void Flush(void);

-};

-

+#ifndef __VIEWDISPLAYREPLAY_H
+#define __VIEWDISPLAYREPLAY_H
+
+#include "view.h"
+
+class cViewReplay : public cView {
+private:
+    cVeMessage             *veMessage;
+    cVeCustomTokens        *veCustomTokens;
+    cVeDrRecTitle          *veRecTitle;
+    cVeDrRecInfo           *veRecInfo;
+    cVeDrScraperContent    *veScraperContent;
+    cVeDrCurrentTime       *veCurrentTime;
+    cVeDrTotalTime         *veTotalTime;
+    cVeDrEndTime           *veEndTime;
+    cVeDrProgressBar       *veProgressbar;
+    cVeDrCutMarks          *veCutMarks;
+    cVeDrProgressModeonly  *veProgressModeOnly;
+    cVeDrControlIcons      *veControlIcons;
+    cVeDrControlIcons      *veControlIconsModeOnly;
+    cVeDrJump              *veJump;
+    cVeDrOnPause           *veOnPause;
+    cVeDrOnPause           *veOnPauseModeOnly;
+    bool modeOnly;
+    time_t lastFlush;
+    bool message;
+    int reclength;
+    bool timeShiftActive;
+    int timeShiftFramesTotal;
+    int timeShiftLength;
+    cString timeShiftDuration;
+    void SetViewElements(void);
+    void ClearVariables(void);
+    void SetViewElementObjects(void);
+    void SetProgressModeOnly(void);
+public:
+    cViewReplay(void);
+    virtual ~cViewReplay(void);
+    void SetModeOnly(bool modeOnly) { this->modeOnly = modeOnly; };
+    void SetRecordingLength(int length) { reclength = length; };
+    void SetTimeShift(int framesTotal, int timeShiftLength);
+    void SetRecording(const cRecording *recording);
+    void SetTitle(const char *title);
+    void SetCurrent(const char *current);
+    void SetTotal(const char *total);
+    void SetEndTime(int current, int total);
+    void SetProgressbar(int current, int total);
+    void SetMarks(const cMarks *marks, int current, int total);
+    void SetControlIcons(bool play, bool forward, int speed);
+    void SetJump(const char *jump);
+    void SetMessage(eMessageType type, const char *text);
+    void StartOnPause(const char *recfilename);
+    void ClearOnPause(void);
+    void Flush(void);
+};
+
 #endif //__VIEWDISPLAYREPLAY_H1
\ No newline at end of file
diff --git a/coreengine/viewdisplaytracks.c b/coreengine/viewdisplaytracks.c
index 15ff584..6a02361 100644
--- a/coreengine/viewdisplaytracks.c
+++ b/coreengine/viewdisplaytracks.c
@@ -1,122 +1,122 @@
-#include "viewdisplaytracks.h"

-#include "../config.h"

-

-/************************************************************************************

-* cViewTracks

-************************************************************************************/

-

-cViewTracks::cViewTracks(void) {

-    ClearVariables();

-    viewId = eViewType::DisplayTracks;

-    viewName = strdup("displayaudiotracks");

-    numViewElements = (int)eVeDisplayTracks::count;

-    viewElements = new cViewElement*[numViewElements];

-    for (int i=0; i < numViewElements; i++) {

-        viewElements[i] = NULL;

-    }

-    viewList = NULL;

-    veBackground = NULL;

-    veHeader = NULL;

-    SetViewElements();

-}

-

-cViewTracks::~cViewTracks() {

-}

-

-void cViewTracks::SetViewElements(void) {

-    viewElementNames.insert(pair<string, int>("background", (int)eVeDisplayTracks::background));

-    viewElementNames.insert(pair<string, int>("header", (int)eVeDisplayTracks::header));

-}

-

-void cViewTracks::SetViewElementObjects(void) {

-    if (viewElements[(int)eVeDisplayTracks::background])

-        veBackground = dynamic_cast<cVeDtBackground*>(viewElements[(int)eVeDisplayTracks::background]);

-    if (viewElements[(int)eVeDisplayTracks::header])

-        veHeader = dynamic_cast<cVeDtHeader*>(viewElements[(int)eVeDisplayTracks::header]);

-}

-

-void cViewTracks::ClearVariables(void) {

-    init = true;

-    change = true;

-}

-

-void cViewTracks::Close(void) {

-    delete fader;

-    fader = NULL;

-    if (FadeTime() > 0) {

-        fader = new cAnimation((cFadable*)this, false);

-        fader->Fade();

-        delete fader;

-        fader = NULL;

-    }

-    for (int i=0; i < numViewElements; i++) {

-        if (viewElements[i]) {

-            viewElements[i]->Close();

-        }

-    }

-    if (viewList) {

-        viewList->Close();

-    }

-    ClearVariables();

-    sdOsd.DeleteOsd();

-}

-

-void cViewTracks::AddViewList(cViewList *viewList) {

-    this->viewList = dynamic_cast<cViewListAudioTracks*>(viewList);

-}

-

-void cViewTracks::PreCache(void) {

-    cView::PreCache();

-    if (viewList) {

-        viewList->SetContainer(0, 0, attribs->Width(), attribs->Height());

-        viewList->SetGlobals(globals);

-        viewList->PreCache();

-    }

-}

-

-void cViewTracks::SetTitle(const char *title) {

-    if (veHeader)

-        veHeader->SetTitle(title);

-    change = true;

-}

-

-void cViewTracks::SetNumtracks(int numTracks) {

-    if (veBackground)

-        veBackground->Set(numTracks);

-    if (veHeader)

-        veHeader->SetNumtracks(numTracks);

-    if (viewList)

-        viewList->SetNumtracks(numTracks);

-}

-

-void cViewTracks::SetAudiochannel(int audioChannel) {

-    if (veHeader)

-        veHeader->SetAudiochannel(audioChannel);

-    change = true;

-}

-

-void cViewTracks::SetTracks(const char * const *tracks) {

-    if (viewList)

-        viewList->SetTracks(tracks);

-    change = true;

-}

-

-void cViewTracks::SetCurrentTrack(int index) {

-    if (viewList)

-        viewList->SetCurrentTrack(index);    

-    change = true;

-}

-

-void cViewTracks::Flush(void) {

-    if (init) {

-        sdOsd.LockFlush();

-        Render((int)eVeDisplayTracks::background);

-    }

-    if (change) {

-        Render((int)eVeDisplayTracks::header);

-        if (viewList)

-            viewList->Draw();

-        change = false;

-    }

-    cView::Flush();

-}

+#include "viewdisplaytracks.h"
+#include "../config.h"
+
+/************************************************************************************
+* cViewTracks
+************************************************************************************/
+
+cViewTracks::cViewTracks(void) {
+    ClearVariables();
+    viewId = eViewType::DisplayTracks;
+    viewName = strdup("displayaudiotracks");
+    numViewElements = (int)eVeDisplayTracks::count;
+    viewElements = new cViewElement*[numViewElements];
+    for (int i=0; i < numViewElements; i++) {
+        viewElements[i] = NULL;
+    }
+    viewList = NULL;
+    veBackground = NULL;
+    veHeader = NULL;
+    SetViewElements();
+}
+
+cViewTracks::~cViewTracks() {
+}
+
+void cViewTracks::SetViewElements(void) {
+    viewElementNames.insert(pair<string, int>("background", (int)eVeDisplayTracks::background));
+    viewElementNames.insert(pair<string, int>("header", (int)eVeDisplayTracks::header));
+}
+
+void cViewTracks::SetViewElementObjects(void) {
+    if (viewElements[(int)eVeDisplayTracks::background])
+        veBackground = dynamic_cast<cVeDtBackground*>(viewElements[(int)eVeDisplayTracks::background]);
+    if (viewElements[(int)eVeDisplayTracks::header])
+        veHeader = dynamic_cast<cVeDtHeader*>(viewElements[(int)eVeDisplayTracks::header]);
+}
+
+void cViewTracks::ClearVariables(void) {
+    init = true;
+    change = true;
+}
+
+void cViewTracks::Close(void) {
+    delete fader;
+    fader = NULL;
+    if (FadeTime() > 0) {
+        fader = new cAnimation((cFadable*)this, false);
+        fader->Fade();
+        delete fader;
+        fader = NULL;
+    }
+    for (int i=0; i < numViewElements; i++) {
+        if (viewElements[i]) {
+            viewElements[i]->Close();
+        }
+    }
+    if (viewList) {
+        viewList->Close();
+    }
+    ClearVariables();
+    sdOsd.DeleteOsd();
+}
+
+void cViewTracks::AddViewList(cViewList *viewList) {
+    this->viewList = dynamic_cast<cViewListAudioTracks*>(viewList);
+}
+
+void cViewTracks::PreCache(void) {
+    cView::PreCache();
+    if (viewList) {
+        viewList->SetContainer(0, 0, attribs->Width(), attribs->Height());
+        viewList->SetGlobals(globals);
+        viewList->PreCache();
+    }
+}
+
+void cViewTracks::SetTitle(const char *title) {
+    if (veHeader)
+        veHeader->SetTitle(title);
+    change = true;
+}
+
+void cViewTracks::SetNumtracks(int numTracks) {
+    if (veBackground)
+        veBackground->Set(numTracks);
+    if (veHeader)
+        veHeader->SetNumtracks(numTracks);
+    if (viewList)
+        viewList->SetNumtracks(numTracks);
+}
+
+void cViewTracks::SetAudiochannel(int audioChannel) {
+    if (veHeader)
+        veHeader->SetAudiochannel(audioChannel);
+    change = true;
+}
+
+void cViewTracks::SetTracks(const char * const *tracks) {
+    if (viewList)
+        viewList->SetTracks(tracks);
+    change = true;
+}
+
+void cViewTracks::SetCurrentTrack(int index) {
+    if (viewList)
+        viewList->SetCurrentTrack(index);    
+    change = true;
+}
+
+void cViewTracks::Flush(void) {
+    if (init) {
+        sdOsd.LockFlush();
+        Render((int)eVeDisplayTracks::background);
+    }
+    if (change) {
+        Render((int)eVeDisplayTracks::header);
+        if (viewList)
+            viewList->Draw();
+        change = false;
+    }
+    cView::Flush();
+}
diff --git a/coreengine/viewdisplaytracks.h b/coreengine/viewdisplaytracks.h
index c3aea1f..e56fa82 100644
--- a/coreengine/viewdisplaytracks.h
+++ b/coreengine/viewdisplaytracks.h
@@ -1,29 +1,29 @@
-#ifndef __VIEWDISPLAYTRACKS_H

-#define __VIEWDISPLAYTRACKS_H

-

-#include "view.h"

-

-class cViewTracks : public cView {

-private:

-    cViewListAudioTracks *viewList;

-    cVeDtBackground *veBackground;

-    cVeDtHeader *veHeader;

-    bool change;

-    void SetViewElements(void);

-    void SetViewElementObjects(void);

-    void ClearVariables(void);

-public:

-    cViewTracks(void);

-    virtual ~cViewTracks(void);

-    void Close(void);

-    void AddViewList(cViewList *viewList);

-    void PreCache(void);

-    void SetTitle(const char *title);

-    void SetNumtracks(int numTracks);

-    void SetTracks(const char * const *tracks);

-    void SetAudiochannel(int audioChannel);

-    void SetCurrentTrack(int index);

-    void Flush(void);

-};

-

+#ifndef __VIEWDISPLAYTRACKS_H
+#define __VIEWDISPLAYTRACKS_H
+
+#include "view.h"
+
+class cViewTracks : public cView {
+private:
+    cViewListAudioTracks *viewList;
+    cVeDtBackground *veBackground;
+    cVeDtHeader *veHeader;
+    bool change;
+    void SetViewElements(void);
+    void SetViewElementObjects(void);
+    void ClearVariables(void);
+public:
+    cViewTracks(void);
+    virtual ~cViewTracks(void);
+    void Close(void);
+    void AddViewList(cViewList *viewList);
+    void PreCache(void);
+    void SetTitle(const char *title);
+    void SetNumtracks(int numTracks);
+    void SetTracks(const char * const *tracks);
+    void SetAudiochannel(int audioChannel);
+    void SetCurrentTrack(int index);
+    void Flush(void);
+};
+
 #endif //__VIEWDISPLAYTRACKS_H
\ No newline at end of file
diff --git a/coreengine/viewdisplayvolume.c b/coreengine/viewdisplayvolume.c
index 2764a67..1cd9926 100644
--- a/coreengine/viewdisplayvolume.c
+++ b/coreengine/viewdisplayvolume.c
@@ -1,52 +1,52 @@
-#include "viewdisplayvolume.h"

-

-/************************************************************************************

-* cViewVolume

-************************************************************************************/

-

-cViewVolume::cViewVolume(void) {

-    viewId = eViewType::DisplayVolume;

-    viewName = strdup("displayvolume");

-    numViewElements = (int)eVeDisplayVolume::count;

-    viewElements = new cViewElement*[numViewElements];

-    for (int i=0; i < numViewElements; i++) {

-        viewElements[i] = NULL;

-    }

-    SetViewElements();

-    ClearVariables();

-    veVolume = NULL;

-}

-

-cViewVolume::~cViewVolume() {

-}

-

-void cViewVolume::SetViewElements(void) {

-    viewElementNames.insert(pair<string, int>("background", (int)eVeDisplayVolume::background));

-    viewElementNames.insert(pair<string, int>("volume", (int)eVeDisplayVolume::volume));

-}

-

-void cViewVolume::SetViewElementObjects(void) {

-    if (!viewElements[(int)eVeDisplayVolume::volume])

-        return;

-    veVolume = dynamic_cast<cVeVolume*>(viewElements[(int)eVeDisplayVolume::volume]);

-}

-

-void cViewVolume::ClearVariables(void) {

-    init = true;

-}

-

-void cViewVolume::SetVolume(int current, int total, bool mute) {

-    if (veVolume)

-        veVolume->Set(current, total, mute);

-}

-

-void cViewVolume::Flush(void) {

-    if (init) {

-        sdOsd.LockFlush();

-        Render((int)eVeDisplayVolume::background);

-    }

-    Render((int)eVeDisplayVolume::volume);

-    cView::Flush();

-}

-

-

+#include "viewdisplayvolume.h"
+
+/************************************************************************************
+* cViewVolume
+************************************************************************************/
+
+cViewVolume::cViewVolume(void) {
+    viewId = eViewType::DisplayVolume;
+    viewName = strdup("displayvolume");
+    numViewElements = (int)eVeDisplayVolume::count;
+    viewElements = new cViewElement*[numViewElements];
+    for (int i=0; i < numViewElements; i++) {
+        viewElements[i] = NULL;
+    }
+    SetViewElements();
+    ClearVariables();
+    veVolume = NULL;
+}
+
+cViewVolume::~cViewVolume() {
+}
+
+void cViewVolume::SetViewElements(void) {
+    viewElementNames.insert(pair<string, int>("background", (int)eVeDisplayVolume::background));
+    viewElementNames.insert(pair<string, int>("volume", (int)eVeDisplayVolume::volume));
+}
+
+void cViewVolume::SetViewElementObjects(void) {
+    if (!viewElements[(int)eVeDisplayVolume::volume])
+        return;
+    veVolume = dynamic_cast<cVeVolume*>(viewElements[(int)eVeDisplayVolume::volume]);
+}
+
+void cViewVolume::ClearVariables(void) {
+    init = true;
+}
+
+void cViewVolume::SetVolume(int current, int total, bool mute) {
+    if (veVolume)
+        veVolume->Set(current, total, mute);
+}
+
+void cViewVolume::Flush(void) {
+    if (init) {
+        sdOsd.LockFlush();
+        Render((int)eVeDisplayVolume::background);
+    }
+    Render((int)eVeDisplayVolume::volume);
+    cView::Flush();
+}
+
+
diff --git a/coreengine/viewdisplayvolume.h b/coreengine/viewdisplayvolume.h
index b65b3fd..6fa7f17 100644
--- a/coreengine/viewdisplayvolume.h
+++ b/coreengine/viewdisplayvolume.h
@@ -1,19 +1,19 @@
-#ifndef __VIEWDISPLAYVOLUME_H

-#define __VIEWDISPLAYVOLUME_H

-

-#include "view.h"

-

-class cViewVolume : public cView {

-private:

-    cVeVolume *veVolume;

-    void SetViewElements(void);

-    void SetViewElementObjects(void);

-    void ClearVariables(void);

-public:

-    cViewVolume(void);

-    virtual ~cViewVolume(void);

-    void SetVolume(int current, int total, bool mute);

-    void Flush(void);

-};

-

+#ifndef __VIEWDISPLAYVOLUME_H
+#define __VIEWDISPLAYVOLUME_H
+
+#include "view.h"
+
+class cViewVolume : public cView {
+private:
+    cVeVolume *veVolume;
+    void SetViewElements(void);
+    void SetViewElementObjects(void);
+    void ClearVariables(void);
+public:
+    cViewVolume(void);
+    virtual ~cViewVolume(void);
+    void SetVolume(int current, int total, bool mute);
+    void Flush(void);
+};
+
 #endif //__VIEWDISPLAYVOLUME_H
\ No newline at end of file
diff --git a/coreengine/viewelement.c b/coreengine/viewelement.c
index 5f6f04b..4759b60 100644
--- a/coreengine/viewelement.c
+++ b/coreengine/viewelement.c
@@ -1,532 +1,532 @@
-#include "viewelement.h"

-#include "../config.h"

-

-/******************************************************************

-* cViewElement

-******************************************************************/

-cViewElement::cViewElement(void) {

-    sdOsd = NULL;

-    id = -1;

-    dirty = true;

-    init = true;

-    drawn = false;

-    scrollingStarted = false;

-    blocked = false;

-    detached = false;

-    waitOnWakeup = true;

-    startAnimation = true;

-    globals = NULL;

-    tokenContainer = NULL;

-    attribs = new cViewElementAttribs((int)eViewElementAttribs::count);

-    detacher = NULL;

-    fader = NULL;

-    shifter = NULL;

-}

-

-cViewElement::cViewElement(const cViewElement &other) {

-    sdOsd = other.sdOsd;

-    id = other.id;

-    dirty = other.dirty; 

-    init = other.init;

-    drawn = false;

-    scrollingStarted = false;

-    blocked = false;

-    detached = false;

-    waitOnWakeup = true;

-    startAnimation = true;

-    globals = other.globals;

-    container.Set(other.container.X(), other.container.Y(), other.container.Width(), other.container.Height());

-    tokenContainer = NULL;

-    attribs = new cViewElementAttribs(*other.attribs);

-

-    for (cAreaNode *node = other.areaNodes.First(); node; node = other.areaNodes.Next(node)) {

-        if (cArea *a = dynamic_cast<cArea*>(node)) {

-            areaNodes.Add(new cArea(*a));

-        } else if (cAreaContainer *ac = dynamic_cast<cAreaContainer*>(node)) {

-            areaNodes.Add(new cAreaContainer(*ac));

-        } 

-    }

-    

-    detacher = NULL;

-    fader = NULL;

-    shifter = NULL;

-}

-

-cViewElement::~cViewElement(void) {

-    delete attribs;

-    delete detacher;

-    delete fader;

-    delete shifter;

-    delete tokenContainer;

-}

-

-/******************************************************************

-* Public Functions

-******************************************************************/

-cViewElement *cViewElement::CreateViewElement(const char *name, const char *viewname) {

-    cViewElement *e = NULL;

-    

-    //common view elements

-    if (!strcmp(name, "background") && strcmp(viewname, "displayaudiotracks"))

-        e = new cViewElement();

-    else if (!strcmp(name, "datetime"))

-        e = new cVeDateTime();

-    else if (!strcmp(name, "time"))

-        e = new cVeTime();

-    else if (!strcmp(name, "message"))

-        e = new cVeMessage();

-    else if (!strcmp(name, "devices"))

-        e = new cVeDevices();

-    else if (!strcmp(name, "currentweather"))

-        e = new cVeCurrentWeather();

-    else if (!strcmp(name, "customtokens"))

-        e = new cVeCustomTokens();

-    

-    //displaychannel viewelements

-    else if (!strcmp(name, "channelinfo"))

-        e = new cVeDcChannelInfo();

-    else if (!strcmp(name, "channelgroup"))

-        e = new cVeDcChannelGroup();

-    else if (!strcmp(name, "epginfo"))

-        e = new cVeDcEpgInfo();

-    else if (!strcmp(name, "progressbar") && !strcmp(viewname, "displaychannel"))

-        e = new cVeDcProgressBar();

-    else if (!strcmp(name, "statusinfo"))

-        e = new cVeDcStatusInfo();

-    else if (!strcmp(name, "audioinfo"))

-        e = new cVeDcAudioInfo();

-    else if (!strcmp(name, "screenresolution"))

-        e = new cVeDcScreenResolution();

-    else if (!strcmp(name, "signalquality"))

-        e = new cVeDcSignalQuality();

-    else if (!strcmp(name, "scrapercontent") && !strcmp(viewname, "displaychannel"))

-        e = new cVeDcScraperContent();

-    else if (!strcmp(name, "ecminfo"))

-        e = new cVeDcEcmInfo();

-    

-    //displaymenu viewelements

-    else if (!strcmp(name, "header") && strcmp(viewname, "displayaudiotracks"))

-        e = new cVeDmHeader();

-    else if (!strcmp(name, "sortmode"))

-        e = new cVeDmSortmode();

-    else if (!strcmp(name, "colorbuttons"))

-        e = new cVeDmColorbuttons();

-    else if (!strcmp(name, "scrollbar"))

-        e = new cVeDmScrollbar();

-    else if (!strcmp(name, "timers"))

-        e = new cVeDmTimers();

-    else if (!strcmp(name, "currentschedule"))

-        e = new cVeDmCurrentschedule();

-    else if (!strcmp(name, "discusage"))

-        e = new cVeDmDiscusage();

-    else if (!strcmp(name, "systemload"))

-        e = new cVeDmSystemload();

-    else if (!strcmp(name, "systemmemory"))

-        e = new cVeDmSystemmemory();

-    else if (!strcmp(name, "temperatures"))

-        e = new cVeDmTemperatures();

-    else if (!strcmp(name, "vdrstatistics"))

-        e = new cVeDmVdrstatistics();

-    else if (!strcmp(name, "lastrecordings"))

-        e = new cVeDmLastrecordings();

-    else if (!strcmp(name, "detailheaderepg"))

-        e = new cVeDmDetailheaderEpg();

-    else if (!strcmp(name, "detailheaderrec"))

-        e = new cVeDmDetailheaderRec();

-    else if (!strcmp(name, "detailheaderplugin"))

-        e = new cVeDmDetailheaderPlugin();

-    else if (!strcmp(name, "tablabels"))

-        e = new cVeDmTablabels();

-

-    //displayreplay viewelements

-    else if (!strcmp(name, "backgroundmodeonly"))

-        e = new cViewElement();

-    else if (!strcmp(name, "rectitle"))

-        e = new cVeDrRecTitle();

-    else if (!strcmp(name, "recinfo"))

-        e = new cVeDrRecInfo();

-    else if (!strcmp(name, "currenttime"))

-        e = new cVeDrCurrentTime();

-    else if (!strcmp(name, "totaltime"))

-        e = new cVeDrTotalTime();

-    else if (!strcmp(name, "endtime"))

-        e = new cVeDrEndTime();

-    else if (!strcmp(name, "progressbar") && !strcmp(viewname, "displayreplay"))

-        e = new cVeDrProgressBar();

-    else if (!strcmp(name, "cutmarks"))

-        e = new cVeDrCutMarks();

-    else if (!strcmp(name, "controlicons"))

-        e = new cVeDrControlIcons();

-    else if (!strcmp(name, "controliconsmodeonly"))

-        e = new cVeDrControlIcons();

-    else if (!strcmp(name, "progressmodeonly"))

-        e = new cVeDrProgressModeonly();

-    else if (!strcmp(name, "jump"))

-        e = new cVeDrJump();

-    else if (!strcmp(name, "onpause"))

-        e = new cVeDrOnPause();

-    else if (!strcmp(name, "onpausemodeonly"))

-        e = new cVeDrOnPause();

-    else if (!strcmp(name, "scrapercontent") && !strcmp(viewname, "displayreplay"))

-        e = new cVeDrScraperContent();

-

-    //displayvolume viewelements

-    else if (!strcmp(name, "volume"))

-        e = new cVeVolume();

-

-    //displayvolume viewelements

-    else if (!strcmp(name, "background") && !strcmp(viewname, "displayaudiotracks"))

-        e = new cVeDtBackground();

-    else if (!strcmp(name, "header") && !strcmp(viewname, "displayaudiotracks"))

-        e = new cVeDtHeader();

-

-    //default

-    else {

-        dsyslog("skindesigner: unknown view element %s", name);

-        e = new cViewElement();

-    }

-

-    return e;

-}

-

-void cViewElement::SetGlobals(cGlobals *globals) {

-    this->globals = globals;

-    attribs->SetGlobals(globals);

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        node->SetGlobals(globals);

-    }

-}

-

-void cViewElement::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    InheritTokenContainer();

-}

-

-bool cViewElement::Detached(void) {

-    return detached;

-}

-

-void cViewElement::SetContainer(int x, int y, int width, int height) {

-    container.SetX(x);

-    container.SetY(y);

-    container.SetWidth(width);

-    container.SetHeight(height);

-}

-

-void cViewElement::SetAttributes(vector<stringpair> &attributes) { 

-    attribs->Set(attributes); 

-}

-

-void cViewElement::AddArea(cAreaNode *area) {

-    areaNodes.Add(area);

-}

-

-void cViewElement::SetAreaX(int x) {

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        node->SetX(x);

-    }

-}

-

-void cViewElement::SetAreaY(int y) {

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        node->SetY(y);

-    }

-}

-

-void cViewElement::SetAreaWidth(int width) {

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        node->SetWidth(width);

-    }

-}

-

-void cViewElement::SetAreaHeight(int height) {

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        node->SetHeight(height);

-    }

-}

-

-void cViewElement::SetPosition(int newX, int newY, int newWidth, int newHeight) {

-    cRect newPos(newX, newY, newWidth, newHeight);

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        node->SetViewPort(newPos);

-    }    

-}

-

-void cViewElement::Cache(void) {

-    attribs->SetContainer(container.X(), container.Y(), container.Width(), container.Height());

-    attribs->Cache();

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        node->SetContainer(container.X(), container.Y(), container.Width(), container.Height());

-        node->Cache();

-    }

-}

-

-bool cViewElement::Execute(void) {

-    return attribs->DoExecute();

-}

-

-void cViewElement::Clear(void) {

-    tokenContainer->Clear();

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        sdOsd->Lock();

-        node->Clear();

-        sdOsd->Unlock();

-    }

-    dirty = false;

-    drawn = false;

-    scrollingStarted = false;

-}

-

-void cViewElement::Hide(void) {

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        sdOsd->Lock();

-        node->Hide();

-        sdOsd->Unlock();

-    }

-    init = true;

-    StopScrolling();

-}

-

-void cViewElement::Show(void) {

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        sdOsd->Lock();

-        node->Show();

-        sdOsd->Unlock();

-    }

-}

-

-void cViewElement::WakeUp(void) {

-    if (!detacher || !waitOnWakeup) {

-        return;

-    }

-    detacher->WakeUp();

-}

-

-void cViewElement::Close(void) {

-    delete detacher;

-    detacher = NULL;

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        sdOsd->Lock();

-        node->Close();

-        sdOsd->Unlock();

-    }

-    StopScrolling();

-    dirty = true;

-    init = true;

-    startAnimation = true;

-    drawn = false;

-    scrollingStarted = false;

-    blocked = false;

-}

-

-void cViewElement::Render(void) {

-    if (!dirty || blocked)

-        return;

-

-    if (attribs->DoDebug())

-        Debug();

-    

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        //Check redraw of already scrolling list element

-        if (drawn && scrollingStarted && node->Scrolling()) {

-            if (DoScroll()) {

-                //current list element

-                continue;

-            } else {

-                //not current list element anymore

-                scrollingStarted = false;

-            }

-        }

-        sdOsd->Lock();

-        node->Clear();

-        sdOsd->Unlock();

-        if (!node->Execute())

-            continue;

-        if (node->BackgroundArea() && drawn)

-            continue;

-        sdOsd->Lock();

-        node->Render();

-        sdOsd->Unlock();

-        

-        if (DoScroll() && node->Scrolling()) {

-            cArea *scrollArea = node->ScrollingArea();

-            if (scrollArea) {

-                scrollingStarted = true;

-                cAnimation *scroller = new cAnimation(scrollArea); 

-                scrollers.Add(scroller);

-                scroller->Start();                

-            }

-        }     

-    }

-    dirty = false;

-    drawn = true;

-    if (startAnimation) {

-        startAnimation = false;

-        StartAnimation();

-    }

-}

-

-void cViewElement::StopScrolling(bool deletePixmaps) {

-    for (cAnimation *scroller = scrollers.First(); scroller; scroller = scrollers.Next(scroller)) {

-        scroller->Stop(deletePixmaps);

-    }

-    scrollers.Clear();

-}

-

-void cViewElement::ParseDetached(void) {

-    Parse(true);

-}

-

-void cViewElement::RenderDetached(void) {

-    blocked = false;

-    Render();

-}

-

-bool cViewElement::Shifting(void) {

-    if (attribs->ShiftTime() >= 0) {

-        return true;

-    }

-    return false;

-}

-

-bool cViewElement::Fading(void) {

-    if (attribs->FadeTime() >= 0) {

-        return true;

-    }

-    return false;

-}

-

-int cViewElement::FadeTime(void) {

-    return attribs->FadeTime();

-}

-

-int cViewElement::ShiftTime(void) {

-    return attribs->ShiftTime();

-}

-

-int cViewElement::ShiftMode(void) {

-    return attribs->ShiftMode();

-}

-

-void cViewElement::StartAnimation(void) {

-    if (ShiftTime() > 0) {

-        cRect shiftbox = CoveredArea();

-        cPoint ref = cPoint(shiftbox.X(), shiftbox.Y());

-        cPoint start = ShiftStart(shiftbox);

-        SetPosition(start, ref);

-        sdOsd->Flush();

-        delete shifter;

-        shifter = new cAnimation((cShiftable*)this, start, ref, true);

-        shifter->Start();

-    } else if (FadeTime() > 0) {

-        SetTransparency(100);

-        sdOsd->Flush();

-        delete fader;

-        fader = new cAnimation((cFadable*)this, true);

-        fader->Start();

-    }

-}

-

-void cViewElement::SetTransparency(int transparency, bool force) {

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        sdOsd->Lock();

-        node->SetTransparency(transparency);

-        sdOsd->Unlock();

-    }

-}

-

-void cViewElement::SetPosition(cPoint &position, cPoint &reference, bool force) {

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        sdOsd->Lock();

-        node->SetPosition(position, reference);

-        sdOsd->Unlock();

-    }

-}

-

-cRect cViewElement::CoveredArea(void) {

-    cRect unionArea;

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        unionArea.Combine(node->CoveringArea());

-    }

-    return unionArea;

-}

-

-void cViewElement::Flush(void) {

-    sdOsd->Flush();

-}

-

-bool cViewElement::Parse(bool forced) { 

-    if (blocked && !forced) {

-        return false;

-    }

-    if (!Detached() || !init) {

-        return true;

-    }

-    delete detacher;

-    detacher = new cAnimation((cDetachable*)this, waitOnWakeup, startAnimation);

-    detacher->Start();

-    startAnimation = false;

-    init = false;

-    blocked = true;

-    return false;

-}

-

-cFunction *cViewElement::GetFunction(const char *name) {

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        if (cFunction *f = node->GetFunction(name))

-            return f;

-    }

-    return NULL;

-}

-

-void cViewElement::Debug(bool full) {

-    esyslog("skindesigner: ---> viewElement %d", id);

-    tokenContainer->Debug();

-    esyslog("skindesigner: container %d %d %dx%d", container.X(), container.Y(), container.Width(), container.Height());

-    attribs->Debug();

-    if (!full)

-        return;

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        node->Debug(full);

-    }    

-}

-

-/******************************************************************

-* protected Functions

-******************************************************************/

-void cViewElement::InheritTokenContainer(void) {

-    tokenContainer->CreateContainers();

-    attribs->SetTokenContainer(tokenContainer);

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        node->SetTokenContainer(tokenContainer);

-    }

-}

-

-void cViewElement::InheritTokenContainerDeep(void) {

-    tokenContainer->CreateContainers();

-    attribs->SetTokenContainerDeep(tokenContainer);

-    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {

-        node->SetTokenContainerDeep(tokenContainer);

-    }    

-}

-

-cPoint cViewElement::ShiftStart(cRect &shiftbox) {

-    eShiftType type = (eShiftType)attribs->ShiftType();

-    cPoint start;

-    if (type == eShiftType::none) {

-        start = attribs->ShiftStartpoint();

-    } else if (type == eShiftType::left) {

-        start.SetX(-shiftbox.Width());

-        start.SetY(shiftbox.Y());

-    } else if (type == eShiftType::right) {

-        start.SetX(cOsd::OsdWidth());

-        start.SetY(shiftbox.Y());        

-    } else if (type == eShiftType::top) {

-        start.SetX(shiftbox.X());

-        start.SetY(-shiftbox.Height());        

-    } else if (type == eShiftType::bottom) {

-        start.SetX(shiftbox.X());

-        start.SetY(cOsd::OsdHeight());

-    }

-    return start;

+#include "viewelement.h"
+#include "../config.h"
+
+/******************************************************************
+* cViewElement
+******************************************************************/
+cViewElement::cViewElement(void) {
+    sdOsd = NULL;
+    id = -1;
+    dirty = true;
+    init = true;
+    drawn = false;
+    scrollingStarted = false;
+    blocked = false;
+    detached = false;
+    waitOnWakeup = true;
+    startAnimation = true;
+    globals = NULL;
+    tokenContainer = NULL;
+    attribs = new cViewElementAttribs((int)eViewElementAttribs::count);
+    detacher = NULL;
+    fader = NULL;
+    shifter = NULL;
+}
+
+cViewElement::cViewElement(const cViewElement &other) {
+    sdOsd = other.sdOsd;
+    id = other.id;
+    dirty = other.dirty; 
+    init = other.init;
+    drawn = false;
+    scrollingStarted = false;
+    blocked = false;
+    detached = false;
+    waitOnWakeup = true;
+    startAnimation = true;
+    globals = other.globals;
+    container.Set(other.container.X(), other.container.Y(), other.container.Width(), other.container.Height());
+    tokenContainer = NULL;
+    attribs = new cViewElementAttribs(*other.attribs);
+
+    for (cAreaNode *node = other.areaNodes.First(); node; node = other.areaNodes.Next(node)) {
+        if (cArea *a = dynamic_cast<cArea*>(node)) {
+            areaNodes.Add(new cArea(*a));
+        } else if (cAreaContainer *ac = dynamic_cast<cAreaContainer*>(node)) {
+            areaNodes.Add(new cAreaContainer(*ac));
+        } 
+    }
+    
+    detacher = NULL;
+    fader = NULL;
+    shifter = NULL;
+}
+
+cViewElement::~cViewElement(void) {
+    delete attribs;
+    delete detacher;
+    delete fader;
+    delete shifter;
+    delete tokenContainer;
+}
+
+/******************************************************************
+* Public Functions
+******************************************************************/
+cViewElement *cViewElement::CreateViewElement(const char *name, const char *viewname) {
+    cViewElement *e = NULL;
+    
+    //common view elements
+    if (!strcmp(name, "background") && strcmp(viewname, "displayaudiotracks"))
+        e = new cViewElement();
+    else if (!strcmp(name, "datetime"))
+        e = new cVeDateTime();
+    else if (!strcmp(name, "time"))
+        e = new cVeTime();
+    else if (!strcmp(name, "message"))
+        e = new cVeMessage();
+    else if (!strcmp(name, "devices"))
+        e = new cVeDevices();
+    else if (!strcmp(name, "currentweather"))
+        e = new cVeCurrentWeather();
+    else if (!strcmp(name, "customtokens"))
+        e = new cVeCustomTokens();
+    
+    //displaychannel viewelements
+    else if (!strcmp(name, "channelinfo"))
+        e = new cVeDcChannelInfo();
+    else if (!strcmp(name, "channelgroup"))
+        e = new cVeDcChannelGroup();
+    else if (!strcmp(name, "epginfo"))
+        e = new cVeDcEpgInfo();
+    else if (!strcmp(name, "progressbar") && !strcmp(viewname, "displaychannel"))
+        e = new cVeDcProgressBar();
+    else if (!strcmp(name, "statusinfo"))
+        e = new cVeDcStatusInfo();
+    else if (!strcmp(name, "audioinfo"))
+        e = new cVeDcAudioInfo();
+    else if (!strcmp(name, "screenresolution"))
+        e = new cVeDcScreenResolution();
+    else if (!strcmp(name, "signalquality"))
+        e = new cVeDcSignalQuality();
+    else if (!strcmp(name, "scrapercontent") && !strcmp(viewname, "displaychannel"))
+        e = new cVeDcScraperContent();
+    else if (!strcmp(name, "ecminfo"))
+        e = new cVeDcEcmInfo();
+    
+    //displaymenu viewelements
+    else if (!strcmp(name, "header") && strcmp(viewname, "displayaudiotracks"))
+        e = new cVeDmHeader();
+    else if (!strcmp(name, "sortmode"))
+        e = new cVeDmSortmode();
+    else if (!strcmp(name, "colorbuttons"))
+        e = new cVeDmColorbuttons();
+    else if (!strcmp(name, "scrollbar"))
+        e = new cVeDmScrollbar();
+    else if (!strcmp(name, "timers"))
+        e = new cVeDmTimers();
+    else if (!strcmp(name, "currentschedule"))
+        e = new cVeDmCurrentschedule();
+    else if (!strcmp(name, "discusage"))
+        e = new cVeDmDiscusage();
+    else if (!strcmp(name, "systemload"))
+        e = new cVeDmSystemload();
+    else if (!strcmp(name, "systemmemory"))
+        e = new cVeDmSystemmemory();
+    else if (!strcmp(name, "temperatures"))
+        e = new cVeDmTemperatures();
+    else if (!strcmp(name, "vdrstatistics"))
+        e = new cVeDmVdrstatistics();
+    else if (!strcmp(name, "lastrecordings"))
+        e = new cVeDmLastrecordings();
+    else if (!strcmp(name, "detailheaderepg"))
+        e = new cVeDmDetailheaderEpg();
+    else if (!strcmp(name, "detailheaderrec"))
+        e = new cVeDmDetailheaderRec();
+    else if (!strcmp(name, "detailheaderplugin"))
+        e = new cVeDmDetailheaderPlugin();
+    else if (!strcmp(name, "tablabels"))
+        e = new cVeDmTablabels();
+
+    //displayreplay viewelements
+    else if (!strcmp(name, "backgroundmodeonly"))
+        e = new cViewElement();
+    else if (!strcmp(name, "rectitle"))
+        e = new cVeDrRecTitle();
+    else if (!strcmp(name, "recinfo"))
+        e = new cVeDrRecInfo();
+    else if (!strcmp(name, "currenttime"))
+        e = new cVeDrCurrentTime();
+    else if (!strcmp(name, "totaltime"))
+        e = new cVeDrTotalTime();
+    else if (!strcmp(name, "endtime"))
+        e = new cVeDrEndTime();
+    else if (!strcmp(name, "progressbar") && !strcmp(viewname, "displayreplay"))
+        e = new cVeDrProgressBar();
+    else if (!strcmp(name, "cutmarks"))
+        e = new cVeDrCutMarks();
+    else if (!strcmp(name, "controlicons"))
+        e = new cVeDrControlIcons();
+    else if (!strcmp(name, "controliconsmodeonly"))
+        e = new cVeDrControlIcons();
+    else if (!strcmp(name, "progressmodeonly"))
+        e = new cVeDrProgressModeonly();
+    else if (!strcmp(name, "jump"))
+        e = new cVeDrJump();
+    else if (!strcmp(name, "onpause"))
+        e = new cVeDrOnPause();
+    else if (!strcmp(name, "onpausemodeonly"))
+        e = new cVeDrOnPause();
+    else if (!strcmp(name, "scrapercontent") && !strcmp(viewname, "displayreplay"))
+        e = new cVeDrScraperContent();
+
+    //displayvolume viewelements
+    else if (!strcmp(name, "volume"))
+        e = new cVeVolume();
+
+    //displayvolume viewelements
+    else if (!strcmp(name, "background") && !strcmp(viewname, "displayaudiotracks"))
+        e = new cVeDtBackground();
+    else if (!strcmp(name, "header") && !strcmp(viewname, "displayaudiotracks"))
+        e = new cVeDtHeader();
+
+    //default
+    else {
+        dsyslog("skindesigner: unknown view element %s", name);
+        e = new cViewElement();
+    }
+
+    return e;
+}
+
+void cViewElement::SetGlobals(cGlobals *globals) {
+    this->globals = globals;
+    attribs->SetGlobals(globals);
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        node->SetGlobals(globals);
+    }
+}
+
+void cViewElement::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    InheritTokenContainer();
+}
+
+bool cViewElement::Detached(void) {
+    return detached;
+}
+
+void cViewElement::SetContainer(int x, int y, int width, int height) {
+    container.SetX(x);
+    container.SetY(y);
+    container.SetWidth(width);
+    container.SetHeight(height);
+}
+
+void cViewElement::SetAttributes(vector<stringpair> &attributes) { 
+    attribs->Set(attributes); 
+}
+
+void cViewElement::AddArea(cAreaNode *area) {
+    areaNodes.Add(area);
+}
+
+void cViewElement::SetAreaX(int x) {
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        node->SetX(x);
+    }
+}
+
+void cViewElement::SetAreaY(int y) {
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        node->SetY(y);
+    }
+}
+
+void cViewElement::SetAreaWidth(int width) {
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        node->SetWidth(width);
+    }
+}
+
+void cViewElement::SetAreaHeight(int height) {
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        node->SetHeight(height);
+    }
+}
+
+void cViewElement::SetPosition(int newX, int newY, int newWidth, int newHeight) {
+    cRect newPos(newX, newY, newWidth, newHeight);
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        node->SetViewPort(newPos);
+    }    
+}
+
+void cViewElement::Cache(void) {
+    attribs->SetContainer(container.X(), container.Y(), container.Width(), container.Height());
+    attribs->Cache();
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        node->SetContainer(container.X(), container.Y(), container.Width(), container.Height());
+        node->Cache();
+    }
+}
+
+bool cViewElement::Execute(void) {
+    return attribs->DoExecute();
+}
+
+void cViewElement::Clear(void) {
+    tokenContainer->Clear();
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        sdOsd->Lock();
+        node->Clear();
+        sdOsd->Unlock();
+    }
+    dirty = false;
+    drawn = false;
+    scrollingStarted = false;
+}
+
+void cViewElement::Hide(void) {
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        sdOsd->Lock();
+        node->Hide();
+        sdOsd->Unlock();
+    }
+    init = true;
+    StopScrolling();
+}
+
+void cViewElement::Show(void) {
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        sdOsd->Lock();
+        node->Show();
+        sdOsd->Unlock();
+    }
+}
+
+void cViewElement::WakeUp(void) {
+    if (!detacher || !waitOnWakeup) {
+        return;
+    }
+    detacher->WakeUp();
+}
+
+void cViewElement::Close(void) {
+    delete detacher;
+    detacher = NULL;
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        sdOsd->Lock();
+        node->Close();
+        sdOsd->Unlock();
+    }
+    StopScrolling();
+    dirty = true;
+    init = true;
+    startAnimation = true;
+    drawn = false;
+    scrollingStarted = false;
+    blocked = false;
+}
+
+void cViewElement::Render(void) {
+    if (!dirty || blocked)
+        return;
+
+    if (attribs->DoDebug())
+        Debug();
+    
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        //Check redraw of already scrolling list element
+        if (drawn && scrollingStarted && node->Scrolling()) {
+            if (DoScroll()) {
+                //current list element
+                continue;
+            } else {
+                //not current list element anymore
+                scrollingStarted = false;
+            }
+        }
+        sdOsd->Lock();
+        node->Clear();
+        sdOsd->Unlock();
+        if (!node->Execute())
+            continue;
+        if (node->BackgroundArea() && drawn)
+            continue;
+        sdOsd->Lock();
+        node->Render();
+        sdOsd->Unlock();
+        
+        if (DoScroll() && node->Scrolling()) {
+            cArea *scrollArea = node->ScrollingArea();
+            if (scrollArea) {
+                scrollingStarted = true;
+                cAnimation *scroller = new cAnimation(scrollArea); 
+                scrollers.Add(scroller);
+                scroller->Start();                
+            }
+        }     
+    }
+    dirty = false;
+    drawn = true;
+    if (startAnimation) {
+        startAnimation = false;
+        StartAnimation();
+    }
+}
+
+void cViewElement::StopScrolling(bool deletePixmaps) {
+    for (cAnimation *scroller = scrollers.First(); scroller; scroller = scrollers.Next(scroller)) {
+        scroller->Stop(deletePixmaps);
+    }
+    scrollers.Clear();
+}
+
+void cViewElement::ParseDetached(void) {
+    Parse(true);
+}
+
+void cViewElement::RenderDetached(void) {
+    blocked = false;
+    Render();
+}
+
+bool cViewElement::Shifting(void) {
+    if (attribs->ShiftTime() >= 0) {
+        return true;
+    }
+    return false;
+}
+
+bool cViewElement::Fading(void) {
+    if (attribs->FadeTime() >= 0) {
+        return true;
+    }
+    return false;
+}
+
+int cViewElement::FadeTime(void) {
+    return attribs->FadeTime();
+}
+
+int cViewElement::ShiftTime(void) {
+    return attribs->ShiftTime();
+}
+
+int cViewElement::ShiftMode(void) {
+    return attribs->ShiftMode();
+}
+
+void cViewElement::StartAnimation(void) {
+    if (ShiftTime() > 0) {
+        cRect shiftbox = CoveredArea();
+        cPoint ref = cPoint(shiftbox.X(), shiftbox.Y());
+        cPoint start = ShiftStart(shiftbox);
+        SetPosition(start, ref);
+        sdOsd->Flush();
+        delete shifter;
+        shifter = new cAnimation((cShiftable*)this, start, ref, true);
+        shifter->Start();
+    } else if (FadeTime() > 0) {
+        SetTransparency(100);
+        sdOsd->Flush();
+        delete fader;
+        fader = new cAnimation((cFadable*)this, true);
+        fader->Start();
+    }
+}
+
+void cViewElement::SetTransparency(int transparency, bool force) {
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        sdOsd->Lock();
+        node->SetTransparency(transparency);
+        sdOsd->Unlock();
+    }
+}
+
+void cViewElement::SetPosition(cPoint &position, cPoint &reference, bool force) {
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        sdOsd->Lock();
+        node->SetPosition(position, reference);
+        sdOsd->Unlock();
+    }
+}
+
+cRect cViewElement::CoveredArea(void) {
+    cRect unionArea;
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        unionArea.Combine(node->CoveringArea());
+    }
+    return unionArea;
+}
+
+void cViewElement::Flush(void) {
+    sdOsd->Flush();
+}
+
+bool cViewElement::Parse(bool forced) { 
+    if (blocked && !forced) {
+        return false;
+    }
+    if (!Detached() || !init) {
+        return true;
+    }
+    delete detacher;
+    detacher = new cAnimation((cDetachable*)this, waitOnWakeup, startAnimation);
+    detacher->Start();
+    startAnimation = false;
+    init = false;
+    blocked = true;
+    return false;
+}
+
+cFunction *cViewElement::GetFunction(const char *name) {
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        if (cFunction *f = node->GetFunction(name))
+            return f;
+    }
+    return NULL;
+}
+
+void cViewElement::Debug(bool full) {
+    esyslog("skindesigner: ---> viewElement %d", id);
+    tokenContainer->Debug();
+    esyslog("skindesigner: container %d %d %dx%d", container.X(), container.Y(), container.Width(), container.Height());
+    attribs->Debug();
+    if (!full)
+        return;
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        node->Debug(full);
+    }    
+}
+
+/******************************************************************
+* protected Functions
+******************************************************************/
+void cViewElement::InheritTokenContainer(void) {
+    tokenContainer->CreateContainers();
+    attribs->SetTokenContainer(tokenContainer);
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        node->SetTokenContainer(tokenContainer);
+    }
+}
+
+void cViewElement::InheritTokenContainerDeep(void) {
+    tokenContainer->CreateContainers();
+    attribs->SetTokenContainerDeep(tokenContainer);
+    for (cAreaNode *node = areaNodes.First(); node; node = areaNodes.Next(node)) {
+        node->SetTokenContainerDeep(tokenContainer);
+    }    
+}
+
+cPoint cViewElement::ShiftStart(cRect &shiftbox) {
+    eShiftType type = (eShiftType)attribs->ShiftType();
+    cPoint start;
+    if (type == eShiftType::none) {
+        start = attribs->ShiftStartpoint();
+    } else if (type == eShiftType::left) {
+        start.SetX(-shiftbox.Width());
+        start.SetY(shiftbox.Y());
+    } else if (type == eShiftType::right) {
+        start.SetX(cOsd::OsdWidth());
+        start.SetY(shiftbox.Y());        
+    } else if (type == eShiftType::top) {
+        start.SetX(shiftbox.X());
+        start.SetY(-shiftbox.Height());        
+    } else if (type == eShiftType::bottom) {
+        start.SetX(shiftbox.X());
+        start.SetY(cOsd::OsdHeight());
+    }
+    return start;
 }
\ No newline at end of file
diff --git a/coreengine/viewelement.h b/coreengine/viewelement.h
index af12a6c..1f7db74 100644
--- a/coreengine/viewelement.h
+++ b/coreengine/viewelement.h
@@ -1,93 +1,93 @@
-#ifndef __VIEWELEMENT_H

-#define __VIEWELEMENT_H

-

-#include <iostream>

-#include <stdio.h>

-#include <stdlib.h>

-#include <stdint.h>

-#include <vdr/tools.h>

-#include "osdwrapper.h"

-#include "globals.h"

-#include "../libskindesignerapi/tokencontainer.h"

-#include "area.h"

-#include "animation.h"

-

-/******************************************************************

-* cViewElement

-******************************************************************/

-class cViewElement : public cDetachable, public cFadable, public cShiftable {

-protected:

-    cSdOsd *sdOsd;

-    int id;

-    bool init;

-    bool drawn;

-    bool dirty;

-    bool blocked;

-    bool detached;

-    bool waitOnWakeup;

-    bool scrollingStarted;

-    bool startAnimation;

-    cGlobals *globals;

-    cRect container;

-    cViewElementAttribs *attribs;

-    cList<cAreaNode> areaNodes;

-    skindesignerapi::cTokenContainer *tokenContainer;

-    cList<cAnimation> scrollers;

-    cAnimation *detacher;

-    cAnimation *fader;

-    cAnimation *shifter;

-    void InheritTokenContainer(void);

-    void InheritTokenContainerDeep(void);

-    virtual bool DoScroll(void) { return true; };

-    cPoint ShiftStart(cRect &shiftbox);

-public:

-    cViewElement(void);

-    cViewElement(const cViewElement &other);

-    virtual ~cViewElement(void);

-    void SetOsd(cSdOsd *osd) { sdOsd = osd; };

-    static cViewElement *CreateViewElement(const char *name, const char *viewname);

-    void SetId(int id) { this->id = id; };

-    void SetGlobals(cGlobals *globals);

-    virtual void SetTokenContainer(void);

-    void SetDetached(void) { detached = true; };

-    void UnsetWaitOnWakeup(void) { waitOnWakeup = false; };

-    bool Detached(void);

-    void SetContainer(int x, int y, int width, int height);

-    void SetAttributes(vector<stringpair> &attributes);

-    void AddArea(cAreaNode *area);

-    void SetAreaX(int x);

-    void SetAreaY(int y);

-    void SetAreaWidth(int width);

-    void SetAreaHeight(int height);

-    void Cache(void);

-    virtual void Close(void);

-    virtual void Clear(void);

-    void Hide(void);

-    void Show(void);

-    void WakeUp(void);

-    bool Execute(void);

-    void SetDirty(void) { dirty = true; };

-    bool Dirty(void) { return dirty; };

-    void SetPosition(int newX, int newY, int newWidth, int newHeight);

-    virtual void Render(void);

-    void StopScrolling(bool deletePixmaps = true);

-    eOrientation Orientation(void) { return attribs->Orientation(); };

-    virtual int Delay(void) { return attribs->Delay(); };

-    void ParseDetached(void);

-    void RenderDetached(void);

-    bool Shifting(void);

-    bool Fading(void);

-    int FadeTime(void);

-    int ShiftTime(void);

-    int ShiftMode(void);

-    void StartAnimation(void);

-    virtual void SetTransparency(int transparency, bool force = false);

-    virtual void SetPosition(cPoint &position, cPoint &reference, bool force = false);

-    cRect CoveredArea(void);

-    void Flush(void);

-    virtual bool Parse(bool forced = false);

-    cFunction *GetFunction(const char *name);

-    virtual void Debug(bool full = false);

-};

-

+#ifndef __VIEWELEMENT_H
+#define __VIEWELEMENT_H
+
+#include <iostream>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <vdr/tools.h>
+#include "osdwrapper.h"
+#include "globals.h"
+#include "../libskindesignerapi/tokencontainer.h"
+#include "area.h"
+#include "animation.h"
+
+/******************************************************************
+* cViewElement
+******************************************************************/
+class cViewElement : public cDetachable, public cFadable, public cShiftable {
+protected:
+    cSdOsd *sdOsd;
+    int id;
+    bool init;
+    bool drawn;
+    bool dirty;
+    bool blocked;
+    bool detached;
+    bool waitOnWakeup;
+    bool scrollingStarted;
+    bool startAnimation;
+    cGlobals *globals;
+    cRect container;
+    cViewElementAttribs *attribs;
+    cList<cAreaNode> areaNodes;
+    skindesignerapi::cTokenContainer *tokenContainer;
+    cList<cAnimation> scrollers;
+    cAnimation *detacher;
+    cAnimation *fader;
+    cAnimation *shifter;
+    void InheritTokenContainer(void);
+    void InheritTokenContainerDeep(void);
+    virtual bool DoScroll(void) { return true; };
+    cPoint ShiftStart(cRect &shiftbox);
+public:
+    cViewElement(void);
+    cViewElement(const cViewElement &other);
+    virtual ~cViewElement(void);
+    void SetOsd(cSdOsd *osd) { sdOsd = osd; };
+    static cViewElement *CreateViewElement(const char *name, const char *viewname);
+    void SetId(int id) { this->id = id; };
+    void SetGlobals(cGlobals *globals);
+    virtual void SetTokenContainer(void);
+    void SetDetached(void) { detached = true; };
+    void UnsetWaitOnWakeup(void) { waitOnWakeup = false; };
+    bool Detached(void);
+    void SetContainer(int x, int y, int width, int height);
+    void SetAttributes(vector<stringpair> &attributes);
+    void AddArea(cAreaNode *area);
+    void SetAreaX(int x);
+    void SetAreaY(int y);
+    void SetAreaWidth(int width);
+    void SetAreaHeight(int height);
+    void Cache(void);
+    virtual void Close(void);
+    virtual void Clear(void);
+    void Hide(void);
+    void Show(void);
+    void WakeUp(void);
+    bool Execute(void);
+    void SetDirty(void) { dirty = true; };
+    bool Dirty(void) { return dirty; };
+    void SetPosition(int newX, int newY, int newWidth, int newHeight);
+    virtual void Render(void);
+    void StopScrolling(bool deletePixmaps = true);
+    eOrientation Orientation(void) { return attribs->Orientation(); };
+    virtual int Delay(void) { return attribs->Delay(); };
+    void ParseDetached(void);
+    void RenderDetached(void);
+    bool Shifting(void);
+    bool Fading(void);
+    int FadeTime(void);
+    int ShiftTime(void);
+    int ShiftMode(void);
+    void StartAnimation(void);
+    virtual void SetTransparency(int transparency, bool force = false);
+    virtual void SetPosition(cPoint &position, cPoint &reference, bool force = false);
+    cRect CoveredArea(void);
+    void Flush(void);
+    virtual bool Parse(bool forced = false);
+    cFunction *GetFunction(const char *name);
+    virtual void Debug(bool full = false);
+};
+
 #endif //__VIEWELEMENT_H
\ No newline at end of file
diff --git a/coreengine/viewelementplugin.c b/coreengine/viewelementplugin.c
index 7d50a82..6981168 100644
--- a/coreengine/viewelementplugin.c
+++ b/coreengine/viewelementplugin.c
@@ -1,36 +1,36 @@
-#include "viewelementplugin.h"

-#include "../config.h"

-

-cVePlugin::cVePlugin(void) {

-    plugId = -1;

-    viewId = -1;

-}

-

-cVePlugin::~cVePlugin(void) {

-}

-

-void cVePlugin::Close(void) {

-    cViewElement::Close();

-}

-

-void cVePlugin::SetTokenContainer(void) {

-    skindesignerapi::cTokenContainer *tkVe = plgManager->GetTokenContainerVE(plugId, viewId, id);

-    if (!tkVe)

-        return;

-    tokenContainer = new skindesignerapi::cTokenContainer(*tkVe);

-    InheritTokenContainer();

-}

-

-void cVePlugin::Set(skindesignerapi::cTokenContainer *tk) {

-    tokenContainer->Clear();

-    tokenContainer->SetTokens(tk);

-    SetDirty();

-}

-

-bool cVePlugin::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    if (!dirty)

-        return false;

-    return true;

-}

+#include "viewelementplugin.h"
+#include "../config.h"
+
+cVePlugin::cVePlugin(void) {
+    plugId = -1;
+    viewId = -1;
+}
+
+cVePlugin::~cVePlugin(void) {
+}
+
+void cVePlugin::Close(void) {
+    cViewElement::Close();
+}
+
+void cVePlugin::SetTokenContainer(void) {
+    skindesignerapi::cTokenContainer *tkVe = plgManager->GetTokenContainerVE(plugId, viewId, id);
+    if (!tkVe)
+        return;
+    tokenContainer = new skindesignerapi::cTokenContainer(*tkVe);
+    InheritTokenContainer();
+}
+
+void cVePlugin::Set(skindesignerapi::cTokenContainer *tk) {
+    tokenContainer->Clear();
+    tokenContainer->SetTokens(tk);
+    SetDirty();
+}
+
+bool cVePlugin::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    if (!dirty)
+        return false;
+    return true;
+}
diff --git a/coreengine/viewelementplugin.h b/coreengine/viewelementplugin.h
index 8e2d5f1..ced411b 100644
--- a/coreengine/viewelementplugin.h
+++ b/coreengine/viewelementplugin.h
@@ -1,22 +1,22 @@
-#ifndef __VIEWELEMENTPLUGIN_H

-#define __VIEWELEMENTPLUGIN_H

-

-#include "viewelement.h"

-

-class cVePlugin : public cViewElement {

-private:

-    int plugId;

-    int viewId;

-public:

-    cVePlugin(void);

-    virtual ~cVePlugin(void);

-    void SetPluginId(int plugId) { this->plugId = plugId; };

-    void SetViewId(int viewId) { this->viewId = viewId; };

-    void Close(void);

-    void SetTokenContainer(void);

-    void Set(skindesignerapi::cTokenContainer *tk);

-    bool Parse(bool forced = false);

-    const char *Name(void) { return attribs->Name(); };

-};

-

-#endif //__VIEWELEMENTPLUGIN_H

+#ifndef __VIEWELEMENTPLUGIN_H
+#define __VIEWELEMENTPLUGIN_H
+
+#include "viewelement.h"
+
+class cVePlugin : public cViewElement {
+private:
+    int plugId;
+    int viewId;
+public:
+    cVePlugin(void);
+    virtual ~cVePlugin(void);
+    void SetPluginId(int plugId) { this->plugId = plugId; };
+    void SetViewId(int viewId) { this->viewId = viewId; };
+    void Close(void);
+    void SetTokenContainer(void);
+    void Set(skindesignerapi::cTokenContainer *tk);
+    bool Parse(bool forced = false);
+    const char *Name(void) { return attribs->Name(); };
+};
+
+#endif //__VIEWELEMENTPLUGIN_H
diff --git a/coreengine/viewelementscommon.c b/coreengine/viewelementscommon.c
index 92538e5..0f9c85c 100644
--- a/coreengine/viewelementscommon.c
+++ b/coreengine/viewelementscommon.c
@@ -1,531 +1,531 @@
-#include "viewelementscommon.h"

-#include "../config.h"

-#include "../services/weatherforecast.h"

-

-/******************************************************************

-* cVeDateTime

-******************************************************************/

-cVeDateTime::cVeDateTime(void) {

-    lastMinute = -1;

-}

-

-cVeDateTime::~cVeDateTime(void) {

-}

-

-void cVeDateTime::Close(void) {

-    lastMinute = -1;

-    cViewElement::Close();

-}

-

-void cVeDateTime::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{time}", (int)eDateTimeST::time);

-    tokenContainer->DefineStringToken("{dayleadingzero}", (int)eDateTimeST::dayleadingzero);

-    tokenContainer->DefineStringToken("{dayname}", (int)eDateTimeST::dayname);

-    tokenContainer->DefineStringToken("{daynameshort}", (int)eDateTimeST::daynameshort);

-    tokenContainer->DefineStringToken("{month}", (int)eDateTimeST::month);

-    tokenContainer->DefineStringToken("{monthname}", (int)eDateTimeST::monthname);

-    tokenContainer->DefineStringToken("{monthnameshort}", (int)eDateTimeST::monthnameshort);

-    tokenContainer->DefineIntToken("{day}", (int)eDateTimeIT::day);

-    tokenContainer->DefineIntToken("{year}", (int)eDateTimeIT::year);

-    InheritTokenContainer();

-}

-

-bool cVeDateTime::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    time_t t = time(0);   // get time now

-    struct tm * now = localtime(&t);

-    int min = now->tm_min;

-    if (!forced && min == lastMinute) {

-        return false;

-    }

-    lastMinute = min;

-    SetDirty();

-

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eDateTimeIT::year, now->tm_year + 1900);

-    tokenContainer->AddIntToken((int)eDateTimeIT::day, now->tm_mday);

-

-    char monthname[20];

-    char monthshort[10];

-    strftime(monthshort, sizeof(monthshort), "%b", now);

-    strftime(monthname, sizeof(monthname), "%B", now);

-

-    tokenContainer->AddStringToken((int)eDateTimeST::monthname, monthname);

-    tokenContainer->AddStringToken((int)eDateTimeST::monthnameshort, monthshort);

-    tokenContainer->AddStringToken((int)eDateTimeST::month, *cString::sprintf("%02d", now->tm_mon + 1));

-    tokenContainer->AddStringToken((int)eDateTimeST::dayleadingzero, *cString::sprintf("%02d", now->tm_mday));

-    tokenContainer->AddStringToken((int)eDateTimeST::dayname, *WeekDayNameFull(now->tm_wday));

-    tokenContainer->AddStringToken((int)eDateTimeST::daynameshort, *WeekDayName(now->tm_wday));

-    tokenContainer->AddStringToken((int)eDateTimeST::time, *TimeString(t));

-    return true;

-}

-

-/******************************************************************

-* cVeTime

-******************************************************************/

-cVeTime::cVeTime(void) {

-    lastSecond = -1;

-}

-

-cVeTime::~cVeTime(void) {

-}

-

-void cVeTime::Close(void) {

-    lastSecond = -1;

-    cViewElement::Close();

-}

-

-void cVeTime::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineIntToken("{sec}", (int)eTimeIT::sec);

-    tokenContainer->DefineIntToken("{min}", (int)eTimeIT::min);

-    tokenContainer->DefineIntToken("{hour}", (int)eTimeIT::hour);

-    tokenContainer->DefineIntToken("{hmins}", (int)eTimeIT::hmins);

-    InheritTokenContainer();

-}

-

-bool cVeTime::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    time_t t = time(0);   // get time now

-    struct tm * now = localtime(&t);

-    int sec = now->tm_sec;

-    if (!forced && sec == lastSecond) {

-        return false;

-    }

-    lastSecond = sec;

-    SetDirty();

-

-    int min = now->tm_min;

-    int hour = now->tm_hour;

-    int hourMinutes = hour%12 * 5 + min / 12;

-

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eTimeIT::sec, sec);

-    tokenContainer->AddIntToken((int)eTimeIT::min, min);

-    tokenContainer->AddIntToken((int)eTimeIT::hour, hour);

-    tokenContainer->AddIntToken((int)eTimeIT::hmins, hourMinutes);

-    return true;

-}

-/******************************************************************

-* cVeMessage

-******************************************************************/

-cVeMessage::cVeMessage(void) {

-    changed = false;

-    text = NULL;

-    type = mtStatus;

-}

-

-cVeMessage::~cVeMessage(void) {

-    free(text);

-}

-

-void cVeMessage::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{text}", (int)eMessageST::text);

-    tokenContainer->DefineIntToken("{status}", (int)eMessageIT::status);

-    tokenContainer->DefineIntToken("{info}", (int)eMessageIT::info);

-    tokenContainer->DefineIntToken("{warning}", (int)eMessageIT::warning);

-    tokenContainer->DefineIntToken("{error}", (int)eMessageIT::error);

-    InheritTokenContainer();

-}

-

-void cVeMessage::Set(eMessageType type, const char *text) {

-    if (!text)

-        return;

-    free(this->text);

-    this->text = strdup(text);

-    this->type = type; 

-    changed = true;

-}

-

-bool cVeMessage::Parse(bool forced) {

-    if (!cViewElement::Parse(forced) || !changed)

-        return false;

-

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eMessageIT::status, (type == mtStatus)  ? true : false);

-    tokenContainer->AddIntToken((int)eMessageIT::info, (type == mtInfo)  ? true : false);

-    tokenContainer->AddIntToken((int)eMessageIT::warning, (type == mtWarning)  ? true : false);

-    tokenContainer->AddIntToken((int)eMessageIT::error, (type == mtError)  ? true : false);

-    tokenContainer->AddStringToken((int)eMessageST::text, text);

-    SetDirty();

-    changed = false;

-    return true;

-}

-

-/******************************************************************

-* cVeDevices

-******************************************************************/

-cVeDevices::cVeDevices(void) {

-    lastRefresh = 0;

-    initial = true;

-    devicesIndex = -1;

-    lastSignalStrength = NULL;

-    lastSignalQuality = NULL;

-    recDevices = NULL;

-}

-

-cVeDevices::~cVeDevices(void) {

-    mutexDevices.Lock();

-    delete[] lastSignalStrength;

-    lastSignalStrength = NULL;

-    delete[] lastSignalQuality;

-    lastSignalQuality = NULL;

-    delete[] recDevices;

-    recDevices = NULL;

-    mutexDevices.Unlock();

-}

-

-void cVeDevices::Init(void) {

-    light = (attribs->Mode() == (int)eViewElementMode::light) ? true : false;  

-    int totalDevices = cDevice::NumDevices();

-    for (int i = 0; i < totalDevices; i++) {

-        const cDevice *device = cDevice::GetDevice(i);

-        if (!device || !device->NumProvidedSystems()) {

-            continue;

-        }

-        devices.push_back(i);

-    }

-    numDevices = devices.size();    

-    lastSignalStrength = new int[numDevices];

-    lastSignalQuality = new int[numDevices];

-    recDevices = new bool[numDevices];

-    mutexDevices.Lock();

-    for (int i=0; i<numDevices; i++) {

-        lastSignalStrength[i] = 0;

-        lastSignalQuality[i] = 0;

-        recDevices[i] = false;

-    }

-    mutexDevices.Unlock();

-}

-

-void cVeDevices::Close(void) {

-    devices.clear();

-    initial = true;

-    numDevices = 0;

-    mutexDevices.Lock();

-    delete[] lastSignalStrength;

-    lastSignalStrength = NULL;

-    delete[] lastSignalQuality;

-    lastSignalQuality = NULL;

-    delete[] recDevices;

-    recDevices = NULL;

-    mutexDevices.Unlock();

-    cViewElement::Close();

-}

-

-void cVeDevices::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineIntToken("{numdevices}", (int)eDevicesIT::numdevices);

-    tokenContainer->DefineLoopToken("{devices[num]}", (int)eDevicesLT::num);

-    tokenContainer->DefineLoopToken("{devices[type]}", (int)eDevicesLT::type);

-    tokenContainer->DefineLoopToken("{devices[istuned]}", (int)eDevicesLT::istuned);

-    tokenContainer->DefineLoopToken("{devices[livetv]}", (int)eDevicesLT::livetv);

-    tokenContainer->DefineLoopToken("{devices[recording]}", (int)eDevicesLT::recording);

-    tokenContainer->DefineLoopToken("{devices[hascam]}", (int)eDevicesLT::hascam);

-    tokenContainer->DefineLoopToken("{devices[cam]}", (int)eDevicesLT::cam);

-    tokenContainer->DefineLoopToken("{devices[signalstrength]}", (int)eDevicesLT::signalstrength);

-    tokenContainer->DefineLoopToken("{devices[signalquality]}", (int)eDevicesLT::signalquality);

-    tokenContainer->DefineLoopToken("{devices[channelnumber]}", (int)eDevicesLT::channelnumber);

-    tokenContainer->DefineLoopToken("{devices[channelname]}", (int)eDevicesLT::channelname);

-    tokenContainer->DefineLoopToken("{devices[channellogoexists]}", (int)eDevicesLT::channellogoexists);

-    tokenContainer->DefineLoopToken("{devices[channelid]}", (int)eDevicesLT::channelid);

-    tokenContainer->DefineLoopToken("{devices[source]}", (int)eDevicesLT::source);

-

-    devicesIndex = tokenContainer->LoopIndex("devices");

-    InheritTokenContainer();

-}

-

-bool cVeDevices::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    if (initial) {

-        Init();

-        initial = false;

-    } else {

-        //in light modus content is static

-        if (light)

-            return false;

-        //check if drawing is necessary

-        if (lastRefresh - cTimeMs::Now() < 500)

-            return false;

-        bool changed = false;

-        for (int i = 0; i < numDevices; i++) {

-            const cDevice *device = cDevice::GetDevice(devices[i]);

-            if (!device || !device->NumProvidedSystems()) {

-                continue;

-            }

-            int signalStrength = device->SignalStrength();

-            int signalQuality = device->SignalQuality();

-            int lastSigStr = 0;

-            int lastSigQual = 0;

-            mutexDevices.Lock();

-            if (lastSignalStrength && lastSignalQuality) {

-                lastSigStr = lastSignalStrength[i];

-                lastSigQual = lastSignalQuality[i];

-            }

-            mutexDevices.Unlock();

-            if ((signalStrength != lastSigStr) || (signalQuality != lastSigQual)) {

-                changed = true;

-                break;

-            }            

-        }

-        if (!changed) {

-            return false;

-        }

-    }

-

-    //check device which currently displays live tv

-    int deviceLiveTV = -1;

-    cDevice *primaryDevice = cDevice::PrimaryDevice();

-    if (primaryDevice) {

-        if (!primaryDevice->Replaying() || primaryDevice->Transferring())

-            deviceLiveTV = cDevice::ActualDevice()->DeviceNumber();

-        else

-            deviceLiveTV = primaryDevice->DeviceNumber();

-    }

-    //check currently recording devices

-    for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer)) {

-        if (!timer->Recording()) {

-            continue;

-        }

-        if (cRecordControl *RecordControl = cRecordControls::GetRecordControl(timer)) {

-            const cDevice *recDevice = RecordControl->Device();

-            if (recDevice) {

-                mutexDevices.Lock();

-                if (recDevices)

-                    recDevices[recDevice->DeviceNumber()] = true;

-                mutexDevices.Unlock();

-            }

-        }

-    }

-

-    //create loop container

-    tokenContainer->Clear();

-    

-    vector<int> loopInfo;

-    loopInfo.push_back(numDevices);

-    tokenContainer->CreateLoopTokenContainer(&loopInfo);

-    tokenContainer->AddIntToken((int)eDevicesIT::numdevices, numDevices);

-

-    for (int i = 0; i < numDevices; i++) {

-        const cDevice *device = cDevice::GetDevice(devices[i]);

-        if (!device || !device->NumProvidedSystems()) {

-            continue;

-        }

-        tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::num, *cString::sprintf("%d", i));

-        tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::type, *(device->DeviceType()));

-

-        cCamSlot *camSlot = device->CamSlot();

-        int camNumber = -1;

-        if (camSlot) {

-            camNumber = camSlot->SlotNumber();

-            tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::hascam, "1");

-        } else {

-            tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::hascam, "0");

-        }

-        tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::cam, *cString::sprintf("%d", camNumber));

-

-        int signalStrength = 0;

-        int signalQuality = 0;

-        if (!light) {

-            signalStrength = device->SignalStrength();

-            signalQuality = device->SignalQuality();

-        }

-        tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::signalstrength, *cString::sprintf("%d", signalStrength));

-        tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::signalstrength, *cString::sprintf("%d", signalQuality));

-        tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::livetv, i == deviceLiveTV ? "1" : "0");

-

-        bool isRecording = false;

-        mutexDevices.Lock();

-        if (recDevices && recDevices[i])

-            isRecording = true;

-        mutexDevices.Unlock();

-        tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::recording, isRecording ? "1" : "0");

-

-        const cChannel *channel = device->GetCurrentlyTunedTransponder();

-        const cSource *source = (channel) ? Sources.Get(channel->Source()) : NULL;

-        if (channel && channel->Number() > 0) {

-            tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::channelnumber, *cString::sprintf("%d", channel->Number()));

-            tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::channelname, channel->Name());

-            string channelID = *(channel->GetChannelID().ToString());

-            tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::channelid, channelID.c_str());

-            tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::channellogoexists, imgCache->LogoExists(channelID) ? "1" : "0");

-            tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::istuned, "1");

-        } else {

-            tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::istuned, "0");

-        }

-    

-        tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::source, source ? source->Description() : "");

-

-        mutexDevices.Lock();

-        if (lastSignalStrength)

-            lastSignalStrength[i] = signalStrength;

-        if (lastSignalQuality)

-            lastSignalQuality[i] = signalQuality;

-        mutexDevices.Unlock();

-    }

-

-    SetDirty();

-    lastRefresh = cTimeMs::Now();

-    return true;

-}

-/******************************************************************

-* cVeCurrentWeather

-******************************************************************/

-cVeCurrentWeather::cVeCurrentWeather(void) {

-}

-

-cVeCurrentWeather::~cVeCurrentWeather(void) {

-}

-

-void cVeCurrentWeather::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{timestamp}", (int)eCurrentWeatherST::timestamp);

-    tokenContainer->DefineStringToken("{summary}", (int)eCurrentWeatherST::summary);

-    tokenContainer->DefineStringToken("{icon}", (int)eCurrentWeatherST::icon);

-    tokenContainer->DefineStringToken("{precipitationtype}", (int)eCurrentWeatherST::precipitationtype);

-    tokenContainer->DefineStringToken("{windbearingstring}", (int)eCurrentWeatherST::windbearingstring);

-    tokenContainer->DefineStringToken("{temperature}", (int)eCurrentWeatherST::temperature);

-    tokenContainer->DefineStringToken("{apparenttemperature}", (int)eCurrentWeatherST::apparenttemperature);

-    tokenContainer->DefineStringToken("{mintemperature}", (int)eCurrentWeatherST::mintemperature);

-    tokenContainer->DefineStringToken("{maxtemperature}", (int)eCurrentWeatherST::maxtemperature);

-    tokenContainer->DefineStringToken("{precipitationintensity}", (int)eCurrentWeatherST::precipitationintensity);

-    tokenContainer->DefineStringToken("{windspeed}", (int)eCurrentWeatherST::windspeed);

-    tokenContainer->DefineStringToken("{visibility}", (int)eCurrentWeatherST::visibility);

-    tokenContainer->DefineStringToken("{pressure}", (int)eCurrentWeatherST::pressure);

-    tokenContainer->DefineStringToken("{ozone}", (int)eCurrentWeatherST::ozone);

-    tokenContainer->DefineIntToken("{precipitationprobability}", (int)eCurrentWeatherIT::precipitationprobability);

-    tokenContainer->DefineIntToken("{humidity}", (int)eCurrentWeatherIT::humidity);

-    tokenContainer->DefineIntToken("{windbearing}", (int)eCurrentWeatherIT::windbearing);

-    tokenContainer->DefineIntToken("{cloudcover}", (int)eCurrentWeatherIT::cloudcover);

-    InheritTokenContainer();

-}

-

-bool cVeCurrentWeather::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    static cPlugin *pWeatherForecast = cPluginManager::GetPlugin("weatherforecast");

-    if (!pWeatherForecast)

-        return false;

-    cServiceCurrentWeather currentWeather;

-    if (!pWeatherForecast->Service("GetCurrentWeather", &currentWeather)) {

-        return false;

-    }

-    SetDirty();

-    tokenContainer->Clear();

-    tokenContainer->AddStringToken((int)eCurrentWeatherST::timestamp, currentWeather.timeStamp.c_str());

-    tokenContainer->AddStringToken((int)eCurrentWeatherST::temperature, currentWeather.temperature.c_str());

-    tokenContainer->AddStringToken((int)eCurrentWeatherST::apparenttemperature, currentWeather.apparentTemperature.c_str());

-    tokenContainer->AddStringToken((int)eCurrentWeatherST::mintemperature, currentWeather.minTemperature.c_str());

-    tokenContainer->AddStringToken((int)eCurrentWeatherST::maxtemperature, currentWeather.maxTemperature.c_str());

-    tokenContainer->AddStringToken((int)eCurrentWeatherST::summary, currentWeather.summary.c_str());

-    tokenContainer->AddStringToken((int)eCurrentWeatherST::icon, currentWeather.icon.c_str());

-    tokenContainer->AddStringToken((int)eCurrentWeatherST::precipitationintensity, currentWeather.precipitationIntensity.c_str());

-    tokenContainer->AddStringToken((int)eCurrentWeatherST::precipitationtype, currentWeather.precipitationType.c_str());

-    tokenContainer->AddStringToken((int)eCurrentWeatherST::windspeed, currentWeather.windSpeed.c_str());

-    tokenContainer->AddStringToken((int)eCurrentWeatherST::windbearingstring, currentWeather.windBearingString.c_str());

-    tokenContainer->AddStringToken((int)eCurrentWeatherST::visibility, currentWeather.visibility.c_str());

-    tokenContainer->AddStringToken((int)eCurrentWeatherST::pressure, currentWeather.pressure.c_str());

-    tokenContainer->AddStringToken((int)eCurrentWeatherST::ozone, currentWeather.ozone.c_str());

-    tokenContainer->AddIntToken((int)eCurrentWeatherIT::precipitationprobability, currentWeather.precipitationProbability);

-    tokenContainer->AddIntToken((int)eCurrentWeatherIT::humidity, currentWeather.humidity);

-    tokenContainer->AddIntToken((int)eCurrentWeatherIT::windbearing, currentWeather.windBearing);

-    tokenContainer->AddIntToken((int)eCurrentWeatherIT::cloudcover, currentWeather.cloudCover);

-    return true;

-}

-/******************************************************************

-* cVeCustomTokens

-******************************************************************/

-cVeCustomTokens::cVeCustomTokens(void) {

-}

-

-cVeCustomTokens::~cVeCustomTokens(void) {

-}

-

-void cVeCustomTokens::Reset(void) {

-    globals->ResetCustomTokenChange();

-}

-

-void cVeCustomTokens::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    int numTokens = config.numCustomTokens;

-    for (int i=0; i < numTokens; i++) {

-        cString nameIntToken = cString::sprintf("{customint%d}", i+1);

-        cString nameStringToken = cString::sprintf("{customstring%d}", i+1);

-        tokenContainer->DefineStringToken(*nameStringToken, i);

-        tokenContainer->DefineIntToken(*nameIntToken, i);

-    }

-    InheritTokenContainer();

-}

-

-bool cVeCustomTokens::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-

-    if (!globals->CustomTokenChange())

-        return false;

-

-    tokenContainer->Clear();

-    map <int, string> customStringTokens = globals->GetCustomStringTokens();

-    for (map<int, string>::iterator it = customStringTokens.begin(); it != customStringTokens.end(); it++) {

-        int index = it->first;

-        if (index > 0 && index <= config.numCustomTokens) {

-            tokenContainer->AddStringToken(index-1, it->second.c_str());

-        }

-    }

-    map <int, int> customIntTokkens = globals-> GetCustomIntTokens();

-    for (map<int, int>::iterator it = customIntTokkens.begin(); it != customIntTokkens.end(); it++) {

-        int index = it->first;

-        if (index > 0 && index <= config.numCustomTokens) {

-            tokenContainer->AddIntToken(index-1, it->second);

-        }

-    }

-    SetDirty();

-    return true;

-}

-

-/******************************************************************

-* cVeVolume

-******************************************************************/

-cVeVolume::cVeVolume(void) {

-    current = 0;

-    total = 0;

-    mute = false;

-    changed = true;

-}

-

-cVeVolume::~cVeVolume(void) {

-}

-

-void cVeVolume::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineIntToken("{volume}", (int)eDVVolumeIT::volume);

-    tokenContainer->DefineIntToken("{volpercent}", (int)eDVVolumeIT::volpercent);

-    tokenContainer->DefineIntToken("{maxvolume}", (int)eDVVolumeIT::maxvolume);

-    tokenContainer->DefineIntToken("{mute}", (int)eDVVolumeIT::mute);

-    InheritTokenContainer();

-}

-

-void cVeVolume::Set(int current, int total, bool mute) {

-    this->current = current;

-    this->total = total;

-    this->mute = mute;

-    changed = true;

-}

-

-bool cVeVolume::Parse(bool forced) {

-    if (!cViewElement::Parse(forced) || !changed)

-        return false;

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eDVVolumeIT::volume, current);

-    tokenContainer->AddIntToken((int)eDVVolumeIT::maxvolume, total);

-    tokenContainer->AddIntToken((int)eDVVolumeIT::volpercent, (double)current *100 / (double)total);

-    tokenContainer->AddIntToken((int)eDVVolumeIT::mute, mute);

-    changed = false;

-    SetDirty();

-    return true;

+#include "viewelementscommon.h"
+#include "../config.h"
+#include "../services/weatherforecast.h"
+
+/******************************************************************
+* cVeDateTime
+******************************************************************/
+cVeDateTime::cVeDateTime(void) {
+    lastMinute = -1;
+}
+
+cVeDateTime::~cVeDateTime(void) {
+}
+
+void cVeDateTime::Close(void) {
+    lastMinute = -1;
+    cViewElement::Close();
+}
+
+void cVeDateTime::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{time}", (int)eDateTimeST::time);
+    tokenContainer->DefineStringToken("{dayleadingzero}", (int)eDateTimeST::dayleadingzero);
+    tokenContainer->DefineStringToken("{dayname}", (int)eDateTimeST::dayname);
+    tokenContainer->DefineStringToken("{daynameshort}", (int)eDateTimeST::daynameshort);
+    tokenContainer->DefineStringToken("{month}", (int)eDateTimeST::month);
+    tokenContainer->DefineStringToken("{monthname}", (int)eDateTimeST::monthname);
+    tokenContainer->DefineStringToken("{monthnameshort}", (int)eDateTimeST::monthnameshort);
+    tokenContainer->DefineIntToken("{day}", (int)eDateTimeIT::day);
+    tokenContainer->DefineIntToken("{year}", (int)eDateTimeIT::year);
+    InheritTokenContainer();
+}
+
+bool cVeDateTime::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    time_t t = time(0);   // get time now
+    struct tm * now = localtime(&t);
+    int min = now->tm_min;
+    if (!forced && min == lastMinute) {
+        return false;
+    }
+    lastMinute = min;
+    SetDirty();
+
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eDateTimeIT::year, now->tm_year + 1900);
+    tokenContainer->AddIntToken((int)eDateTimeIT::day, now->tm_mday);
+
+    char monthname[20];
+    char monthshort[10];
+    strftime(monthshort, sizeof(monthshort), "%b", now);
+    strftime(monthname, sizeof(monthname), "%B", now);
+
+    tokenContainer->AddStringToken((int)eDateTimeST::monthname, monthname);
+    tokenContainer->AddStringToken((int)eDateTimeST::monthnameshort, monthshort);
+    tokenContainer->AddStringToken((int)eDateTimeST::month, *cString::sprintf("%02d", now->tm_mon + 1));
+    tokenContainer->AddStringToken((int)eDateTimeST::dayleadingzero, *cString::sprintf("%02d", now->tm_mday));
+    tokenContainer->AddStringToken((int)eDateTimeST::dayname, *WeekDayNameFull(now->tm_wday));
+    tokenContainer->AddStringToken((int)eDateTimeST::daynameshort, *WeekDayName(now->tm_wday));
+    tokenContainer->AddStringToken((int)eDateTimeST::time, *TimeString(t));
+    return true;
+}
+
+/******************************************************************
+* cVeTime
+******************************************************************/
+cVeTime::cVeTime(void) {
+    lastSecond = -1;
+}
+
+cVeTime::~cVeTime(void) {
+}
+
+void cVeTime::Close(void) {
+    lastSecond = -1;
+    cViewElement::Close();
+}
+
+void cVeTime::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineIntToken("{sec}", (int)eTimeIT::sec);
+    tokenContainer->DefineIntToken("{min}", (int)eTimeIT::min);
+    tokenContainer->DefineIntToken("{hour}", (int)eTimeIT::hour);
+    tokenContainer->DefineIntToken("{hmins}", (int)eTimeIT::hmins);
+    InheritTokenContainer();
+}
+
+bool cVeTime::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    time_t t = time(0);   // get time now
+    struct tm * now = localtime(&t);
+    int sec = now->tm_sec;
+    if (!forced && sec == lastSecond) {
+        return false;
+    }
+    lastSecond = sec;
+    SetDirty();
+
+    int min = now->tm_min;
+    int hour = now->tm_hour;
+    int hourMinutes = hour%12 * 5 + min / 12;
+
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eTimeIT::sec, sec);
+    tokenContainer->AddIntToken((int)eTimeIT::min, min);
+    tokenContainer->AddIntToken((int)eTimeIT::hour, hour);
+    tokenContainer->AddIntToken((int)eTimeIT::hmins, hourMinutes);
+    return true;
+}
+/******************************************************************
+* cVeMessage
+******************************************************************/
+cVeMessage::cVeMessage(void) {
+    changed = false;
+    text = NULL;
+    type = mtStatus;
+}
+
+cVeMessage::~cVeMessage(void) {
+    free(text);
+}
+
+void cVeMessage::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{text}", (int)eMessageST::text);
+    tokenContainer->DefineIntToken("{status}", (int)eMessageIT::status);
+    tokenContainer->DefineIntToken("{info}", (int)eMessageIT::info);
+    tokenContainer->DefineIntToken("{warning}", (int)eMessageIT::warning);
+    tokenContainer->DefineIntToken("{error}", (int)eMessageIT::error);
+    InheritTokenContainer();
+}
+
+void cVeMessage::Set(eMessageType type, const char *text) {
+    if (!text)
+        return;
+    free(this->text);
+    this->text = strdup(text);
+    this->type = type; 
+    changed = true;
+}
+
+bool cVeMessage::Parse(bool forced) {
+    if (!cViewElement::Parse(forced) || !changed)
+        return false;
+
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eMessageIT::status, (type == mtStatus)  ? true : false);
+    tokenContainer->AddIntToken((int)eMessageIT::info, (type == mtInfo)  ? true : false);
+    tokenContainer->AddIntToken((int)eMessageIT::warning, (type == mtWarning)  ? true : false);
+    tokenContainer->AddIntToken((int)eMessageIT::error, (type == mtError)  ? true : false);
+    tokenContainer->AddStringToken((int)eMessageST::text, text);
+    SetDirty();
+    changed = false;
+    return true;
+}
+
+/******************************************************************
+* cVeDevices
+******************************************************************/
+cVeDevices::cVeDevices(void) {
+    lastRefresh = 0;
+    initial = true;
+    devicesIndex = -1;
+    lastSignalStrength = NULL;
+    lastSignalQuality = NULL;
+    recDevices = NULL;
+}
+
+cVeDevices::~cVeDevices(void) {
+    mutexDevices.Lock();
+    delete[] lastSignalStrength;
+    lastSignalStrength = NULL;
+    delete[] lastSignalQuality;
+    lastSignalQuality = NULL;
+    delete[] recDevices;
+    recDevices = NULL;
+    mutexDevices.Unlock();
+}
+
+void cVeDevices::Init(void) {
+    light = (attribs->Mode() == (int)eViewElementMode::light) ? true : false;  
+    int totalDevices = cDevice::NumDevices();
+    for (int i = 0; i < totalDevices; i++) {
+        const cDevice *device = cDevice::GetDevice(i);
+        if (!device || !device->NumProvidedSystems()) {
+            continue;
+        }
+        devices.push_back(i);
+    }
+    numDevices = devices.size();    
+    lastSignalStrength = new int[numDevices];
+    lastSignalQuality = new int[numDevices];
+    recDevices = new bool[numDevices];
+    mutexDevices.Lock();
+    for (int i=0; i<numDevices; i++) {
+        lastSignalStrength[i] = 0;
+        lastSignalQuality[i] = 0;
+        recDevices[i] = false;
+    }
+    mutexDevices.Unlock();
+}
+
+void cVeDevices::Close(void) {
+    devices.clear();
+    initial = true;
+    numDevices = 0;
+    mutexDevices.Lock();
+    delete[] lastSignalStrength;
+    lastSignalStrength = NULL;
+    delete[] lastSignalQuality;
+    lastSignalQuality = NULL;
+    delete[] recDevices;
+    recDevices = NULL;
+    mutexDevices.Unlock();
+    cViewElement::Close();
+}
+
+void cVeDevices::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineIntToken("{numdevices}", (int)eDevicesIT::numdevices);
+    tokenContainer->DefineLoopToken("{devices[num]}", (int)eDevicesLT::num);
+    tokenContainer->DefineLoopToken("{devices[type]}", (int)eDevicesLT::type);
+    tokenContainer->DefineLoopToken("{devices[istuned]}", (int)eDevicesLT::istuned);
+    tokenContainer->DefineLoopToken("{devices[livetv]}", (int)eDevicesLT::livetv);
+    tokenContainer->DefineLoopToken("{devices[recording]}", (int)eDevicesLT::recording);
+    tokenContainer->DefineLoopToken("{devices[hascam]}", (int)eDevicesLT::hascam);
+    tokenContainer->DefineLoopToken("{devices[cam]}", (int)eDevicesLT::cam);
+    tokenContainer->DefineLoopToken("{devices[signalstrength]}", (int)eDevicesLT::signalstrength);
+    tokenContainer->DefineLoopToken("{devices[signalquality]}", (int)eDevicesLT::signalquality);
+    tokenContainer->DefineLoopToken("{devices[channelnumber]}", (int)eDevicesLT::channelnumber);
+    tokenContainer->DefineLoopToken("{devices[channelname]}", (int)eDevicesLT::channelname);
+    tokenContainer->DefineLoopToken("{devices[channellogoexists]}", (int)eDevicesLT::channellogoexists);
+    tokenContainer->DefineLoopToken("{devices[channelid]}", (int)eDevicesLT::channelid);
+    tokenContainer->DefineLoopToken("{devices[source]}", (int)eDevicesLT::source);
+
+    devicesIndex = tokenContainer->LoopIndex("devices");
+    InheritTokenContainer();
+}
+
+bool cVeDevices::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    if (initial) {
+        Init();
+        initial = false;
+    } else {
+        //in light modus content is static
+        if (light)
+            return false;
+        //check if drawing is necessary
+        if (lastRefresh - cTimeMs::Now() < 500)
+            return false;
+        bool changed = false;
+        for (int i = 0; i < numDevices; i++) {
+            const cDevice *device = cDevice::GetDevice(devices[i]);
+            if (!device || !device->NumProvidedSystems()) {
+                continue;
+            }
+            int signalStrength = device->SignalStrength();
+            int signalQuality = device->SignalQuality();
+            int lastSigStr = 0;
+            int lastSigQual = 0;
+            mutexDevices.Lock();
+            if (lastSignalStrength && lastSignalQuality) {
+                lastSigStr = lastSignalStrength[i];
+                lastSigQual = lastSignalQuality[i];
+            }
+            mutexDevices.Unlock();
+            if ((signalStrength != lastSigStr) || (signalQuality != lastSigQual)) {
+                changed = true;
+                break;
+            }            
+        }
+        if (!changed) {
+            return false;
+        }
+    }
+
+    //check device which currently displays live tv
+    int deviceLiveTV = -1;
+    cDevice *primaryDevice = cDevice::PrimaryDevice();
+    if (primaryDevice) {
+        if (!primaryDevice->Replaying() || primaryDevice->Transferring())
+            deviceLiveTV = cDevice::ActualDevice()->DeviceNumber();
+        else
+            deviceLiveTV = primaryDevice->DeviceNumber();
+    }
+    //check currently recording devices
+    for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer)) {
+        if (!timer->Recording()) {
+            continue;
+        }
+        if (cRecordControl *RecordControl = cRecordControls::GetRecordControl(timer)) {
+            const cDevice *recDevice = RecordControl->Device();
+            if (recDevice) {
+                mutexDevices.Lock();
+                if (recDevices)
+                    recDevices[recDevice->DeviceNumber()] = true;
+                mutexDevices.Unlock();
+            }
+        }
+    }
+
+    //create loop container
+    tokenContainer->Clear();
+    
+    vector<int> loopInfo;
+    loopInfo.push_back(numDevices);
+    tokenContainer->CreateLoopTokenContainer(&loopInfo);
+    tokenContainer->AddIntToken((int)eDevicesIT::numdevices, numDevices);
+
+    for (int i = 0; i < numDevices; i++) {
+        const cDevice *device = cDevice::GetDevice(devices[i]);
+        if (!device || !device->NumProvidedSystems()) {
+            continue;
+        }
+        tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::num, *cString::sprintf("%d", i));
+        tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::type, *(device->DeviceType()));
+
+        cCamSlot *camSlot = device->CamSlot();
+        int camNumber = -1;
+        if (camSlot) {
+            camNumber = camSlot->SlotNumber();
+            tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::hascam, "1");
+        } else {
+            tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::hascam, "0");
+        }
+        tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::cam, *cString::sprintf("%d", camNumber));
+
+        int signalStrength = 0;
+        int signalQuality = 0;
+        if (!light) {
+            signalStrength = device->SignalStrength();
+            signalQuality = device->SignalQuality();
+        }
+        tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::signalstrength, *cString::sprintf("%d", signalStrength));
+        tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::signalstrength, *cString::sprintf("%d", signalQuality));
+        tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::livetv, i == deviceLiveTV ? "1" : "0");
+
+        bool isRecording = false;
+        mutexDevices.Lock();
+        if (recDevices && recDevices[i])
+            isRecording = true;
+        mutexDevices.Unlock();
+        tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::recording, isRecording ? "1" : "0");
+
+        const cChannel *channel = device->GetCurrentlyTunedTransponder();
+        const cSource *source = (channel) ? Sources.Get(channel->Source()) : NULL;
+        if (channel && channel->Number() > 0) {
+            tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::channelnumber, *cString::sprintf("%d", channel->Number()));
+            tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::channelname, channel->Name());
+            string channelID = *(channel->GetChannelID().ToString());
+            tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::channelid, channelID.c_str());
+            tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::channellogoexists, imgCache->LogoExists(channelID) ? "1" : "0");
+            tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::istuned, "1");
+        } else {
+            tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::istuned, "0");
+        }
+    
+        tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::source, source ? source->Description() : "");
+
+        mutexDevices.Lock();
+        if (lastSignalStrength)
+            lastSignalStrength[i] = signalStrength;
+        if (lastSignalQuality)
+            lastSignalQuality[i] = signalQuality;
+        mutexDevices.Unlock();
+    }
+
+    SetDirty();
+    lastRefresh = cTimeMs::Now();
+    return true;
+}
+/******************************************************************
+* cVeCurrentWeather
+******************************************************************/
+cVeCurrentWeather::cVeCurrentWeather(void) {
+}
+
+cVeCurrentWeather::~cVeCurrentWeather(void) {
+}
+
+void cVeCurrentWeather::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{timestamp}", (int)eCurrentWeatherST::timestamp);
+    tokenContainer->DefineStringToken("{summary}", (int)eCurrentWeatherST::summary);
+    tokenContainer->DefineStringToken("{icon}", (int)eCurrentWeatherST::icon);
+    tokenContainer->DefineStringToken("{precipitationtype}", (int)eCurrentWeatherST::precipitationtype);
+    tokenContainer->DefineStringToken("{windbearingstring}", (int)eCurrentWeatherST::windbearingstring);
+    tokenContainer->DefineStringToken("{temperature}", (int)eCurrentWeatherST::temperature);
+    tokenContainer->DefineStringToken("{apparenttemperature}", (int)eCurrentWeatherST::apparenttemperature);
+    tokenContainer->DefineStringToken("{mintemperature}", (int)eCurrentWeatherST::mintemperature);
+    tokenContainer->DefineStringToken("{maxtemperature}", (int)eCurrentWeatherST::maxtemperature);
+    tokenContainer->DefineStringToken("{precipitationintensity}", (int)eCurrentWeatherST::precipitationintensity);
+    tokenContainer->DefineStringToken("{windspeed}", (int)eCurrentWeatherST::windspeed);
+    tokenContainer->DefineStringToken("{visibility}", (int)eCurrentWeatherST::visibility);
+    tokenContainer->DefineStringToken("{pressure}", (int)eCurrentWeatherST::pressure);
+    tokenContainer->DefineStringToken("{ozone}", (int)eCurrentWeatherST::ozone);
+    tokenContainer->DefineIntToken("{precipitationprobability}", (int)eCurrentWeatherIT::precipitationprobability);
+    tokenContainer->DefineIntToken("{humidity}", (int)eCurrentWeatherIT::humidity);
+    tokenContainer->DefineIntToken("{windbearing}", (int)eCurrentWeatherIT::windbearing);
+    tokenContainer->DefineIntToken("{cloudcover}", (int)eCurrentWeatherIT::cloudcover);
+    InheritTokenContainer();
+}
+
+bool cVeCurrentWeather::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    static cPlugin *pWeatherForecast = cPluginManager::GetPlugin("weatherforecast");
+    if (!pWeatherForecast)
+        return false;
+    cServiceCurrentWeather currentWeather;
+    if (!pWeatherForecast->Service("GetCurrentWeather", &currentWeather)) {
+        return false;
+    }
+    SetDirty();
+    tokenContainer->Clear();
+    tokenContainer->AddStringToken((int)eCurrentWeatherST::timestamp, currentWeather.timeStamp.c_str());
+    tokenContainer->AddStringToken((int)eCurrentWeatherST::temperature, currentWeather.temperature.c_str());
+    tokenContainer->AddStringToken((int)eCurrentWeatherST::apparenttemperature, currentWeather.apparentTemperature.c_str());
+    tokenContainer->AddStringToken((int)eCurrentWeatherST::mintemperature, currentWeather.minTemperature.c_str());
+    tokenContainer->AddStringToken((int)eCurrentWeatherST::maxtemperature, currentWeather.maxTemperature.c_str());
+    tokenContainer->AddStringToken((int)eCurrentWeatherST::summary, currentWeather.summary.c_str());
+    tokenContainer->AddStringToken((int)eCurrentWeatherST::icon, currentWeather.icon.c_str());
+    tokenContainer->AddStringToken((int)eCurrentWeatherST::precipitationintensity, currentWeather.precipitationIntensity.c_str());
+    tokenContainer->AddStringToken((int)eCurrentWeatherST::precipitationtype, currentWeather.precipitationType.c_str());
+    tokenContainer->AddStringToken((int)eCurrentWeatherST::windspeed, currentWeather.windSpeed.c_str());
+    tokenContainer->AddStringToken((int)eCurrentWeatherST::windbearingstring, currentWeather.windBearingString.c_str());
+    tokenContainer->AddStringToken((int)eCurrentWeatherST::visibility, currentWeather.visibility.c_str());
+    tokenContainer->AddStringToken((int)eCurrentWeatherST::pressure, currentWeather.pressure.c_str());
+    tokenContainer->AddStringToken((int)eCurrentWeatherST::ozone, currentWeather.ozone.c_str());
+    tokenContainer->AddIntToken((int)eCurrentWeatherIT::precipitationprobability, currentWeather.precipitationProbability);
+    tokenContainer->AddIntToken((int)eCurrentWeatherIT::humidity, currentWeather.humidity);
+    tokenContainer->AddIntToken((int)eCurrentWeatherIT::windbearing, currentWeather.windBearing);
+    tokenContainer->AddIntToken((int)eCurrentWeatherIT::cloudcover, currentWeather.cloudCover);
+    return true;
+}
+/******************************************************************
+* cVeCustomTokens
+******************************************************************/
+cVeCustomTokens::cVeCustomTokens(void) {
+}
+
+cVeCustomTokens::~cVeCustomTokens(void) {
+}
+
+void cVeCustomTokens::Reset(void) {
+    globals->ResetCustomTokenChange();
+}
+
+void cVeCustomTokens::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    int numTokens = config.numCustomTokens;
+    for (int i=0; i < numTokens; i++) {
+        cString nameIntToken = cString::sprintf("{customint%d}", i+1);
+        cString nameStringToken = cString::sprintf("{customstring%d}", i+1);
+        tokenContainer->DefineStringToken(*nameStringToken, i);
+        tokenContainer->DefineIntToken(*nameIntToken, i);
+    }
+    InheritTokenContainer();
+}
+
+bool cVeCustomTokens::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+
+    if (!globals->CustomTokenChange())
+        return false;
+
+    tokenContainer->Clear();
+    map <int, string> customStringTokens = globals->GetCustomStringTokens();
+    for (map<int, string>::iterator it = customStringTokens.begin(); it != customStringTokens.end(); it++) {
+        int index = it->first;
+        if (index > 0 && index <= config.numCustomTokens) {
+            tokenContainer->AddStringToken(index-1, it->second.c_str());
+        }
+    }
+    map <int, int> customIntTokkens = globals-> GetCustomIntTokens();
+    for (map<int, int>::iterator it = customIntTokkens.begin(); it != customIntTokkens.end(); it++) {
+        int index = it->first;
+        if (index > 0 && index <= config.numCustomTokens) {
+            tokenContainer->AddIntToken(index-1, it->second);
+        }
+    }
+    SetDirty();
+    return true;
+}
+
+/******************************************************************
+* cVeVolume
+******************************************************************/
+cVeVolume::cVeVolume(void) {
+    current = 0;
+    total = 0;
+    mute = false;
+    changed = true;
+}
+
+cVeVolume::~cVeVolume(void) {
+}
+
+void cVeVolume::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineIntToken("{volume}", (int)eDVVolumeIT::volume);
+    tokenContainer->DefineIntToken("{volpercent}", (int)eDVVolumeIT::volpercent);
+    tokenContainer->DefineIntToken("{maxvolume}", (int)eDVVolumeIT::maxvolume);
+    tokenContainer->DefineIntToken("{mute}", (int)eDVVolumeIT::mute);
+    InheritTokenContainer();
+}
+
+void cVeVolume::Set(int current, int total, bool mute) {
+    this->current = current;
+    this->total = total;
+    this->mute = mute;
+    changed = true;
+}
+
+bool cVeVolume::Parse(bool forced) {
+    if (!cViewElement::Parse(forced) || !changed)
+        return false;
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eDVVolumeIT::volume, current);
+    tokenContainer->AddIntToken((int)eDVVolumeIT::maxvolume, total);
+    tokenContainer->AddIntToken((int)eDVVolumeIT::volpercent, (double)current *100 / (double)total);
+    tokenContainer->AddIntToken((int)eDVVolumeIT::mute, mute);
+    changed = false;
+    SetDirty();
+    return true;
 }
\ No newline at end of file
diff --git a/coreengine/viewelementscommon.h b/coreengine/viewelementscommon.h
index b373bc9..e0b2870 100644
--- a/coreengine/viewelementscommon.h
+++ b/coreengine/viewelementscommon.h
@@ -1,110 +1,110 @@
-#ifndef __VIEWELEMENTSCOMMON_H

-#define __VIEWELEMENTSCOMMON_H

-

-#include <vdr/menu.h>

-#include "viewelement.h"

-

-/******************************************************************

-* cVeDateTime

-******************************************************************/

-class cVeDateTime : public cViewElement {

-private:

-    int lastMinute;

-public:

-    cVeDateTime(void);

-    virtual ~cVeDateTime(void);

-    void Close(void);

-    void SetTokenContainer(void);

-    bool Parse(bool forced = false);

-};

-/******************************************************************

-* cVeTime

-******************************************************************/

-class cVeTime : public cViewElement {

-private:

-    int lastSecond;

-public:

-    cVeTime(void);

-    virtual ~cVeTime(void);

-    void Close(void);

-    void SetTokenContainer(void);

-    bool Parse(bool forced = false);

-};

-/******************************************************************

-* cVeMessage

-******************************************************************/

-class cVeMessage : public cViewElement {

-private:

-    bool changed;

-    eMessageType type;

-    char *text;

-public:

-    cVeMessage(void);

-    virtual ~cVeMessage(void);

-    void SetTokenContainer(void);

-    void Set(eMessageType type, const char *text);

-    bool Parse(bool forced = false);

-};

-/******************************************************************

-* cVeDevices

-******************************************************************/

-class cVeDevices : public cViewElement {

-private:

-    bool light;

-    time_t lastRefresh;

-    vector<int> devices;

-    bool initial;

-    int devicesIndex;

-    cMutex mutexDevices;

-    int numDevices;

-    int* lastSignalStrength;

-    int* lastSignalQuality;

-    bool* recDevices;

-    void Init(void);

-public:

-    cVeDevices(void);

-    virtual ~cVeDevices(void);

-    void Close(void);

-    void SetTokenContainer(void);

-    bool Parse(bool forced = false);

-};

-/******************************************************************

-* cVeCurrentWeather

-******************************************************************/

-class cVeCurrentWeather : public cViewElement {

-private:

-public:

-    cVeCurrentWeather(void);

-    virtual ~cVeCurrentWeather(void);

-    void SetTokenContainer(void);

-    bool Parse(bool forced = false);

-};

-/******************************************************************

-* cVeCustomTokens

-******************************************************************/

-class cVeCustomTokens : public cViewElement {

-private:

-public:

-    cVeCustomTokens(void);

-    virtual ~cVeCustomTokens(void);

-    void Reset(void);

-    void SetTokenContainer(void);

-    bool Parse(bool forced = false);

-};

-/******************************************************************

-* cVeVolume

-******************************************************************/

-class cVeVolume : public cViewElement {

-private:

-    int current;

-    int total;

-    bool mute;

-    bool changed;

-public:

-    cVeVolume(void);

-    virtual ~cVeVolume(void);

-    void SetTokenContainer(void);

-    void Set(int current, int total, bool mute);

-    bool Parse(bool forced = false);

-};

+#ifndef __VIEWELEMENTSCOMMON_H
+#define __VIEWELEMENTSCOMMON_H
+
+#include <vdr/menu.h>
+#include "viewelement.h"
+
+/******************************************************************
+* cVeDateTime
+******************************************************************/
+class cVeDateTime : public cViewElement {
+private:
+    int lastMinute;
+public:
+    cVeDateTime(void);
+    virtual ~cVeDateTime(void);
+    void Close(void);
+    void SetTokenContainer(void);
+    bool Parse(bool forced = false);
+};
+/******************************************************************
+* cVeTime
+******************************************************************/
+class cVeTime : public cViewElement {
+private:
+    int lastSecond;
+public:
+    cVeTime(void);
+    virtual ~cVeTime(void);
+    void Close(void);
+    void SetTokenContainer(void);
+    bool Parse(bool forced = false);
+};
+/******************************************************************
+* cVeMessage
+******************************************************************/
+class cVeMessage : public cViewElement {
+private:
+    bool changed;
+    eMessageType type;
+    char *text;
+public:
+    cVeMessage(void);
+    virtual ~cVeMessage(void);
+    void SetTokenContainer(void);
+    void Set(eMessageType type, const char *text);
+    bool Parse(bool forced = false);
+};
+/******************************************************************
+* cVeDevices
+******************************************************************/
+class cVeDevices : public cViewElement {
+private:
+    bool light;
+    time_t lastRefresh;
+    vector<int> devices;
+    bool initial;
+    int devicesIndex;
+    cMutex mutexDevices;
+    int numDevices;
+    int* lastSignalStrength;
+    int* lastSignalQuality;
+    bool* recDevices;
+    void Init(void);
+public:
+    cVeDevices(void);
+    virtual ~cVeDevices(void);
+    void Close(void);
+    void SetTokenContainer(void);
+    bool Parse(bool forced = false);
+};
+/******************************************************************
+* cVeCurrentWeather
+******************************************************************/
+class cVeCurrentWeather : public cViewElement {
+private:
+public:
+    cVeCurrentWeather(void);
+    virtual ~cVeCurrentWeather(void);
+    void SetTokenContainer(void);
+    bool Parse(bool forced = false);
+};
+/******************************************************************
+* cVeCustomTokens
+******************************************************************/
+class cVeCustomTokens : public cViewElement {
+private:
+public:
+    cVeCustomTokens(void);
+    virtual ~cVeCustomTokens(void);
+    void Reset(void);
+    void SetTokenContainer(void);
+    bool Parse(bool forced = false);
+};
+/******************************************************************
+* cVeVolume
+******************************************************************/
+class cVeVolume : public cViewElement {
+private:
+    int current;
+    int total;
+    bool mute;
+    bool changed;
+public:
+    cVeVolume(void);
+    virtual ~cVeVolume(void);
+    void SetTokenContainer(void);
+    void Set(int current, int total, bool mute);
+    bool Parse(bool forced = false);
+};
 #endif //__VIEWELEMENTSCOMMON_H
\ No newline at end of file
diff --git a/coreengine/viewelementsdisplaychannel.c b/coreengine/viewelementsdisplaychannel.c
index b523435..55fa3bb 100644
--- a/coreengine/viewelementsdisplaychannel.c
+++ b/coreengine/viewelementsdisplaychannel.c
@@ -1,650 +1,650 @@
-#include "viewelementsdisplaychannel.h"

-#include "../config.h"

-#include "../extensions/helpers.h"

-#include "../extensions/timers.h"

-#include "../services/scraper2vdr.h"

-

-/******************************************************************

-* cVeDcChannelInfo

-******************************************************************/

-cVeDcChannelInfo::cVeDcChannelInfo(void) {

-}

-

-cVeDcChannelInfo::~cVeDcChannelInfo(void) {

-}

-

-void cVeDcChannelInfo::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{channelnumber}", (int)eDCChannelInfoST::channelnumber);

-    tokenContainer->DefineStringToken("{channelname}", (int)eDCChannelInfoST::channelname);

-    tokenContainer->DefineStringToken("{channelid}", (int)eDCChannelInfoST::channelid);

-    tokenContainer->DefineIntToken("{channellogoexists}", (int)eDCChannelInfoIT::channellogoexists);

-    tokenContainer->DefineIntToken("{switching}", (int)eDCChannelInfoIT::switching);

-    InheritTokenContainer();

-}

-

-void cVeDcChannelInfo::Set(const cChannel *c, int number) {

-    cString channelNumber("");

-    cString channelName("");

-    cString channelId("");

-    if (c) {

-        channelName = c->Name() ? c->Name() : "";

-        channelId = c->GetChannelID().ToString();

-        if (!c->GroupSep()) {

-            channelNumber = cString::sprintf("%d%s", c->Number(), number ? "-" : "");

-        }

-    } else if (number) {

-        channelNumber = cString::sprintf("%d-", number);

-    } else {

-        channelName = ChannelString(NULL, 0);

-    }

-

-    tokenContainer->Clear();

-    tokenContainer->AddStringToken((int)eDCChannelInfoST::channelnumber, *channelNumber);

-    tokenContainer->AddStringToken((int)eDCChannelInfoST::channelname, *channelName);

-    tokenContainer->AddStringToken((int)eDCChannelInfoST::channelid, *channelId);

-    bool logoExists = imgCache->LogoExists(*channelId);

-    tokenContainer->AddIntToken((int)eDCChannelInfoIT::channellogoexists, logoExists);

-    tokenContainer->AddIntToken((int)eDCChannelInfoIT::switching, (number > 0)?true:false);

-

-    SetDirty();

-}

-

-/******************************************************************

-* cVeDcChannelGroup

-******************************************************************/

-cVeDcChannelGroup::cVeDcChannelGroup(void) {

-}

-

-cVeDcChannelGroup::~cVeDcChannelGroup(void) {

-}

-

-void cVeDcChannelGroup::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{group}", (int)eDCChannelGroupST::group);

-    tokenContainer->DefineStringToken("{nextgroup}", (int)eDCChannelGroupST::nextgroup);

-    tokenContainer->DefineStringToken("{prevgroup}", (int)eDCChannelGroupST::prevgroup);

-    tokenContainer->DefineStringToken("{seppath}", (int)eDCChannelGroupST::seppath);

-    tokenContainer->DefineIntToken("{prevAvailable}", (int)eDCChannelGroupIT::prevAvailable);

-    tokenContainer->DefineIntToken("{nextAvailable}", (int)eDCChannelGroupIT::nextAvailable);

-    tokenContainer->DefineIntToken("{sepexists}", (int)eDCChannelGroupIT::sepexists);

-    InheritTokenContainer();

-}

-

-void cVeDcChannelGroup::Set(const cChannel *c) {

-    const char *sep = c->Name(); 

-    bool sepExists = imgCache->SeparatorLogoExists(sep);

-

-    const char *prevChannelSep = GetChannelSep(c, true);

-    const char *nextChannelSep = GetChannelSep(c, false);

-

-    tokenContainer->Clear();

-    tokenContainer->AddStringToken((int)eDCChannelGroupST::group, sep);

-    tokenContainer->AddStringToken((int)eDCChannelGroupST::nextgroup, nextChannelSep ? nextChannelSep : "");

-    tokenContainer->AddStringToken((int)eDCChannelGroupST::prevgroup, prevChannelSep ? prevChannelSep : "");

-    tokenContainer->AddStringToken((int)eDCChannelGroupST::seppath, sepExists ? sep : "");

-    tokenContainer->AddIntToken((int)eDCChannelGroupIT::prevAvailable, (prevChannelSep)?true:false);

-    tokenContainer->AddIntToken((int)eDCChannelGroupIT::nextAvailable, (nextChannelSep)?true:false);

-    tokenContainer->AddIntToken((int)eDCChannelGroupIT::sepexists, sepExists);

-

-    SetDirty();

-}

-

-const char *cVeDcChannelGroup::GetChannelSep(const cChannel *c, bool prev) {

-    const cChannel *sep = prev ? Channels.Prev(c) :

-                                 Channels.Next(c);

-    for (; sep; (prev)?(sep = Channels.Prev(sep)):(sep = Channels.Next(sep))) {

-        if (sep->GroupSep()) {

-            return sep->Name();

-        }

-    }

-    return NULL;

-}

-/******************************************************************

-* cVeDcEpgInfo

-******************************************************************/

-cVeDcEpgInfo::cVeDcEpgInfo(void) {

-}

-

-cVeDcEpgInfo::~cVeDcEpgInfo(void) {

-}

-

-void cVeDcEpgInfo::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{currenttitle}", (int)eDCEpgInfoST::currenttitle);

-    tokenContainer->DefineStringToken("{currentsubtitle}", (int)eDCEpgInfoST::currentsubtitle);

-    tokenContainer->DefineStringToken("{currentstart}", (int)eDCEpgInfoST::currentstart);

-    tokenContainer->DefineStringToken("{currentstop}", (int)eDCEpgInfoST::currentstop);

-    tokenContainer->DefineStringToken("{nexttitle}", (int)eDCEpgInfoST::nexttitle);

-    tokenContainer->DefineStringToken("{nextsubtitle}", (int)eDCEpgInfoST::nextsubtitle);

-    tokenContainer->DefineStringToken("{nextstart}", (int)eDCEpgInfoST::nextstart);

-    tokenContainer->DefineStringToken("{nextstop}", (int)eDCEpgInfoST::nextstop);

-    tokenContainer->DefineIntToken("{currentduration}", (int)eDCEpgInfoIT::currentduration);

-    tokenContainer->DefineIntToken("{currentdurationhours}", (int)eDCEpgInfoIT::currentdurationhours);

-    tokenContainer->DefineIntToken("{currentdurationminutes}", (int)eDCEpgInfoIT::currentdurationminutes);

-    tokenContainer->DefineIntToken("{currentelapsed}", (int)eDCEpgInfoIT::currentelapsed);

-    tokenContainer->DefineIntToken("{currentremaining}", (int)eDCEpgInfoIT::currentremaining);

-    tokenContainer->DefineIntToken("{nextduration}", (int)eDCEpgInfoIT::nextduration);

-    tokenContainer->DefineIntToken("{nextdurationhours}", (int)eDCEpgInfoIT::nextdurationhours);

-    tokenContainer->DefineIntToken("{nextdurationminutes}", (int)eDCEpgInfoIT::nextdurationminutes);

-    tokenContainer->DefineIntToken("{nextrecording}", (int)eDCEpgInfoIT::nextrecording);

-    tokenContainer->DefineIntToken("{currentrecording}", (int)eDCEpgInfoIT::currentrecording);

-    tokenContainer->DefineIntToken("{hasVPS}", (int)eDCEpgInfoIT::hasVPS);

-    InheritTokenContainer();

-}

-

-void cVeDcEpgInfo::Set(const cEvent *p, const cEvent *f) {

-    tokenContainer->Clear();

-    if (p) {

-        tokenContainer->AddStringToken((int)eDCEpgInfoST::currenttitle, p->Title());

-        tokenContainer->AddStringToken((int)eDCEpgInfoST::currentsubtitle, p->ShortText());

-        tokenContainer->AddStringToken((int)eDCEpgInfoST::currentstart, *p->GetTimeString());

-        tokenContainer->AddStringToken((int)eDCEpgInfoST::currentstop, *p->GetEndTimeString());

-        tokenContainer->AddIntToken((int)eDCEpgInfoIT::currentduration, p->Duration() / 60);

-        tokenContainer->AddIntToken((int)eDCEpgInfoIT::currentdurationhours, p->Duration() / 3600);

-        tokenContainer->AddIntToken((int)eDCEpgInfoIT::currentdurationminutes, (p->Duration() / 60) % 60);

-        tokenContainer->AddIntToken((int)eDCEpgInfoIT::currentelapsed, (int)round((time(NULL) - p->StartTime())/60));

-        tokenContainer->AddIntToken((int)eDCEpgInfoIT::currentremaining, (int)round((p->EndTime() - time(NULL))/60));

-        tokenContainer->AddIntToken((int)eDCEpgInfoIT::currentrecording, EventHasTimer(p));

-        tokenContainer->AddIntToken((int)eDCEpgInfoIT::hasVPS, (bool)p->Vps());

-    }

-    if (f) {

-        tokenContainer->AddStringToken((int)eDCEpgInfoST::nexttitle, f->Title());

-        tokenContainer->AddStringToken((int)eDCEpgInfoST::nextsubtitle, f->ShortText());

-        tokenContainer->AddStringToken((int)eDCEpgInfoST::nextstart, *f->GetTimeString());

-        tokenContainer->AddStringToken((int)eDCEpgInfoST::nextstop, *f->GetEndTimeString());

-        tokenContainer->AddIntToken((int)eDCEpgInfoIT::nextduration, f->Duration() / 60);

-        tokenContainer->AddIntToken((int)eDCEpgInfoIT::nextdurationhours, f->Duration() / 3600);

-        tokenContainer->AddIntToken((int)eDCEpgInfoIT::nextdurationminutes, (f->Duration() / 60) % 60);

-        tokenContainer->AddIntToken((int)eDCEpgInfoIT::hasVPS, (bool)f->Vps());

-    }

-    SetDirty();

-}

-

-bool cVeDcEpgInfo::EventHasTimer(const cEvent *e) {

-    if (!e) return false;

-    cGlobalSortedTimers SortedTimers;// local and remote timers

-    bool hasTimer = e->HasTimer();

-    for (int i = 0; i < SortedTimers.Size() && !hasTimer; i++) 

-        if (const cTimer *Timer = SortedTimers[i]) 

-            if (Timer->Channel()->GetChannelID() == e->ChannelID()) 

-                if (const cEvent *timerEvent = Timer->Event())

-                    if (e->EventID() == timerEvent->EventID())

-                        hasTimer = true;

-    return hasTimer;

-}

-

-/******************************************************************

-* cVeDcProgressBar

-******************************************************************/

-cVeDcProgressBar::cVeDcProgressBar(void) {

-    currentLast = -1;

-    startTime = -1;

-    duration = -1;

-}

-

-cVeDcProgressBar::~cVeDcProgressBar(void) {

-}

-

-void cVeDcProgressBar::Close(void) {

-    currentLast = -1;

-    startTime = -1;

-    duration = -1;

-    cViewElement::Close();

-}

-

-void cVeDcProgressBar::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{start}", (int)eDCProgressBarST::start);

-    tokenContainer->DefineStringToken("{stop}", (int)eDCProgressBarST::stop);

-    tokenContainer->DefineIntToken("{duration}", (int)eDCProgressBarIT::duration);

-    tokenContainer->DefineIntToken("{elapsed}", (int)eDCProgressBarIT::elapsed);

-    tokenContainer->DefineIntToken("{remaining}", (int)eDCProgressBarIT::remaining);

-    tokenContainer->DefineIntToken("{permashift}", (int)eDCProgressBarIT::permashift);

-    tokenContainer->DefineIntToken("{livebuffer}", (int)eDCProgressBarIT::livebuffer);

-    InheritTokenContainer();

-}

-

-void cVeDcProgressBar::Set(const cEvent *p) {

-    if (!p) {

-        startTime = -1;

-        duration = -1;

-        return;

-    }

-    startTime = p->StartTime();

-    duration = p->Duration();

-

-    int current = 0;

-    time_t t = time(NULL);

-    if (t > startTime)

-        current = t - startTime;

-

-    currentLast = current;

-    SetDirty();

-

-    tokenContainer->Clear();

-    tokenContainer->AddStringToken((int)eDCProgressBarST::start, *p->GetTimeString());

-    tokenContainer->AddStringToken((int)eDCProgressBarST::stop, *p->GetEndTimeString());

-    tokenContainer->AddIntToken((int)eDCProgressBarIT::duration, duration);

-    tokenContainer->AddIntToken((int)eDCProgressBarIT::elapsed, current);

-    tokenContainer->AddIntToken((int)eDCProgressBarIT::remaining, duration - current);

-    int liveBuffer = GetLiveBuffer();

-    if (liveBuffer >= 0) {

-        tokenContainer->AddIntToken((int)eDCProgressBarIT::permashift, 1);

-        tokenContainer->AddIntToken((int)eDCProgressBarIT::livebuffer, liveBuffer);

-    } else {

-        tokenContainer->AddIntToken((int)eDCProgressBarIT::permashift, 0);

-    }

-}

-

-bool cVeDcProgressBar::Parse(bool force) {

-    if (!cViewElement::Parse(force))

-        return false;

-    int current = 0;

-    time_t t = time(NULL);

-    if (t > startTime)

-        current = t - startTime;

-    if (!(current > currentLast + 3) && !force && !Dirty())

-        return false;

-    SetDirty();

-    if (duration <= 0) {

-        tokenContainer->AddIntToken((int)eDCProgressBarIT::duration, 0);

-        tokenContainer->AddIntToken((int)eDCProgressBarIT::elapsed, 0);

-        tokenContainer->AddIntToken((int)eDCProgressBarIT::remaining, 0);        

-    } else {    

-        tokenContainer->AddIntToken((int)eDCProgressBarIT::duration, duration);

-        tokenContainer->AddIntToken((int)eDCProgressBarIT::elapsed, current);

-        tokenContainer->AddIntToken((int)eDCProgressBarIT::remaining, duration - current);

-        int liveBuffer = GetLiveBuffer();

-        if (liveBuffer >= 0) {

-            tokenContainer->AddIntToken((int)eDCProgressBarIT::permashift, 1);

-            tokenContainer->AddIntToken((int)eDCProgressBarIT::livebuffer, liveBuffer);

-        } else {

-            tokenContainer->AddIntToken((int)eDCProgressBarIT::permashift, 0);

-        }

-    }

-    return true;

-}

-

-int cVeDcProgressBar::GetLiveBuffer(void) {

-    static cPlugin *pPermashift = cPluginManager::GetPlugin("permashift");

-    if (!pPermashift) {

-        return -1;

-    }

-    int buffer = 0;

-    if (pPermashift->Service("Permashift-GetUsedBufferSecs-v1", &buffer)) {

-        return buffer;

-    }

-    return -1;

-}

-/******************************************************************

-* cVeDcStatusInfo

-******************************************************************/

-cVeDcStatusInfo::cVeDcStatusInfo(void) {

-}

-

-cVeDcStatusInfo::~cVeDcStatusInfo(void) {

-}

-

-void cVeDcStatusInfo::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineIntToken("{isRadio}", (int)eDCStatusInfoIT::isRadio);

-    tokenContainer->DefineIntToken("{hasVT}", (int)eDCStatusInfoIT::hasVT);

-    tokenContainer->DefineIntToken("{isStereo}", (int)eDCStatusInfoIT::isStereo);

-    tokenContainer->DefineIntToken("{isDolby}", (int)eDCStatusInfoIT::isDolby);

-    tokenContainer->DefineIntToken("{isEncrypted}", (int)eDCStatusInfoIT::isEncrypted);

-    tokenContainer->DefineIntToken("{isRecording}", (int)eDCStatusInfoIT::isRecording);

-    tokenContainer->DefineIntToken("{newmails}", (int)eDCStatusInfoIT::newmails);

-    InheritTokenContainer();

-}

-

-void cVeDcStatusInfo::Set(const cChannel *c) {

-    bool isRadio = !c->Vpid() && c->Apid(0);

-    bool hasVT = c->Vpid() && c->Tpid();

-    bool isStereo = c->Apid(0);

-    bool isDolby = c->Dpid(0);

-    bool isEncrypted = c->Ca();

-    bool isRecording = cRecordControls::Active();

-    cGlobalSortedTimers SortedTimers;// local and remote timers

-    for (int i = 0; i < SortedTimers.Size() && !isRecording; i++)

-        if (const cTimer *Timer = SortedTimers[i])

-            if (Timer->Recording()) 

-                isRecording = true;

-

-    tokenContainer->AddIntToken((int)eDCStatusInfoIT::isRadio, isRadio);

-    tokenContainer->AddIntToken((int)eDCStatusInfoIT::hasVT, hasVT);

-    tokenContainer->AddIntToken((int)eDCStatusInfoIT::isStereo, isStereo);

-    tokenContainer->AddIntToken((int)eDCStatusInfoIT::isDolby, isDolby);

-    tokenContainer->AddIntToken((int)eDCStatusInfoIT::isEncrypted, isEncrypted);

-    tokenContainer->AddIntToken((int)eDCStatusInfoIT::isRecording, isRecording);

-    tokenContainer->AddIntToken((int)eDCStatusInfoIT::newmails, CheckMails());

-    SetDirty();

-}

-

-bool cVeDcStatusInfo::CheckMails(void) {

-    static cPlugin *pMailbox = cPluginManager::GetPlugin("mailbox");

-    if (!pMailbox) {

-        return false;

-    }

-    bool newMail = false;

-    if (pMailbox->Service("MailBox-HasNewMail-1.0", &newMail)) {

-        return newMail;

-    }

-    return false;

-}

-

-/******************************************************************

-* cVeDcAudioInfo

-******************************************************************/

-cVeDcAudioInfo::cVeDcAudioInfo(void) {

-    lastNumAudioTracks = -1;

-    lastAudioChannel = -1;

-    lastTracDesc = NULL;

-    lastTrackLang = NULL;

-}

-

-cVeDcAudioInfo::~cVeDcAudioInfo(void) {

-}

-

-void cVeDcAudioInfo::Close(void) {

-    lastNumAudioTracks = -1;

-    lastAudioChannel = -1;

-    free(lastTracDesc);

-    lastTracDesc = NULL;

-    free(lastTrackLang);

-    lastTrackLang = NULL;

-    cViewElement::Close();

-}

-

-void cVeDcAudioInfo::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{trackdesc}", (int)eDCAudioInfoST::trackdesc);

-    tokenContainer->DefineStringToken("{tracklang}", (int)eDCAudioInfoST::tracklang);

-    tokenContainer->DefineIntToken("{numaudiotracks}", (int)eDCAudioInfoIT::numaudiotracks);

-    tokenContainer->DefineIntToken("{audiochannel}", (int)eDCAudioInfoIT::audiochannel);

-    InheritTokenContainer();

-}

-

-bool cVeDcAudioInfo::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    int numAudioTracks = 0;

-    int audioChannel = -1;

-    const char *trackDescription = "";

-    const char *trackLanguage = "";

-

-    cDevice *device = cDevice::PrimaryDevice();

-    if (device) {

-        numAudioTracks = device->NumAudioTracks();

-        audioChannel = device->GetAudioChannel();

-        if (numAudioTracks > 0) {

-            const tTrackId *track = device->GetTrack(device->GetCurrentAudioTrack());

-            if (track) {

-                trackDescription = track->description ? track->description : "";

-                trackLanguage = track->language ? track->language : "";

-            }

-        }

-    }

-    if (   !Dirty() && !forced && lastNumAudioTracks == numAudioTracks 

-           && lastAudioChannel == audioChannel 

-           && lastTracDesc && !strcmp(trackDescription, lastTracDesc)

-           && lastTrackLang && !strcmp(trackLanguage, lastTrackLang)) {

-        return false;

-    }

-

-    lastNumAudioTracks = numAudioTracks;

-    lastAudioChannel = audioChannel;

-    free(lastTracDesc);

-    lastTracDesc = strdup(trackDescription);

-    free(lastTrackLang);

-    lastTrackLang = strdup(trackLanguage);

-    SetDirty();

-

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eDCAudioInfoIT::numaudiotracks, numAudioTracks);

-    tokenContainer->AddIntToken((int)eDCAudioInfoIT::audiochannel, audioChannel);

-    tokenContainer->AddStringToken((int)eDCAudioInfoST::trackdesc, trackDescription);

-    tokenContainer->AddStringToken((int)eDCAudioInfoST::tracklang, trackLanguage);

-    return true;

-}

-/******************************************************************

-* cVeDcScreenResolution

-******************************************************************/

-cVeDcScreenResolution::cVeDcScreenResolution(void) {

-    lastScreenWidth = -1;

-    lastScreenHeight = -1;

-}

-

-cVeDcScreenResolution::~cVeDcScreenResolution(void) {

-}

-

-void cVeDcScreenResolution::Close(void) {

-    lastScreenWidth = -1;

-    lastScreenHeight = -1;

-    cViewElement::Close();

-}

-

-void cVeDcScreenResolution::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{resolution}", (int)eDCScreenResolutionST::resolution);

-    tokenContainer->DefineStringToken("{aspect}", (int)eDCScreenResolutionST::aspect);

-    tokenContainer->DefineIntToken("{screenwidth}", (int)eDCScreenResolutionIT::screenwidth);

-    tokenContainer->DefineIntToken("{screenheight}", (int)eDCScreenResolutionIT::screenheight);

-    tokenContainer->DefineIntToken("{isHD}", (int)eDCScreenResolutionIT::isHD);

-    tokenContainer->DefineIntToken("{isWideScreen}", (int)eDCScreenResolutionIT::isWideScreen);

-    InheritTokenContainer();

-}

-

-bool cVeDcScreenResolution::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    int screenWidth = 0;

-    int screenHeight = 0;

-    double aspect = 0;

-

-    cDevice::PrimaryDevice()->GetVideoSize(screenWidth, screenHeight, aspect);

-

-    if ((lastScreenWidth == screenWidth) && (lastScreenHeight == screenHeight))

-        return false;

-

-    if ((screenWidth == 0) && (screenHeight == 0))

-        return false;

-

-    lastScreenWidth = screenWidth;

-    lastScreenHeight = screenHeight;

-    SetDirty();

-

-    bool isHD = false;

-    string resName = GetScreenResolutionString(screenWidth, screenHeight, &isHD);

-

-    bool isWideScreen = false;

-    string aspectName = GetScreenAspectString(aspect, &isWideScreen);

-

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eDCScreenResolutionIT::screenwidth, screenWidth);

-    tokenContainer->AddIntToken((int)eDCScreenResolutionIT::screenheight, screenHeight);

-    tokenContainer->AddIntToken((int)eDCScreenResolutionIT::isHD, isHD);

-    tokenContainer->AddIntToken((int)eDCScreenResolutionIT::isWideScreen, isWideScreen);

-    tokenContainer->AddStringToken((int)eDCScreenResolutionST::resolution, resName.c_str());

-    tokenContainer->AddStringToken((int)eDCScreenResolutionST::aspect, aspectName.c_str());

-    return true;

-}

-/******************************************************************

-* cVeDcSignalQuality

-******************************************************************/

-cVeDcSignalQuality::cVeDcSignalQuality(void) {

-    lastSignalDisplay = -1;

-    lastSignalStrength = -1;

-    lastSignalQuality = -1;

-}

-

-cVeDcSignalQuality::~cVeDcSignalQuality(void) {

-}

-

-void cVeDcSignalQuality::Close(void) {

-    lastSignalDisplay = -1;

-    lastSignalStrength = -1;

-    lastSignalQuality = -1;

-    cViewElement::Close();

-}

-

-void cVeDcSignalQuality::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineIntToken("{signalstrength}", (int)eDCSignalQualityIT::signalstrength);

-    tokenContainer->DefineIntToken("{signalquality}", (int)eDCSignalQualityIT::signalquality);

-    InheritTokenContainer();

-}

-

-bool cVeDcSignalQuality::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    time_t now = time(NULL);

-    if (now == lastSignalDisplay)

-        return false;

-    lastSignalDisplay = now;

-

-    int signalStrength = cDevice::ActualDevice()->SignalStrength();

-    int signalQuality = cDevice::ActualDevice()->SignalQuality();

-

-    if (signalStrength < 0) signalStrength = 0;

-    if (signalQuality < 0) signalQuality = 0;

-

-    if (signalStrength == 0 && signalQuality==0)

-        return false;

-

-    if ((lastSignalStrength == signalStrength) && (lastSignalQuality == signalQuality))

-        return false;

-    SetDirty();

-    lastSignalStrength = signalStrength;

-    lastSignalQuality = signalQuality;

-

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eDCSignalQualityIT::signalstrength, signalStrength);

-    tokenContainer->AddIntToken((int)eDCSignalQualityIT::signalquality, signalQuality);

-    return true;

-}

-

-/******************************************************************

-* cVeDcScraperContent

-******************************************************************/

-cVeDcScraperContent::cVeDcScraperContent(void) {

-}

-

-cVeDcScraperContent::~cVeDcScraperContent(void) {

-}

-

-void cVeDcScraperContent::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{posterpath}", (int)eScraperPosterBannerST::posterpath);

-    tokenContainer->DefineStringToken("{bannerpath}", (int)eScraperPosterBannerST::bannerpath);

-    tokenContainer->DefineStringToken("{mediapath}", (int)eScraperPosterBannerST::mediapath);

-    tokenContainer->DefineIntToken("{posterwidth}", (int)eScraperPosterBannerIT::posterwidth);

-    tokenContainer->DefineIntToken("{posterheight}", (int)eScraperPosterBannerIT::posterheight);

-    tokenContainer->DefineIntToken("{hasPoster}", (int)eScraperPosterBannerIT::hasposter);

-    tokenContainer->DefineIntToken("{bannerwidth}", (int)eScraperPosterBannerIT::bannerwidth);

-    tokenContainer->DefineIntToken("{bannerheight}", (int)eScraperPosterBannerIT::bannerheight);

-    tokenContainer->DefineIntToken("{hasBanner}", (int)eScraperPosterBannerIT::hasbanner);

-    tokenContainer->DefineIntToken("{mediawidth}", (int)eScraperPosterBannerIT::mediawidth);

-    tokenContainer->DefineIntToken("{mediaheight}", (int)eScraperPosterBannerIT::mediaheight);

-    tokenContainer->DefineIntToken("{isbanner}", (int)eScraperPosterBannerIT::isbanner);

-    InheritTokenContainer();

-}

-

-void cVeDcScraperContent::Set(const cEvent *e) {

-    tokenContainer->Clear();

-    SetPosterBanner(tokenContainer, e, NULL);

-    SetDirty();

-}

-

-/******************************************************************

-* cVeDcScreenResolution

-******************************************************************/

-cVeDcEcmInfo::cVeDcEcmInfo(void) {

-    channelSid = -1;

-    lastEcmInfo.hops = -1;

-    lastEcmInfo.ecmtime = -1;

-    lastEcmInfo.caid = -1;

-    lastEcmInfo.pid = -1;

-    lastEcmInfo.prid = -1;

-}

-

-cVeDcEcmInfo::~cVeDcEcmInfo(void) {

-}

-

-void cVeDcEcmInfo::Close(void) {

-    channelSid = -1;

-    lastEcmInfo.hops = -1;

-    lastEcmInfo.ecmtime = -1;

-    lastEcmInfo.caid = -1;

-    lastEcmInfo.pid = -1;

-    lastEcmInfo.prid = -1;

-    cViewElement::Close();

-}

-

-void cVeDcEcmInfo::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{cardsystem}", (int)eDCEcmInfoST::cardsystem);

-    tokenContainer->DefineStringToken("{reader}", (int)eDCEcmInfoST::reader);

-    tokenContainer->DefineStringToken("{from}", (int)eDCEcmInfoST::from);

-    tokenContainer->DefineStringToken("{protocol}", (int)eDCEcmInfoST::protocol);

-    tokenContainer->DefineIntToken("{caid}", (int)eDCEcmInfoIT::caid);

-    tokenContainer->DefineIntToken("{pid}", (int)eDCEcmInfoIT::pid);

-    tokenContainer->DefineIntToken("{prid}", (int)eDCEcmInfoIT::prid);

-    tokenContainer->DefineIntToken("{ecmtime}", (int)eDCEcmInfoIT::ecmtime);

-    tokenContainer->DefineIntToken("{hops}", (int)eDCEcmInfoIT::hops);

-    InheritTokenContainer();

-}

-

-void cVeDcEcmInfo::Set(const cChannel *c) {

-    channelSid = c->Sid();

-}

-

-bool cVeDcEcmInfo::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    static cPlugin *pDVBApi = cPluginManager::GetPlugin("dvbapi");

-    if (!pDVBApi)

-        return false;

-    if (channelSid < 0)

-        return false;

-

-    sDVBAPIEcmInfo ecmInfo;

-    ecmInfo.sid = channelSid;

-

-    if (!pDVBApi->Service("GetEcmInfo", &ecmInfo)) {

-        return false;

-    }

-

-    if (ecmInfo.hops < 0 || ecmInfo.ecmtime <= 0 || ecmInfo.ecmtime > 100000)

-        return false;

-    if (CompareECMInfos(&ecmInfo))

-        return false;

-    lastEcmInfo = ecmInfo;

-    SetDirty();

-

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eDCEcmInfoIT::caid, ecmInfo.caid);

-    tokenContainer->AddIntToken((int)eDCEcmInfoIT::pid, ecmInfo.pid);

-    tokenContainer->AddIntToken((int)eDCEcmInfoIT::prid, ecmInfo.prid);

-    tokenContainer->AddIntToken((int)eDCEcmInfoIT::ecmtime, ecmInfo.ecmtime);

-    tokenContainer->AddIntToken((int)eDCEcmInfoIT::hops, ecmInfo.hops);

-    tokenContainer->AddStringToken((int)eDCEcmInfoST::cardsystem, *ecmInfo.cardsystem);

-    tokenContainer->AddStringToken((int)eDCEcmInfoST::reader, *ecmInfo.reader);

-    tokenContainer->AddStringToken((int)eDCEcmInfoST::from, *ecmInfo.from);

-    tokenContainer->AddStringToken((int)eDCEcmInfoST::protocol, *ecmInfo.protocol);

-    return true;

-}

-

-bool cVeDcEcmInfo::CompareECMInfos(sDVBAPIEcmInfo *ecmInfo) {

-    if (ecmInfo->caid != lastEcmInfo.caid)

-        return false;

-    if (ecmInfo->pid != lastEcmInfo.pid)

-        return false;

-    if (ecmInfo->prid != lastEcmInfo.prid)

-        return false;

-    if (ecmInfo->ecmtime != lastEcmInfo.ecmtime)

-        return false;

-    if (ecmInfo->hops != lastEcmInfo.hops)

-        return false;

-    return true;

-}

+#include "viewelementsdisplaychannel.h"
+#include "../config.h"
+#include "../extensions/helpers.h"
+#include "../extensions/timers.h"
+#include "../services/scraper2vdr.h"
+
+/******************************************************************
+* cVeDcChannelInfo
+******************************************************************/
+cVeDcChannelInfo::cVeDcChannelInfo(void) {
+}
+
+cVeDcChannelInfo::~cVeDcChannelInfo(void) {
+}
+
+void cVeDcChannelInfo::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{channelnumber}", (int)eDCChannelInfoST::channelnumber);
+    tokenContainer->DefineStringToken("{channelname}", (int)eDCChannelInfoST::channelname);
+    tokenContainer->DefineStringToken("{channelid}", (int)eDCChannelInfoST::channelid);
+    tokenContainer->DefineIntToken("{channellogoexists}", (int)eDCChannelInfoIT::channellogoexists);
+    tokenContainer->DefineIntToken("{switching}", (int)eDCChannelInfoIT::switching);
+    InheritTokenContainer();
+}
+
+void cVeDcChannelInfo::Set(const cChannel *c, int number) {
+    cString channelNumber("");
+    cString channelName("");
+    cString channelId("");
+    if (c) {
+        channelName = c->Name() ? c->Name() : "";
+        channelId = c->GetChannelID().ToString();
+        if (!c->GroupSep()) {
+            channelNumber = cString::sprintf("%d%s", c->Number(), number ? "-" : "");
+        }
+    } else if (number) {
+        channelNumber = cString::sprintf("%d-", number);
+    } else {
+        channelName = ChannelString(NULL, 0);
+    }
+
+    tokenContainer->Clear();
+    tokenContainer->AddStringToken((int)eDCChannelInfoST::channelnumber, *channelNumber);
+    tokenContainer->AddStringToken((int)eDCChannelInfoST::channelname, *channelName);
+    tokenContainer->AddStringToken((int)eDCChannelInfoST::channelid, *channelId);
+    bool logoExists = imgCache->LogoExists(*channelId);
+    tokenContainer->AddIntToken((int)eDCChannelInfoIT::channellogoexists, logoExists);
+    tokenContainer->AddIntToken((int)eDCChannelInfoIT::switching, (number > 0)?true:false);
+
+    SetDirty();
+}
+
+/******************************************************************
+* cVeDcChannelGroup
+******************************************************************/
+cVeDcChannelGroup::cVeDcChannelGroup(void) {
+}
+
+cVeDcChannelGroup::~cVeDcChannelGroup(void) {
+}
+
+void cVeDcChannelGroup::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{group}", (int)eDCChannelGroupST::group);
+    tokenContainer->DefineStringToken("{nextgroup}", (int)eDCChannelGroupST::nextgroup);
+    tokenContainer->DefineStringToken("{prevgroup}", (int)eDCChannelGroupST::prevgroup);
+    tokenContainer->DefineStringToken("{seppath}", (int)eDCChannelGroupST::seppath);
+    tokenContainer->DefineIntToken("{prevAvailable}", (int)eDCChannelGroupIT::prevAvailable);
+    tokenContainer->DefineIntToken("{nextAvailable}", (int)eDCChannelGroupIT::nextAvailable);
+    tokenContainer->DefineIntToken("{sepexists}", (int)eDCChannelGroupIT::sepexists);
+    InheritTokenContainer();
+}
+
+void cVeDcChannelGroup::Set(const cChannel *c) {
+    const char *sep = c->Name(); 
+    bool sepExists = imgCache->SeparatorLogoExists(sep);
+
+    const char *prevChannelSep = GetChannelSep(c, true);
+    const char *nextChannelSep = GetChannelSep(c, false);
+
+    tokenContainer->Clear();
+    tokenContainer->AddStringToken((int)eDCChannelGroupST::group, sep);
+    tokenContainer->AddStringToken((int)eDCChannelGroupST::nextgroup, nextChannelSep ? nextChannelSep : "");
+    tokenContainer->AddStringToken((int)eDCChannelGroupST::prevgroup, prevChannelSep ? prevChannelSep : "");
+    tokenContainer->AddStringToken((int)eDCChannelGroupST::seppath, sepExists ? sep : "");
+    tokenContainer->AddIntToken((int)eDCChannelGroupIT::prevAvailable, (prevChannelSep)?true:false);
+    tokenContainer->AddIntToken((int)eDCChannelGroupIT::nextAvailable, (nextChannelSep)?true:false);
+    tokenContainer->AddIntToken((int)eDCChannelGroupIT::sepexists, sepExists);
+
+    SetDirty();
+}
+
+const char *cVeDcChannelGroup::GetChannelSep(const cChannel *c, bool prev) {
+    const cChannel *sep = prev ? Channels.Prev(c) :
+                                 Channels.Next(c);
+    for (; sep; (prev)?(sep = Channels.Prev(sep)):(sep = Channels.Next(sep))) {
+        if (sep->GroupSep()) {
+            return sep->Name();
+        }
+    }
+    return NULL;
+}
+/******************************************************************
+* cVeDcEpgInfo
+******************************************************************/
+cVeDcEpgInfo::cVeDcEpgInfo(void) {
+}
+
+cVeDcEpgInfo::~cVeDcEpgInfo(void) {
+}
+
+void cVeDcEpgInfo::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{currenttitle}", (int)eDCEpgInfoST::currenttitle);
+    tokenContainer->DefineStringToken("{currentsubtitle}", (int)eDCEpgInfoST::currentsubtitle);
+    tokenContainer->DefineStringToken("{currentstart}", (int)eDCEpgInfoST::currentstart);
+    tokenContainer->DefineStringToken("{currentstop}", (int)eDCEpgInfoST::currentstop);
+    tokenContainer->DefineStringToken("{nexttitle}", (int)eDCEpgInfoST::nexttitle);
+    tokenContainer->DefineStringToken("{nextsubtitle}", (int)eDCEpgInfoST::nextsubtitle);
+    tokenContainer->DefineStringToken("{nextstart}", (int)eDCEpgInfoST::nextstart);
+    tokenContainer->DefineStringToken("{nextstop}", (int)eDCEpgInfoST::nextstop);
+    tokenContainer->DefineIntToken("{currentduration}", (int)eDCEpgInfoIT::currentduration);
+    tokenContainer->DefineIntToken("{currentdurationhours}", (int)eDCEpgInfoIT::currentdurationhours);
+    tokenContainer->DefineIntToken("{currentdurationminutes}", (int)eDCEpgInfoIT::currentdurationminutes);
+    tokenContainer->DefineIntToken("{currentelapsed}", (int)eDCEpgInfoIT::currentelapsed);
+    tokenContainer->DefineIntToken("{currentremaining}", (int)eDCEpgInfoIT::currentremaining);
+    tokenContainer->DefineIntToken("{nextduration}", (int)eDCEpgInfoIT::nextduration);
+    tokenContainer->DefineIntToken("{nextdurationhours}", (int)eDCEpgInfoIT::nextdurationhours);
+    tokenContainer->DefineIntToken("{nextdurationminutes}", (int)eDCEpgInfoIT::nextdurationminutes);
+    tokenContainer->DefineIntToken("{nextrecording}", (int)eDCEpgInfoIT::nextrecording);
+    tokenContainer->DefineIntToken("{currentrecording}", (int)eDCEpgInfoIT::currentrecording);
+    tokenContainer->DefineIntToken("{hasVPS}", (int)eDCEpgInfoIT::hasVPS);
+    InheritTokenContainer();
+}
+
+void cVeDcEpgInfo::Set(const cEvent *p, const cEvent *f) {
+    tokenContainer->Clear();
+    if (p) {
+        tokenContainer->AddStringToken((int)eDCEpgInfoST::currenttitle, p->Title());
+        tokenContainer->AddStringToken((int)eDCEpgInfoST::currentsubtitle, p->ShortText());
+        tokenContainer->AddStringToken((int)eDCEpgInfoST::currentstart, *p->GetTimeString());
+        tokenContainer->AddStringToken((int)eDCEpgInfoST::currentstop, *p->GetEndTimeString());
+        tokenContainer->AddIntToken((int)eDCEpgInfoIT::currentduration, p->Duration() / 60);
+        tokenContainer->AddIntToken((int)eDCEpgInfoIT::currentdurationhours, p->Duration() / 3600);
+        tokenContainer->AddIntToken((int)eDCEpgInfoIT::currentdurationminutes, (p->Duration() / 60) % 60);
+        tokenContainer->AddIntToken((int)eDCEpgInfoIT::currentelapsed, (int)round((time(NULL) - p->StartTime())/60));
+        tokenContainer->AddIntToken((int)eDCEpgInfoIT::currentremaining, (int)round((p->EndTime() - time(NULL))/60));
+        tokenContainer->AddIntToken((int)eDCEpgInfoIT::currentrecording, EventHasTimer(p));
+        tokenContainer->AddIntToken((int)eDCEpgInfoIT::hasVPS, (bool)p->Vps());
+    }
+    if (f) {
+        tokenContainer->AddStringToken((int)eDCEpgInfoST::nexttitle, f->Title());
+        tokenContainer->AddStringToken((int)eDCEpgInfoST::nextsubtitle, f->ShortText());
+        tokenContainer->AddStringToken((int)eDCEpgInfoST::nextstart, *f->GetTimeString());
+        tokenContainer->AddStringToken((int)eDCEpgInfoST::nextstop, *f->GetEndTimeString());
+        tokenContainer->AddIntToken((int)eDCEpgInfoIT::nextduration, f->Duration() / 60);
+        tokenContainer->AddIntToken((int)eDCEpgInfoIT::nextdurationhours, f->Duration() / 3600);
+        tokenContainer->AddIntToken((int)eDCEpgInfoIT::nextdurationminutes, (f->Duration() / 60) % 60);
+        tokenContainer->AddIntToken((int)eDCEpgInfoIT::hasVPS, (bool)f->Vps());
+    }
+    SetDirty();
+}
+
+bool cVeDcEpgInfo::EventHasTimer(const cEvent *e) {
+    if (!e) return false;
+    cGlobalSortedTimers SortedTimers;// local and remote timers
+    bool hasTimer = e->HasTimer();
+    for (int i = 0; i < SortedTimers.Size() && !hasTimer; i++) 
+        if (const cTimer *Timer = SortedTimers[i]) 
+            if (Timer->Channel()->GetChannelID() == e->ChannelID()) 
+                if (const cEvent *timerEvent = Timer->Event())
+                    if (e->EventID() == timerEvent->EventID())
+                        hasTimer = true;
+    return hasTimer;
+}
+
+/******************************************************************
+* cVeDcProgressBar
+******************************************************************/
+cVeDcProgressBar::cVeDcProgressBar(void) {
+    currentLast = -1;
+    startTime = -1;
+    duration = -1;
+}
+
+cVeDcProgressBar::~cVeDcProgressBar(void) {
+}
+
+void cVeDcProgressBar::Close(void) {
+    currentLast = -1;
+    startTime = -1;
+    duration = -1;
+    cViewElement::Close();
+}
+
+void cVeDcProgressBar::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{start}", (int)eDCProgressBarST::start);
+    tokenContainer->DefineStringToken("{stop}", (int)eDCProgressBarST::stop);
+    tokenContainer->DefineIntToken("{duration}", (int)eDCProgressBarIT::duration);
+    tokenContainer->DefineIntToken("{elapsed}", (int)eDCProgressBarIT::elapsed);
+    tokenContainer->DefineIntToken("{remaining}", (int)eDCProgressBarIT::remaining);
+    tokenContainer->DefineIntToken("{permashift}", (int)eDCProgressBarIT::permashift);
+    tokenContainer->DefineIntToken("{livebuffer}", (int)eDCProgressBarIT::livebuffer);
+    InheritTokenContainer();
+}
+
+void cVeDcProgressBar::Set(const cEvent *p) {
+    if (!p) {
+        startTime = -1;
+        duration = -1;
+        return;
+    }
+    startTime = p->StartTime();
+    duration = p->Duration();
+
+    int current = 0;
+    time_t t = time(NULL);
+    if (t > startTime)
+        current = t - startTime;
+
+    currentLast = current;
+    SetDirty();
+
+    tokenContainer->Clear();
+    tokenContainer->AddStringToken((int)eDCProgressBarST::start, *p->GetTimeString());
+    tokenContainer->AddStringToken((int)eDCProgressBarST::stop, *p->GetEndTimeString());
+    tokenContainer->AddIntToken((int)eDCProgressBarIT::duration, duration);
+    tokenContainer->AddIntToken((int)eDCProgressBarIT::elapsed, current);
+    tokenContainer->AddIntToken((int)eDCProgressBarIT::remaining, duration - current);
+    int liveBuffer = GetLiveBuffer();
+    if (liveBuffer >= 0) {
+        tokenContainer->AddIntToken((int)eDCProgressBarIT::permashift, 1);
+        tokenContainer->AddIntToken((int)eDCProgressBarIT::livebuffer, liveBuffer);
+    } else {
+        tokenContainer->AddIntToken((int)eDCProgressBarIT::permashift, 0);
+    }
+}
+
+bool cVeDcProgressBar::Parse(bool force) {
+    if (!cViewElement::Parse(force))
+        return false;
+    int current = 0;
+    time_t t = time(NULL);
+    if (t > startTime)
+        current = t - startTime;
+    if (!(current > currentLast + 3) && !force && !Dirty())
+        return false;
+    SetDirty();
+    if (duration <= 0) {
+        tokenContainer->AddIntToken((int)eDCProgressBarIT::duration, 0);
+        tokenContainer->AddIntToken((int)eDCProgressBarIT::elapsed, 0);
+        tokenContainer->AddIntToken((int)eDCProgressBarIT::remaining, 0);        
+    } else {    
+        tokenContainer->AddIntToken((int)eDCProgressBarIT::duration, duration);
+        tokenContainer->AddIntToken((int)eDCProgressBarIT::elapsed, current);
+        tokenContainer->AddIntToken((int)eDCProgressBarIT::remaining, duration - current);
+        int liveBuffer = GetLiveBuffer();
+        if (liveBuffer >= 0) {
+            tokenContainer->AddIntToken((int)eDCProgressBarIT::permashift, 1);
+            tokenContainer->AddIntToken((int)eDCProgressBarIT::livebuffer, liveBuffer);
+        } else {
+            tokenContainer->AddIntToken((int)eDCProgressBarIT::permashift, 0);
+        }
+    }
+    return true;
+}
+
+int cVeDcProgressBar::GetLiveBuffer(void) {
+    static cPlugin *pPermashift = cPluginManager::GetPlugin("permashift");
+    if (!pPermashift) {
+        return -1;
+    }
+    int buffer = 0;
+    if (pPermashift->Service("Permashift-GetUsedBufferSecs-v1", &buffer)) {
+        return buffer;
+    }
+    return -1;
+}
+/******************************************************************
+* cVeDcStatusInfo
+******************************************************************/
+cVeDcStatusInfo::cVeDcStatusInfo(void) {
+}
+
+cVeDcStatusInfo::~cVeDcStatusInfo(void) {
+}
+
+void cVeDcStatusInfo::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineIntToken("{isRadio}", (int)eDCStatusInfoIT::isRadio);
+    tokenContainer->DefineIntToken("{hasVT}", (int)eDCStatusInfoIT::hasVT);
+    tokenContainer->DefineIntToken("{isStereo}", (int)eDCStatusInfoIT::isStereo);
+    tokenContainer->DefineIntToken("{isDolby}", (int)eDCStatusInfoIT::isDolby);
+    tokenContainer->DefineIntToken("{isEncrypted}", (int)eDCStatusInfoIT::isEncrypted);
+    tokenContainer->DefineIntToken("{isRecording}", (int)eDCStatusInfoIT::isRecording);
+    tokenContainer->DefineIntToken("{newmails}", (int)eDCStatusInfoIT::newmails);
+    InheritTokenContainer();
+}
+
+void cVeDcStatusInfo::Set(const cChannel *c) {
+    bool isRadio = !c->Vpid() && c->Apid(0);
+    bool hasVT = c->Vpid() && c->Tpid();
+    bool isStereo = c->Apid(0);
+    bool isDolby = c->Dpid(0);
+    bool isEncrypted = c->Ca();
+    bool isRecording = cRecordControls::Active();
+    cGlobalSortedTimers SortedTimers;// local and remote timers
+    for (int i = 0; i < SortedTimers.Size() && !isRecording; i++)
+        if (const cTimer *Timer = SortedTimers[i])
+            if (Timer->Recording()) 
+                isRecording = true;
+
+    tokenContainer->AddIntToken((int)eDCStatusInfoIT::isRadio, isRadio);
+    tokenContainer->AddIntToken((int)eDCStatusInfoIT::hasVT, hasVT);
+    tokenContainer->AddIntToken((int)eDCStatusInfoIT::isStereo, isStereo);
+    tokenContainer->AddIntToken((int)eDCStatusInfoIT::isDolby, isDolby);
+    tokenContainer->AddIntToken((int)eDCStatusInfoIT::isEncrypted, isEncrypted);
+    tokenContainer->AddIntToken((int)eDCStatusInfoIT::isRecording, isRecording);
+    tokenContainer->AddIntToken((int)eDCStatusInfoIT::newmails, CheckMails());
+    SetDirty();
+}
+
+bool cVeDcStatusInfo::CheckMails(void) {
+    static cPlugin *pMailbox = cPluginManager::GetPlugin("mailbox");
+    if (!pMailbox) {
+        return false;
+    }
+    bool newMail = false;
+    if (pMailbox->Service("MailBox-HasNewMail-1.0", &newMail)) {
+        return newMail;
+    }
+    return false;
+}
+
+/******************************************************************
+* cVeDcAudioInfo
+******************************************************************/
+cVeDcAudioInfo::cVeDcAudioInfo(void) {
+    lastNumAudioTracks = -1;
+    lastAudioChannel = -1;
+    lastTracDesc = NULL;
+    lastTrackLang = NULL;
+}
+
+cVeDcAudioInfo::~cVeDcAudioInfo(void) {
+}
+
+void cVeDcAudioInfo::Close(void) {
+    lastNumAudioTracks = -1;
+    lastAudioChannel = -1;
+    free(lastTracDesc);
+    lastTracDesc = NULL;
+    free(lastTrackLang);
+    lastTrackLang = NULL;
+    cViewElement::Close();
+}
+
+void cVeDcAudioInfo::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{trackdesc}", (int)eDCAudioInfoST::trackdesc);
+    tokenContainer->DefineStringToken("{tracklang}", (int)eDCAudioInfoST::tracklang);
+    tokenContainer->DefineIntToken("{numaudiotracks}", (int)eDCAudioInfoIT::numaudiotracks);
+    tokenContainer->DefineIntToken("{audiochannel}", (int)eDCAudioInfoIT::audiochannel);
+    InheritTokenContainer();
+}
+
+bool cVeDcAudioInfo::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    int numAudioTracks = 0;
+    int audioChannel = -1;
+    const char *trackDescription = "";
+    const char *trackLanguage = "";
+
+    cDevice *device = cDevice::PrimaryDevice();
+    if (device) {
+        numAudioTracks = device->NumAudioTracks();
+        audioChannel = device->GetAudioChannel();
+        if (numAudioTracks > 0) {
+            const tTrackId *track = device->GetTrack(device->GetCurrentAudioTrack());
+            if (track) {
+                trackDescription = track->description ? track->description : "";
+                trackLanguage = track->language ? track->language : "";
+            }
+        }
+    }
+    if (   !Dirty() && !forced && lastNumAudioTracks == numAudioTracks 
+           && lastAudioChannel == audioChannel 
+           && lastTracDesc && !strcmp(trackDescription, lastTracDesc)
+           && lastTrackLang && !strcmp(trackLanguage, lastTrackLang)) {
+        return false;
+    }
+
+    lastNumAudioTracks = numAudioTracks;
+    lastAudioChannel = audioChannel;
+    free(lastTracDesc);
+    lastTracDesc = strdup(trackDescription);
+    free(lastTrackLang);
+    lastTrackLang = strdup(trackLanguage);
+    SetDirty();
+
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eDCAudioInfoIT::numaudiotracks, numAudioTracks);
+    tokenContainer->AddIntToken((int)eDCAudioInfoIT::audiochannel, audioChannel);
+    tokenContainer->AddStringToken((int)eDCAudioInfoST::trackdesc, trackDescription);
+    tokenContainer->AddStringToken((int)eDCAudioInfoST::tracklang, trackLanguage);
+    return true;
+}
+/******************************************************************
+* cVeDcScreenResolution
+******************************************************************/
+cVeDcScreenResolution::cVeDcScreenResolution(void) {
+    lastScreenWidth = -1;
+    lastScreenHeight = -1;
+}
+
+cVeDcScreenResolution::~cVeDcScreenResolution(void) {
+}
+
+void cVeDcScreenResolution::Close(void) {
+    lastScreenWidth = -1;
+    lastScreenHeight = -1;
+    cViewElement::Close();
+}
+
+void cVeDcScreenResolution::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{resolution}", (int)eDCScreenResolutionST::resolution);
+    tokenContainer->DefineStringToken("{aspect}", (int)eDCScreenResolutionST::aspect);
+    tokenContainer->DefineIntToken("{screenwidth}", (int)eDCScreenResolutionIT::screenwidth);
+    tokenContainer->DefineIntToken("{screenheight}", (int)eDCScreenResolutionIT::screenheight);
+    tokenContainer->DefineIntToken("{isHD}", (int)eDCScreenResolutionIT::isHD);
+    tokenContainer->DefineIntToken("{isWideScreen}", (int)eDCScreenResolutionIT::isWideScreen);
+    InheritTokenContainer();
+}
+
+bool cVeDcScreenResolution::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    int screenWidth = 0;
+    int screenHeight = 0;
+    double aspect = 0;
+
+    cDevice::PrimaryDevice()->GetVideoSize(screenWidth, screenHeight, aspect);
+
+    if ((lastScreenWidth == screenWidth) && (lastScreenHeight == screenHeight))
+        return false;
+
+    if ((screenWidth == 0) && (screenHeight == 0))
+        return false;
+
+    lastScreenWidth = screenWidth;
+    lastScreenHeight = screenHeight;
+    SetDirty();
+
+    bool isHD = false;
+    string resName = GetScreenResolutionString(screenWidth, screenHeight, &isHD);
+
+    bool isWideScreen = false;
+    string aspectName = GetScreenAspectString(aspect, &isWideScreen);
+
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eDCScreenResolutionIT::screenwidth, screenWidth);
+    tokenContainer->AddIntToken((int)eDCScreenResolutionIT::screenheight, screenHeight);
+    tokenContainer->AddIntToken((int)eDCScreenResolutionIT::isHD, isHD);
+    tokenContainer->AddIntToken((int)eDCScreenResolutionIT::isWideScreen, isWideScreen);
+    tokenContainer->AddStringToken((int)eDCScreenResolutionST::resolution, resName.c_str());
+    tokenContainer->AddStringToken((int)eDCScreenResolutionST::aspect, aspectName.c_str());
+    return true;
+}
+/******************************************************************
+* cVeDcSignalQuality
+******************************************************************/
+cVeDcSignalQuality::cVeDcSignalQuality(void) {
+    lastSignalDisplay = -1;
+    lastSignalStrength = -1;
+    lastSignalQuality = -1;
+}
+
+cVeDcSignalQuality::~cVeDcSignalQuality(void) {
+}
+
+void cVeDcSignalQuality::Close(void) {
+    lastSignalDisplay = -1;
+    lastSignalStrength = -1;
+    lastSignalQuality = -1;
+    cViewElement::Close();
+}
+
+void cVeDcSignalQuality::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineIntToken("{signalstrength}", (int)eDCSignalQualityIT::signalstrength);
+    tokenContainer->DefineIntToken("{signalquality}", (int)eDCSignalQualityIT::signalquality);
+    InheritTokenContainer();
+}
+
+bool cVeDcSignalQuality::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    time_t now = time(NULL);
+    if (now == lastSignalDisplay)
+        return false;
+    lastSignalDisplay = now;
+
+    int signalStrength = cDevice::ActualDevice()->SignalStrength();
+    int signalQuality = cDevice::ActualDevice()->SignalQuality();
+
+    if (signalStrength < 0) signalStrength = 0;
+    if (signalQuality < 0) signalQuality = 0;
+
+    if (signalStrength == 0 && signalQuality==0)
+        return false;
+
+    if ((lastSignalStrength == signalStrength) && (lastSignalQuality == signalQuality))
+        return false;
+    SetDirty();
+    lastSignalStrength = signalStrength;
+    lastSignalQuality = signalQuality;
+
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eDCSignalQualityIT::signalstrength, signalStrength);
+    tokenContainer->AddIntToken((int)eDCSignalQualityIT::signalquality, signalQuality);
+    return true;
+}
+
+/******************************************************************
+* cVeDcScraperContent
+******************************************************************/
+cVeDcScraperContent::cVeDcScraperContent(void) {
+}
+
+cVeDcScraperContent::~cVeDcScraperContent(void) {
+}
+
+void cVeDcScraperContent::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{posterpath}", (int)eScraperPosterBannerST::posterpath);
+    tokenContainer->DefineStringToken("{bannerpath}", (int)eScraperPosterBannerST::bannerpath);
+    tokenContainer->DefineStringToken("{mediapath}", (int)eScraperPosterBannerST::mediapath);
+    tokenContainer->DefineIntToken("{posterwidth}", (int)eScraperPosterBannerIT::posterwidth);
+    tokenContainer->DefineIntToken("{posterheight}", (int)eScraperPosterBannerIT::posterheight);
+    tokenContainer->DefineIntToken("{hasPoster}", (int)eScraperPosterBannerIT::hasposter);
+    tokenContainer->DefineIntToken("{bannerwidth}", (int)eScraperPosterBannerIT::bannerwidth);
+    tokenContainer->DefineIntToken("{bannerheight}", (int)eScraperPosterBannerIT::bannerheight);
+    tokenContainer->DefineIntToken("{hasBanner}", (int)eScraperPosterBannerIT::hasbanner);
+    tokenContainer->DefineIntToken("{mediawidth}", (int)eScraperPosterBannerIT::mediawidth);
+    tokenContainer->DefineIntToken("{mediaheight}", (int)eScraperPosterBannerIT::mediaheight);
+    tokenContainer->DefineIntToken("{isbanner}", (int)eScraperPosterBannerIT::isbanner);
+    InheritTokenContainer();
+}
+
+void cVeDcScraperContent::Set(const cEvent *e) {
+    tokenContainer->Clear();
+    SetPosterBanner(tokenContainer, e, NULL);
+    SetDirty();
+}
+
+/******************************************************************
+* cVeDcScreenResolution
+******************************************************************/
+cVeDcEcmInfo::cVeDcEcmInfo(void) {
+    channelSid = -1;
+    lastEcmInfo.hops = -1;
+    lastEcmInfo.ecmtime = -1;
+    lastEcmInfo.caid = -1;
+    lastEcmInfo.pid = -1;
+    lastEcmInfo.prid = -1;
+}
+
+cVeDcEcmInfo::~cVeDcEcmInfo(void) {
+}
+
+void cVeDcEcmInfo::Close(void) {
+    channelSid = -1;
+    lastEcmInfo.hops = -1;
+    lastEcmInfo.ecmtime = -1;
+    lastEcmInfo.caid = -1;
+    lastEcmInfo.pid = -1;
+    lastEcmInfo.prid = -1;
+    cViewElement::Close();
+}
+
+void cVeDcEcmInfo::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{cardsystem}", (int)eDCEcmInfoST::cardsystem);
+    tokenContainer->DefineStringToken("{reader}", (int)eDCEcmInfoST::reader);
+    tokenContainer->DefineStringToken("{from}", (int)eDCEcmInfoST::from);
+    tokenContainer->DefineStringToken("{protocol}", (int)eDCEcmInfoST::protocol);
+    tokenContainer->DefineIntToken("{caid}", (int)eDCEcmInfoIT::caid);
+    tokenContainer->DefineIntToken("{pid}", (int)eDCEcmInfoIT::pid);
+    tokenContainer->DefineIntToken("{prid}", (int)eDCEcmInfoIT::prid);
+    tokenContainer->DefineIntToken("{ecmtime}", (int)eDCEcmInfoIT::ecmtime);
+    tokenContainer->DefineIntToken("{hops}", (int)eDCEcmInfoIT::hops);
+    InheritTokenContainer();
+}
+
+void cVeDcEcmInfo::Set(const cChannel *c) {
+    channelSid = c->Sid();
+}
+
+bool cVeDcEcmInfo::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    static cPlugin *pDVBApi = cPluginManager::GetPlugin("dvbapi");
+    if (!pDVBApi)
+        return false;
+    if (channelSid < 0)
+        return false;
+
+    sDVBAPIEcmInfo ecmInfo;
+    ecmInfo.sid = channelSid;
+
+    if (!pDVBApi->Service("GetEcmInfo", &ecmInfo)) {
+        return false;
+    }
+
+    if (ecmInfo.hops < 0 || ecmInfo.ecmtime <= 0 || ecmInfo.ecmtime > 100000)
+        return false;
+    if (CompareECMInfos(&ecmInfo))
+        return false;
+    lastEcmInfo = ecmInfo;
+    SetDirty();
+
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eDCEcmInfoIT::caid, ecmInfo.caid);
+    tokenContainer->AddIntToken((int)eDCEcmInfoIT::pid, ecmInfo.pid);
+    tokenContainer->AddIntToken((int)eDCEcmInfoIT::prid, ecmInfo.prid);
+    tokenContainer->AddIntToken((int)eDCEcmInfoIT::ecmtime, ecmInfo.ecmtime);
+    tokenContainer->AddIntToken((int)eDCEcmInfoIT::hops, ecmInfo.hops);
+    tokenContainer->AddStringToken((int)eDCEcmInfoST::cardsystem, *ecmInfo.cardsystem);
+    tokenContainer->AddStringToken((int)eDCEcmInfoST::reader, *ecmInfo.reader);
+    tokenContainer->AddStringToken((int)eDCEcmInfoST::from, *ecmInfo.from);
+    tokenContainer->AddStringToken((int)eDCEcmInfoST::protocol, *ecmInfo.protocol);
+    return true;
+}
+
+bool cVeDcEcmInfo::CompareECMInfos(sDVBAPIEcmInfo *ecmInfo) {
+    if (ecmInfo->caid != lastEcmInfo.caid)
+        return false;
+    if (ecmInfo->pid != lastEcmInfo.pid)
+        return false;
+    if (ecmInfo->prid != lastEcmInfo.prid)
+        return false;
+    if (ecmInfo->ecmtime != lastEcmInfo.ecmtime)
+        return false;
+    if (ecmInfo->hops != lastEcmInfo.hops)
+        return false;
+    return true;
+}
diff --git a/coreengine/viewelementsdisplaychannel.h b/coreengine/viewelementsdisplaychannel.h
index b4a2fbd..2e0d5a2 100644
--- a/coreengine/viewelementsdisplaychannel.h
+++ b/coreengine/viewelementsdisplaychannel.h
@@ -1,145 +1,145 @@
-#ifndef __VIEWELEMENTSDC_H

-#define __VIEWELEMENTSDC_H

-

-#include "viewelement.h"

-#include "../extensions/scrapmanager.h"

-#include "../services/dvbapi.h"

-

-/******************************************************************

-* cVeDcChannelInfo

-******************************************************************/

-class cVeDcChannelInfo : public cViewElement {

-private:

-public:

-    cVeDcChannelInfo(void);

-    virtual ~cVeDcChannelInfo(void);

-    void SetTokenContainer(void);

-    void Set(const cChannel *c, int number);

-};

-/******************************************************************

-* cVeDcChannelGroup

-******************************************************************/

-class cVeDcChannelGroup : public cViewElement {

-private:

-    const char *GetChannelSep(const cChannel *c, bool prev);

-public:

-    cVeDcChannelGroup(void);

-    virtual ~cVeDcChannelGroup(void);

-    void SetTokenContainer(void);

-    void Set(const cChannel *c);

-};

-/******************************************************************

-* cVeDcEpgInfo

-******************************************************************/

-class cVeDcEpgInfo : public cViewElement {

-private:

-    bool EventHasTimer(const cEvent *e);

-public:

-    cVeDcEpgInfo(void);

-    virtual ~cVeDcEpgInfo(void);

-    void SetTokenContainer(void);

-    void Set(const cEvent *p, const cEvent *f);

-};

-/******************************************************************

-* cVeDcProgressBar

-******************************************************************/

-class cVeDcProgressBar : public cViewElement {

-private:

-    int currentLast;

-    int startTime;

-    int duration;

-    int GetLiveBuffer(void);

-public:

-    cVeDcProgressBar(void);

-    virtual ~cVeDcProgressBar(void);

-    void Close(void);

-    void SetTokenContainer(void);

-    void Set(const cEvent *p);

-    bool Parse(bool forced = false);

-};

-/******************************************************************

-* cVeDcStatusInfo

-******************************************************************/

-class cVeDcStatusInfo : public cViewElement {

-private:

-    bool CheckMails(void);

-public:

-    cVeDcStatusInfo(void);

-    virtual ~cVeDcStatusInfo(void);

-    void SetTokenContainer(void);

-    void Set(const cChannel *c);

-};

-/******************************************************************

-* cVeDcAudioInfo

-******************************************************************/

-class cVeDcAudioInfo : public cViewElement {

-private:

-    int lastNumAudioTracks;

-    int lastAudioChannel;

-    char *lastTracDesc;

-    char *lastTrackLang;

-public:

-    cVeDcAudioInfo(void);

-    virtual ~cVeDcAudioInfo(void);

-    void Close(void);

-    void SetTokenContainer(void);

-    bool Parse(bool forced = false);

-};

-/******************************************************************

-* cVeDcScreenResolution

-******************************************************************/

-class cVeDcScreenResolution : public cViewElement {

-private:

-    int lastScreenWidth;

-    int lastScreenHeight;

-public:

-    cVeDcScreenResolution(void);

-    virtual ~cVeDcScreenResolution(void);

-    void Close(void);

-    void SetTokenContainer(void);

-    bool Parse(bool forced = false);

-};

-/******************************************************************

-* cVeDcSignalQuality

-******************************************************************/

-class cVeDcSignalQuality : public cViewElement {

-private:

-    int lastSignalDisplay;

-    int lastSignalStrength;

-    int lastSignalQuality;

-public:

-    cVeDcSignalQuality(void);

-    virtual ~cVeDcSignalQuality(void);

-    void Close(void);

-    void SetTokenContainer(void);

-    bool Parse(bool forced = false);

-};

-/******************************************************************

-* cVeDcScraperContent

-******************************************************************/

-class cVeDcScraperContent : public cViewElement, public cScrapManager {

-private:

-public:

-    cVeDcScraperContent(void);

-    virtual ~cVeDcScraperContent(void);

-    void SetTokenContainer(void);

-    void Set(const cEvent *e);

-};

-/******************************************************************

-* cVeDcEcmInfo

-******************************************************************/

-class cVeDcEcmInfo : public cViewElement {

-private:

-    int channelSid;

-    sDVBAPIEcmInfo lastEcmInfo;

-    bool CompareECMInfos(sDVBAPIEcmInfo *ecmInfo);

-public:

-    cVeDcEcmInfo(void);

-    virtual ~cVeDcEcmInfo(void);

-    void Close(void);

-    void SetTokenContainer(void);

-    void Set(const cChannel *c);

-    bool Parse(bool forced = false);

-};

-

+#ifndef __VIEWELEMENTSDC_H
+#define __VIEWELEMENTSDC_H
+
+#include "viewelement.h"
+#include "../extensions/scrapmanager.h"
+#include "../services/dvbapi.h"
+
+/******************************************************************
+* cVeDcChannelInfo
+******************************************************************/
+class cVeDcChannelInfo : public cViewElement {
+private:
+public:
+    cVeDcChannelInfo(void);
+    virtual ~cVeDcChannelInfo(void);
+    void SetTokenContainer(void);
+    void Set(const cChannel *c, int number);
+};
+/******************************************************************
+* cVeDcChannelGroup
+******************************************************************/
+class cVeDcChannelGroup : public cViewElement {
+private:
+    const char *GetChannelSep(const cChannel *c, bool prev);
+public:
+    cVeDcChannelGroup(void);
+    virtual ~cVeDcChannelGroup(void);
+    void SetTokenContainer(void);
+    void Set(const cChannel *c);
+};
+/******************************************************************
+* cVeDcEpgInfo
+******************************************************************/
+class cVeDcEpgInfo : public cViewElement {
+private:
+    bool EventHasTimer(const cEvent *e);
+public:
+    cVeDcEpgInfo(void);
+    virtual ~cVeDcEpgInfo(void);
+    void SetTokenContainer(void);
+    void Set(const cEvent *p, const cEvent *f);
+};
+/******************************************************************
+* cVeDcProgressBar
+******************************************************************/
+class cVeDcProgressBar : public cViewElement {
+private:
+    int currentLast;
+    int startTime;
+    int duration;
+    int GetLiveBuffer(void);
+public:
+    cVeDcProgressBar(void);
+    virtual ~cVeDcProgressBar(void);
+    void Close(void);
+    void SetTokenContainer(void);
+    void Set(const cEvent *p);
+    bool Parse(bool forced = false);
+};
+/******************************************************************
+* cVeDcStatusInfo
+******************************************************************/
+class cVeDcStatusInfo : public cViewElement {
+private:
+    bool CheckMails(void);
+public:
+    cVeDcStatusInfo(void);
+    virtual ~cVeDcStatusInfo(void);
+    void SetTokenContainer(void);
+    void Set(const cChannel *c);
+};
+/******************************************************************
+* cVeDcAudioInfo
+******************************************************************/
+class cVeDcAudioInfo : public cViewElement {
+private:
+    int lastNumAudioTracks;
+    int lastAudioChannel;
+    char *lastTracDesc;
+    char *lastTrackLang;
+public:
+    cVeDcAudioInfo(void);
+    virtual ~cVeDcAudioInfo(void);
+    void Close(void);
+    void SetTokenContainer(void);
+    bool Parse(bool forced = false);
+};
+/******************************************************************
+* cVeDcScreenResolution
+******************************************************************/
+class cVeDcScreenResolution : public cViewElement {
+private:
+    int lastScreenWidth;
+    int lastScreenHeight;
+public:
+    cVeDcScreenResolution(void);
+    virtual ~cVeDcScreenResolution(void);
+    void Close(void);
+    void SetTokenContainer(void);
+    bool Parse(bool forced = false);
+};
+/******************************************************************
+* cVeDcSignalQuality
+******************************************************************/
+class cVeDcSignalQuality : public cViewElement {
+private:
+    int lastSignalDisplay;
+    int lastSignalStrength;
+    int lastSignalQuality;
+public:
+    cVeDcSignalQuality(void);
+    virtual ~cVeDcSignalQuality(void);
+    void Close(void);
+    void SetTokenContainer(void);
+    bool Parse(bool forced = false);
+};
+/******************************************************************
+* cVeDcScraperContent
+******************************************************************/
+class cVeDcScraperContent : public cViewElement, public cScrapManager {
+private:
+public:
+    cVeDcScraperContent(void);
+    virtual ~cVeDcScraperContent(void);
+    void SetTokenContainer(void);
+    void Set(const cEvent *e);
+};
+/******************************************************************
+* cVeDcEcmInfo
+******************************************************************/
+class cVeDcEcmInfo : public cViewElement {
+private:
+    int channelSid;
+    sDVBAPIEcmInfo lastEcmInfo;
+    bool CompareECMInfos(sDVBAPIEcmInfo *ecmInfo);
+public:
+    cVeDcEcmInfo(void);
+    virtual ~cVeDcEcmInfo(void);
+    void Close(void);
+    void SetTokenContainer(void);
+    void Set(const cChannel *c);
+    bool Parse(bool forced = false);
+};
+
 #endif //__VIEWELEMENTSDC_H
\ No newline at end of file
diff --git a/coreengine/viewelementsdisplaymenu.c b/coreengine/viewelementsdisplaymenu.c
index bbc6783..2a39274 100644
--- a/coreengine/viewelementsdisplaymenu.c
+++ b/coreengine/viewelementsdisplaymenu.c
@@ -1,1231 +1,1231 @@
-#include "viewelementsdisplaymenu.h"

-#include "../config.h"

-#include <vdr/videodir.h>

-#include "../extensions/timers.h"

-#include "../extensions/helpers.h"

-#include <sys/sysinfo.h>

-#include <fstream>

-#include <iostream>

-

-/******************************************************************

-* cVeDmHeader

-******************************************************************/

-cVeDmHeader::cVeDmHeader(void) {

-    title = NULL;

-    channelName = NULL;

-    channelNumber = 0;

-    channelId = NULL;

-    epgSearchFav = false;

-}

-

-cVeDmHeader::~cVeDmHeader(void) {

-    free(title);

-    free(channelName);

-    free(channelId);

-}

-

-void cVeDmHeader::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{title}", (int)eDMHeaderST::title);

-    tokenContainer->DefineStringToken("{vdrversion}", (int)eDMHeaderST::vdrversion);

-    tokenContainer->DefineStringToken("{icon}", (int)eDMHeaderST::icon);

-    tokenContainer->DefineStringToken("{freetime}", (int)eDMHeaderST::freetime);

-    tokenContainer->DefineStringToken("{vdrusagestring}", (int)eDMHeaderST::vdrusagestring);

-    tokenContainer->DefineStringToken("{channelname}", (int)eDMHeaderST::channelname);

-    tokenContainer->DefineStringToken("{channelid}", (int)eDMHeaderST::channelid);

-    tokenContainer->DefineIntToken("{hasicon}", (int)eDMHeaderIT::hasicon);

-    tokenContainer->DefineIntToken("{freepercent}", (int)eDMHeaderIT::freepercent);

-    tokenContainer->DefineIntToken("{usedpercent}", (int)eDMHeaderIT::usedpercent);

-    tokenContainer->DefineIntToken("{freegb}", (int)eDMHeaderIT::freegb);

-    tokenContainer->DefineIntToken("{discalert}", (int)eDMHeaderIT::discalert);

-    tokenContainer->DefineIntToken("{channelnumber}", (int)eDMHeaderIT::channelnumber);

-    tokenContainer->DefineIntToken("{channellogoexists}", (int)eDMHeaderIT::channellogoexists);

-    tokenContainer->DefineIntToken("{whatson}", (int)eDMHeaderIT::whatson);

-    tokenContainer->DefineIntToken("{whatsonnow}", (int)eDMHeaderIT::whatsonnow);

-    tokenContainer->DefineIntToken("{whatsonnext}", (int)eDMHeaderIT::whatsonnext);

-    tokenContainer->DefineIntToken("{whatsonfavorites}", (int)eDMHeaderIT::whatsonfavorites);

-    InheritTokenContainer();

-}

-

-void cVeDmHeader::SetTitle(const char *title) { 

-    this->title = strdup(title); 

-    free(channelName);

-    channelName = NULL;

-    channelNumber = 0;

-    free(channelId);

-    channelId = NULL;

-}

-

-void cVeDmHeader::SetChannel(const cChannel *channel) {

-    channelNumber = channel->Number();

-    free(channelName);

-    free(channelId);

-    channelName = strdup(channel->Name());

-    channelId = strdup(*(channel->GetChannelID().ToString()));

-}

-

-void cVeDmHeader::Set(eMenuCategory menuCat) {

-    tokenContainer->Clear();

-    tokenContainer->AddStringToken((int)eDMHeaderST::title, title);

-    tokenContainer->AddStringToken((int)eDMHeaderST::vdrversion, VDRVERSION);

-

-    tokenContainer->AddIntToken((int)eDMHeaderIT::whatson, (menuCat == mcSchedule && !epgSearchFav) ? true : false);

-    tokenContainer->AddIntToken((int)eDMHeaderIT::whatsonnow, menuCat == mcScheduleNow ? true : false);

-    tokenContainer->AddIntToken((int)eDMHeaderIT::whatsonnext, menuCat == mcScheduleNext ? true : false);

-    tokenContainer->AddIntToken((int)eDMHeaderIT::whatsonfavorites, epgSearchFav);

-

-    //check for standard menu entries

-    bool hasIcon = false;

-

-    string icon = imgCache->GetIconName(title, menuCat);

-    if (imgCache->MenuIconExists(icon))

-        hasIcon = true;

-

-    tokenContainer->AddStringToken((int)eDMHeaderST::icon, icon.c_str());

-    tokenContainer->AddIntToken((int)eDMHeaderIT::hasicon, hasIcon);

-

-    //Disc Usage

-    tokenContainer->AddStringToken((int)eDMHeaderST::vdrusagestring, *cVideoDiskUsage::String());

-    tokenContainer->AddStringToken((int)eDMHeaderST::freetime, *cString::sprintf("%02d:%02d", cVideoDiskUsage::FreeMinutes() / 60, cVideoDiskUsage::FreeMinutes() % 60));

-    int discUsage = cVideoDiskUsage::UsedPercent();

-    bool discAlert = (discUsage > 95) ? true : false;

-    int freeGB = cVideoDiskUsage::FreeMB() / 1024;

-    tokenContainer->AddIntToken((int)eDMHeaderIT::usedpercent, discUsage);

-    tokenContainer->AddIntToken((int)eDMHeaderIT::freepercent, 100-discUsage);

-    tokenContainer->AddIntToken((int)eDMHeaderIT::discalert, discAlert);

-    tokenContainer->AddIntToken((int)eDMHeaderIT::freegb, freeGB);

-

-    if (channelName && channelId) {

-        tokenContainer->AddStringToken((int)eDMHeaderST::channelname, channelName);

-        tokenContainer->AddStringToken((int)eDMHeaderST::channelid, channelId);

-        tokenContainer->AddIntToken((int)eDMHeaderIT::channelnumber, channelNumber);

-        tokenContainer->AddIntToken((int)eDMHeaderIT::channellogoexists, imgCache->LogoExists(channelId));

-    }

-    SetDirty();

-}

-

-/******************************************************************

-* cVeDmSortmode

-******************************************************************/

-cVeDmSortmode::cVeDmSortmode(void) {

-    sortMode = msmUnknown;

-    lastSortMode = msmUnknown;

-}

-

-cVeDmSortmode::~cVeDmSortmode(void) {

-}

-

-void cVeDmSortmode::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineIntToken("{sortnumber}", (int)eDMSortmodeIT::sortnumber);

-    tokenContainer->DefineIntToken("{sortname}", (int)eDMSortmodeIT::sortname);

-    tokenContainer->DefineIntToken("{sorttime}", (int)eDMSortmodeIT::sorttime);

-    tokenContainer->DefineIntToken("{sortprovider}", (int)eDMSortmodeIT::sortprovider);

-    InheritTokenContainer();

-}

-

-void cVeDmSortmode::Set(eMenuSortMode sortMode) {

-    this->sortMode = sortMode;

-}

-

-bool cVeDmSortmode::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-

-    if (sortMode == lastSortMode) {

-        return false;

-    }

-    lastSortMode = sortMode;

-

-    bool sortNumber   = (sortMode == msmNumber)   ? true : false;

-    bool sortName     = (sortMode == msmName)     ? true : false;

-    bool sortTime     = (sortMode == msmTime)     ? true : false;

-    bool sortProvider = (sortMode == msmProvider) ? true : false;

-    

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eDMSortmodeIT::sortnumber, sortNumber);

-    tokenContainer->AddIntToken((int)eDMSortmodeIT::sortname, sortName);

-    tokenContainer->AddIntToken((int)eDMSortmodeIT::sorttime, sortTime);

-    tokenContainer->AddIntToken((int)eDMSortmodeIT::sortprovider, sortProvider);

-    SetDirty();

-    return true;

-}

-/******************************************************************

-* cVeDmColorbuttons

-******************************************************************/

-cVeDmColorbuttons::cVeDmColorbuttons(void) {

-    changed = false;

-    red = NULL;

-    green = NULL;

-    yellow = NULL;

-    blue = NULL;

-}

-

-cVeDmColorbuttons::~cVeDmColorbuttons(void) {

-    free(red);

-    free(yellow);

-    free(green);

-    free(blue);

-}

-

-void cVeDmColorbuttons::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{red}", (int)eDMColorbuttonsST::red);

-    tokenContainer->DefineStringToken("{green}", (int)eDMColorbuttonsST::green);

-    tokenContainer->DefineStringToken("{yellow}", (int)eDMColorbuttonsST::yellow);

-    tokenContainer->DefineStringToken("{blue}", (int)eDMColorbuttonsST::blue);

-    tokenContainer->DefineIntToken("{red1}", (int)eDMColorbuttonsIT::red1);

-    tokenContainer->DefineIntToken("{red2}", (int)eDMColorbuttonsIT::red2);

-    tokenContainer->DefineIntToken("{red3}", (int)eDMColorbuttonsIT::red3);

-    tokenContainer->DefineIntToken("{red4}", (int)eDMColorbuttonsIT::red4);

-    tokenContainer->DefineIntToken("{green1}", (int)eDMColorbuttonsIT::green1);

-    tokenContainer->DefineIntToken("{green2}", (int)eDMColorbuttonsIT::green2);

-    tokenContainer->DefineIntToken("{green3}", (int)eDMColorbuttonsIT::green3);

-    tokenContainer->DefineIntToken("{green4}", (int)eDMColorbuttonsIT::green4);

-    tokenContainer->DefineIntToken("{yellow1}", (int)eDMColorbuttonsIT::yellow1);

-    tokenContainer->DefineIntToken("{yellow2}", (int)eDMColorbuttonsIT::yellow2);

-    tokenContainer->DefineIntToken("{yellow3}", (int)eDMColorbuttonsIT::yellow3);

-    tokenContainer->DefineIntToken("{yellow4}", (int)eDMColorbuttonsIT::yellow4);

-    tokenContainer->DefineIntToken("{blue1}", (int)eDMColorbuttonsIT::blue1);

-    tokenContainer->DefineIntToken("{blue2}", (int)eDMColorbuttonsIT::blue2);

-    tokenContainer->DefineIntToken("{blue3}", (int)eDMColorbuttonsIT::blue3);

-    tokenContainer->DefineIntToken("{blue4}", (int)eDMColorbuttonsIT::blue4);

-    InheritTokenContainer();

-}

-

-void cVeDmColorbuttons::SetButtons(const char *red, const char *green, const char *yellow, const char *blue) {

-    free(this->red);

-    free(this->yellow);

-    free(this->green);

-    free(this->blue);

-    this->red = NULL;

-    this->green = NULL;

-    this->yellow = NULL;

-    this->blue = NULL;

-    if (red) this->red = strdup(red);

-    if (green) this->green = strdup(green);

-    if (yellow) this->yellow = strdup(yellow);

-    if (blue) this->blue = strdup(blue);

-    changed = true;

-}

-

-bool cVeDmColorbuttons::Parse(bool forced) {

-    if (!cViewElement::Parse(forced) || !changed)

-        return false;

-

-    tokenContainer->Clear();

-    tokenContainer->AddStringToken((int)eDMColorbuttonsST::red, red);

-    tokenContainer->AddStringToken((int)eDMColorbuttonsST::green, green);

-    tokenContainer->AddStringToken((int)eDMColorbuttonsST::yellow, yellow);

-    tokenContainer->AddStringToken((int)eDMColorbuttonsST::blue, blue);

-

-    int colorKeys[4] = { Setup.ColorKey0, Setup.ColorKey1, Setup.ColorKey2, Setup.ColorKey3 };

-

-    for (int button = 1; button < 5; button++) {

-        bool isRed = false;

-        bool isGreen = false;

-        bool isYellow = false;

-        bool isBlue = false;

-        switch (colorKeys[button-1]) {

-            case 0:

-                isRed = true;

-                break;

-            case 1:

-                isGreen = true;

-                break;

-            case 2:

-                isYellow = true;

-                break;

-            case 3:

-                isBlue = true;

-                break;

-            default:

-                break;

-        }

-        int tokRed = button - 1;

-        int tokGreen = 3 + button;

-        int tokYellow = 7 + button;

-        int tokBlue = 11 + button;

-        tokenContainer->AddIntToken(tokRed, isRed);

-        tokenContainer->AddIntToken(tokGreen, isGreen);

-        tokenContainer->AddIntToken(tokYellow, isYellow);

-        tokenContainer->AddIntToken(tokBlue, isBlue);

-    }

-    SetDirty();

-    changed = false;

-    return true;

-}

-

-/******************************************************************

-* cVeDmScrollbar

-******************************************************************/

-cVeDmScrollbar::cVeDmScrollbar(void) {

-}

-

-cVeDmScrollbar::~cVeDmScrollbar(void) {

-}

-

-void cVeDmScrollbar::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineIntToken("{height}", (int)eDMScrollbarIT::height);

-    tokenContainer->DefineIntToken("{offset}", (int)eDMScrollbarIT::offset);

-    tokenContainer->DefineIntToken("{hasprev}", (int)eDMScrollbarIT::hasprev);

-    tokenContainer->DefineIntToken("{hasnext}", (int)eDMScrollbarIT::hasnext);

-    InheritTokenContainer();

-}

-

-void cVeDmScrollbar::SetList(int numDisplayed, int offset, int numMax) {

-    if (numDisplayed < 1)

-        return;

-    

-    int barHeight = 0;

-    if (numDisplayed < numMax)

-        barHeight = 1000;

-    else

-        barHeight = (double)numMax * 1000 / (double)numDisplayed;

-    

-    int barOffset = (double)offset * 1000 / (double)numDisplayed;

-

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eDMScrollbarIT::height, barHeight);

-    tokenContainer->AddIntToken((int)eDMScrollbarIT::offset, barOffset);

-    tokenContainer->AddIntToken((int)eDMScrollbarIT::hasprev, (offset == 0) ? 0 : 1);

-    tokenContainer->AddIntToken((int)eDMScrollbarIT::hasnext, (offset + numMax == numDisplayed) ? 0 : 1);

-    SetDirty();

-}

-

-void cVeDmScrollbar::SetDetail(int height, int offset, bool end) {

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eDMScrollbarIT::height, height);

-    tokenContainer->AddIntToken((int)eDMScrollbarIT::offset, offset);

-    tokenContainer->AddIntToken((int)eDMScrollbarIT::hasprev, (offset == 0) ? 0 : 1);

-    tokenContainer->AddIntToken((int)eDMScrollbarIT::hasnext, (end) ? 0 : 1);

-    SetDirty();

-}

-

-/******************************************************************

-* cVeDmTimers

-******************************************************************/

-cVeDmTimers::cVeDmTimers(void) {

-    timerIndex = -1;

-}

-

-cVeDmTimers::~cVeDmTimers(void) {

-}

-

-void cVeDmTimers::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineLoopToken("{timers[title]}", (int)eDMTimersLT::title);

-    tokenContainer->DefineLoopToken("{timers[datetime]}", (int)eDMTimersLT::datetime);

-    tokenContainer->DefineLoopToken("{timers[recording]}", (int)eDMTimersLT::recording);

-    tokenContainer->DefineLoopToken("{timers[channelname]}", (int)eDMTimersLT::channelname);

-    tokenContainer->DefineLoopToken("{timers[channelnumber]}", (int)eDMTimersLT::channelnumber);

-    tokenContainer->DefineLoopToken("{timers[channelid]}", (int)eDMTimersLT::channelid);

-    tokenContainer->DefineLoopToken("{timers[channellogoexists]}", (int)eDMTimersLT::channellogoexists);

-    tokenContainer->DefineLoopToken("{timers[isremotetimer]}", (int)eDMTimersLT::isremotetimer);

-    tokenContainer->DefineIntToken("{numtimers}", (int)eDMTimersIT::numtimers);

-    tokenContainer->DefineIntToken("{numtimerconflicts}", (int)eDMTimersIT::numtimerconflicts);

-    tokenContainer->DefineIntToken("{timer1exists}", (int)eDMTimersIT::timer1exists);

-    tokenContainer->DefineIntToken("{timer2exists}", (int)eDMTimersIT::timer2exists);

-    tokenContainer->DefineIntToken("{timer3exists}", (int)eDMTimersIT::timer3exists);

-    tokenContainer->DefineIntToken("{timer4exists}", (int)eDMTimersIT::timer4exists);

-    tokenContainer->DefineIntToken("{timer5exists}", (int)eDMTimersIT::timer5exists);

-    tokenContainer->DefineIntToken("{timer6exists}", (int)eDMTimersIT::timer6exists);

-    tokenContainer->DefineIntToken("{timer7exists}", (int)eDMTimersIT::timer7exists);

-    tokenContainer->DefineIntToken("{timer8exists}", (int)eDMTimersIT::timer8exists);

-    tokenContainer->DefineIntToken("{timer9exists}", (int)eDMTimersIT::timer9exists);

-    tokenContainer->DefineIntToken("{timer10exists}", (int)eDMTimersIT::timer10exists);

-    tokenContainer->DefineIntToken("{timer11exists}", (int)eDMTimersIT::timer11exists);

-    tokenContainer->DefineIntToken("{timer12exists}", (int)eDMTimersIT::timer12exists);

-    tokenContainer->DefineIntToken("{timer13exists}", (int)eDMTimersIT::timer13exists);

-    tokenContainer->DefineIntToken("{timer14exists}", (int)eDMTimersIT::timer14exists);

-    tokenContainer->DefineIntToken("{timer15exists}", (int)eDMTimersIT::timer15exists);

-    timerIndex = tokenContainer->LoopIndex("timers");

-    InheritTokenContainer();

-}

-

-bool cVeDmTimers::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-

-    tokenContainer->Clear();

-    cGlobalSortedTimers SortedTimers;// local and remote timers

-    int numTimers = SortedTimers.Size();

-    tokenContainer->AddIntToken((int)eDMTimersIT::numtimers, numTimers);

-    tokenContainer->AddIntToken((int)eDMTimersIT::numtimerconflicts, SortedTimers.NumTimerConfilicts());

-    for (int i=0; i<15; i++) {

-        if (i < numTimers) {

-            tokenContainer->AddIntToken(i+2, true);

-        } else {

-            tokenContainer->AddIntToken(i+2, false);

-        }

-    }

-

-    vector<int> timerInfo;

-    timerInfo.push_back(numTimers);

-    tokenContainer->CreateLoopTokenContainer(&timerInfo);

-

-    for (int i = 0; i < numTimers; i++) {

-        if (i >=15)

-            break;

-        const cTimer *Timer = SortedTimers[i];

-        tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::isremotetimer, SortedTimers.IsRemoteTimer(i) ? "1" : "0");

-        const cEvent *event = Timer->Event();

-        if (event) {

-            tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::title, event->Title());

-        } else {

-            const char *File = Setup.FoldersInTimerMenu ? NULL : strrchr(Timer->File(), FOLDERDELIMCHAR);

-            if (File && strcmp(File + 1, TIMERMACRO_TITLE) && strcmp(File + 1, TIMERMACRO_EPISODE))

-                File++;

-            else

-                File = Timer->File();

-            tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::title, File);

-        }

-        const cChannel *channel = Timer->Channel();

-        if (channel) {

-            tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::channelname, channel->Name());

-            tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::channelnumber, *cString::sprintf("%d", channel->Number()));

-            cString channelID = channel->GetChannelID().ToString();

-            tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::channelid, *channelID);

-            tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::channellogoexists, imgCache->LogoExists(*channelID) ? "1" : "0");

-        }

-        tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::recording, Timer->Recording() ? "1" : "0");

-

-        cString timerDate("");

-        if (Timer->Recording()) {

-            timerDate = cString::sprintf("-%s", *TimeString(Timer->StopTime()));

-        } else {

-            time_t Now = time(NULL);

-            cString Today = WeekDayName(Now);

-            cString Time = TimeString(Timer->StartTime());

-            cString Day = WeekDayName(Timer->StartTime());

-            if (Timer->StartTime() > Now + 6 * SECSINDAY) {

-                time_t ttm = Timer->StartTime();

-                struct tm * timerTime = localtime(&ttm);

-                timerDate = cString::sprintf("%02d.%02d %s", timerTime->tm_mday, timerTime->tm_mon + 1, *Time);

-            } else if (strcmp(Day, Today) != 0)

-                timerDate = cString::sprintf("%s %s", *Day, *Time);

-            else

-                timerDate = Time;

-            if (Timer->Flags() & tfVps)

-                timerDate = cString::sprintf("VPS %s", *timerDate);

-        }

-        tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::datetime, *timerDate);

-        tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::isremotetimer, SortedTimers.IsRemoteTimer(i) ? "1" : "0");

-    }

-    SetDirty();

-    return true;

-}

-

-/******************************************************************

-* cVeDmCurrentschedule

-******************************************************************/

-cVeDmCurrentschedule::cVeDmCurrentschedule(void) {

-    rec = NULL;

-}

-

-cVeDmCurrentschedule::~cVeDmCurrentschedule(void) {

-}

-

-void cVeDmCurrentschedule::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{title}", (int)eDMCurrentscheduleST::title);

-    tokenContainer->DefineStringToken("{subtitle}", (int)eDMCurrentscheduleST::subtitle);

-    tokenContainer->DefineStringToken("{start}", (int)eDMCurrentscheduleST::start);

-    tokenContainer->DefineStringToken("{stop}", (int)eDMCurrentscheduleST::stop);

-    tokenContainer->DefineStringToken("{durationminutes}", (int)eDMCurrentscheduleST::durationminutes);

-    tokenContainer->DefineStringToken("{mediapath}", (int)eScraperPosterBannerST::mediapath);

-    tokenContainer->DefineStringToken("{posterpath}", (int)eScraperPosterBannerST::posterpath);

-    tokenContainer->DefineStringToken("{bannerpath}", (int)eScraperPosterBannerST::bannerpath);

-    tokenContainer->DefineIntToken("{islivetv}", (int)eDMCurrentscheduleIT::islivetv);

-    tokenContainer->DefineIntToken("{duration}", (int)eDMCurrentscheduleIT::duration);

-    tokenContainer->DefineIntToken("{durationhours}", (int)eDMCurrentscheduleIT::durationhours);

-    tokenContainer->DefineIntToken("{minutes}", (int)eDMCurrentscheduleIT::minutes);

-    tokenContainer->DefineIntToken("{elapsed}", (int)eDMCurrentscheduleIT::elapsed);

-    tokenContainer->DefineIntToken("{remaining}", (int)eDMCurrentscheduleIT::remaining);

-    tokenContainer->DefineIntToken("{mediawidth}", (int)eScraperPosterBannerIT::mediawidth);

-    tokenContainer->DefineIntToken("{mediaheight}", (int)eScraperPosterBannerIT::mediaheight);

-    tokenContainer->DefineIntToken("{isbanner}", (int)eScraperPosterBannerIT::isbanner);

-    tokenContainer->DefineIntToken("{hasposter}", (int)eScraperPosterBannerIT::hasposter);

-    tokenContainer->DefineIntToken("{posterwidth}", (int)eScraperPosterBannerIT::posterwidth);

-    tokenContainer->DefineIntToken("{posterheight}", (int)eScraperPosterBannerIT::posterheight);

-    tokenContainer->DefineIntToken("{hasBanner}", (int)eScraperPosterBannerIT::hasbanner);

-    tokenContainer->DefineIntToken("{bannerwidth}", (int)eScraperPosterBannerIT::bannerwidth);

-    tokenContainer->DefineIntToken("{bannerheight}", (int)eScraperPosterBannerIT::bannerheight);

-    InheritTokenContainer();

-}

-

-void cVeDmCurrentschedule::SetRecording(const char *currentRec) { 

-    rec = currentRec; 

-}

-

-bool cVeDmCurrentschedule::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-

-    cDevice *device = cDevice::PrimaryDevice();

-    const cChannel *channel = NULL;

-    if (!device->Replaying() || device->Transferring()) {

-        channel = Channels.GetByNumber(device->CurrentChannel());

-    }

-    if (channel) {

-        ParseFromChannel(channel);

-    } else {

-        if (!rec)

-            return true;

-        const cRecording *recording = new cRecording(rec);

-        if (recording) {

-            ParseFromRecording(recording);

-            delete recording;

-        }

-    }

-    SetDirty();

-    return true;

-}

-

-void cVeDmCurrentschedule::ParseFromChannel(const cChannel *channel) {

-    const cEvent *event = NULL;

-    cSchedulesLock SchedulesLock;

-    if (const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock))

-        if (const cSchedule *Schedule = Schedules->GetSchedule(channel))

-            event = Schedule->GetPresentEvent();

-    if (!event)

-        return;

-

-    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::islivetv, 1);

-    tokenContainer->AddStringToken((int)eDMCurrentscheduleST::title, event->Title());

-    tokenContainer->AddStringToken((int)eDMCurrentscheduleST::subtitle, event->ShortText());

-    tokenContainer->AddStringToken((int)eDMCurrentscheduleST::start, *event->GetTimeString());

-    tokenContainer->AddStringToken((int)eDMCurrentscheduleST::stop, *event->GetEndTimeString());

-    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::duration, event->Duration() / 60);

-    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::durationhours, event->Duration() / 3600);

-    tokenContainer->AddStringToken((int)eDMCurrentscheduleST::durationminutes, *cString::sprintf("%.2d", (event->Duration() / 60)%60));

-    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::elapsed, (int)round((time(NULL) - event->StartTime())/60));

-    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::remaining, (int)round((event->EndTime() - time(NULL))/60));

-    SetPosterBanner(tokenContainer, event, NULL);

-}

-

-void cVeDmCurrentschedule::ParseFromRecording(const cRecording *recording) {

-    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::islivetv, 0);

-    string recFullName = recording->Name() ? recording->Name() : "";

-    string recName = "";

-    string recFolder = "";

-    RecName(recFullName, recName, recFolder);

-    tokenContainer->AddStringToken((int)eDMCurrentscheduleST::title, recName.c_str());

-    const cRecordingInfo *info = recording->Info();

-    if (info)

-        tokenContainer->AddStringToken((int)eDMCurrentscheduleST::subtitle, info->ShortText());

-    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::duration, recording->LengthInSeconds() / 60);

-    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::durationhours, recording->LengthInSeconds() / 3600);

-    tokenContainer->AddStringToken((int)eDMCurrentscheduleST::durationminutes, *cString::sprintf("%.2d", (recording->LengthInSeconds() / 60)%60));

-    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::elapsed, 0);

-    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::remaining, 0);

-    SetPosterBanner(tokenContainer, NULL, recording);

-}

-

-void cVeDmCurrentschedule::RecName(string &path, string &name, string &folder) {

-    size_t delim = path.find_last_of('~');

-    if (delim == string::npos) {

-        name = path;

-        if (name.find('%') == 0) {

-            name = name.substr(1);

-        }

-        return;

-    }

-    name = path.substr(delim+1);

-    if (name.find('%') == 0) {

-        name = name.substr(1);

-    }

-    folder = path.substr(0, delim);

-    size_t delim2 = folder.find_last_of('~');

-    if (delim2 == string::npos) {

-        return;

-    }

-    folder = folder.substr(delim2+1);

-}

-/******************************************************************

-* cVeDmDiscusage

-******************************************************************/

-cVeDmDiscusage::cVeDmDiscusage(void) {

-}

-

-cVeDmDiscusage::~cVeDmDiscusage(void) {

-}

-

-void cVeDmDiscusage::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{freetime}", (int)eDMDiscusageST::freetime);

-    tokenContainer->DefineStringToken("{vdrusagestring}", (int)eDMDiscusageST::vdrusagestring);

-    tokenContainer->DefineIntToken("{freepercent}", (int)eDMDiscusageIT::freepercent);

-    tokenContainer->DefineIntToken("{usedpercent}", (int)eDMDiscusageIT::usedpercent);

-    tokenContainer->DefineIntToken("{freegb}", (int)eDMDiscusageIT::freegb);

-    tokenContainer->DefineIntToken("{discalert}", (int)eDMDiscusageIT::discalert);

-    InheritTokenContainer();

-}

-

-bool cVeDmDiscusage::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    tokenContainer->Clear();

-    tokenContainer->AddStringToken((int)eDMDiscusageST::vdrusagestring, *cVideoDiskUsage::String());

-    tokenContainer->AddStringToken((int)eDMDiscusageST::freetime, *cString::sprintf("%02d:%02d", cVideoDiskUsage::FreeMinutes() / 60, cVideoDiskUsage::FreeMinutes() % 60));

-    int discUsage = cVideoDiskUsage::UsedPercent();

-    bool discAlert = (discUsage > 95) ? true : false;

-    int freeGB = cVideoDiskUsage::FreeMB() / 1024;

-    tokenContainer->AddIntToken((int)eDMDiscusageIT::usedpercent, discUsage);

-    tokenContainer->AddIntToken((int)eDMDiscusageIT::freepercent, 100-discUsage);

-    tokenContainer->AddIntToken((int)eDMDiscusageIT::discalert, discAlert);

-    tokenContainer->AddIntToken((int)eDMDiscusageIT::freegb, freeGB);

-    SetDirty();

-    return true;

-}

-

-/******************************************************************

-* cVeDmSystemload

-******************************************************************/

-cVeDmSystemload::cVeDmSystemload(void) {

-    lastSystemLoad = -1.0f;

-}

-

-cVeDmSystemload::~cVeDmSystemload(void) {

-}

-

-void cVeDmSystemload::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{load}", (int)eDMSystemloadST::load);

-    tokenContainer->DefineIntToken("{loadhand}", (int)eDMSystemloadIT::loadhand);

-    InheritTokenContainer();

-}

-

-bool cVeDmSystemload::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    double systemLoad;

-    if (getloadavg(&systemLoad, 1) <= 0)

-        return false;

-    if (lastSystemLoad == systemLoad && !forced)

-        return false;

-

-    lastSystemLoad = systemLoad;

-

-    string load = *cString::sprintf("%.2f", systemLoad);

-    int loadHand = systemLoad * 1000;

-    int loadHandValue = 0;

-    if (loadHand > 2500)

-        loadHandValue = 2525;

-    else {

-        int loadHandDec = loadHand - (loadHand / 100) * 100;

-        if (loadHandDec <= 12)

-            loadHandDec = 0;

-        else if (loadHandDec <= 37)

-            loadHandDec = 25;

-        else if (loadHandDec <= 62)

-            loadHandDec = 50;

-        else if (loadHandDec <= 87)

-            loadHandDec = 75;

-        else

-            loadHandDec = 0;

-        loadHandValue = loadHand / 100 * 100 + loadHandDec;

-    }

-    tokenContainer->AddStringToken((int)eDMSystemloadST::load, *cString::sprintf("%.2f", systemLoad));

-    tokenContainer->AddIntToken((int)eDMSystemloadIT::loadhand, loadHandValue);

-    SetDirty();

-    return true;

-}

-

-/******************************************************************

-* cVeDmSystemmemory

-******************************************************************/

-cVeDmSystemmemory::cVeDmSystemmemory(void) {

-    lastMemUsage = -1;

-}

-

-cVeDmSystemmemory::~cVeDmSystemmemory(void) {

-}

-

-void cVeDmSystemmemory::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineIntToken("{totalmem}", (int)eDMSystemmemoryIT::totalmem);

-    tokenContainer->DefineIntToken("{usedmem}", (int)eDMSystemmemoryIT::usedmem);

-    tokenContainer->DefineIntToken("{usedmempercent}", (int)eDMSystemmemoryIT::usedmempercent);

-    InheritTokenContainer();

-}

-

-bool cVeDmSystemmemory::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-

-    struct sysinfo memInfo;

-    sysinfo (&memInfo);

-    long long totalMem = memInfo.totalram;

-    totalMem += memInfo.totalswap;

-    totalMem *= memInfo.mem_unit;

-    int totalMemMB = totalMem / 1024 / 1024;

-    long long usedMem = memInfo.totalram - memInfo.freeram;

-    usedMem += memInfo.totalswap - memInfo.freeswap;

-    usedMem *= memInfo.mem_unit;

-    int usedMemMB = usedMem / 1024 / 1024;

-

-    if (lastMemUsage == usedMemMB) {

-        return false;

-    }

-    lastMemUsage = usedMemMB;

-    tokenContainer->AddIntToken((int)eDMSystemmemoryIT::totalmem, totalMemMB);

-    tokenContainer->AddIntToken((int)eDMSystemmemoryIT::usedmem, usedMemMB);

-    if (totalMemMB > 0)

-        tokenContainer->AddIntToken((int)eDMSystemmemoryIT::usedmempercent, usedMemMB * 100 / totalMemMB);

-    SetDirty();

-    return true;

-}

-

-/******************************************************************

-* cVeDmTemperatures

-******************************************************************/

-cVeDmTemperatures::cVeDmTemperatures(void) {

-    Reset();

-}

-

-cVeDmTemperatures::~cVeDmTemperatures(void) {

-}

-

-void cVeDmTemperatures::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineIntToken("{cputemp}", (int)eDMTemperaturesIT::cputemp);

-    tokenContainer->DefineIntToken("{gputemp}", (int)eDMTemperaturesIT::gputemp);

-    InheritTokenContainer();

-}

-

-bool cVeDmTemperatures::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-

-    cString execCommand = cString::sprintf("cd \"%s/\"; \"%s/temperatures\"", SCRIPTFOLDER, SCRIPTFOLDER);

-    int ok = system(*execCommand);

-    if (ok) {}

-

-    string tempCPU, tempGPU;

-    int cpu, gpu;

-

-    cString itemFilename = cString::sprintf("%s/cpu", SCRIPTOUTPUTPATH );

-    ifstream file(*itemFilename, ifstream::in);

-    if( file.is_open() ) {

-        std::getline(file, tempCPU);

-        if (tempCPU.size() > 2) {

-            cpu = atoi(tempCPU.substr(0,2).c_str());

-        } else

-            cpu = 0;

-        file.close();

-    } else {

-        cpu = 0;

-    }

-

-    itemFilename = cString::sprintf("%s/gpu", SCRIPTOUTPUTPATH );

-    ifstream file2(*itemFilename, ifstream::in);

-    if( file2.is_open() ) {

-        std::getline(file2, tempGPU);

-        if (tempGPU.size() > 2) {

-            gpu = atoi(tempGPU.substr(0,2).c_str());

-        } else

-            gpu = 0;

-        file2.close();

-    } else {

-        gpu = 0;

-    }

-

-    if ((lastCpuTemp == cpu) && (lastGpuTemp == gpu))

-        return false;

-    lastCpuTemp = cpu;

-    lastGpuTemp = gpu;

-

-    tokenContainer->AddIntToken((int)eDMTemperaturesIT::cputemp, cpu);

-    tokenContainer->AddIntToken((int)eDMTemperaturesIT::gputemp, gpu);

-    SetDirty();

-    return true;

-}

-/******************************************************************

-* cVeDmVdrstatistics

-******************************************************************/

-cVeDmVdrstatistics::cVeDmVdrstatistics(void) {

-    Reset();

-}

-

-cVeDmVdrstatistics::~cVeDmVdrstatistics(void) {

-}

-

-void cVeDmVdrstatistics::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{vdrcpu}", (int)eDMVdrstatisticsST::vdrcpu);

-    tokenContainer->DefineStringToken("{vdrmem}", (int)eDMVdrstatisticsST::vdrmem);

-    InheritTokenContainer();

-}

-

-bool cVeDmVdrstatistics::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-

-    cString execCommand = cString::sprintf("cd \"%s/\"; \"%s/vdrstats\"", SCRIPTFOLDER, SCRIPTFOLDER);

-    int ok = system(*execCommand);

-    if (ok) {}

-

-    string vdrCPU = "";

-    string vdrMEM = "";

-

-    cString itemFilename = cString::sprintf("%s/vdrcpu", SCRIPTOUTPUTPATH );

-    ifstream file(*itemFilename, ifstream::in);

-    if( file.is_open() ) {

-        std::getline(file, vdrCPU);

-        file.close();

-    }

-

-    itemFilename = cString::sprintf("%s/vdrmem", SCRIPTOUTPUTPATH );

-    ifstream file2(*itemFilename, ifstream::in);

-    if( file2.is_open() ) {

-        std::getline(file2, vdrMEM);

-        file2.close();

-    }

-

-    if (vdrCPU.size() == 0 || vdrMEM.size() == 0)

-        return false;

-

-    if (!lastVdrCPU.compare(vdrCPU) && !lastVdrMEM.compare(vdrMEM)) {

-        return false;

-    }

-    lastVdrCPU = vdrCPU;

-    lastVdrMEM = vdrMEM;

-

-    tokenContainer->AddStringToken((int)eDMVdrstatisticsST::vdrcpu, vdrCPU.c_str());

-    tokenContainer->AddStringToken((int)eDMVdrstatisticsST::vdrmem, vdrMEM.c_str());

-    SetDirty();

-    return true;

-}

-/******************************************************************

-* cVeDmLastrecordings

-******************************************************************/

-cVeDmLastrecordings::cVeDmLastrecordings(void) {

-    recIndex = -1;

-}

-

-cVeDmLastrecordings::~cVeDmLastrecordings(void) {

-}

-

-void cVeDmLastrecordings::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineIntToken("{numtimers}", (int)eDMLastrecordingsIT::numtimers);

-    tokenContainer->DefineLoopToken("{recordings[name]}", (int)eDMLastrecordingsLT::name);

-    tokenContainer->DefineLoopToken("{recordings[seriesname]}", (int)eDMLastrecordingsLT::seriesname);

-    tokenContainer->DefineLoopToken("{recordings[date]}", (int)eDMLastrecordingsLT::date);

-    tokenContainer->DefineLoopToken("{recordings[time]}", (int)eDMLastrecordingsLT::time);

-    tokenContainer->DefineLoopToken("{recordings[duration]}", (int)eDMLastrecordingsLT::duration);

-    tokenContainer->DefineLoopToken("{recordings[hasposter]}", (int)eDMLastrecordingsLT::hasposter);

-    tokenContainer->DefineLoopToken("{recordings[posterpath]}", (int)eDMLastrecordingsLT::posterpath);

-    tokenContainer->DefineLoopToken("{recordings[posterwidth]}", (int)eDMLastrecordingsLT::posterwidth);

-    tokenContainer->DefineLoopToken("{recordings[posterheight]}", (int)eDMLastrecordingsLT::posterheight);

-    recIndex = tokenContainer->LoopIndex("recordings");

-    InheritTokenContainer();

-}

-

-bool cVeDmLastrecordings::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-

-    cGlobalSortedTimers SortedTimers;// local and remote timers

-    int numTimers = SortedTimers.Size();

-    //set number of timers so that it is possible to adapt this viewelement accordingly

-    tokenContainer->AddIntToken((int)eDMLastrecordingsIT::numtimers, numTimers);

-

-    list<cRecording*> orderedRecs;

-

-    for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {

-        if (orderedRecs.size() == 0) {

-            orderedRecs.push_back(recording);

-            continue;

-        }

-        bool inserted = false;

-        for (list<cRecording*>::iterator it = orderedRecs.begin(); it != orderedRecs.end(); it++) {

-            const cRecording *orderedRec = *it;

-            if (recording->Start() >= orderedRec->Start()) {

-                orderedRecs.insert(it, recording);

-                inserted = true;

-                break;

-            }

-        }

-        if (!inserted) {

-            orderedRecs.push_back(recording);

-        }

-    }

-

-    int MAX_RECORDINGS = 10;

-    int availableRecordings = orderedRecs.size();

-    int numRecordings = min(MAX_RECORDINGS, availableRecordings);

-    if (!numRecordings)

-        return true;

-

-    vector<int> loopInfo;

-    loopInfo.push_back(numRecordings);

-    tokenContainer->CreateLoopTokenContainer(&loopInfo);

-

-    int i = 0;

-    for (list<cRecording*>::iterator it = orderedRecs.begin(); it != orderedRecs.end(); it++) {

-        const cRecording *recording = *it;

-#if APIVERSNUM >= 20101

-        if (recording->IsInUse()) {

-            continue;

-        }

-#endif

-        string recFullPath = recording->Name() ? recording->Name() : "";

-        string recName = "";

-        string recPath = "";

-        RecName(recFullPath, recName, recPath);

-        cString recDuration = cString::sprintf("%d", recording->LengthInSeconds()/60);

-

-        string posterPath = "";

-        int posterWidth = 0;

-        int posterHeight = 0;

-        bool hasPoster = false;

-        RecPoster(recording, posterWidth, posterHeight, posterPath, hasPoster);

-

-        tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::name, recName.c_str());

-        tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::seriesname, recPath.c_str());

-        tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::date, *ShortDateString(recording->Start()));

-        tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::time, *TimeString(recording->Start()));

-        tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::duration, *recDuration);

-        tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::hasposter, hasPoster ? "1" : "0");

-        tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::posterpath, posterPath.c_str());

-        tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::posterwidth, *cString::sprintf("%d", posterWidth));

-        tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::posterheight, *cString::sprintf("%d", posterHeight));

-

-        i++;

-        if (i == MAX_RECORDINGS)

-            break;

-    }

-    SetDirty();

-    return true;

-}

-

-void cVeDmLastrecordings::RecName(string &path, string &name, string &folder) {

-    size_t delim = path.find_last_of('~');

-    if (delim == string::npos) {

-        name = path;

-        if (name.find('%') == 0) {

-            name = name.substr(1);

-        }

-        return;

-    }

-    name = path.substr(delim+1);

-    if (name.find('%') == 0) {

-        name = name.substr(1);

-    }

-    folder = path.substr(0, delim);

-    size_t delim2 = folder.find_last_of('~');

-    if (delim2 == string::npos) {

-        return;

-    }

-    folder = folder.substr(delim2+1);

-}

-/******************************************************************

-* cVeDmDetailheaderEpg

-******************************************************************/

-cVeDmDetailheaderEpg::cVeDmDetailheaderEpg(void) {

-    event = NULL;

-}

-

-cVeDmDetailheaderEpg::~cVeDmDetailheaderEpg(void) {

-}

-

-void cVeDmDetailheaderEpg::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{posterpath}", (int)eScraperHeaderST::posterpath);

-    tokenContainer->DefineStringToken("{bannerpath}", (int)eScraperHeaderST::bannerpath);

-    tokenContainer->DefineStringToken("{title}", (int)eDmDetailedHeaderEpgST::title);

-    tokenContainer->DefineStringToken("{shorttext}", (int)eDmDetailedHeaderEpgST::shorttext);

-    tokenContainer->DefineStringToken("{start}", (int)eDmDetailedHeaderEpgST::start);

-    tokenContainer->DefineStringToken("{stop}", (int)eDmDetailedHeaderEpgST::stop);

-    tokenContainer->DefineStringToken("{day}", (int)eDmDetailedHeaderEpgST::day);

-    tokenContainer->DefineStringToken("{date}", (int)eDmDetailedHeaderEpgST::date);

-    tokenContainer->DefineStringToken("{durationminutes}", (int)eDmDetailedHeaderEpgST::durationminutes);

-    tokenContainer->DefineStringToken("{vps}", (int)eDmDetailedHeaderEpgST::vps);

-    tokenContainer->DefineStringToken("{channelname}", (int)eDmDetailedHeaderEpgST::channelname);

-    tokenContainer->DefineStringToken("{channelid}", (int)eDmDetailedHeaderEpgST::channelid);

-    tokenContainer->DefineStringToken("{epgpicpath}", (int)eDmDetailedHeaderEpgST::epgpicpath);

-    tokenContainer->DefineIntToken("{ismovie}", (int)eScraperHeaderIT::ismovie);

-    tokenContainer->DefineIntToken("{isseries}", (int)eScraperHeaderIT::isseries);

-    tokenContainer->DefineIntToken("{posteravailable}", (int)eScraperHeaderIT::posteravailable);

-    tokenContainer->DefineIntToken("{posterwidth}", (int)eScraperHeaderIT::posterwidth);

-    tokenContainer->DefineIntToken("{posterheight}", (int)eScraperHeaderIT::posterheight);

-    tokenContainer->DefineIntToken("{banneravailable}", (int)eScraperHeaderIT::banneravailable);

-    tokenContainer->DefineIntToken("{bannerwidth}", (int)eScraperHeaderIT::bannerwidth);

-    tokenContainer->DefineIntToken("{bannerheight}", (int)eScraperHeaderIT::bannerheight);

-    tokenContainer->DefineIntToken("{daynumeric}", (int)eDmDetailedHeaderEpgIT::daynumeric);

-    tokenContainer->DefineIntToken("{month}", (int)eDmDetailedHeaderEpgIT::month);

-    tokenContainer->DefineIntToken("{year}", (int)eDmDetailedHeaderEpgIT::year);

-    tokenContainer->DefineIntToken("{running}", (int)eDmDetailedHeaderEpgIT::running);

-    tokenContainer->DefineIntToken("{elapsed}", (int)eDmDetailedHeaderEpgIT::elapsed);

-    tokenContainer->DefineIntToken("{duration}", (int)eDmDetailedHeaderEpgIT::duration);

-    tokenContainer->DefineIntToken("{durationhours}", (int)eDmDetailedHeaderEpgIT::durationhours);

-    tokenContainer->DefineIntToken("{channelnumber}", (int)eDmDetailedHeaderEpgIT::channelnumber);

-    tokenContainer->DefineIntToken("{channellogoexists}", (int)eDmDetailedHeaderEpgIT::channellogoexists);

-    tokenContainer->DefineIntToken("{epgpicavailable}", (int)eDmDetailedHeaderEpgIT::epgpicavailable);

-    InheritTokenContainer();

-}

-

-void cVeDmDetailheaderEpg::SetEvent(const cEvent *event) {

-    this->event = event;

-}

-

-bool cVeDmDetailheaderEpg::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    if (!event)

-        return false;

-    tokenContainer->Clear();

-    tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::title, event->Title());

-    tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::shorttext, event->ShortText());

-    tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::start, *(event->GetTimeString()));

-    tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::stop, *(event->GetEndTimeString()));

-    time_t startTime = event->StartTime();

-    tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::day, *WeekDayName(startTime));

-    tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::date, *ShortDateString(startTime));

-    struct tm * sStartTime = localtime(&startTime);

-    tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::year, sStartTime->tm_year + 1900);

-    tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::daynumeric, sStartTime->tm_mday);

-    tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::month, sStartTime->tm_mon+1);

-    const cChannel *channel = Channels.GetByChannelID(event->ChannelID());

-    if (channel) {

-        tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::channelname, channel->Name());

-        tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::channelnumber, channel->Number());

-    }

-    cString channelID = event->ChannelID().ToString();

-    tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::channelid, *channelID);

-    tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::channellogoexists, imgCache->LogoExists(*channelID));

-

-    bool isRunning = false;

-    time_t now = time(NULL);

-    if ((now >= event->StartTime()) && (now <= event->EndTime()))

-        isRunning = true;

-    tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::running, isRunning);

-    if (isRunning) {

-        tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::elapsed, (now - event->StartTime())/60);

-    } else {

-        tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::elapsed, 0);

-    }

-    tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::duration, event->Duration() / 60);

-    tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::durationhours, event->Duration() / 3600);

-    tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::durationminutes, *cString::sprintf("%.2d", (event->Duration() / 60)%60));

-    if (event->Vps())

-        tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::vps, *event->GetVpsString());

-

-    cString epgImageName = cString::sprintf("%d", event->EventID());

-    bool epgPicAvailable = FileExists(*config.epgImagePath, *epgImageName, "jpg");

-    if (epgPicAvailable) {

-        tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::epgpicavailable, true);

-        tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::epgpicpath, *cString::sprintf("%s%s.jpg", *config.epgImagePath, *epgImageName));

-    } else {

-        epgImageName = cString::sprintf("%d_0", event->EventID());

-        epgPicAvailable = FileExists(*config.epgImagePath, *epgImageName, "jpg");

-        if (epgPicAvailable) {

-            tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::epgpicavailable, true);

-            tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::epgpicpath, *cString::sprintf("%s%s.jpg", *config.epgImagePath, *epgImageName));

-        }

-    }

-    bool scrapInfoAvailable = LoadFullScrapInfo(event, NULL);

-    if (scrapInfoAvailable) {

-        SetHeaderScrapInfo(tokenContainer);

-    }

-

-    SetDirty();

-    return true;

-}

-

-/******************************************************************

-* cVeDmDetailheaderRec

-******************************************************************/

-cVeDmDetailheaderRec::cVeDmDetailheaderRec(void) {

-}

-

-cVeDmDetailheaderRec::~cVeDmDetailheaderRec(void) {

-}

-

-void cVeDmDetailheaderRec::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{posterpath}", (int)eScraperHeaderST::posterpath);

-    tokenContainer->DefineStringToken("{bannerpath}", (int)eScraperHeaderST::bannerpath);

-    tokenContainer->DefineStringToken("{name}", (int)eDmDetailedHeaderRecST::name);

-    tokenContainer->DefineStringToken("{epgname}", (int)eDmDetailedHeaderRecST::epgname);

-    tokenContainer->DefineStringToken("{shorttext}", (int)eDmDetailedHeaderRecST::shorttext);

-    tokenContainer->DefineStringToken("{date}", (int)eDmDetailedHeaderRecST::date);

-    tokenContainer->DefineStringToken("{time}", (int)eDmDetailedHeaderRecST::time);

-    tokenContainer->DefineStringToken("{recimgpath}", (int)eDmDetailedHeaderRecST::recimgpath);

-    tokenContainer->DefineStringToken("{recchannelname}", (int)eDmDetailedHeaderRecST::recchannelname);

-    tokenContainer->DefineStringToken("{recchannelid}", (int)eDmDetailedHeaderRecST::recchannelid);

-    tokenContainer->DefineStringToken("{durationminutes}", (int)eDmDetailedHeaderRecST::durationminutes);

-    tokenContainer->DefineStringToken("{durationeventminutes}", (int)eDmDetailedHeaderRecST::durationeventminutes);

-    tokenContainer->DefineIntToken("{ismovie}", (int)eScraperHeaderIT::ismovie);

-    tokenContainer->DefineIntToken("{isseries}", (int)eScraperHeaderIT::isseries);

-    tokenContainer->DefineIntToken("{posteravailable}", (int)eScraperHeaderIT::posteravailable);

-    tokenContainer->DefineIntToken("{posterwidth}", (int)eScraperHeaderIT::posterwidth);

-    tokenContainer->DefineIntToken("{posterheight}", (int)eScraperHeaderIT::posterheight);

-    tokenContainer->DefineIntToken("{banneravailable}", (int)eScraperHeaderIT::banneravailable);

-    tokenContainer->DefineIntToken("{bannerwidth}", (int)eScraperHeaderIT::bannerwidth);

-    tokenContainer->DefineIntToken("{bannerheight}", (int)eScraperHeaderIT::bannerheight);

-    tokenContainer->DefineIntToken("{daynumeric}", (int)eDmDetailedHeaderRecIT::daynumeric);

-    tokenContainer->DefineIntToken("{month}", (int)eDmDetailedHeaderRecIT::month);

-    tokenContainer->DefineIntToken("{year}", (int)eDmDetailedHeaderRecIT::year);

-    tokenContainer->DefineIntToken("{duration}", (int)eDmDetailedHeaderRecIT::duration);

-    tokenContainer->DefineIntToken("{durationhours}", (int)eDmDetailedHeaderRecIT::durationhours);

-    tokenContainer->DefineIntToken("{durationevent}", (int)eDmDetailedHeaderRecIT::durationevent);

-    tokenContainer->DefineIntToken("{durationeventhours}", (int)eDmDetailedHeaderRecIT::durationeventhours);

-    tokenContainer->DefineIntToken("{recimgavailable}", (int)eDmDetailedHeaderRecIT::recimgavailable);

-    tokenContainer->DefineIntToken("{recchannelnumber}", (int)eDmDetailedHeaderRecIT::recchannelnumber);

-    InheritTokenContainer();

-}

-

-void cVeDmDetailheaderRec::SetRecording(const cRecording *recording) {

-    this->recording = recording;

-}

-

-bool cVeDmDetailheaderRec::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    if (!recording)

-        return false;

-    tokenContainer->Clear();

-    tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::name, recording->Name());

-

-    const cRecordingInfo *info = recording->Info();

-    if (info) {

-        tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::epgname, info->Title());

-        tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::shorttext, info->ShortText());

-        const cEvent *event = info->GetEvent();

-        if (event) {

-            cString recDate = event->GetDateString();

-            cString recTime = event->GetTimeString();

-            if (strstr(*recDate, "1970")) {

-                time_t start = recording->Start();

-                recDate = DateString(start);

-                recTime = TimeString(start);

-            }

-            int duration = event->Duration() / 60;

-            int recDuration = recording->LengthInSeconds();

-            recDuration = (recDuration > 0) ? (recDuration / 60) : 0;

-            tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::date, *recDate);

-            tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::time, *recTime);

-            time_t startTime = event->StartTime();

-            struct tm * sStartTime = localtime(&startTime);

-            tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::year, sStartTime->tm_year + 1900);

-            tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::daynumeric, sStartTime->tm_mday);

-            tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::month, sStartTime->tm_mon+1);

-            tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::duration, recDuration);

-            tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::durationhours, recDuration / 60);

-            tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::durationminutes, *cString::sprintf("%.2d", recDuration%60));

-            tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::durationevent, duration);

-            tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::durationeventhours, duration / 60);

-            tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::durationeventminutes, *cString::sprintf("%.2d", duration%60));

-        }

-        cChannel *channel = Channels.GetByChannelID(info->ChannelID());

-        if (channel) {

-            tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelname, channel->Name());

-            tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelid, *channel->GetChannelID().ToString());

-            tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::recchannelnumber, channel->Number());

-        }

-    }

-    string recImage = "";

-    string path = recording->FileName() ? recording->FileName() : "";

-    string extension =  ".jpg";

-    if (FirstFileInFolder(path, extension, recImage)) {

-        tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::recimgavailable, 1);

-        tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recimgpath, *cString::sprintf("%s/%s", path.c_str(), recImage.c_str()));

-    }

-    bool scrapInfoAvailable = LoadFullScrapInfo(NULL, recording);

-    if (scrapInfoAvailable) {

-        SetHeaderScrapInfo(tokenContainer);

-    }

-    SetDirty();

-    return true;

-}

-

-/******************************************************************

-* cVeDmDetailheaderPlugin

-******************************************************************/

-cVeDmDetailheaderPlugin::cVeDmDetailheaderPlugin(void) {

-    plugId = -1;

-    plugMenuId = -1;

-}

-

-cVeDmDetailheaderPlugin::~cVeDmDetailheaderPlugin(void) {

-}

-

-void cVeDmDetailheaderPlugin::SetTokenContainer(void) {

-    if (plugId == -1 || plugMenuId == -1)

-        return;

-    skindesignerapi::cTokenContainer *tkPlugMenu = plgManager->GetTokenContainer(plugId, plugMenuId);

-    tokenContainer = new skindesignerapi::cTokenContainer(*tkPlugMenu);

-    InheritTokenContainer();

-}

-

-void cVeDmDetailheaderPlugin::Set(skindesignerapi::cTokenContainer *tk) {

-    tokenContainer->Clear();

-    tokenContainer->SetTokens(tk);

-}

-

-bool cVeDmDetailheaderPlugin::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    SetDirty();

-    return true;

-}

-/******************************************************************

-* cVeDmTablabels

-******************************************************************/

-cVeDmTablabels::cVeDmTablabels(void) {

-    tabIndex = -1;

-    activeTab = -1;

-}

-

-cVeDmTablabels::~cVeDmTablabels(void) {

-}

-

-void cVeDmTablabels::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineLoopToken("{tabs[title]}", (int)eDmTabsLT::title);

-    tokenContainer->DefineLoopToken("{tabs[current]}", (int)eDmTabsLT::current);

-    tokenContainer->DefineStringToken("{currenttab}", (int)eDmTabsST::currenttab);

-    tokenContainer->DefineStringToken("{prevtab}", (int)eDmTabsST::prevtab);

-    tokenContainer->DefineStringToken("{nexttab}", (int)eDmTabsST::nexttab);

-    tabIndex = tokenContainer->LoopIndex("tabs");

-    InheritTokenContainer();

-}

-

-void cVeDmTablabels::SetTabs(vector<const char*> &newTabs) { 

-    tabs.clear();

-    for (vector<const char*>::iterator it = newTabs.begin(); it != newTabs.end(); it++) {

-        tabs.push_back(*it);

-    }

-    SetDirty();

-}

-

-bool cVeDmTablabels::Parse(bool forced) {

-    tokenContainer->Clear();

-    int numTabs = tabs.size();

-    vector<int> loopInfo;

-    loopInfo.push_back(numTabs);

-    tokenContainer->CreateLoopTokenContainer(&loopInfo);

-    for (int i = 0; i < numTabs; i++) {

-        if (i == activeTab) {

-            tokenContainer->AddLoopToken(tabIndex, i, (int)eDmTabsLT::current, "1");

-

-        } else {

-            tokenContainer->AddLoopToken(tabIndex, i, (int)eDmTabsLT::current, "0");

-        }

-        tokenContainer->AddLoopToken(tabIndex, i, (int)eDmTabsLT::title, tabs[i]);

-    }

-

-    if (activeTab >= 0 && activeTab < numTabs) {

-        tokenContainer->AddStringToken((int)eDmTabsST::currenttab, tabs[activeTab]);

-        tokenContainer->AddStringToken((int)eDmTabsST::prevtab, (activeTab == 0)         ? tabs[numTabs-1] : tabs[activeTab-1]);

-        tokenContainer->AddStringToken((int)eDmTabsST::nexttab, (activeTab == numTabs-1) ? tabs[0]         : tabs[activeTab+1]);

-    }

-    return true;

-}

-

-

-

+#include "viewelementsdisplaymenu.h"
+#include "../config.h"
+#include <vdr/videodir.h>
+#include "../extensions/timers.h"
+#include "../extensions/helpers.h"
+#include <sys/sysinfo.h>
+#include <fstream>
+#include <iostream>
+
+/******************************************************************
+* cVeDmHeader
+******************************************************************/
+cVeDmHeader::cVeDmHeader(void) {
+    title = NULL;
+    channelName = NULL;
+    channelNumber = 0;
+    channelId = NULL;
+    epgSearchFav = false;
+}
+
+cVeDmHeader::~cVeDmHeader(void) {
+    free(title);
+    free(channelName);
+    free(channelId);
+}
+
+void cVeDmHeader::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{title}", (int)eDMHeaderST::title);
+    tokenContainer->DefineStringToken("{vdrversion}", (int)eDMHeaderST::vdrversion);
+    tokenContainer->DefineStringToken("{icon}", (int)eDMHeaderST::icon);
+    tokenContainer->DefineStringToken("{freetime}", (int)eDMHeaderST::freetime);
+    tokenContainer->DefineStringToken("{vdrusagestring}", (int)eDMHeaderST::vdrusagestring);
+    tokenContainer->DefineStringToken("{channelname}", (int)eDMHeaderST::channelname);
+    tokenContainer->DefineStringToken("{channelid}", (int)eDMHeaderST::channelid);
+    tokenContainer->DefineIntToken("{hasicon}", (int)eDMHeaderIT::hasicon);
+    tokenContainer->DefineIntToken("{freepercent}", (int)eDMHeaderIT::freepercent);
+    tokenContainer->DefineIntToken("{usedpercent}", (int)eDMHeaderIT::usedpercent);
+    tokenContainer->DefineIntToken("{freegb}", (int)eDMHeaderIT::freegb);
+    tokenContainer->DefineIntToken("{discalert}", (int)eDMHeaderIT::discalert);
+    tokenContainer->DefineIntToken("{channelnumber}", (int)eDMHeaderIT::channelnumber);
+    tokenContainer->DefineIntToken("{channellogoexists}", (int)eDMHeaderIT::channellogoexists);
+    tokenContainer->DefineIntToken("{whatson}", (int)eDMHeaderIT::whatson);
+    tokenContainer->DefineIntToken("{whatsonnow}", (int)eDMHeaderIT::whatsonnow);
+    tokenContainer->DefineIntToken("{whatsonnext}", (int)eDMHeaderIT::whatsonnext);
+    tokenContainer->DefineIntToken("{whatsonfavorites}", (int)eDMHeaderIT::whatsonfavorites);
+    InheritTokenContainer();
+}
+
+void cVeDmHeader::SetTitle(const char *title) { 
+    this->title = strdup(title); 
+    free(channelName);
+    channelName = NULL;
+    channelNumber = 0;
+    free(channelId);
+    channelId = NULL;
+}
+
+void cVeDmHeader::SetChannel(const cChannel *channel) {
+    channelNumber = channel->Number();
+    free(channelName);
+    free(channelId);
+    channelName = strdup(channel->Name());
+    channelId = strdup(*(channel->GetChannelID().ToString()));
+}
+
+void cVeDmHeader::Set(eMenuCategory menuCat) {
+    tokenContainer->Clear();
+    tokenContainer->AddStringToken((int)eDMHeaderST::title, title);
+    tokenContainer->AddStringToken((int)eDMHeaderST::vdrversion, VDRVERSION);
+
+    tokenContainer->AddIntToken((int)eDMHeaderIT::whatson, (menuCat == mcSchedule && !epgSearchFav) ? true : false);
+    tokenContainer->AddIntToken((int)eDMHeaderIT::whatsonnow, menuCat == mcScheduleNow ? true : false);
+    tokenContainer->AddIntToken((int)eDMHeaderIT::whatsonnext, menuCat == mcScheduleNext ? true : false);
+    tokenContainer->AddIntToken((int)eDMHeaderIT::whatsonfavorites, epgSearchFav);
+
+    //check for standard menu entries
+    bool hasIcon = false;
+
+    string icon = imgCache->GetIconName(title, menuCat);
+    if (imgCache->MenuIconExists(icon))
+        hasIcon = true;
+
+    tokenContainer->AddStringToken((int)eDMHeaderST::icon, icon.c_str());
+    tokenContainer->AddIntToken((int)eDMHeaderIT::hasicon, hasIcon);
+
+    //Disc Usage
+    tokenContainer->AddStringToken((int)eDMHeaderST::vdrusagestring, *cVideoDiskUsage::String());
+    tokenContainer->AddStringToken((int)eDMHeaderST::freetime, *cString::sprintf("%02d:%02d", cVideoDiskUsage::FreeMinutes() / 60, cVideoDiskUsage::FreeMinutes() % 60));
+    int discUsage = cVideoDiskUsage::UsedPercent();
+    bool discAlert = (discUsage > 95) ? true : false;
+    int freeGB = cVideoDiskUsage::FreeMB() / 1024;
+    tokenContainer->AddIntToken((int)eDMHeaderIT::usedpercent, discUsage);
+    tokenContainer->AddIntToken((int)eDMHeaderIT::freepercent, 100-discUsage);
+    tokenContainer->AddIntToken((int)eDMHeaderIT::discalert, discAlert);
+    tokenContainer->AddIntToken((int)eDMHeaderIT::freegb, freeGB);
+
+    if (channelName && channelId) {
+        tokenContainer->AddStringToken((int)eDMHeaderST::channelname, channelName);
+        tokenContainer->AddStringToken((int)eDMHeaderST::channelid, channelId);
+        tokenContainer->AddIntToken((int)eDMHeaderIT::channelnumber, channelNumber);
+        tokenContainer->AddIntToken((int)eDMHeaderIT::channellogoexists, imgCache->LogoExists(channelId));
+    }
+    SetDirty();
+}
+
+/******************************************************************
+* cVeDmSortmode
+******************************************************************/
+cVeDmSortmode::cVeDmSortmode(void) {
+    sortMode = msmUnknown;
+    lastSortMode = msmUnknown;
+}
+
+cVeDmSortmode::~cVeDmSortmode(void) {
+}
+
+void cVeDmSortmode::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineIntToken("{sortnumber}", (int)eDMSortmodeIT::sortnumber);
+    tokenContainer->DefineIntToken("{sortname}", (int)eDMSortmodeIT::sortname);
+    tokenContainer->DefineIntToken("{sorttime}", (int)eDMSortmodeIT::sorttime);
+    tokenContainer->DefineIntToken("{sortprovider}", (int)eDMSortmodeIT::sortprovider);
+    InheritTokenContainer();
+}
+
+void cVeDmSortmode::Set(eMenuSortMode sortMode) {
+    this->sortMode = sortMode;
+}
+
+bool cVeDmSortmode::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+
+    if (sortMode == lastSortMode) {
+        return false;
+    }
+    lastSortMode = sortMode;
+
+    bool sortNumber   = (sortMode == msmNumber)   ? true : false;
+    bool sortName     = (sortMode == msmName)     ? true : false;
+    bool sortTime     = (sortMode == msmTime)     ? true : false;
+    bool sortProvider = (sortMode == msmProvider) ? true : false;
+    
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eDMSortmodeIT::sortnumber, sortNumber);
+    tokenContainer->AddIntToken((int)eDMSortmodeIT::sortname, sortName);
+    tokenContainer->AddIntToken((int)eDMSortmodeIT::sorttime, sortTime);
+    tokenContainer->AddIntToken((int)eDMSortmodeIT::sortprovider, sortProvider);
+    SetDirty();
+    return true;
+}
+/******************************************************************
+* cVeDmColorbuttons
+******************************************************************/
+cVeDmColorbuttons::cVeDmColorbuttons(void) {
+    changed = false;
+    red = NULL;
+    green = NULL;
+    yellow = NULL;
+    blue = NULL;
+}
+
+cVeDmColorbuttons::~cVeDmColorbuttons(void) {
+    free(red);
+    free(yellow);
+    free(green);
+    free(blue);
+}
+
+void cVeDmColorbuttons::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{red}", (int)eDMColorbuttonsST::red);
+    tokenContainer->DefineStringToken("{green}", (int)eDMColorbuttonsST::green);
+    tokenContainer->DefineStringToken("{yellow}", (int)eDMColorbuttonsST::yellow);
+    tokenContainer->DefineStringToken("{blue}", (int)eDMColorbuttonsST::blue);
+    tokenContainer->DefineIntToken("{red1}", (int)eDMColorbuttonsIT::red1);
+    tokenContainer->DefineIntToken("{red2}", (int)eDMColorbuttonsIT::red2);
+    tokenContainer->DefineIntToken("{red3}", (int)eDMColorbuttonsIT::red3);
+    tokenContainer->DefineIntToken("{red4}", (int)eDMColorbuttonsIT::red4);
+    tokenContainer->DefineIntToken("{green1}", (int)eDMColorbuttonsIT::green1);
+    tokenContainer->DefineIntToken("{green2}", (int)eDMColorbuttonsIT::green2);
+    tokenContainer->DefineIntToken("{green3}", (int)eDMColorbuttonsIT::green3);
+    tokenContainer->DefineIntToken("{green4}", (int)eDMColorbuttonsIT::green4);
+    tokenContainer->DefineIntToken("{yellow1}", (int)eDMColorbuttonsIT::yellow1);
+    tokenContainer->DefineIntToken("{yellow2}", (int)eDMColorbuttonsIT::yellow2);
+    tokenContainer->DefineIntToken("{yellow3}", (int)eDMColorbuttonsIT::yellow3);
+    tokenContainer->DefineIntToken("{yellow4}", (int)eDMColorbuttonsIT::yellow4);
+    tokenContainer->DefineIntToken("{blue1}", (int)eDMColorbuttonsIT::blue1);
+    tokenContainer->DefineIntToken("{blue2}", (int)eDMColorbuttonsIT::blue2);
+    tokenContainer->DefineIntToken("{blue3}", (int)eDMColorbuttonsIT::blue3);
+    tokenContainer->DefineIntToken("{blue4}", (int)eDMColorbuttonsIT::blue4);
+    InheritTokenContainer();
+}
+
+void cVeDmColorbuttons::SetButtons(const char *red, const char *green, const char *yellow, const char *blue) {
+    free(this->red);
+    free(this->yellow);
+    free(this->green);
+    free(this->blue);
+    this->red = NULL;
+    this->green = NULL;
+    this->yellow = NULL;
+    this->blue = NULL;
+    if (red) this->red = strdup(red);
+    if (green) this->green = strdup(green);
+    if (yellow) this->yellow = strdup(yellow);
+    if (blue) this->blue = strdup(blue);
+    changed = true;
+}
+
+bool cVeDmColorbuttons::Parse(bool forced) {
+    if (!cViewElement::Parse(forced) || !changed)
+        return false;
+
+    tokenContainer->Clear();
+    tokenContainer->AddStringToken((int)eDMColorbuttonsST::red, red);
+    tokenContainer->AddStringToken((int)eDMColorbuttonsST::green, green);
+    tokenContainer->AddStringToken((int)eDMColorbuttonsST::yellow, yellow);
+    tokenContainer->AddStringToken((int)eDMColorbuttonsST::blue, blue);
+
+    int colorKeys[4] = { Setup.ColorKey0, Setup.ColorKey1, Setup.ColorKey2, Setup.ColorKey3 };
+
+    for (int button = 1; button < 5; button++) {
+        bool isRed = false;
+        bool isGreen = false;
+        bool isYellow = false;
+        bool isBlue = false;
+        switch (colorKeys[button-1]) {
+            case 0:
+                isRed = true;
+                break;
+            case 1:
+                isGreen = true;
+                break;
+            case 2:
+                isYellow = true;
+                break;
+            case 3:
+                isBlue = true;
+                break;
+            default:
+                break;
+        }
+        int tokRed = button - 1;
+        int tokGreen = 3 + button;
+        int tokYellow = 7 + button;
+        int tokBlue = 11 + button;
+        tokenContainer->AddIntToken(tokRed, isRed);
+        tokenContainer->AddIntToken(tokGreen, isGreen);
+        tokenContainer->AddIntToken(tokYellow, isYellow);
+        tokenContainer->AddIntToken(tokBlue, isBlue);
+    }
+    SetDirty();
+    changed = false;
+    return true;
+}
+
+/******************************************************************
+* cVeDmScrollbar
+******************************************************************/
+cVeDmScrollbar::cVeDmScrollbar(void) {
+}
+
+cVeDmScrollbar::~cVeDmScrollbar(void) {
+}
+
+void cVeDmScrollbar::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineIntToken("{height}", (int)eDMScrollbarIT::height);
+    tokenContainer->DefineIntToken("{offset}", (int)eDMScrollbarIT::offset);
+    tokenContainer->DefineIntToken("{hasprev}", (int)eDMScrollbarIT::hasprev);
+    tokenContainer->DefineIntToken("{hasnext}", (int)eDMScrollbarIT::hasnext);
+    InheritTokenContainer();
+}
+
+void cVeDmScrollbar::SetList(int numDisplayed, int offset, int numMax) {
+    if (numDisplayed < 1)
+        return;
+    
+    int barHeight = 0;
+    if (numDisplayed < numMax)
+        barHeight = 1000;
+    else
+        barHeight = (double)numMax * 1000 / (double)numDisplayed;
+    
+    int barOffset = (double)offset * 1000 / (double)numDisplayed;
+
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eDMScrollbarIT::height, barHeight);
+    tokenContainer->AddIntToken((int)eDMScrollbarIT::offset, barOffset);
+    tokenContainer->AddIntToken((int)eDMScrollbarIT::hasprev, (offset == 0) ? 0 : 1);
+    tokenContainer->AddIntToken((int)eDMScrollbarIT::hasnext, (offset + numMax == numDisplayed) ? 0 : 1);
+    SetDirty();
+}
+
+void cVeDmScrollbar::SetDetail(int height, int offset, bool end) {
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eDMScrollbarIT::height, height);
+    tokenContainer->AddIntToken((int)eDMScrollbarIT::offset, offset);
+    tokenContainer->AddIntToken((int)eDMScrollbarIT::hasprev, (offset == 0) ? 0 : 1);
+    tokenContainer->AddIntToken((int)eDMScrollbarIT::hasnext, (end) ? 0 : 1);
+    SetDirty();
+}
+
+/******************************************************************
+* cVeDmTimers
+******************************************************************/
+cVeDmTimers::cVeDmTimers(void) {
+    timerIndex = -1;
+}
+
+cVeDmTimers::~cVeDmTimers(void) {
+}
+
+void cVeDmTimers::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineLoopToken("{timers[title]}", (int)eDMTimersLT::title);
+    tokenContainer->DefineLoopToken("{timers[datetime]}", (int)eDMTimersLT::datetime);
+    tokenContainer->DefineLoopToken("{timers[recording]}", (int)eDMTimersLT::recording);
+    tokenContainer->DefineLoopToken("{timers[channelname]}", (int)eDMTimersLT::channelname);
+    tokenContainer->DefineLoopToken("{timers[channelnumber]}", (int)eDMTimersLT::channelnumber);
+    tokenContainer->DefineLoopToken("{timers[channelid]}", (int)eDMTimersLT::channelid);
+    tokenContainer->DefineLoopToken("{timers[channellogoexists]}", (int)eDMTimersLT::channellogoexists);
+    tokenContainer->DefineLoopToken("{timers[isremotetimer]}", (int)eDMTimersLT::isremotetimer);
+    tokenContainer->DefineIntToken("{numtimers}", (int)eDMTimersIT::numtimers);
+    tokenContainer->DefineIntToken("{numtimerconflicts}", (int)eDMTimersIT::numtimerconflicts);
+    tokenContainer->DefineIntToken("{timer1exists}", (int)eDMTimersIT::timer1exists);
+    tokenContainer->DefineIntToken("{timer2exists}", (int)eDMTimersIT::timer2exists);
+    tokenContainer->DefineIntToken("{timer3exists}", (int)eDMTimersIT::timer3exists);
+    tokenContainer->DefineIntToken("{timer4exists}", (int)eDMTimersIT::timer4exists);
+    tokenContainer->DefineIntToken("{timer5exists}", (int)eDMTimersIT::timer5exists);
+    tokenContainer->DefineIntToken("{timer6exists}", (int)eDMTimersIT::timer6exists);
+    tokenContainer->DefineIntToken("{timer7exists}", (int)eDMTimersIT::timer7exists);
+    tokenContainer->DefineIntToken("{timer8exists}", (int)eDMTimersIT::timer8exists);
+    tokenContainer->DefineIntToken("{timer9exists}", (int)eDMTimersIT::timer9exists);
+    tokenContainer->DefineIntToken("{timer10exists}", (int)eDMTimersIT::timer10exists);
+    tokenContainer->DefineIntToken("{timer11exists}", (int)eDMTimersIT::timer11exists);
+    tokenContainer->DefineIntToken("{timer12exists}", (int)eDMTimersIT::timer12exists);
+    tokenContainer->DefineIntToken("{timer13exists}", (int)eDMTimersIT::timer13exists);
+    tokenContainer->DefineIntToken("{timer14exists}", (int)eDMTimersIT::timer14exists);
+    tokenContainer->DefineIntToken("{timer15exists}", (int)eDMTimersIT::timer15exists);
+    timerIndex = tokenContainer->LoopIndex("timers");
+    InheritTokenContainer();
+}
+
+bool cVeDmTimers::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+
+    tokenContainer->Clear();
+    cGlobalSortedTimers SortedTimers;// local and remote timers
+    int numTimers = SortedTimers.Size();
+    tokenContainer->AddIntToken((int)eDMTimersIT::numtimers, numTimers);
+    tokenContainer->AddIntToken((int)eDMTimersIT::numtimerconflicts, SortedTimers.NumTimerConfilicts());
+    for (int i=0; i<15; i++) {
+        if (i < numTimers) {
+            tokenContainer->AddIntToken(i+2, true);
+        } else {
+            tokenContainer->AddIntToken(i+2, false);
+        }
+    }
+
+    vector<int> timerInfo;
+    timerInfo.push_back(numTimers);
+    tokenContainer->CreateLoopTokenContainer(&timerInfo);
+
+    for (int i = 0; i < numTimers; i++) {
+        if (i >=15)
+            break;
+        const cTimer *Timer = SortedTimers[i];
+        tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::isremotetimer, SortedTimers.IsRemoteTimer(i) ? "1" : "0");
+        const cEvent *event = Timer->Event();
+        if (event) {
+            tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::title, event->Title());
+        } else {
+            const char *File = Setup.FoldersInTimerMenu ? NULL : strrchr(Timer->File(), FOLDERDELIMCHAR);
+            if (File && strcmp(File + 1, TIMERMACRO_TITLE) && strcmp(File + 1, TIMERMACRO_EPISODE))
+                File++;
+            else
+                File = Timer->File();
+            tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::title, File);
+        }
+        const cChannel *channel = Timer->Channel();
+        if (channel) {
+            tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::channelname, channel->Name());
+            tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::channelnumber, *cString::sprintf("%d", channel->Number()));
+            cString channelID = channel->GetChannelID().ToString();
+            tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::channelid, *channelID);
+            tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::channellogoexists, imgCache->LogoExists(*channelID) ? "1" : "0");
+        }
+        tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::recording, Timer->Recording() ? "1" : "0");
+
+        cString timerDate("");
+        if (Timer->Recording()) {
+            timerDate = cString::sprintf("-%s", *TimeString(Timer->StopTime()));
+        } else {
+            time_t Now = time(NULL);
+            cString Today = WeekDayName(Now);
+            cString Time = TimeString(Timer->StartTime());
+            cString Day = WeekDayName(Timer->StartTime());
+            if (Timer->StartTime() > Now + 6 * SECSINDAY) {
+                time_t ttm = Timer->StartTime();
+                struct tm * timerTime = localtime(&ttm);
+                timerDate = cString::sprintf("%02d.%02d %s", timerTime->tm_mday, timerTime->tm_mon + 1, *Time);
+            } else if (strcmp(Day, Today) != 0)
+                timerDate = cString::sprintf("%s %s", *Day, *Time);
+            else
+                timerDate = Time;
+            if (Timer->Flags() & tfVps)
+                timerDate = cString::sprintf("VPS %s", *timerDate);
+        }
+        tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::datetime, *timerDate);
+        tokenContainer->AddLoopToken(timerIndex, i, (int)eDMTimersLT::isremotetimer, SortedTimers.IsRemoteTimer(i) ? "1" : "0");
+    }
+    SetDirty();
+    return true;
+}
+
+/******************************************************************
+* cVeDmCurrentschedule
+******************************************************************/
+cVeDmCurrentschedule::cVeDmCurrentschedule(void) {
+    rec = NULL;
+}
+
+cVeDmCurrentschedule::~cVeDmCurrentschedule(void) {
+}
+
+void cVeDmCurrentschedule::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{title}", (int)eDMCurrentscheduleST::title);
+    tokenContainer->DefineStringToken("{subtitle}", (int)eDMCurrentscheduleST::subtitle);
+    tokenContainer->DefineStringToken("{start}", (int)eDMCurrentscheduleST::start);
+    tokenContainer->DefineStringToken("{stop}", (int)eDMCurrentscheduleST::stop);
+    tokenContainer->DefineStringToken("{durationminutes}", (int)eDMCurrentscheduleST::durationminutes);
+    tokenContainer->DefineStringToken("{mediapath}", (int)eScraperPosterBannerST::mediapath);
+    tokenContainer->DefineStringToken("{posterpath}", (int)eScraperPosterBannerST::posterpath);
+    tokenContainer->DefineStringToken("{bannerpath}", (int)eScraperPosterBannerST::bannerpath);
+    tokenContainer->DefineIntToken("{islivetv}", (int)eDMCurrentscheduleIT::islivetv);
+    tokenContainer->DefineIntToken("{duration}", (int)eDMCurrentscheduleIT::duration);
+    tokenContainer->DefineIntToken("{durationhours}", (int)eDMCurrentscheduleIT::durationhours);
+    tokenContainer->DefineIntToken("{minutes}", (int)eDMCurrentscheduleIT::minutes);
+    tokenContainer->DefineIntToken("{elapsed}", (int)eDMCurrentscheduleIT::elapsed);
+    tokenContainer->DefineIntToken("{remaining}", (int)eDMCurrentscheduleIT::remaining);
+    tokenContainer->DefineIntToken("{mediawidth}", (int)eScraperPosterBannerIT::mediawidth);
+    tokenContainer->DefineIntToken("{mediaheight}", (int)eScraperPosterBannerIT::mediaheight);
+    tokenContainer->DefineIntToken("{isbanner}", (int)eScraperPosterBannerIT::isbanner);
+    tokenContainer->DefineIntToken("{hasposter}", (int)eScraperPosterBannerIT::hasposter);
+    tokenContainer->DefineIntToken("{posterwidth}", (int)eScraperPosterBannerIT::posterwidth);
+    tokenContainer->DefineIntToken("{posterheight}", (int)eScraperPosterBannerIT::posterheight);
+    tokenContainer->DefineIntToken("{hasBanner}", (int)eScraperPosterBannerIT::hasbanner);
+    tokenContainer->DefineIntToken("{bannerwidth}", (int)eScraperPosterBannerIT::bannerwidth);
+    tokenContainer->DefineIntToken("{bannerheight}", (int)eScraperPosterBannerIT::bannerheight);
+    InheritTokenContainer();
+}
+
+void cVeDmCurrentschedule::SetRecording(const char *currentRec) { 
+    rec = currentRec; 
+}
+
+bool cVeDmCurrentschedule::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+
+    cDevice *device = cDevice::PrimaryDevice();
+    const cChannel *channel = NULL;
+    if (!device->Replaying() || device->Transferring()) {
+        channel = Channels.GetByNumber(device->CurrentChannel());
+    }
+    if (channel) {
+        ParseFromChannel(channel);
+    } else {
+        if (!rec)
+            return true;
+        const cRecording *recording = new cRecording(rec);
+        if (recording) {
+            ParseFromRecording(recording);
+            delete recording;
+        }
+    }
+    SetDirty();
+    return true;
+}
+
+void cVeDmCurrentschedule::ParseFromChannel(const cChannel *channel) {
+    const cEvent *event = NULL;
+    cSchedulesLock SchedulesLock;
+    if (const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock))
+        if (const cSchedule *Schedule = Schedules->GetSchedule(channel))
+            event = Schedule->GetPresentEvent();
+    if (!event)
+        return;
+
+    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::islivetv, 1);
+    tokenContainer->AddStringToken((int)eDMCurrentscheduleST::title, event->Title());
+    tokenContainer->AddStringToken((int)eDMCurrentscheduleST::subtitle, event->ShortText());
+    tokenContainer->AddStringToken((int)eDMCurrentscheduleST::start, *event->GetTimeString());
+    tokenContainer->AddStringToken((int)eDMCurrentscheduleST::stop, *event->GetEndTimeString());
+    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::duration, event->Duration() / 60);
+    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::durationhours, event->Duration() / 3600);
+    tokenContainer->AddStringToken((int)eDMCurrentscheduleST::durationminutes, *cString::sprintf("%.2d", (event->Duration() / 60)%60));
+    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::elapsed, (int)round((time(NULL) - event->StartTime())/60));
+    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::remaining, (int)round((event->EndTime() - time(NULL))/60));
+    SetPosterBanner(tokenContainer, event, NULL);
+}
+
+void cVeDmCurrentschedule::ParseFromRecording(const cRecording *recording) {
+    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::islivetv, 0);
+    string recFullName = recording->Name() ? recording->Name() : "";
+    string recName = "";
+    string recFolder = "";
+    RecName(recFullName, recName, recFolder);
+    tokenContainer->AddStringToken((int)eDMCurrentscheduleST::title, recName.c_str());
+    const cRecordingInfo *info = recording->Info();
+    if (info)
+        tokenContainer->AddStringToken((int)eDMCurrentscheduleST::subtitle, info->ShortText());
+    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::duration, recording->LengthInSeconds() / 60);
+    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::durationhours, recording->LengthInSeconds() / 3600);
+    tokenContainer->AddStringToken((int)eDMCurrentscheduleST::durationminutes, *cString::sprintf("%.2d", (recording->LengthInSeconds() / 60)%60));
+    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::elapsed, 0);
+    tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::remaining, 0);
+    SetPosterBanner(tokenContainer, NULL, recording);
+}
+
+void cVeDmCurrentschedule::RecName(string &path, string &name, string &folder) {
+    size_t delim = path.find_last_of('~');
+    if (delim == string::npos) {
+        name = path;
+        if (name.find('%') == 0) {
+            name = name.substr(1);
+        }
+        return;
+    }
+    name = path.substr(delim+1);
+    if (name.find('%') == 0) {
+        name = name.substr(1);
+    }
+    folder = path.substr(0, delim);
+    size_t delim2 = folder.find_last_of('~');
+    if (delim2 == string::npos) {
+        return;
+    }
+    folder = folder.substr(delim2+1);
+}
+/******************************************************************
+* cVeDmDiscusage
+******************************************************************/
+cVeDmDiscusage::cVeDmDiscusage(void) {
+}
+
+cVeDmDiscusage::~cVeDmDiscusage(void) {
+}
+
+void cVeDmDiscusage::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{freetime}", (int)eDMDiscusageST::freetime);
+    tokenContainer->DefineStringToken("{vdrusagestring}", (int)eDMDiscusageST::vdrusagestring);
+    tokenContainer->DefineIntToken("{freepercent}", (int)eDMDiscusageIT::freepercent);
+    tokenContainer->DefineIntToken("{usedpercent}", (int)eDMDiscusageIT::usedpercent);
+    tokenContainer->DefineIntToken("{freegb}", (int)eDMDiscusageIT::freegb);
+    tokenContainer->DefineIntToken("{discalert}", (int)eDMDiscusageIT::discalert);
+    InheritTokenContainer();
+}
+
+bool cVeDmDiscusage::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    tokenContainer->Clear();
+    tokenContainer->AddStringToken((int)eDMDiscusageST::vdrusagestring, *cVideoDiskUsage::String());
+    tokenContainer->AddStringToken((int)eDMDiscusageST::freetime, *cString::sprintf("%02d:%02d", cVideoDiskUsage::FreeMinutes() / 60, cVideoDiskUsage::FreeMinutes() % 60));
+    int discUsage = cVideoDiskUsage::UsedPercent();
+    bool discAlert = (discUsage > 95) ? true : false;
+    int freeGB = cVideoDiskUsage::FreeMB() / 1024;
+    tokenContainer->AddIntToken((int)eDMDiscusageIT::usedpercent, discUsage);
+    tokenContainer->AddIntToken((int)eDMDiscusageIT::freepercent, 100-discUsage);
+    tokenContainer->AddIntToken((int)eDMDiscusageIT::discalert, discAlert);
+    tokenContainer->AddIntToken((int)eDMDiscusageIT::freegb, freeGB);
+    SetDirty();
+    return true;
+}
+
+/******************************************************************
+* cVeDmSystemload
+******************************************************************/
+cVeDmSystemload::cVeDmSystemload(void) {
+    lastSystemLoad = -1.0f;
+}
+
+cVeDmSystemload::~cVeDmSystemload(void) {
+}
+
+void cVeDmSystemload::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{load}", (int)eDMSystemloadST::load);
+    tokenContainer->DefineIntToken("{loadhand}", (int)eDMSystemloadIT::loadhand);
+    InheritTokenContainer();
+}
+
+bool cVeDmSystemload::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    double systemLoad;
+    if (getloadavg(&systemLoad, 1) <= 0)
+        return false;
+    if (lastSystemLoad == systemLoad && !forced)
+        return false;
+
+    lastSystemLoad = systemLoad;
+
+    string load = *cString::sprintf("%.2f", systemLoad);
+    int loadHand = systemLoad * 1000;
+    int loadHandValue = 0;
+    if (loadHand > 2500)
+        loadHandValue = 2525;
+    else {
+        int loadHandDec = loadHand - (loadHand / 100) * 100;
+        if (loadHandDec <= 12)
+            loadHandDec = 0;
+        else if (loadHandDec <= 37)
+            loadHandDec = 25;
+        else if (loadHandDec <= 62)
+            loadHandDec = 50;
+        else if (loadHandDec <= 87)
+            loadHandDec = 75;
+        else
+            loadHandDec = 0;
+        loadHandValue = loadHand / 100 * 100 + loadHandDec;
+    }
+    tokenContainer->AddStringToken((int)eDMSystemloadST::load, *cString::sprintf("%.2f", systemLoad));
+    tokenContainer->AddIntToken((int)eDMSystemloadIT::loadhand, loadHandValue);
+    SetDirty();
+    return true;
+}
+
+/******************************************************************
+* cVeDmSystemmemory
+******************************************************************/
+cVeDmSystemmemory::cVeDmSystemmemory(void) {
+    lastMemUsage = -1;
+}
+
+cVeDmSystemmemory::~cVeDmSystemmemory(void) {
+}
+
+void cVeDmSystemmemory::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineIntToken("{totalmem}", (int)eDMSystemmemoryIT::totalmem);
+    tokenContainer->DefineIntToken("{usedmem}", (int)eDMSystemmemoryIT::usedmem);
+    tokenContainer->DefineIntToken("{usedmempercent}", (int)eDMSystemmemoryIT::usedmempercent);
+    InheritTokenContainer();
+}
+
+bool cVeDmSystemmemory::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+
+    struct sysinfo memInfo;
+    sysinfo (&memInfo);
+    long long totalMem = memInfo.totalram;
+    totalMem += memInfo.totalswap;
+    totalMem *= memInfo.mem_unit;
+    int totalMemMB = totalMem / 1024 / 1024;
+    long long usedMem = memInfo.totalram - memInfo.freeram;
+    usedMem += memInfo.totalswap - memInfo.freeswap;
+    usedMem *= memInfo.mem_unit;
+    int usedMemMB = usedMem / 1024 / 1024;
+
+    if (lastMemUsage == usedMemMB) {
+        return false;
+    }
+    lastMemUsage = usedMemMB;
+    tokenContainer->AddIntToken((int)eDMSystemmemoryIT::totalmem, totalMemMB);
+    tokenContainer->AddIntToken((int)eDMSystemmemoryIT::usedmem, usedMemMB);
+    if (totalMemMB > 0)
+        tokenContainer->AddIntToken((int)eDMSystemmemoryIT::usedmempercent, usedMemMB * 100 / totalMemMB);
+    SetDirty();
+    return true;
+}
+
+/******************************************************************
+* cVeDmTemperatures
+******************************************************************/
+cVeDmTemperatures::cVeDmTemperatures(void) {
+    Reset();
+}
+
+cVeDmTemperatures::~cVeDmTemperatures(void) {
+}
+
+void cVeDmTemperatures::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineIntToken("{cputemp}", (int)eDMTemperaturesIT::cputemp);
+    tokenContainer->DefineIntToken("{gputemp}", (int)eDMTemperaturesIT::gputemp);
+    InheritTokenContainer();
+}
+
+bool cVeDmTemperatures::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+
+    cString execCommand = cString::sprintf("cd \"%s/\"; \"%s/temperatures\"", SCRIPTFOLDER, SCRIPTFOLDER);
+    int ok = system(*execCommand);
+    if (ok) {}
+
+    string tempCPU, tempGPU;
+    int cpu, gpu;
+
+    cString itemFilename = cString::sprintf("%s/cpu", SCRIPTOUTPUTPATH );
+    ifstream file(*itemFilename, ifstream::in);
+    if( file.is_open() ) {
+        std::getline(file, tempCPU);
+        if (tempCPU.size() > 2) {
+            cpu = atoi(tempCPU.substr(0,2).c_str());
+        } else
+            cpu = 0;
+        file.close();
+    } else {
+        cpu = 0;
+    }
+
+    itemFilename = cString::sprintf("%s/gpu", SCRIPTOUTPUTPATH );
+    ifstream file2(*itemFilename, ifstream::in);
+    if( file2.is_open() ) {
+        std::getline(file2, tempGPU);
+        if (tempGPU.size() > 2) {
+            gpu = atoi(tempGPU.substr(0,2).c_str());
+        } else
+            gpu = 0;
+        file2.close();
+    } else {
+        gpu = 0;
+    }
+
+    if ((lastCpuTemp == cpu) && (lastGpuTemp == gpu))
+        return false;
+    lastCpuTemp = cpu;
+    lastGpuTemp = gpu;
+
+    tokenContainer->AddIntToken((int)eDMTemperaturesIT::cputemp, cpu);
+    tokenContainer->AddIntToken((int)eDMTemperaturesIT::gputemp, gpu);
+    SetDirty();
+    return true;
+}
+/******************************************************************
+* cVeDmVdrstatistics
+******************************************************************/
+cVeDmVdrstatistics::cVeDmVdrstatistics(void) {
+    Reset();
+}
+
+cVeDmVdrstatistics::~cVeDmVdrstatistics(void) {
+}
+
+void cVeDmVdrstatistics::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{vdrcpu}", (int)eDMVdrstatisticsST::vdrcpu);
+    tokenContainer->DefineStringToken("{vdrmem}", (int)eDMVdrstatisticsST::vdrmem);
+    InheritTokenContainer();
+}
+
+bool cVeDmVdrstatistics::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+
+    cString execCommand = cString::sprintf("cd \"%s/\"; \"%s/vdrstats\"", SCRIPTFOLDER, SCRIPTFOLDER);
+    int ok = system(*execCommand);
+    if (ok) {}
+
+    string vdrCPU = "";
+    string vdrMEM = "";
+
+    cString itemFilename = cString::sprintf("%s/vdrcpu", SCRIPTOUTPUTPATH );
+    ifstream file(*itemFilename, ifstream::in);
+    if( file.is_open() ) {
+        std::getline(file, vdrCPU);
+        file.close();
+    }
+
+    itemFilename = cString::sprintf("%s/vdrmem", SCRIPTOUTPUTPATH );
+    ifstream file2(*itemFilename, ifstream::in);
+    if( file2.is_open() ) {
+        std::getline(file2, vdrMEM);
+        file2.close();
+    }
+
+    if (vdrCPU.size() == 0 || vdrMEM.size() == 0)
+        return false;
+
+    if (!lastVdrCPU.compare(vdrCPU) && !lastVdrMEM.compare(vdrMEM)) {
+        return false;
+    }
+    lastVdrCPU = vdrCPU;
+    lastVdrMEM = vdrMEM;
+
+    tokenContainer->AddStringToken((int)eDMVdrstatisticsST::vdrcpu, vdrCPU.c_str());
+    tokenContainer->AddStringToken((int)eDMVdrstatisticsST::vdrmem, vdrMEM.c_str());
+    SetDirty();
+    return true;
+}
+/******************************************************************
+* cVeDmLastrecordings
+******************************************************************/
+cVeDmLastrecordings::cVeDmLastrecordings(void) {
+    recIndex = -1;
+}
+
+cVeDmLastrecordings::~cVeDmLastrecordings(void) {
+}
+
+void cVeDmLastrecordings::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineIntToken("{numtimers}", (int)eDMLastrecordingsIT::numtimers);
+    tokenContainer->DefineLoopToken("{recordings[name]}", (int)eDMLastrecordingsLT::name);
+    tokenContainer->DefineLoopToken("{recordings[seriesname]}", (int)eDMLastrecordingsLT::seriesname);
+    tokenContainer->DefineLoopToken("{recordings[date]}", (int)eDMLastrecordingsLT::date);
+    tokenContainer->DefineLoopToken("{recordings[time]}", (int)eDMLastrecordingsLT::time);
+    tokenContainer->DefineLoopToken("{recordings[duration]}", (int)eDMLastrecordingsLT::duration);
+    tokenContainer->DefineLoopToken("{recordings[hasposter]}", (int)eDMLastrecordingsLT::hasposter);
+    tokenContainer->DefineLoopToken("{recordings[posterpath]}", (int)eDMLastrecordingsLT::posterpath);
+    tokenContainer->DefineLoopToken("{recordings[posterwidth]}", (int)eDMLastrecordingsLT::posterwidth);
+    tokenContainer->DefineLoopToken("{recordings[posterheight]}", (int)eDMLastrecordingsLT::posterheight);
+    recIndex = tokenContainer->LoopIndex("recordings");
+    InheritTokenContainer();
+}
+
+bool cVeDmLastrecordings::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+
+    cGlobalSortedTimers SortedTimers;// local and remote timers
+    int numTimers = SortedTimers.Size();
+    //set number of timers so that it is possible to adapt this viewelement accordingly
+    tokenContainer->AddIntToken((int)eDMLastrecordingsIT::numtimers, numTimers);
+
+    list<cRecording*> orderedRecs;
+
+    for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
+        if (orderedRecs.size() == 0) {
+            orderedRecs.push_back(recording);
+            continue;
+        }
+        bool inserted = false;
+        for (list<cRecording*>::iterator it = orderedRecs.begin(); it != orderedRecs.end(); it++) {
+            const cRecording *orderedRec = *it;
+            if (recording->Start() >= orderedRec->Start()) {
+                orderedRecs.insert(it, recording);
+                inserted = true;
+                break;
+            }
+        }
+        if (!inserted) {
+            orderedRecs.push_back(recording);
+        }
+    }
+
+    int MAX_RECORDINGS = 10;
+    int availableRecordings = orderedRecs.size();
+    int numRecordings = min(MAX_RECORDINGS, availableRecordings);
+    if (!numRecordings)
+        return true;
+
+    vector<int> loopInfo;
+    loopInfo.push_back(numRecordings);
+    tokenContainer->CreateLoopTokenContainer(&loopInfo);
+
+    int i = 0;
+    for (list<cRecording*>::iterator it = orderedRecs.begin(); it != orderedRecs.end(); it++) {
+        const cRecording *recording = *it;
+#if APIVERSNUM >= 20101
+        if (recording->IsInUse()) {
+            continue;
+        }
+#endif
+        string recFullPath = recording->Name() ? recording->Name() : "";
+        string recName = "";
+        string recPath = "";
+        RecName(recFullPath, recName, recPath);
+        cString recDuration = cString::sprintf("%d", recording->LengthInSeconds()/60);
+
+        string posterPath = "";
+        int posterWidth = 0;
+        int posterHeight = 0;
+        bool hasPoster = false;
+        RecPoster(recording, posterWidth, posterHeight, posterPath, hasPoster);
+
+        tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::name, recName.c_str());
+        tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::seriesname, recPath.c_str());
+        tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::date, *ShortDateString(recording->Start()));
+        tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::time, *TimeString(recording->Start()));
+        tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::duration, *recDuration);
+        tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::hasposter, hasPoster ? "1" : "0");
+        tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::posterpath, posterPath.c_str());
+        tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::posterwidth, *cString::sprintf("%d", posterWidth));
+        tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::posterheight, *cString::sprintf("%d", posterHeight));
+
+        i++;
+        if (i == MAX_RECORDINGS)
+            break;
+    }
+    SetDirty();
+    return true;
+}
+
+void cVeDmLastrecordings::RecName(string &path, string &name, string &folder) {
+    size_t delim = path.find_last_of('~');
+    if (delim == string::npos) {
+        name = path;
+        if (name.find('%') == 0) {
+            name = name.substr(1);
+        }
+        return;
+    }
+    name = path.substr(delim+1);
+    if (name.find('%') == 0) {
+        name = name.substr(1);
+    }
+    folder = path.substr(0, delim);
+    size_t delim2 = folder.find_last_of('~');
+    if (delim2 == string::npos) {
+        return;
+    }
+    folder = folder.substr(delim2+1);
+}
+/******************************************************************
+* cVeDmDetailheaderEpg
+******************************************************************/
+cVeDmDetailheaderEpg::cVeDmDetailheaderEpg(void) {
+    event = NULL;
+}
+
+cVeDmDetailheaderEpg::~cVeDmDetailheaderEpg(void) {
+}
+
+void cVeDmDetailheaderEpg::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{posterpath}", (int)eScraperHeaderST::posterpath);
+    tokenContainer->DefineStringToken("{bannerpath}", (int)eScraperHeaderST::bannerpath);
+    tokenContainer->DefineStringToken("{title}", (int)eDmDetailedHeaderEpgST::title);
+    tokenContainer->DefineStringToken("{shorttext}", (int)eDmDetailedHeaderEpgST::shorttext);
+    tokenContainer->DefineStringToken("{start}", (int)eDmDetailedHeaderEpgST::start);
+    tokenContainer->DefineStringToken("{stop}", (int)eDmDetailedHeaderEpgST::stop);
+    tokenContainer->DefineStringToken("{day}", (int)eDmDetailedHeaderEpgST::day);
+    tokenContainer->DefineStringToken("{date}", (int)eDmDetailedHeaderEpgST::date);
+    tokenContainer->DefineStringToken("{durationminutes}", (int)eDmDetailedHeaderEpgST::durationminutes);
+    tokenContainer->DefineStringToken("{vps}", (int)eDmDetailedHeaderEpgST::vps);
+    tokenContainer->DefineStringToken("{channelname}", (int)eDmDetailedHeaderEpgST::channelname);
+    tokenContainer->DefineStringToken("{channelid}", (int)eDmDetailedHeaderEpgST::channelid);
+    tokenContainer->DefineStringToken("{epgpicpath}", (int)eDmDetailedHeaderEpgST::epgpicpath);
+    tokenContainer->DefineIntToken("{ismovie}", (int)eScraperHeaderIT::ismovie);
+    tokenContainer->DefineIntToken("{isseries}", (int)eScraperHeaderIT::isseries);
+    tokenContainer->DefineIntToken("{posteravailable}", (int)eScraperHeaderIT::posteravailable);
+    tokenContainer->DefineIntToken("{posterwidth}", (int)eScraperHeaderIT::posterwidth);
+    tokenContainer->DefineIntToken("{posterheight}", (int)eScraperHeaderIT::posterheight);
+    tokenContainer->DefineIntToken("{banneravailable}", (int)eScraperHeaderIT::banneravailable);
+    tokenContainer->DefineIntToken("{bannerwidth}", (int)eScraperHeaderIT::bannerwidth);
+    tokenContainer->DefineIntToken("{bannerheight}", (int)eScraperHeaderIT::bannerheight);
+    tokenContainer->DefineIntToken("{daynumeric}", (int)eDmDetailedHeaderEpgIT::daynumeric);
+    tokenContainer->DefineIntToken("{month}", (int)eDmDetailedHeaderEpgIT::month);
+    tokenContainer->DefineIntToken("{year}", (int)eDmDetailedHeaderEpgIT::year);
+    tokenContainer->DefineIntToken("{running}", (int)eDmDetailedHeaderEpgIT::running);
+    tokenContainer->DefineIntToken("{elapsed}", (int)eDmDetailedHeaderEpgIT::elapsed);
+    tokenContainer->DefineIntToken("{duration}", (int)eDmDetailedHeaderEpgIT::duration);
+    tokenContainer->DefineIntToken("{durationhours}", (int)eDmDetailedHeaderEpgIT::durationhours);
+    tokenContainer->DefineIntToken("{channelnumber}", (int)eDmDetailedHeaderEpgIT::channelnumber);
+    tokenContainer->DefineIntToken("{channellogoexists}", (int)eDmDetailedHeaderEpgIT::channellogoexists);
+    tokenContainer->DefineIntToken("{epgpicavailable}", (int)eDmDetailedHeaderEpgIT::epgpicavailable);
+    InheritTokenContainer();
+}
+
+void cVeDmDetailheaderEpg::SetEvent(const cEvent *event) {
+    this->event = event;
+}
+
+bool cVeDmDetailheaderEpg::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    if (!event)
+        return false;
+    tokenContainer->Clear();
+    tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::title, event->Title());
+    tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::shorttext, event->ShortText());
+    tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::start, *(event->GetTimeString()));
+    tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::stop, *(event->GetEndTimeString()));
+    time_t startTime = event->StartTime();
+    tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::day, *WeekDayName(startTime));
+    tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::date, *ShortDateString(startTime));
+    struct tm * sStartTime = localtime(&startTime);
+    tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::year, sStartTime->tm_year + 1900);
+    tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::daynumeric, sStartTime->tm_mday);
+    tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::month, sStartTime->tm_mon+1);
+    const cChannel *channel = Channels.GetByChannelID(event->ChannelID());
+    if (channel) {
+        tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::channelname, channel->Name());
+        tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::channelnumber, channel->Number());
+    }
+    cString channelID = event->ChannelID().ToString();
+    tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::channelid, *channelID);
+    tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::channellogoexists, imgCache->LogoExists(*channelID));
+
+    bool isRunning = false;
+    time_t now = time(NULL);
+    if ((now >= event->StartTime()) && (now <= event->EndTime()))
+        isRunning = true;
+    tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::running, isRunning);
+    if (isRunning) {
+        tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::elapsed, (now - event->StartTime())/60);
+    } else {
+        tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::elapsed, 0);
+    }
+    tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::duration, event->Duration() / 60);
+    tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::durationhours, event->Duration() / 3600);
+    tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::durationminutes, *cString::sprintf("%.2d", (event->Duration() / 60)%60));
+    if (event->Vps())
+        tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::vps, *event->GetVpsString());
+
+    cString epgImageName = cString::sprintf("%d", event->EventID());
+    bool epgPicAvailable = FileExists(*config.epgImagePath, *epgImageName, "jpg");
+    if (epgPicAvailable) {
+        tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::epgpicavailable, true);
+        tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::epgpicpath, *cString::sprintf("%s%s.jpg", *config.epgImagePath, *epgImageName));
+    } else {
+        epgImageName = cString::sprintf("%d_0", event->EventID());
+        epgPicAvailable = FileExists(*config.epgImagePath, *epgImageName, "jpg");
+        if (epgPicAvailable) {
+            tokenContainer->AddIntToken((int)eDmDetailedHeaderEpgIT::epgpicavailable, true);
+            tokenContainer->AddStringToken((int)eDmDetailedHeaderEpgST::epgpicpath, *cString::sprintf("%s%s.jpg", *config.epgImagePath, *epgImageName));
+        }
+    }
+    bool scrapInfoAvailable = LoadFullScrapInfo(event, NULL);
+    if (scrapInfoAvailable) {
+        SetHeaderScrapInfo(tokenContainer);
+    }
+
+    SetDirty();
+    return true;
+}
+
+/******************************************************************
+* cVeDmDetailheaderRec
+******************************************************************/
+cVeDmDetailheaderRec::cVeDmDetailheaderRec(void) {
+}
+
+cVeDmDetailheaderRec::~cVeDmDetailheaderRec(void) {
+}
+
+void cVeDmDetailheaderRec::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{posterpath}", (int)eScraperHeaderST::posterpath);
+    tokenContainer->DefineStringToken("{bannerpath}", (int)eScraperHeaderST::bannerpath);
+    tokenContainer->DefineStringToken("{name}", (int)eDmDetailedHeaderRecST::name);
+    tokenContainer->DefineStringToken("{epgname}", (int)eDmDetailedHeaderRecST::epgname);
+    tokenContainer->DefineStringToken("{shorttext}", (int)eDmDetailedHeaderRecST::shorttext);
+    tokenContainer->DefineStringToken("{date}", (int)eDmDetailedHeaderRecST::date);
+    tokenContainer->DefineStringToken("{time}", (int)eDmDetailedHeaderRecST::time);
+    tokenContainer->DefineStringToken("{recimgpath}", (int)eDmDetailedHeaderRecST::recimgpath);
+    tokenContainer->DefineStringToken("{recchannelname}", (int)eDmDetailedHeaderRecST::recchannelname);
+    tokenContainer->DefineStringToken("{recchannelid}", (int)eDmDetailedHeaderRecST::recchannelid);
+    tokenContainer->DefineStringToken("{durationminutes}", (int)eDmDetailedHeaderRecST::durationminutes);
+    tokenContainer->DefineStringToken("{durationeventminutes}", (int)eDmDetailedHeaderRecST::durationeventminutes);
+    tokenContainer->DefineIntToken("{ismovie}", (int)eScraperHeaderIT::ismovie);
+    tokenContainer->DefineIntToken("{isseries}", (int)eScraperHeaderIT::isseries);
+    tokenContainer->DefineIntToken("{posteravailable}", (int)eScraperHeaderIT::posteravailable);
+    tokenContainer->DefineIntToken("{posterwidth}", (int)eScraperHeaderIT::posterwidth);
+    tokenContainer->DefineIntToken("{posterheight}", (int)eScraperHeaderIT::posterheight);
+    tokenContainer->DefineIntToken("{banneravailable}", (int)eScraperHeaderIT::banneravailable);
+    tokenContainer->DefineIntToken("{bannerwidth}", (int)eScraperHeaderIT::bannerwidth);
+    tokenContainer->DefineIntToken("{bannerheight}", (int)eScraperHeaderIT::bannerheight);
+    tokenContainer->DefineIntToken("{daynumeric}", (int)eDmDetailedHeaderRecIT::daynumeric);
+    tokenContainer->DefineIntToken("{month}", (int)eDmDetailedHeaderRecIT::month);
+    tokenContainer->DefineIntToken("{year}", (int)eDmDetailedHeaderRecIT::year);
+    tokenContainer->DefineIntToken("{duration}", (int)eDmDetailedHeaderRecIT::duration);
+    tokenContainer->DefineIntToken("{durationhours}", (int)eDmDetailedHeaderRecIT::durationhours);
+    tokenContainer->DefineIntToken("{durationevent}", (int)eDmDetailedHeaderRecIT::durationevent);
+    tokenContainer->DefineIntToken("{durationeventhours}", (int)eDmDetailedHeaderRecIT::durationeventhours);
+    tokenContainer->DefineIntToken("{recimgavailable}", (int)eDmDetailedHeaderRecIT::recimgavailable);
+    tokenContainer->DefineIntToken("{recchannelnumber}", (int)eDmDetailedHeaderRecIT::recchannelnumber);
+    InheritTokenContainer();
+}
+
+void cVeDmDetailheaderRec::SetRecording(const cRecording *recording) {
+    this->recording = recording;
+}
+
+bool cVeDmDetailheaderRec::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    if (!recording)
+        return false;
+    tokenContainer->Clear();
+    tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::name, recording->Name());
+
+    const cRecordingInfo *info = recording->Info();
+    if (info) {
+        tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::epgname, info->Title());
+        tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::shorttext, info->ShortText());
+        const cEvent *event = info->GetEvent();
+        if (event) {
+            cString recDate = event->GetDateString();
+            cString recTime = event->GetTimeString();
+            if (strstr(*recDate, "1970")) {
+                time_t start = recording->Start();
+                recDate = DateString(start);
+                recTime = TimeString(start);
+            }
+            int duration = event->Duration() / 60;
+            int recDuration = recording->LengthInSeconds();
+            recDuration = (recDuration > 0) ? (recDuration / 60) : 0;
+            tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::date, *recDate);
+            tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::time, *recTime);
+            time_t startTime = event->StartTime();
+            struct tm * sStartTime = localtime(&startTime);
+            tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::year, sStartTime->tm_year + 1900);
+            tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::daynumeric, sStartTime->tm_mday);
+            tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::month, sStartTime->tm_mon+1);
+            tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::duration, recDuration);
+            tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::durationhours, recDuration / 60);
+            tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::durationminutes, *cString::sprintf("%.2d", recDuration%60));
+            tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::durationevent, duration);
+            tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::durationeventhours, duration / 60);
+            tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::durationeventminutes, *cString::sprintf("%.2d", duration%60));
+        }
+        cChannel *channel = Channels.GetByChannelID(info->ChannelID());
+        if (channel) {
+            tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelname, channel->Name());
+            tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelid, *channel->GetChannelID().ToString());
+            tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::recchannelnumber, channel->Number());
+        }
+    }
+    string recImage = "";
+    string path = recording->FileName() ? recording->FileName() : "";
+    string extension =  ".jpg";
+    if (FirstFileInFolder(path, extension, recImage)) {
+        tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::recimgavailable, 1);
+        tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recimgpath, *cString::sprintf("%s/%s", path.c_str(), recImage.c_str()));
+    }
+    bool scrapInfoAvailable = LoadFullScrapInfo(NULL, recording);
+    if (scrapInfoAvailable) {
+        SetHeaderScrapInfo(tokenContainer);
+    }
+    SetDirty();
+    return true;
+}
+
+/******************************************************************
+* cVeDmDetailheaderPlugin
+******************************************************************/
+cVeDmDetailheaderPlugin::cVeDmDetailheaderPlugin(void) {
+    plugId = -1;
+    plugMenuId = -1;
+}
+
+cVeDmDetailheaderPlugin::~cVeDmDetailheaderPlugin(void) {
+}
+
+void cVeDmDetailheaderPlugin::SetTokenContainer(void) {
+    if (plugId == -1 || plugMenuId == -1)
+        return;
+    skindesignerapi::cTokenContainer *tkPlugMenu = plgManager->GetTokenContainer(plugId, plugMenuId);
+    tokenContainer = new skindesignerapi::cTokenContainer(*tkPlugMenu);
+    InheritTokenContainer();
+}
+
+void cVeDmDetailheaderPlugin::Set(skindesignerapi::cTokenContainer *tk) {
+    tokenContainer->Clear();
+    tokenContainer->SetTokens(tk);
+}
+
+bool cVeDmDetailheaderPlugin::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    SetDirty();
+    return true;
+}
+/******************************************************************
+* cVeDmTablabels
+******************************************************************/
+cVeDmTablabels::cVeDmTablabels(void) {
+    tabIndex = -1;
+    activeTab = -1;
+}
+
+cVeDmTablabels::~cVeDmTablabels(void) {
+}
+
+void cVeDmTablabels::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineLoopToken("{tabs[title]}", (int)eDmTabsLT::title);
+    tokenContainer->DefineLoopToken("{tabs[current]}", (int)eDmTabsLT::current);
+    tokenContainer->DefineStringToken("{currenttab}", (int)eDmTabsST::currenttab);
+    tokenContainer->DefineStringToken("{prevtab}", (int)eDmTabsST::prevtab);
+    tokenContainer->DefineStringToken("{nexttab}", (int)eDmTabsST::nexttab);
+    tabIndex = tokenContainer->LoopIndex("tabs");
+    InheritTokenContainer();
+}
+
+void cVeDmTablabels::SetTabs(vector<const char*> &newTabs) { 
+    tabs.clear();
+    for (vector<const char*>::iterator it = newTabs.begin(); it != newTabs.end(); it++) {
+        tabs.push_back(*it);
+    }
+    SetDirty();
+}
+
+bool cVeDmTablabels::Parse(bool forced) {
+    tokenContainer->Clear();
+    int numTabs = tabs.size();
+    vector<int> loopInfo;
+    loopInfo.push_back(numTabs);
+    tokenContainer->CreateLoopTokenContainer(&loopInfo);
+    for (int i = 0; i < numTabs; i++) {
+        if (i == activeTab) {
+            tokenContainer->AddLoopToken(tabIndex, i, (int)eDmTabsLT::current, "1");
+
+        } else {
+            tokenContainer->AddLoopToken(tabIndex, i, (int)eDmTabsLT::current, "0");
+        }
+        tokenContainer->AddLoopToken(tabIndex, i, (int)eDmTabsLT::title, tabs[i]);
+    }
+
+    if (activeTab >= 0 && activeTab < numTabs) {
+        tokenContainer->AddStringToken((int)eDmTabsST::currenttab, tabs[activeTab]);
+        tokenContainer->AddStringToken((int)eDmTabsST::prevtab, (activeTab == 0)         ? tabs[numTabs-1] : tabs[activeTab-1]);
+        tokenContainer->AddStringToken((int)eDmTabsST::nexttab, (activeTab == numTabs-1) ? tabs[0]         : tabs[activeTab+1]);
+    }
+    return true;
+}
+
+
+
diff --git a/coreengine/viewelementsdisplaymenu.h b/coreengine/viewelementsdisplaymenu.h
index 20b1bed..600af91 100644
--- a/coreengine/viewelementsdisplaymenu.h
+++ b/coreengine/viewelementsdisplaymenu.h
@@ -1,250 +1,250 @@
-#ifndef __VIEWELEMENTSDM_H

-#define __VIEWELEMENTSDM_H

-

-#include "viewelement.h"

-#include "../extensions/scrapmanager.h"

-

-/******************************************************************

-* cVeDmHeader

-******************************************************************/

-class cVeDmHeader : public cViewElement {

-private:

-    char *title;

-    char *channelName;

-    int channelNumber;

-    char *channelId;

-    bool epgSearchFav;

-public:

-    cVeDmHeader(void);

-    virtual ~cVeDmHeader(void);

-    void SetTokenContainer(void);

-    void SetTitle(const char *title);

-    void SetChannel(const cChannel *channel);

-    void Set(eMenuCategory menuCat);

-    void IsEpgSearchFav(bool isFav) { epgSearchFav = isFav;} ;

-};

-

-/******************************************************************

-* cVeDmSortmode

-******************************************************************/

-class cVeDmSortmode : public cViewElement {

-private:

-    eMenuSortMode sortMode;

-    eMenuSortMode lastSortMode;

-public:

-    cVeDmSortmode(void);

-    virtual ~cVeDmSortmode(void);

-    void Reset(void) { lastSortMode = msmUnknown; }

-    void SetTokenContainer(void);

-    void Set(eMenuSortMode sortMode);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDmColorbuttons

-******************************************************************/

-class cVeDmColorbuttons : public cViewElement {

-private:

-    bool changed;

-    char *red;

-    char *green;

-    char *yellow;

-    char *blue;

-public:

-    cVeDmColorbuttons(void);

-    virtual ~cVeDmColorbuttons(void);

-    void SetTokenContainer(void);

-    void SetButtons(const char *red, const char *green, const char *yellow, const char *blue);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDmScrollbar

-******************************************************************/

-class cVeDmScrollbar : public cViewElement {

-private:

-public:

-    cVeDmScrollbar(void);

-    virtual ~cVeDmScrollbar(void);

-    void SetTokenContainer(void);

-    void SetList(int numDisplayed, int offset, int numMax);

-    void SetDetail(int height, int offset, bool end);

-};

-

-

-/******************************************************************

-* cVeDmTimers

-******************************************************************/

-class cVeDmTimers : public cViewElement {

-private:

-    int timerIndex;

-public:

-    cVeDmTimers(void);

-    virtual ~cVeDmTimers(void);

-    void SetTokenContainer(void);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDmCurrentschedule

-******************************************************************/

-class cVeDmCurrentschedule : public cViewElement, public cScrapManager {

-private:

-    const char *rec;

-    void ParseFromChannel(const cChannel *channel);

-    void ParseFromRecording(const cRecording *recording);

-    void RecName(string &path, string &name, string &folder);

-public:

-    cVeDmCurrentschedule(void);

-    virtual ~cVeDmCurrentschedule(void);

-    void SetTokenContainer(void);

-    void SetRecording(const char *currentRec);

-    bool Parse(bool forced = false);    

-};

-

-/******************************************************************

-* cVeDmDiscusage

-******************************************************************/

-class cVeDmDiscusage : public cViewElement {

-private:

-public:

-    cVeDmDiscusage(void);

-    virtual ~cVeDmDiscusage(void);

-    void SetTokenContainer(void);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDmSystemload

-******************************************************************/

-class cVeDmSystemload : public cViewElement {

-private:

-    double lastSystemLoad;

-public:

-    cVeDmSystemload(void);

-    virtual ~cVeDmSystemload(void);

-    void Reset(void) { lastSystemLoad = -1.0f; }

-    void SetTokenContainer(void);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDmSystemmemory

-******************************************************************/

-class cVeDmSystemmemory : public cViewElement {

-private:

-    int lastMemUsage;

-public:

-    cVeDmSystemmemory(void);

-    virtual ~cVeDmSystemmemory(void);

-    void Reset(void) { lastMemUsage = -1; }

-    void SetTokenContainer(void);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDmTemperatures

-******************************************************************/

-class cVeDmTemperatures : public cViewElement {

-private:

-    int lastCpuTemp;

-    int lastGpuTemp;

-public:

-    cVeDmTemperatures(void);

-    virtual ~cVeDmTemperatures(void);

-    void Reset(void) { lastCpuTemp = -1; lastGpuTemp = -1; }

-    void SetTokenContainer(void);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDmVdrstatistics

-******************************************************************/

-class cVeDmVdrstatistics : public cViewElement {

-private:

-    string lastVdrCPU;

-    string lastVdrMEM;

-public:

-    cVeDmVdrstatistics(void);

-    virtual ~cVeDmVdrstatistics(void);

-    void Reset(void) { lastVdrCPU = "undefined"; lastVdrMEM = "undefined"; }

-    void SetTokenContainer(void);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDmLastrecordings

-******************************************************************/

-class cVeDmLastrecordings : public cViewElement, public cScrapManager {

-private:

-    int recIndex;

-    void RecName(string &path, string &name, string &folder);

-public:

-    cVeDmLastrecordings(void);

-    virtual ~cVeDmLastrecordings(void);

-    void SetTokenContainer(void);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDmDetailheaderEpg

-******************************************************************/

-class cVeDmDetailheaderEpg : public cViewElement, public cScrapManager {

-private:

-    const cEvent *event;

-public:

-    cVeDmDetailheaderEpg(void);

-    virtual ~cVeDmDetailheaderEpg(void);

-    void SetTokenContainer(void);

-    void SetEvent(const cEvent *event);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDmDetailheaderRec

-******************************************************************/

-class cVeDmDetailheaderRec : public cViewElement, public cScrapManager {

-private:

-    const cRecording *recording;

-public:

-    cVeDmDetailheaderRec(void);

-    virtual ~cVeDmDetailheaderRec(void);

-    void SetTokenContainer(void);

-    void SetRecording(const cRecording *rec);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDmDetailheaderPlugin

-******************************************************************/

-class cVeDmDetailheaderPlugin : public cViewElement {

-private:

-    int plugId;

-    int plugMenuId;

-public:

-    cVeDmDetailheaderPlugin(void);

-    virtual ~cVeDmDetailheaderPlugin(void);

-    void SetPlugId(int id) { plugId = id; };

-    void SetPlugMenuId(int id) { plugMenuId = id; };

-    void SetTokenContainer(void);

-    void Set(skindesignerapi::cTokenContainer *tk);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDmTablabels

-******************************************************************/

-class cVeDmTablabels : public cViewElement {

-private:

-    int tabIndex;

-    int activeTab;

-    vector<const char*> tabs;

-public:

-    cVeDmTablabels(void);

-    virtual ~cVeDmTablabels(void);

-    void SetTokenContainer(void);

-    void SetTabs(vector<const char*> &newTabs);

-    void SetActiveTab(int activeTab) { SetDirty(); this->activeTab = activeTab; };

-    bool Parse(bool forced = false);

-};

+#ifndef __VIEWELEMENTSDM_H
+#define __VIEWELEMENTSDM_H
+
+#include "viewelement.h"
+#include "../extensions/scrapmanager.h"
+
+/******************************************************************
+* cVeDmHeader
+******************************************************************/
+class cVeDmHeader : public cViewElement {
+private:
+    char *title;
+    char *channelName;
+    int channelNumber;
+    char *channelId;
+    bool epgSearchFav;
+public:
+    cVeDmHeader(void);
+    virtual ~cVeDmHeader(void);
+    void SetTokenContainer(void);
+    void SetTitle(const char *title);
+    void SetChannel(const cChannel *channel);
+    void Set(eMenuCategory menuCat);
+    void IsEpgSearchFav(bool isFav) { epgSearchFav = isFav;} ;
+};
+
+/******************************************************************
+* cVeDmSortmode
+******************************************************************/
+class cVeDmSortmode : public cViewElement {
+private:
+    eMenuSortMode sortMode;
+    eMenuSortMode lastSortMode;
+public:
+    cVeDmSortmode(void);
+    virtual ~cVeDmSortmode(void);
+    void Reset(void) { lastSortMode = msmUnknown; }
+    void SetTokenContainer(void);
+    void Set(eMenuSortMode sortMode);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDmColorbuttons
+******************************************************************/
+class cVeDmColorbuttons : public cViewElement {
+private:
+    bool changed;
+    char *red;
+    char *green;
+    char *yellow;
+    char *blue;
+public:
+    cVeDmColorbuttons(void);
+    virtual ~cVeDmColorbuttons(void);
+    void SetTokenContainer(void);
+    void SetButtons(const char *red, const char *green, const char *yellow, const char *blue);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDmScrollbar
+******************************************************************/
+class cVeDmScrollbar : public cViewElement {
+private:
+public:
+    cVeDmScrollbar(void);
+    virtual ~cVeDmScrollbar(void);
+    void SetTokenContainer(void);
+    void SetList(int numDisplayed, int offset, int numMax);
+    void SetDetail(int height, int offset, bool end);
+};
+
+
+/******************************************************************
+* cVeDmTimers
+******************************************************************/
+class cVeDmTimers : public cViewElement {
+private:
+    int timerIndex;
+public:
+    cVeDmTimers(void);
+    virtual ~cVeDmTimers(void);
+    void SetTokenContainer(void);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDmCurrentschedule
+******************************************************************/
+class cVeDmCurrentschedule : public cViewElement, public cScrapManager {
+private:
+    const char *rec;
+    void ParseFromChannel(const cChannel *channel);
+    void ParseFromRecording(const cRecording *recording);
+    void RecName(string &path, string &name, string &folder);
+public:
+    cVeDmCurrentschedule(void);
+    virtual ~cVeDmCurrentschedule(void);
+    void SetTokenContainer(void);
+    void SetRecording(const char *currentRec);
+    bool Parse(bool forced = false);    
+};
+
+/******************************************************************
+* cVeDmDiscusage
+******************************************************************/
+class cVeDmDiscusage : public cViewElement {
+private:
+public:
+    cVeDmDiscusage(void);
+    virtual ~cVeDmDiscusage(void);
+    void SetTokenContainer(void);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDmSystemload
+******************************************************************/
+class cVeDmSystemload : public cViewElement {
+private:
+    double lastSystemLoad;
+public:
+    cVeDmSystemload(void);
+    virtual ~cVeDmSystemload(void);
+    void Reset(void) { lastSystemLoad = -1.0f; }
+    void SetTokenContainer(void);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDmSystemmemory
+******************************************************************/
+class cVeDmSystemmemory : public cViewElement {
+private:
+    int lastMemUsage;
+public:
+    cVeDmSystemmemory(void);
+    virtual ~cVeDmSystemmemory(void);
+    void Reset(void) { lastMemUsage = -1; }
+    void SetTokenContainer(void);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDmTemperatures
+******************************************************************/
+class cVeDmTemperatures : public cViewElement {
+private:
+    int lastCpuTemp;
+    int lastGpuTemp;
+public:
+    cVeDmTemperatures(void);
+    virtual ~cVeDmTemperatures(void);
+    void Reset(void) { lastCpuTemp = -1; lastGpuTemp = -1; }
+    void SetTokenContainer(void);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDmVdrstatistics
+******************************************************************/
+class cVeDmVdrstatistics : public cViewElement {
+private:
+    string lastVdrCPU;
+    string lastVdrMEM;
+public:
+    cVeDmVdrstatistics(void);
+    virtual ~cVeDmVdrstatistics(void);
+    void Reset(void) { lastVdrCPU = "undefined"; lastVdrMEM = "undefined"; }
+    void SetTokenContainer(void);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDmLastrecordings
+******************************************************************/
+class cVeDmLastrecordings : public cViewElement, public cScrapManager {
+private:
+    int recIndex;
+    void RecName(string &path, string &name, string &folder);
+public:
+    cVeDmLastrecordings(void);
+    virtual ~cVeDmLastrecordings(void);
+    void SetTokenContainer(void);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDmDetailheaderEpg
+******************************************************************/
+class cVeDmDetailheaderEpg : public cViewElement, public cScrapManager {
+private:
+    const cEvent *event;
+public:
+    cVeDmDetailheaderEpg(void);
+    virtual ~cVeDmDetailheaderEpg(void);
+    void SetTokenContainer(void);
+    void SetEvent(const cEvent *event);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDmDetailheaderRec
+******************************************************************/
+class cVeDmDetailheaderRec : public cViewElement, public cScrapManager {
+private:
+    const cRecording *recording;
+public:
+    cVeDmDetailheaderRec(void);
+    virtual ~cVeDmDetailheaderRec(void);
+    void SetTokenContainer(void);
+    void SetRecording(const cRecording *rec);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDmDetailheaderPlugin
+******************************************************************/
+class cVeDmDetailheaderPlugin : public cViewElement {
+private:
+    int plugId;
+    int plugMenuId;
+public:
+    cVeDmDetailheaderPlugin(void);
+    virtual ~cVeDmDetailheaderPlugin(void);
+    void SetPlugId(int id) { plugId = id; };
+    void SetPlugMenuId(int id) { plugMenuId = id; };
+    void SetTokenContainer(void);
+    void Set(skindesignerapi::cTokenContainer *tk);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDmTablabels
+******************************************************************/
+class cVeDmTablabels : public cViewElement {
+private:
+    int tabIndex;
+    int activeTab;
+    vector<const char*> tabs;
+public:
+    cVeDmTablabels(void);
+    virtual ~cVeDmTablabels(void);
+    void SetTokenContainer(void);
+    void SetTabs(vector<const char*> &newTabs);
+    void SetActiveTab(int activeTab) { SetDirty(); this->activeTab = activeTab; };
+    bool Parse(bool forced = false);
+};
 #endif //__VIEWELEMENTSDM_H
\ No newline at end of file
diff --git a/coreengine/viewelementsdisplayreplay.c b/coreengine/viewelementsdisplayreplay.c
index 06ec8f8..cbdba6b 100644
--- a/coreengine/viewelementsdisplayreplay.c
+++ b/coreengine/viewelementsdisplayreplay.c
@@ -1,816 +1,816 @@
-#include "viewelementsdisplayreplay.h"

-#include "../config.h"

-#include "../extensions/helpers.h"

-#include "../services/scraper2vdr.h"

-

-/******************************************************************

-* cVeDrRecTitle

-******************************************************************/

-cVeDrRecTitle::cVeDrRecTitle(void) {

-    recording = NULL;

-    title = NULL;

-}

-

-cVeDrRecTitle::~cVeDrRecTitle(void) {

-    free(title);

-}

-

-void cVeDrRecTitle::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{rectitle}", (int)eDRRecTitleST::rectitle);

-    tokenContainer->DefineStringToken("{recsubtitle}", (int)eDRRecTitleST::recsubtitle);

-    tokenContainer->DefineStringToken("{recdate}", (int)eDRRecTitleST::recdate);

-    tokenContainer->DefineStringToken("{rectime}", (int)eDRRecTitleST::rectime);

-    InheritTokenContainer();

-}

-

-void cVeDrRecTitle::Set(const cRecording *recording) {

-    this->recording = recording;

-}

-

-void cVeDrRecTitle::Set(const char *title) {

-    if (!title)

-        return;

-    free(this->title);

-    this->title = strdup(title);

-}

-

-bool cVeDrRecTitle::Parse(bool force) {

-    if (!cViewElement::Parse(force))

-        return false;

-    if (!recording && !title)

-        return false;

-

-    tokenContainer->Clear();

-    if (recording) {

-        const char *recName = NULL;

-        const cRecordingInfo *recInfo = recording->Info();

-        if (recInfo)

-            recName = recInfo->Title();

-        if (!recName)

-            recName = recording->Name();

-        tokenContainer->AddStringToken((int)eDRRecTitleST::rectitle, recName);

-        tokenContainer->AddStringToken((int)eDRRecTitleST::recsubtitle, recInfo ? recInfo->ShortText() : "");

-        tokenContainer->AddStringToken((int)eDRRecTitleST::recdate, *ShortDateString(recording->Start()));

-        tokenContainer->AddStringToken((int)eDRRecTitleST::rectime, *TimeString(recording->Start()));        

-    } else if (title) {

-        tokenContainer->AddStringToken((int)eDRRecTitleST::rectitle, title);        

-    }

-

-    SetDirty();

-    return true;

-}

-

-/******************************************************************

-* cVeDrRecInfo

-******************************************************************/

-cVeDrRecInfo::cVeDrRecInfo(void) {

-    recording = NULL;

-}

-

-cVeDrRecInfo::~cVeDrRecInfo(void) {

-}

-

-void cVeDrRecInfo::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{resolution}", (int)eDRRecInfoST::resolution);

-    tokenContainer->DefineStringToken("{aspect}", (int)eDRRecInfoST::aspect);

-    tokenContainer->DefineIntToken("{screenwidth}", (int)eDRRecInfoIT::screenwidth);

-    tokenContainer->DefineIntToken("{screenheight}", (int)eDRRecInfoIT::screenheight);

-    tokenContainer->DefineIntToken("{isHD}", (int)eDRRecInfoIT::isHD);

-    tokenContainer->DefineIntToken("{isWideScreen}", (int)eDRRecInfoIT::isWideScreen);

-    InheritTokenContainer();

-}

-

-void cVeDrRecInfo::Set(const cRecording *recording) {

-    this->recording = recording;

-}

-

-bool cVeDrRecInfo::Parse(bool force) {

-    if (!cViewElement::Parse(force))

-        return false;

-    if (!recording)

-        return false;

-    

-    int screenWidth = 0;

-    int screenHeight = 0;

-    double aspect = 0;

-    cDevice::PrimaryDevice()->GetVideoSize(screenWidth, screenHeight, aspect);

-    bool isHD = false;

-    string resName = GetScreenResolutionString(screenWidth, screenHeight, &isHD);

-    bool isWideScreen = false;

-    string aspectName = GetScreenAspectString(aspect, &isWideScreen);

-

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eDRRecInfoIT::screenwidth, screenWidth);

-    tokenContainer->AddIntToken((int)eDRRecInfoIT::screenheight, screenHeight);

-    tokenContainer->AddIntToken((int)eDRRecInfoIT::isHD, isHD);

-    tokenContainer->AddIntToken((int)eDRRecInfoIT::isWideScreen, isWideScreen);

-    tokenContainer->AddStringToken((int)eDRRecInfoST::resolution, resName.c_str());

-    tokenContainer->AddStringToken((int)eDRRecInfoST::aspect, aspectName.c_str());

-

-    SetDirty();

-    return true;

-}

-

-/******************************************************************

-* cVeDrCurrentTime

-******************************************************************/

-cVeDrCurrentTime::cVeDrCurrentTime(void) {

-    changed = true;

-    current = NULL;

-}

-

-cVeDrCurrentTime::~cVeDrCurrentTime(void) {

-    free(current);

-}

-

-void cVeDrCurrentTime::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{reccurrent}", (int)eDRCurrentTimeST::reccurrent);

-    InheritTokenContainer();

-}

-

-void cVeDrCurrentTime::Set(const char *current) {

-    if (!current)

-        return;

-    free(this->current);

-    this->current = strdup(current);

-    changed = true;

-}

-

-bool cVeDrCurrentTime::Parse(bool force) {

-    if (!cViewElement::Parse(force) || !changed)

-        return false;

-    tokenContainer->Clear();

-    tokenContainer->AddStringToken((int)eDRCurrentTimeST::reccurrent, current);

-    SetDirty();

-    changed = false;

-    return true;

-}

-

-/******************************************************************

-* cVeDrTotalTime

-******************************************************************/

-cVeDrTotalTime::cVeDrTotalTime(void) {

-    changed = true;

-    total = NULL;

-    timeshiftActive = false;

-    timeshiftDuration = NULL;

-}

-

-cVeDrTotalTime::~cVeDrTotalTime(void) {

-    free(total);

-    free(timeshiftDuration);

-}

-

-void cVeDrTotalTime::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{rectotal}", (int)eDRTotalTimeST::rectotal);

-    tokenContainer->DefineStringToken("{timeshifttotal}", (int)eDRTotalTimeST::timeshifttotal);

-    tokenContainer->DefineIntToken("{timeshift}", (int)eDRTotalTimeIT::timeshift);

-    InheritTokenContainer();

-}

-

-void cVeDrTotalTime::Set(const char *total, bool timeshiftActive, const char *timeshiftDuration) {

-    if (!total)

-        return;

-    free(this->total);

-    this->total = strdup(total);

-    this->timeshiftActive = timeshiftActive;

-    free(this->timeshiftDuration);

-    this->timeshiftDuration = NULL;

-    if (timeshiftDuration)

-        this->timeshiftDuration = strdup(timeshiftDuration);

-    changed = true;

-}

-

-bool cVeDrTotalTime::Parse(bool force) {

-    if (!cViewElement::Parse(force) || !changed)

-        return false;

-    tokenContainer->Clear();

-    tokenContainer->AddStringToken((int)eDRTotalTimeST::rectotal, total);

-    tokenContainer->AddStringToken((int)eDRTotalTimeST::timeshifttotal, timeshiftDuration);

-    tokenContainer->AddIntToken((int)eDRTotalTimeIT::timeshift, timeshiftActive);

-    SetDirty();

-    changed = false;

-    return true;

-}

-

-/******************************************************************

-* cVeDrEndTime

-******************************************************************/

-cVeDrEndTime::cVeDrEndTime(void) {

-    end = "";

-}

-

-cVeDrEndTime::~cVeDrEndTime(void) {

-}

-

-void cVeDrEndTime::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{recend}", (int)eDREndTimeST::recend);

-    InheritTokenContainer();

-}

-

-void cVeDrEndTime::Set(cString end) {

-    if (strcmp(*this->end, *end)) {

-        this->end = end;

-        changed = true;

-    }

-}

-

-bool cVeDrEndTime::Parse(bool force) {

-    if (!cViewElement::Parse(force) || !changed)

-        return false;

-    tokenContainer->Clear();

-    tokenContainer->AddStringToken((int)eDREndTimeST::recend, *end);

-    SetDirty();

-    changed = false;

-    return true;

-}

-

-/******************************************************************

-* cVeDrProgressBar

-******************************************************************/

-cVeDrProgressBar::cVeDrProgressBar(void) {

-    current = -1;

-    total = -1;

-    timeshiftActive = false;

-    timeshiftTotal = -1;

-    changed = true;

-}

-

-cVeDrProgressBar::~cVeDrProgressBar(void) {

-}

-

-void cVeDrProgressBar::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineIntToken("{current}", (int)eDRProgressbarIT::current);

-    tokenContainer->DefineIntToken("{total}", (int)eDRProgressbarIT::total);

-    tokenContainer->DefineIntToken("{timeshift}", (int)eDRProgressbarIT::timeshift);

-    tokenContainer->DefineIntToken("{timeshifttotal}", (int)eDRProgressbarIT::timeshifttotal);

-    InheritTokenContainer();

-}

-

-void cVeDrProgressBar::Set(int current, int total, bool timeshiftActive, int timeshiftTotal) {

-    if (this->current == current)

-        return;

-    this->current = current;

-    this->total = total;

-    this->timeshiftActive = timeshiftActive;

-    this->timeshiftTotal = timeshiftTotal;

-    changed = true;

-}

-

-bool cVeDrProgressBar::Parse(bool force) {

-    if (!cViewElement::Parse(force) || !changed)

-        return false;

-

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eDRProgressbarIT::current, current);

-    tokenContainer->AddIntToken((int)eDRProgressbarIT::total, total);

-    tokenContainer->AddIntToken((int)eDRProgressbarIT::timeshift, timeshiftActive);

-    tokenContainer->AddIntToken((int)eDRProgressbarIT::timeshifttotal, timeshiftTotal);

-

-    SetDirty();

-    return true;

-}

-

-/******************************************************************

-* cVeDrCutMarks

-******************************************************************/

-cVeDrCutMarks::cVeDrCutMarks(void) {

-    cutmarksIndex = -1;

-    lastMarks = NULL;

-    Reset();

-}

-

-cVeDrCutMarks::~cVeDrCutMarks(void) {

-    delete[] lastMarks;

-}

-

-void cVeDrCutMarks::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineIntToken("{timeshift}", (int)eDRCutmarksIT::timeshift);

-    tokenContainer->DefineLoopToken("{marks[position]}", (int)eDRCutmarksLT::position);

-    tokenContainer->DefineLoopToken("{marks[endposition]}", (int)eDRCutmarksLT::endposition);

-    tokenContainer->DefineLoopToken("{marks[total]}", (int)eDRCutmarksLT::total);

-    tokenContainer->DefineLoopToken("{marks[timeshifttotal]}", (int)eDRCutmarksLT::timeshifttotal);

-    tokenContainer->DefineLoopToken("{marks[active]}", (int)eDRCutmarksLT::active);

-    tokenContainer->DefineLoopToken("{marks[startmark]}", (int)eDRCutmarksLT::startmark);

-    cutmarksIndex = tokenContainer->LoopIndex("marks");

-    InheritTokenContainer();

-}

-

-void cVeDrCutMarks::Set(const cMarks *marks, int current, int total, bool timeshiftActive, int timeshiftTotal) {

-    this->marks = marks;

-    this->current = current;

-    this->total = total;

-    this->timeshiftActive = timeshiftActive;

-    this->timeshiftTotal = timeshiftTotal;

-}

-

-void cVeDrCutMarks::Reset(void) {

-    marks = NULL;

-    current = -1;

-    total = -1;

-    numMarksLast = 0;

-    delete[] lastMarks;

-    lastMarks = NULL;

-    markActive = -1;

-    timeshiftActive = false;

-    timeshiftTotal = -1;

-}

-

-bool cVeDrCutMarks::Parse(bool force) {

-    if (!cViewElement::Parse(force))

-        return false;

-    if (!marks || !MarksChanged()) {

-        return false;

-    }

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eDRCutmarksIT::timeshift, timeshiftActive);

-    int numMarks = marks->Count();

-    vector<int> cutmarksInfo;

-    cutmarksInfo.push_back(numMarks);

-    tokenContainer->CreateLoopTokenContainer(&cutmarksInfo);

-    cString tot = cString::sprintf("%d", total);

-    cString timeshifttot = cString::sprintf("%d",timeshiftTotal);

-    int i = 0;

-    bool isStartMark = true;

-    for (const cMark *m = marks->First(); m; m = marks->Next(m)) {

-        tokenContainer->AddLoopToken(cutmarksIndex, i, (int)eDRCutmarksLT::position, *cString::sprintf("%d", m->Position()));

-        tokenContainer->AddLoopToken(cutmarksIndex, i, (int)eDRCutmarksLT::total, *tot);

-        if (timeshiftActive) {

-            tokenContainer->AddLoopToken(cutmarksIndex, i, (int)eDRCutmarksLT::timeshifttotal, *timeshifttot);

-        }

-        tokenContainer->AddLoopToken(cutmarksIndex, i, (int)eDRCutmarksLT::startmark, isStartMark ? "1" : "0");

-        tokenContainer->AddLoopToken(cutmarksIndex, i, (int)eDRCutmarksLT::active, (m->Position() == current) ? "1" : "0");

-        const cMark *m2 = marks->Next(m);

-        if (m2) { 

-            tokenContainer->AddLoopToken(cutmarksIndex, i, (int)eDRCutmarksLT::endposition, *cString::sprintf("%d", m2->Position()));

-        } else {

-            tokenContainer->AddLoopToken(cutmarksIndex, i, (int)eDRCutmarksLT::endposition, *tot);

-        }

-        i++;

-        isStartMark = !isStartMark;

-    }

-    SetDirty();

-    return true;

-}

-

-bool cVeDrCutMarks::MarksChanged(void) {

-    bool redraw = false;

-    //if mark was active, we redraw always

-    if (markActive >= 0) {

-        markActive = -1;

-        redraw = true;

-    }

-    //check if current position in recording hits mark exactly

-    for (const cMark *m = marks->First(); m; m = marks->Next(m)) {

-        if (m->Position() == current) {

-            markActive = current;

-            redraw = true;

-            break;

-        }

-    }

-    if (redraw)

-        return true;

-    //if number of marks has changed, redraw

-    int numMarks = marks->Count();

-    if (numMarks != numMarksLast) {

-        RememberMarks();

-        return true;

-    }

-    if (!lastMarks)

-        return false;

-    //if position has changed, redraw

-    int i=0;

-    for (const cMark *m = marks->First(); m; m = marks->Next(m)) {

-        if (m->Position() != lastMarks[i]) {

-            RememberMarks();

-            return true;

-        }

-        i++;

-    }

-    return false;

-}

-

-void cVeDrCutMarks::RememberMarks(void) {

-    if (!marks)

-        return;

-    numMarksLast = marks->Count();

-    if (numMarksLast < 1)

-        return;

-    delete[] lastMarks;

-    lastMarks = new int[numMarksLast];

-    int i=0;

-    for (const cMark *m = marks->First(); m; m = marks->Next(m)) {

-        lastMarks[i] = m->Position();

-        i++;

-    }

-}

-

-/******************************************************************

-* cVeDrControlIcons

-******************************************************************/

-cVeDrControlIcons::cVeDrControlIcons(void) {

-    play = false;

-    forward = false;

-    speed = 0;

-    changed = true;

-}

-

-cVeDrControlIcons::~cVeDrControlIcons(void) {

-}

-

-void cVeDrControlIcons::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineIntToken("{play}", (int)eDRControlIconsIT::play);

-    tokenContainer->DefineIntToken("{pause}", (int)eDRControlIconsIT::pause);

-    tokenContainer->DefineIntToken("{forward}", (int)eDRControlIconsIT::forward);

-    tokenContainer->DefineIntToken("{forward1x}", (int)eDRControlIconsIT::forward1x);

-    tokenContainer->DefineIntToken("{forward2x}", (int)eDRControlIconsIT::forward2x);

-    tokenContainer->DefineIntToken("{forward3x}", (int)eDRControlIconsIT::forward3x);

-    tokenContainer->DefineIntToken("{rewind}", (int)eDRControlIconsIT::rewind);

-    tokenContainer->DefineIntToken("{rewind1x}", (int)eDRControlIconsIT::rewind1x);

-    tokenContainer->DefineIntToken("{rewind2x}", (int)eDRControlIconsIT::rewind2x);

-    tokenContainer->DefineIntToken("{rewind3x}", (int)eDRControlIconsIT::rewind3x);

-    InheritTokenContainer();

-}

-

-void cVeDrControlIcons::Set(bool play, bool forward, int speed) {

-    this->play = play;

-    this->forward = forward;

-    this->speed = speed;

-    changed = true;

-}

-

-bool cVeDrControlIcons::Parse(bool force) {

-    if (!cViewElement::Parse(force) || !changed)

-        return false;

-

-    bool isPlay = false;

-    bool isPause = false;

-    bool isFF = false;

-    bool isFF1x = false;

-    bool isFF2x = false;

-    bool isFF3x = false;

-    bool isRew = false;

-    bool isRew1x = false;

-    bool isRew2x = false;

-    bool isRew3x = false;

-

-    if (speed == -1) {

-        if (play) {

-            isPlay = true;

-        } else {

-            isPause = true;

-        }

-    } else if (forward) {

-        if (!play) {

-            isPause = true;

-        }

-        if (speed == 1) {

-            isFF1x = true;

-        } else if (speed == 2) {

-            isFF2x = true;

-        } else if (speed == 3) {

-            isFF3x = true;

-        } else {

-            isFF = true;

-        }

-    } else {

-        if (!play) {

-            isPause = true;

-        }

-        if (speed == 1) {

-            isRew1x = true;

-        } else if (speed == 2) {

-            isRew2x = true;

-        } else if (speed == 3) {

-            isRew3x = true;

-        } else {

-            isRew = true;

-        }

-    }

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eDRControlIconsIT::play, isPlay);

-    tokenContainer->AddIntToken((int)eDRControlIconsIT::pause, isPause);

-    tokenContainer->AddIntToken((int)eDRControlIconsIT::forward, isFF);

-    tokenContainer->AddIntToken((int)eDRControlIconsIT::forward1x, isFF1x);

-    tokenContainer->AddIntToken((int)eDRControlIconsIT::forward2x, isFF2x);

-    tokenContainer->AddIntToken((int)eDRControlIconsIT::forward3x, isFF3x);

-    tokenContainer->AddIntToken((int)eDRControlIconsIT::rewind, isRew);

-    tokenContainer->AddIntToken((int)eDRControlIconsIT::rewind1x, isRew1x);

-    tokenContainer->AddIntToken((int)eDRControlIconsIT::rewind2x, isRew2x);

-    tokenContainer->AddIntToken((int)eDRControlIconsIT::rewind3x, isRew3x);

-    SetDirty();

-    changed = false;

-    return true;

-}

-

-/******************************************************************

-* cVeDrProgressModeonly

-******************************************************************/

-cVeDrProgressModeonly::cVeDrProgressModeonly(void) {

-    fps = 0.0f;

-    current = 0;

-    total = 0;

-    changed = true;

-}

-

-cVeDrProgressModeonly::~cVeDrProgressModeonly(void) {

-}

-

-void cVeDrProgressModeonly::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineIntToken("{current}", (int)eDRProgressModeonlyIT::current);

-    tokenContainer->DefineIntToken("{total}", (int)eDRProgressModeonlyIT::total);

-    tokenContainer->DefineStringToken("{timecurrent}", (int)eDRProgressModeonlyST::timecurrent);

-    tokenContainer->DefineStringToken("{timetotal}", (int)eDRProgressModeonlyST::timetotal);

-    InheritTokenContainer();

-}

-

-void cVeDrProgressModeonly::Set(double fps, int current, int total) {

-    if (this->current == current)

-        return;

-    this->fps = fps;

-    this->current = current;

-    this->total = total;    

-    changed = true;

-}

-

-bool cVeDrProgressModeonly::Parse(bool force) {

-    if (!cViewElement::Parse(force) || !changed)

-        return false;

-

-    string cur = GetTimeString((double)current / fps);

-    string tot = GetTimeString((double)total / fps);

-

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eDRProgressModeonlyIT::current, current);

-    tokenContainer->AddIntToken((int)eDRProgressModeonlyIT::total, total);

-    tokenContainer->AddStringToken((int)eDRProgressModeonlyST::timecurrent, cur.c_str());

-    tokenContainer->AddStringToken((int)eDRProgressModeonlyST::timetotal, tot.c_str());

-

-    SetDirty();

-    changed = false;

-    return true;

-}

-

-/******************************************************************

-* cVeDrJump

-******************************************************************/

-cVeDrJump::cVeDrJump(void) {

-    jump = NULL;

-    changed = false;

-}

-

-cVeDrJump::~cVeDrJump(void) {

-    free(jump);

-}

-

-void cVeDrJump::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{jump}", (int)eDRJumpST::jump);

-    InheritTokenContainer();

-}

-

-void cVeDrJump::Set(const char *jump) {

-    if (!jump)

-        return;

-    free(this->jump);

-    this->jump = strdup(jump);

-    changed = true;

-}

-

-bool cVeDrJump::Parse(bool force) {

-    if (!cViewElement::Parse(force) || !changed)

-        return false;

-

-    tokenContainer->Clear();

-    tokenContainer->AddStringToken((int)eDRJumpST::jump, jump);

-    changed = false;

-    SetDirty();

-    return true;

-}

-

-/******************************************************************

-* cVeDrOnPause

-******************************************************************/

-cVeDrOnPause::cVeDrOnPause(void) {

-    actorsIndex = -1;

-    recfilename = NULL;

-}

-

-cVeDrOnPause::~cVeDrOnPause(void) {

-    free(recfilename);

-}

-

-void cVeDrOnPause::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{name}", (int)eDROnpauseST::name);

-    tokenContainer->DefineStringToken("{shorttext}", (int)eDROnpauseST::shorttext);

-    tokenContainer->DefineStringToken("{description}", (int)eDROnpauseST::description);

-    tokenContainer->DefineStringToken("{date}", (int)eDROnpauseST::date);

-    tokenContainer->DefineStringToken("{time}", (int)eDROnpauseST::time);

-    tokenContainer->DefineStringToken("{durationminutes}", (int)eDROnpauseST::durationminutes);

-    tokenContainer->DefineStringToken("{durationeventminutes}", (int)eDROnpauseST::durationeventminutes);

-    tokenContainer->DefineIntToken("{daynumeric}", (int)eDROnpauseIT::daynumeric);

-    tokenContainer->DefineIntToken("{month}", (int)eDROnpauseIT::month);

-    tokenContainer->DefineIntToken("{year}", (int)eDROnpauseIT::year);

-    tokenContainer->DefineIntToken("{duration}", (int)eDROnpauseIT::duration);

-    tokenContainer->DefineIntToken("{durationhours}", (int)eDROnpauseIT::durationhours);

-    tokenContainer->DefineIntToken("{durationevent}", (int)eDROnpauseIT::durationevent);

-    tokenContainer->DefineIntToken("{durationeventhours}", (int)eDROnpauseIT::durationeventhours);

-    tokenContainer->DefineStringToken("{movietitle}", (int)eScraperST::movietitle);

-    tokenContainer->DefineStringToken("{movieoriginalTitle}", (int)eScraperST::movieoriginalTitle);

-    tokenContainer->DefineStringToken("{movietagline}", (int)eScraperST::movietagline);

-    tokenContainer->DefineStringToken("{movieoverview}", (int)eScraperST::movieoverview);

-    tokenContainer->DefineStringToken("{moviegenres}", (int)eScraperST::moviegenres);

-    tokenContainer->DefineStringToken("{moviehomepage}", (int)eScraperST::moviehomepage);

-    tokenContainer->DefineStringToken("{moviereleasedate}", (int)eScraperST::moviereleasedate);

-    tokenContainer->DefineStringToken("{moviepopularity}", (int)eScraperST::moviepopularity);

-    tokenContainer->DefineStringToken("{movievoteaverage}", (int)eScraperST::movievoteaverage);

-    tokenContainer->DefineStringToken("{posterpath}", (int)eScraperST::posterpath);

-    tokenContainer->DefineStringToken("{fanartpath}", (int)eScraperST::fanartpath);

-    tokenContainer->DefineStringToken("{moviecollectionName}", (int)eScraperST::moviecollectionName);

-    tokenContainer->DefineStringToken("{collectionposterpath}", (int)eScraperST::collectionposterpath);

-    tokenContainer->DefineStringToken("{collectionfanartpath}", (int)eScraperST::collectionfanartpath);

-    tokenContainer->DefineStringToken("{seriesname}", (int)eScraperST::seriesname);

-    tokenContainer->DefineStringToken("{seriesoverview}", (int)eScraperST::seriesoverview);

-    tokenContainer->DefineStringToken("{seriesfirstaired}", (int)eScraperST::seriesfirstaired);

-    tokenContainer->DefineStringToken("{seriesnetwork}", (int)eScraperST::seriesnetwork);

-    tokenContainer->DefineStringToken("{seriesgenre}", (int)eScraperST::seriesgenre);

-    tokenContainer->DefineStringToken("{seriesrating}", (int)eScraperST::seriesrating);

-    tokenContainer->DefineStringToken("{seriesstatus}", (int)eScraperST::seriesstatus);

-    tokenContainer->DefineStringToken("{episodetitle}", (int)eScraperST::episodetitle);

-    tokenContainer->DefineStringToken("{episodefirstaired}", (int)eScraperST::episodefirstaired);

-    tokenContainer->DefineStringToken("{episodegueststars}", (int)eScraperST::episodegueststars);

-    tokenContainer->DefineStringToken("{episodeoverview}", (int)eScraperST::episodeoverview);

-    tokenContainer->DefineStringToken("{episoderating}", (int)eScraperST::episoderating);

-    tokenContainer->DefineStringToken("{episodeimagepath}", (int)eScraperST::episodeimagepath);

-    tokenContainer->DefineStringToken("{seasonposterpath}", (int)eScraperST::seasonposterpath);

-    tokenContainer->DefineStringToken("{seriesposter1path}", (int)eScraperST::seriesposter1path);

-    tokenContainer->DefineStringToken("{seriesposter2path}", (int)eScraperST::seriesposter2path);

-    tokenContainer->DefineStringToken("{seriesposter3path}", (int)eScraperST::seriesposter3path);

-    tokenContainer->DefineStringToken("{seriesfanart1path}", (int)eScraperST::seriesfanart1path);

-    tokenContainer->DefineStringToken("{seriesfanart2path}", (int)eScraperST::seriesfanart2path);

-    tokenContainer->DefineStringToken("{seriesfanart3path}", (int)eScraperST::seriesfanart3path);

-    tokenContainer->DefineStringToken("{seriesbanner1path}", (int)eScraperST::seriesbanner1path);

-    tokenContainer->DefineStringToken("{seriesbanner2path}", (int)eScraperST::seriesbanner2path);

-    tokenContainer->DefineStringToken("{seriesbanner3path}", (int)eScraperST::seriesbanner3path);

-    tokenContainer->DefineIntToken("{ismovie}", (int)eScraperIT::ismovie);

-    tokenContainer->DefineIntToken("{moviebudget}", (int)eScraperIT::moviebudget);

-    tokenContainer->DefineIntToken("{movierevenue}", (int)eScraperIT::movierevenue);

-    tokenContainer->DefineIntToken("{movieadult}", (int)eScraperIT::movieadult);

-    tokenContainer->DefineIntToken("{movieruntime}", (int)eScraperIT::movieruntime);

-    tokenContainer->DefineIntToken("{isseries}", (int)eScraperIT::isseries);

-    tokenContainer->DefineIntToken("{posterwidth}", (int)eScraperIT::posterwidth);

-    tokenContainer->DefineIntToken("{posterheight}", (int)eScraperIT::posterheight);

-    tokenContainer->DefineIntToken("{fanartwidth}", (int)eScraperIT::fanartwidth);

-    tokenContainer->DefineIntToken("{fanartheight}", (int)eScraperIT::fanartheight);

-    tokenContainer->DefineIntToken("{movieiscollection}", (int)eScraperIT::movieiscollection);

-    tokenContainer->DefineIntToken("{collectionposterwidth}", (int)eScraperIT::collectionposterwidth);

-    tokenContainer->DefineIntToken("{collectionposterheight}", (int)eScraperIT::collectionposterheight);

-    tokenContainer->DefineIntToken("{collectionfanartwidth}", (int)eScraperIT::collectionfanartwidth);

-    tokenContainer->DefineIntToken("{collectionfanartheight}", (int)eScraperIT::collectionfanartheight);

-    tokenContainer->DefineIntToken("{epgpicavailable}", (int)eScraperIT::epgpicavailable);

-    tokenContainer->DefineIntToken("{episodenumber}", (int)eScraperIT::episodenumber);

-    tokenContainer->DefineIntToken("{episodeseason}", (int)eScraperIT::episodeseason);

-    tokenContainer->DefineIntToken("{episodeimagewidth}", (int)eScraperIT::episodeimagewidth);

-    tokenContainer->DefineIntToken("{episodeimageheight}", (int)eScraperIT::episodeimageheight);

-    tokenContainer->DefineIntToken("{seasonposterwidth}", (int)eScraperIT::seasonposterwidth);

-    tokenContainer->DefineIntToken("{seasonposterheight}", (int)eScraperIT::seasonposterheight);

-    tokenContainer->DefineIntToken("{seriesposter1width}", (int)eScraperIT::seriesposter1width);

-    tokenContainer->DefineIntToken("{seriesposter1height}", (int)eScraperIT::seriesposter1height);

-    tokenContainer->DefineIntToken("{seriesposter2width}", (int)eScraperIT::seriesposter2width);

-    tokenContainer->DefineIntToken("{seriesposter2height}", (int)eScraperIT::seriesposter2height);

-    tokenContainer->DefineIntToken("{seriesposter3width}", (int)eScraperIT::seriesposter3width);

-    tokenContainer->DefineIntToken("{seriesposter3height}", (int)eScraperIT::seriesposter3height);

-    tokenContainer->DefineIntToken("{seriesfanart1width}", (int)eScraperIT::seriesfanart1width);

-    tokenContainer->DefineIntToken("{seriesfanart1height}", (int)eScraperIT::seriesfanart1height);

-    tokenContainer->DefineIntToken("{seriesfanart2width}", (int)eScraperIT::seriesfanart2width);

-    tokenContainer->DefineIntToken("{seriesfanart2height}", (int)eScraperIT::seriesfanart2height);

-    tokenContainer->DefineIntToken("{seriesfanart3width}", (int)eScraperIT::seriesfanart3width);

-    tokenContainer->DefineIntToken("{seriesfanart3height}", (int)eScraperIT::seriesfanart3height);

-    tokenContainer->DefineIntToken("{seriesbanner1width}", (int)eScraperIT::seriesbanner1width);

-    tokenContainer->DefineIntToken("{seriesbanner1height}", (int)eScraperIT::seriesbanner1height);

-    tokenContainer->DefineIntToken("{seriesbanner2width}", (int)eScraperIT::seriesbanner2width);

-    tokenContainer->DefineIntToken("{seriesbanner2height}", (int)eScraperIT::seriesbanner2height);

-    tokenContainer->DefineIntToken("{seriesbanner3width}", (int)eScraperIT::seriesbanner3width);

-    tokenContainer->DefineIntToken("{seriesbanner3height}", (int)eScraperIT::seriesbanner3height);

-    tokenContainer->DefineLoopToken("{actors[name]}", (int)eScraperLT::name);

-    tokenContainer->DefineLoopToken("{actors[role]}", (int)eScraperLT::role);

-    tokenContainer->DefineLoopToken("{actors[thumb]}", (int)eScraperLT::thumb);

-    tokenContainer->DefineLoopToken("{actors[thumbwidth]}", (int)eScraperLT::thumbwidth);

-    tokenContainer->DefineLoopToken("{actors[thumbheight]}", (int)eScraperLT::thumbheight);

-    actorsIndex = tokenContainer->LoopIndex("actors");

-    InheritTokenContainer();

-}

-

-void cVeDrOnPause::Set(const char *recfilename) {

-    if (!recfilename)

-        return;

-    free(this->recfilename);

-    this->recfilename = strdup(recfilename);

-}

-

-bool cVeDrOnPause::Parse(bool force) {

-    if (!cViewElement::Parse(force))

-        return false;

-    if (!recfilename)

-        return false;

-    const cRecording *recording = new cRecording(recfilename);

-    if (!recording)

-        return false;

-    tokenContainer->Clear();

-    tokenContainer->AddStringToken((int)eDROnpauseST::name, recording->Name());

-    const cRecordingInfo *info = recording->Info();

-    if (info) {

-        tokenContainer->AddStringToken((int)eDROnpauseST::shorttext, info->ShortText());

-        tokenContainer->AddStringToken((int)eDROnpauseST::description, info->Description());

-        const cEvent *event = info->GetEvent();

-        if (event) {

-            string recDate = *(event->GetDateString());

-            string recTime = *(event->GetTimeString());

-            if (recDate.find("1970") != string::npos) {

-                time_t start = recording->Start();

-                recDate = *DateString(start);

-                recTime = *TimeString(start);

-            }

-            tokenContainer->AddStringToken((int)eDROnpauseST::date, recDate.c_str());

-            tokenContainer->AddStringToken((int)eDROnpauseST::time, recTime.c_str());

-            time_t startTime = event->StartTime();

-            struct tm * sStartTime = localtime(&startTime);

-            tokenContainer->AddIntToken((int)eDROnpauseIT::year, sStartTime->tm_year + 1900);

-            tokenContainer->AddIntToken((int)eDROnpauseIT::daynumeric, sStartTime->tm_mday);

-            tokenContainer->AddIntToken((int)eDROnpauseIT::month, sStartTime->tm_mon+1);

-            int duration = event->Duration() / 60;

-            int recDuration = recording->LengthInSeconds();

-            recDuration = (recDuration>0)?(recDuration / 60):0;

-            tokenContainer->AddIntToken((int)eDROnpauseIT::duration, recDuration);

-            tokenContainer->AddIntToken((int)eDROnpauseIT::durationhours, recDuration / 60);

-            tokenContainer->AddStringToken((int)eDROnpauseST::durationminutes, *cString::sprintf("%.2d", recDuration%60));

-            tokenContainer->AddIntToken((int)eDROnpauseIT::durationevent, duration);

-            tokenContainer->AddIntToken((int)eDROnpauseIT::durationeventhours, duration / 60);

-            tokenContainer->AddStringToken((int)eDROnpauseST::durationeventminutes, *cString::sprintf("%.2d", duration%60));

-        }

-    }

-    

-    vector<int> loopInfo;

-    bool scrapInfoAvailable = LoadFullScrapInfo(NULL, recording);

-    int numActors = NumActors();

-    loopInfo.push_back(numActors);

-    tokenContainer->CreateLoopTokenContainer(&loopInfo);

-    if (scrapInfoAvailable) {

-        SetFullScrapInfo(tokenContainer, actorsIndex);

-    }

-

-    SetDirty();

-    delete recording;

-    return true;

-}

-

-/******************************************************************

-* cVeDrScraperContent

-******************************************************************/

-cVeDrScraperContent::cVeDrScraperContent(void) {

-    recording = NULL;

-}

-

-cVeDrScraperContent::~cVeDrScraperContent(void) {

-}

-

-void cVeDrScraperContent::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineStringToken("{posterpath}", (int)eScraperPosterBannerST::posterpath);

-    tokenContainer->DefineStringToken("{bannerpath}", (int)eScraperPosterBannerST::bannerpath);

-    tokenContainer->DefineStringToken("{mediapath}", (int)eScraperPosterBannerST::mediapath);

-    tokenContainer->DefineIntToken("{posterwidth}", (int)eScraperPosterBannerIT::posterwidth);

-    tokenContainer->DefineIntToken("{posterheight}", (int)eScraperPosterBannerIT::posterheight);

-    tokenContainer->DefineIntToken("{hasPoster}", (int)eScraperPosterBannerIT::hasposter);

-    tokenContainer->DefineIntToken("{bannerwidth}", (int)eScraperPosterBannerIT::bannerwidth);

-    tokenContainer->DefineIntToken("{bannerheight}", (int)eScraperPosterBannerIT::bannerheight);

-    tokenContainer->DefineIntToken("{hasBanner}", (int)eScraperPosterBannerIT::hasbanner);

-    tokenContainer->DefineIntToken("{mediawidth}", (int)eScraperPosterBannerIT::mediawidth);

-    tokenContainer->DefineIntToken("{mediaheight}", (int)eScraperPosterBannerIT::mediaheight);

-    tokenContainer->DefineIntToken("{isbanner}", (int)eScraperPosterBannerIT::isbanner);

-    InheritTokenContainer();

-}

-

-void cVeDrScraperContent::Set(const cRecording *recording) {

-    this->recording = recording;

-}

-

-bool cVeDrScraperContent::Parse(bool force) {

-    if (!cViewElement::Parse(force))

-        return false;

-    if (!recording)

-        return false;

-    SetPosterBanner(tokenContainer, NULL, recording);

-    SetDirty();

-    return true;

-}

+#include "viewelementsdisplayreplay.h"
+#include "../config.h"
+#include "../extensions/helpers.h"
+#include "../services/scraper2vdr.h"
+
+/******************************************************************
+* cVeDrRecTitle
+******************************************************************/
+cVeDrRecTitle::cVeDrRecTitle(void) {
+    recording = NULL;
+    title = NULL;
+}
+
+cVeDrRecTitle::~cVeDrRecTitle(void) {
+    free(title);
+}
+
+void cVeDrRecTitle::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{rectitle}", (int)eDRRecTitleST::rectitle);
+    tokenContainer->DefineStringToken("{recsubtitle}", (int)eDRRecTitleST::recsubtitle);
+    tokenContainer->DefineStringToken("{recdate}", (int)eDRRecTitleST::recdate);
+    tokenContainer->DefineStringToken("{rectime}", (int)eDRRecTitleST::rectime);
+    InheritTokenContainer();
+}
+
+void cVeDrRecTitle::Set(const cRecording *recording) {
+    this->recording = recording;
+}
+
+void cVeDrRecTitle::Set(const char *title) {
+    if (!title)
+        return;
+    free(this->title);
+    this->title = strdup(title);
+}
+
+bool cVeDrRecTitle::Parse(bool force) {
+    if (!cViewElement::Parse(force))
+        return false;
+    if (!recording && !title)
+        return false;
+
+    tokenContainer->Clear();
+    if (recording) {
+        const char *recName = NULL;
+        const cRecordingInfo *recInfo = recording->Info();
+        if (recInfo)
+            recName = recInfo->Title();
+        if (!recName)
+            recName = recording->Name();
+        tokenContainer->AddStringToken((int)eDRRecTitleST::rectitle, recName);
+        tokenContainer->AddStringToken((int)eDRRecTitleST::recsubtitle, recInfo ? recInfo->ShortText() : "");
+        tokenContainer->AddStringToken((int)eDRRecTitleST::recdate, *ShortDateString(recording->Start()));
+        tokenContainer->AddStringToken((int)eDRRecTitleST::rectime, *TimeString(recording->Start()));        
+    } else if (title) {
+        tokenContainer->AddStringToken((int)eDRRecTitleST::rectitle, title);        
+    }
+
+    SetDirty();
+    return true;
+}
+
+/******************************************************************
+* cVeDrRecInfo
+******************************************************************/
+cVeDrRecInfo::cVeDrRecInfo(void) {
+    recording = NULL;
+}
+
+cVeDrRecInfo::~cVeDrRecInfo(void) {
+}
+
+void cVeDrRecInfo::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{resolution}", (int)eDRRecInfoST::resolution);
+    tokenContainer->DefineStringToken("{aspect}", (int)eDRRecInfoST::aspect);
+    tokenContainer->DefineIntToken("{screenwidth}", (int)eDRRecInfoIT::screenwidth);
+    tokenContainer->DefineIntToken("{screenheight}", (int)eDRRecInfoIT::screenheight);
+    tokenContainer->DefineIntToken("{isHD}", (int)eDRRecInfoIT::isHD);
+    tokenContainer->DefineIntToken("{isWideScreen}", (int)eDRRecInfoIT::isWideScreen);
+    InheritTokenContainer();
+}
+
+void cVeDrRecInfo::Set(const cRecording *recording) {
+    this->recording = recording;
+}
+
+bool cVeDrRecInfo::Parse(bool force) {
+    if (!cViewElement::Parse(force))
+        return false;
+    if (!recording)
+        return false;
+    
+    int screenWidth = 0;
+    int screenHeight = 0;
+    double aspect = 0;
+    cDevice::PrimaryDevice()->GetVideoSize(screenWidth, screenHeight, aspect);
+    bool isHD = false;
+    string resName = GetScreenResolutionString(screenWidth, screenHeight, &isHD);
+    bool isWideScreen = false;
+    string aspectName = GetScreenAspectString(aspect, &isWideScreen);
+
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eDRRecInfoIT::screenwidth, screenWidth);
+    tokenContainer->AddIntToken((int)eDRRecInfoIT::screenheight, screenHeight);
+    tokenContainer->AddIntToken((int)eDRRecInfoIT::isHD, isHD);
+    tokenContainer->AddIntToken((int)eDRRecInfoIT::isWideScreen, isWideScreen);
+    tokenContainer->AddStringToken((int)eDRRecInfoST::resolution, resName.c_str());
+    tokenContainer->AddStringToken((int)eDRRecInfoST::aspect, aspectName.c_str());
+
+    SetDirty();
+    return true;
+}
+
+/******************************************************************
+* cVeDrCurrentTime
+******************************************************************/
+cVeDrCurrentTime::cVeDrCurrentTime(void) {
+    changed = true;
+    current = NULL;
+}
+
+cVeDrCurrentTime::~cVeDrCurrentTime(void) {
+    free(current);
+}
+
+void cVeDrCurrentTime::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{reccurrent}", (int)eDRCurrentTimeST::reccurrent);
+    InheritTokenContainer();
+}
+
+void cVeDrCurrentTime::Set(const char *current) {
+    if (!current)
+        return;
+    free(this->current);
+    this->current = strdup(current);
+    changed = true;
+}
+
+bool cVeDrCurrentTime::Parse(bool force) {
+    if (!cViewElement::Parse(force) || !changed)
+        return false;
+    tokenContainer->Clear();
+    tokenContainer->AddStringToken((int)eDRCurrentTimeST::reccurrent, current);
+    SetDirty();
+    changed = false;
+    return true;
+}
+
+/******************************************************************
+* cVeDrTotalTime
+******************************************************************/
+cVeDrTotalTime::cVeDrTotalTime(void) {
+    changed = true;
+    total = NULL;
+    timeshiftActive = false;
+    timeshiftDuration = NULL;
+}
+
+cVeDrTotalTime::~cVeDrTotalTime(void) {
+    free(total);
+    free(timeshiftDuration);
+}
+
+void cVeDrTotalTime::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{rectotal}", (int)eDRTotalTimeST::rectotal);
+    tokenContainer->DefineStringToken("{timeshifttotal}", (int)eDRTotalTimeST::timeshifttotal);
+    tokenContainer->DefineIntToken("{timeshift}", (int)eDRTotalTimeIT::timeshift);
+    InheritTokenContainer();
+}
+
+void cVeDrTotalTime::Set(const char *total, bool timeshiftActive, const char *timeshiftDuration) {
+    if (!total)
+        return;
+    free(this->total);
+    this->total = strdup(total);
+    this->timeshiftActive = timeshiftActive;
+    free(this->timeshiftDuration);
+    this->timeshiftDuration = NULL;
+    if (timeshiftDuration)
+        this->timeshiftDuration = strdup(timeshiftDuration);
+    changed = true;
+}
+
+bool cVeDrTotalTime::Parse(bool force) {
+    if (!cViewElement::Parse(force) || !changed)
+        return false;
+    tokenContainer->Clear();
+    tokenContainer->AddStringToken((int)eDRTotalTimeST::rectotal, total);
+    tokenContainer->AddStringToken((int)eDRTotalTimeST::timeshifttotal, timeshiftDuration);
+    tokenContainer->AddIntToken((int)eDRTotalTimeIT::timeshift, timeshiftActive);
+    SetDirty();
+    changed = false;
+    return true;
+}
+
+/******************************************************************
+* cVeDrEndTime
+******************************************************************/
+cVeDrEndTime::cVeDrEndTime(void) {
+    end = "";
+}
+
+cVeDrEndTime::~cVeDrEndTime(void) {
+}
+
+void cVeDrEndTime::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{recend}", (int)eDREndTimeST::recend);
+    InheritTokenContainer();
+}
+
+void cVeDrEndTime::Set(cString end) {
+    if (strcmp(*this->end, *end)) {
+        this->end = end;
+        changed = true;
+    }
+}
+
+bool cVeDrEndTime::Parse(bool force) {
+    if (!cViewElement::Parse(force) || !changed)
+        return false;
+    tokenContainer->Clear();
+    tokenContainer->AddStringToken((int)eDREndTimeST::recend, *end);
+    SetDirty();
+    changed = false;
+    return true;
+}
+
+/******************************************************************
+* cVeDrProgressBar
+******************************************************************/
+cVeDrProgressBar::cVeDrProgressBar(void) {
+    current = -1;
+    total = -1;
+    timeshiftActive = false;
+    timeshiftTotal = -1;
+    changed = true;
+}
+
+cVeDrProgressBar::~cVeDrProgressBar(void) {
+}
+
+void cVeDrProgressBar::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineIntToken("{current}", (int)eDRProgressbarIT::current);
+    tokenContainer->DefineIntToken("{total}", (int)eDRProgressbarIT::total);
+    tokenContainer->DefineIntToken("{timeshift}", (int)eDRProgressbarIT::timeshift);
+    tokenContainer->DefineIntToken("{timeshifttotal}", (int)eDRProgressbarIT::timeshifttotal);
+    InheritTokenContainer();
+}
+
+void cVeDrProgressBar::Set(int current, int total, bool timeshiftActive, int timeshiftTotal) {
+    if (this->current == current)
+        return;
+    this->current = current;
+    this->total = total;
+    this->timeshiftActive = timeshiftActive;
+    this->timeshiftTotal = timeshiftTotal;
+    changed = true;
+}
+
+bool cVeDrProgressBar::Parse(bool force) {
+    if (!cViewElement::Parse(force) || !changed)
+        return false;
+
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eDRProgressbarIT::current, current);
+    tokenContainer->AddIntToken((int)eDRProgressbarIT::total, total);
+    tokenContainer->AddIntToken((int)eDRProgressbarIT::timeshift, timeshiftActive);
+    tokenContainer->AddIntToken((int)eDRProgressbarIT::timeshifttotal, timeshiftTotal);
+
+    SetDirty();
+    return true;
+}
+
+/******************************************************************
+* cVeDrCutMarks
+******************************************************************/
+cVeDrCutMarks::cVeDrCutMarks(void) {
+    cutmarksIndex = -1;
+    lastMarks = NULL;
+    Reset();
+}
+
+cVeDrCutMarks::~cVeDrCutMarks(void) {
+    delete[] lastMarks;
+}
+
+void cVeDrCutMarks::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineIntToken("{timeshift}", (int)eDRCutmarksIT::timeshift);
+    tokenContainer->DefineLoopToken("{marks[position]}", (int)eDRCutmarksLT::position);
+    tokenContainer->DefineLoopToken("{marks[endposition]}", (int)eDRCutmarksLT::endposition);
+    tokenContainer->DefineLoopToken("{marks[total]}", (int)eDRCutmarksLT::total);
+    tokenContainer->DefineLoopToken("{marks[timeshifttotal]}", (int)eDRCutmarksLT::timeshifttotal);
+    tokenContainer->DefineLoopToken("{marks[active]}", (int)eDRCutmarksLT::active);
+    tokenContainer->DefineLoopToken("{marks[startmark]}", (int)eDRCutmarksLT::startmark);
+    cutmarksIndex = tokenContainer->LoopIndex("marks");
+    InheritTokenContainer();
+}
+
+void cVeDrCutMarks::Set(const cMarks *marks, int current, int total, bool timeshiftActive, int timeshiftTotal) {
+    this->marks = marks;
+    this->current = current;
+    this->total = total;
+    this->timeshiftActive = timeshiftActive;
+    this->timeshiftTotal = timeshiftTotal;
+}
+
+void cVeDrCutMarks::Reset(void) {
+    marks = NULL;
+    current = -1;
+    total = -1;
+    numMarksLast = 0;
+    delete[] lastMarks;
+    lastMarks = NULL;
+    markActive = -1;
+    timeshiftActive = false;
+    timeshiftTotal = -1;
+}
+
+bool cVeDrCutMarks::Parse(bool force) {
+    if (!cViewElement::Parse(force))
+        return false;
+    if (!marks || !MarksChanged()) {
+        return false;
+    }
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eDRCutmarksIT::timeshift, timeshiftActive);
+    int numMarks = marks->Count();
+    vector<int> cutmarksInfo;
+    cutmarksInfo.push_back(numMarks);
+    tokenContainer->CreateLoopTokenContainer(&cutmarksInfo);
+    cString tot = cString::sprintf("%d", total);
+    cString timeshifttot = cString::sprintf("%d",timeshiftTotal);
+    int i = 0;
+    bool isStartMark = true;
+    for (const cMark *m = marks->First(); m; m = marks->Next(m)) {
+        tokenContainer->AddLoopToken(cutmarksIndex, i, (int)eDRCutmarksLT::position, *cString::sprintf("%d", m->Position()));
+        tokenContainer->AddLoopToken(cutmarksIndex, i, (int)eDRCutmarksLT::total, *tot);
+        if (timeshiftActive) {
+            tokenContainer->AddLoopToken(cutmarksIndex, i, (int)eDRCutmarksLT::timeshifttotal, *timeshifttot);
+        }
+        tokenContainer->AddLoopToken(cutmarksIndex, i, (int)eDRCutmarksLT::startmark, isStartMark ? "1" : "0");
+        tokenContainer->AddLoopToken(cutmarksIndex, i, (int)eDRCutmarksLT::active, (m->Position() == current) ? "1" : "0");
+        const cMark *m2 = marks->Next(m);
+        if (m2) { 
+            tokenContainer->AddLoopToken(cutmarksIndex, i, (int)eDRCutmarksLT::endposition, *cString::sprintf("%d", m2->Position()));
+        } else {
+            tokenContainer->AddLoopToken(cutmarksIndex, i, (int)eDRCutmarksLT::endposition, *tot);
+        }
+        i++;
+        isStartMark = !isStartMark;
+    }
+    SetDirty();
+    return true;
+}
+
+bool cVeDrCutMarks::MarksChanged(void) {
+    bool redraw = false;
+    //if mark was active, we redraw always
+    if (markActive >= 0) {
+        markActive = -1;
+        redraw = true;
+    }
+    //check if current position in recording hits mark exactly
+    for (const cMark *m = marks->First(); m; m = marks->Next(m)) {
+        if (m->Position() == current) {
+            markActive = current;
+            redraw = true;
+            break;
+        }
+    }
+    if (redraw)
+        return true;
+    //if number of marks has changed, redraw
+    int numMarks = marks->Count();
+    if (numMarks != numMarksLast) {
+        RememberMarks();
+        return true;
+    }
+    if (!lastMarks)
+        return false;
+    //if position has changed, redraw
+    int i=0;
+    for (const cMark *m = marks->First(); m; m = marks->Next(m)) {
+        if (m->Position() != lastMarks[i]) {
+            RememberMarks();
+            return true;
+        }
+        i++;
+    }
+    return false;
+}
+
+void cVeDrCutMarks::RememberMarks(void) {
+    if (!marks)
+        return;
+    numMarksLast = marks->Count();
+    if (numMarksLast < 1)
+        return;
+    delete[] lastMarks;
+    lastMarks = new int[numMarksLast];
+    int i=0;
+    for (const cMark *m = marks->First(); m; m = marks->Next(m)) {
+        lastMarks[i] = m->Position();
+        i++;
+    }
+}
+
+/******************************************************************
+* cVeDrControlIcons
+******************************************************************/
+cVeDrControlIcons::cVeDrControlIcons(void) {
+    play = false;
+    forward = false;
+    speed = 0;
+    changed = true;
+}
+
+cVeDrControlIcons::~cVeDrControlIcons(void) {
+}
+
+void cVeDrControlIcons::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineIntToken("{play}", (int)eDRControlIconsIT::play);
+    tokenContainer->DefineIntToken("{pause}", (int)eDRControlIconsIT::pause);
+    tokenContainer->DefineIntToken("{forward}", (int)eDRControlIconsIT::forward);
+    tokenContainer->DefineIntToken("{forward1x}", (int)eDRControlIconsIT::forward1x);
+    tokenContainer->DefineIntToken("{forward2x}", (int)eDRControlIconsIT::forward2x);
+    tokenContainer->DefineIntToken("{forward3x}", (int)eDRControlIconsIT::forward3x);
+    tokenContainer->DefineIntToken("{rewind}", (int)eDRControlIconsIT::rewind);
+    tokenContainer->DefineIntToken("{rewind1x}", (int)eDRControlIconsIT::rewind1x);
+    tokenContainer->DefineIntToken("{rewind2x}", (int)eDRControlIconsIT::rewind2x);
+    tokenContainer->DefineIntToken("{rewind3x}", (int)eDRControlIconsIT::rewind3x);
+    InheritTokenContainer();
+}
+
+void cVeDrControlIcons::Set(bool play, bool forward, int speed) {
+    this->play = play;
+    this->forward = forward;
+    this->speed = speed;
+    changed = true;
+}
+
+bool cVeDrControlIcons::Parse(bool force) {
+    if (!cViewElement::Parse(force) || !changed)
+        return false;
+
+    bool isPlay = false;
+    bool isPause = false;
+    bool isFF = false;
+    bool isFF1x = false;
+    bool isFF2x = false;
+    bool isFF3x = false;
+    bool isRew = false;
+    bool isRew1x = false;
+    bool isRew2x = false;
+    bool isRew3x = false;
+
+    if (speed == -1) {
+        if (play) {
+            isPlay = true;
+        } else {
+            isPause = true;
+        }
+    } else if (forward) {
+        if (!play) {
+            isPause = true;
+        }
+        if (speed == 1) {
+            isFF1x = true;
+        } else if (speed == 2) {
+            isFF2x = true;
+        } else if (speed == 3) {
+            isFF3x = true;
+        } else {
+            isFF = true;
+        }
+    } else {
+        if (!play) {
+            isPause = true;
+        }
+        if (speed == 1) {
+            isRew1x = true;
+        } else if (speed == 2) {
+            isRew2x = true;
+        } else if (speed == 3) {
+            isRew3x = true;
+        } else {
+            isRew = true;
+        }
+    }
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eDRControlIconsIT::play, isPlay);
+    tokenContainer->AddIntToken((int)eDRControlIconsIT::pause, isPause);
+    tokenContainer->AddIntToken((int)eDRControlIconsIT::forward, isFF);
+    tokenContainer->AddIntToken((int)eDRControlIconsIT::forward1x, isFF1x);
+    tokenContainer->AddIntToken((int)eDRControlIconsIT::forward2x, isFF2x);
+    tokenContainer->AddIntToken((int)eDRControlIconsIT::forward3x, isFF3x);
+    tokenContainer->AddIntToken((int)eDRControlIconsIT::rewind, isRew);
+    tokenContainer->AddIntToken((int)eDRControlIconsIT::rewind1x, isRew1x);
+    tokenContainer->AddIntToken((int)eDRControlIconsIT::rewind2x, isRew2x);
+    tokenContainer->AddIntToken((int)eDRControlIconsIT::rewind3x, isRew3x);
+    SetDirty();
+    changed = false;
+    return true;
+}
+
+/******************************************************************
+* cVeDrProgressModeonly
+******************************************************************/
+cVeDrProgressModeonly::cVeDrProgressModeonly(void) {
+    fps = 0.0f;
+    current = 0;
+    total = 0;
+    changed = true;
+}
+
+cVeDrProgressModeonly::~cVeDrProgressModeonly(void) {
+}
+
+void cVeDrProgressModeonly::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineIntToken("{current}", (int)eDRProgressModeonlyIT::current);
+    tokenContainer->DefineIntToken("{total}", (int)eDRProgressModeonlyIT::total);
+    tokenContainer->DefineStringToken("{timecurrent}", (int)eDRProgressModeonlyST::timecurrent);
+    tokenContainer->DefineStringToken("{timetotal}", (int)eDRProgressModeonlyST::timetotal);
+    InheritTokenContainer();
+}
+
+void cVeDrProgressModeonly::Set(double fps, int current, int total) {
+    if (this->current == current)
+        return;
+    this->fps = fps;
+    this->current = current;
+    this->total = total;    
+    changed = true;
+}
+
+bool cVeDrProgressModeonly::Parse(bool force) {
+    if (!cViewElement::Parse(force) || !changed)
+        return false;
+
+    string cur = GetTimeString((double)current / fps);
+    string tot = GetTimeString((double)total / fps);
+
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eDRProgressModeonlyIT::current, current);
+    tokenContainer->AddIntToken((int)eDRProgressModeonlyIT::total, total);
+    tokenContainer->AddStringToken((int)eDRProgressModeonlyST::timecurrent, cur.c_str());
+    tokenContainer->AddStringToken((int)eDRProgressModeonlyST::timetotal, tot.c_str());
+
+    SetDirty();
+    changed = false;
+    return true;
+}
+
+/******************************************************************
+* cVeDrJump
+******************************************************************/
+cVeDrJump::cVeDrJump(void) {
+    jump = NULL;
+    changed = false;
+}
+
+cVeDrJump::~cVeDrJump(void) {
+    free(jump);
+}
+
+void cVeDrJump::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{jump}", (int)eDRJumpST::jump);
+    InheritTokenContainer();
+}
+
+void cVeDrJump::Set(const char *jump) {
+    if (!jump)
+        return;
+    free(this->jump);
+    this->jump = strdup(jump);
+    changed = true;
+}
+
+bool cVeDrJump::Parse(bool force) {
+    if (!cViewElement::Parse(force) || !changed)
+        return false;
+
+    tokenContainer->Clear();
+    tokenContainer->AddStringToken((int)eDRJumpST::jump, jump);
+    changed = false;
+    SetDirty();
+    return true;
+}
+
+/******************************************************************
+* cVeDrOnPause
+******************************************************************/
+cVeDrOnPause::cVeDrOnPause(void) {
+    actorsIndex = -1;
+    recfilename = NULL;
+}
+
+cVeDrOnPause::~cVeDrOnPause(void) {
+    free(recfilename);
+}
+
+void cVeDrOnPause::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{name}", (int)eDROnpauseST::name);
+    tokenContainer->DefineStringToken("{shorttext}", (int)eDROnpauseST::shorttext);
+    tokenContainer->DefineStringToken("{description}", (int)eDROnpauseST::description);
+    tokenContainer->DefineStringToken("{date}", (int)eDROnpauseST::date);
+    tokenContainer->DefineStringToken("{time}", (int)eDROnpauseST::time);
+    tokenContainer->DefineStringToken("{durationminutes}", (int)eDROnpauseST::durationminutes);
+    tokenContainer->DefineStringToken("{durationeventminutes}", (int)eDROnpauseST::durationeventminutes);
+    tokenContainer->DefineIntToken("{daynumeric}", (int)eDROnpauseIT::daynumeric);
+    tokenContainer->DefineIntToken("{month}", (int)eDROnpauseIT::month);
+    tokenContainer->DefineIntToken("{year}", (int)eDROnpauseIT::year);
+    tokenContainer->DefineIntToken("{duration}", (int)eDROnpauseIT::duration);
+    tokenContainer->DefineIntToken("{durationhours}", (int)eDROnpauseIT::durationhours);
+    tokenContainer->DefineIntToken("{durationevent}", (int)eDROnpauseIT::durationevent);
+    tokenContainer->DefineIntToken("{durationeventhours}", (int)eDROnpauseIT::durationeventhours);
+    tokenContainer->DefineStringToken("{movietitle}", (int)eScraperST::movietitle);
+    tokenContainer->DefineStringToken("{movieoriginalTitle}", (int)eScraperST::movieoriginalTitle);
+    tokenContainer->DefineStringToken("{movietagline}", (int)eScraperST::movietagline);
+    tokenContainer->DefineStringToken("{movieoverview}", (int)eScraperST::movieoverview);
+    tokenContainer->DefineStringToken("{moviegenres}", (int)eScraperST::moviegenres);
+    tokenContainer->DefineStringToken("{moviehomepage}", (int)eScraperST::moviehomepage);
+    tokenContainer->DefineStringToken("{moviereleasedate}", (int)eScraperST::moviereleasedate);
+    tokenContainer->DefineStringToken("{moviepopularity}", (int)eScraperST::moviepopularity);
+    tokenContainer->DefineStringToken("{movievoteaverage}", (int)eScraperST::movievoteaverage);
+    tokenContainer->DefineStringToken("{posterpath}", (int)eScraperST::posterpath);
+    tokenContainer->DefineStringToken("{fanartpath}", (int)eScraperST::fanartpath);
+    tokenContainer->DefineStringToken("{moviecollectionName}", (int)eScraperST::moviecollectionName);
+    tokenContainer->DefineStringToken("{collectionposterpath}", (int)eScraperST::collectionposterpath);
+    tokenContainer->DefineStringToken("{collectionfanartpath}", (int)eScraperST::collectionfanartpath);
+    tokenContainer->DefineStringToken("{seriesname}", (int)eScraperST::seriesname);
+    tokenContainer->DefineStringToken("{seriesoverview}", (int)eScraperST::seriesoverview);
+    tokenContainer->DefineStringToken("{seriesfirstaired}", (int)eScraperST::seriesfirstaired);
+    tokenContainer->DefineStringToken("{seriesnetwork}", (int)eScraperST::seriesnetwork);
+    tokenContainer->DefineStringToken("{seriesgenre}", (int)eScraperST::seriesgenre);
+    tokenContainer->DefineStringToken("{seriesrating}", (int)eScraperST::seriesrating);
+    tokenContainer->DefineStringToken("{seriesstatus}", (int)eScraperST::seriesstatus);
+    tokenContainer->DefineStringToken("{episodetitle}", (int)eScraperST::episodetitle);
+    tokenContainer->DefineStringToken("{episodefirstaired}", (int)eScraperST::episodefirstaired);
+    tokenContainer->DefineStringToken("{episodegueststars}", (int)eScraperST::episodegueststars);
+    tokenContainer->DefineStringToken("{episodeoverview}", (int)eScraperST::episodeoverview);
+    tokenContainer->DefineStringToken("{episoderating}", (int)eScraperST::episoderating);
+    tokenContainer->DefineStringToken("{episodeimagepath}", (int)eScraperST::episodeimagepath);
+    tokenContainer->DefineStringToken("{seasonposterpath}", (int)eScraperST::seasonposterpath);
+    tokenContainer->DefineStringToken("{seriesposter1path}", (int)eScraperST::seriesposter1path);
+    tokenContainer->DefineStringToken("{seriesposter2path}", (int)eScraperST::seriesposter2path);
+    tokenContainer->DefineStringToken("{seriesposter3path}", (int)eScraperST::seriesposter3path);
+    tokenContainer->DefineStringToken("{seriesfanart1path}", (int)eScraperST::seriesfanart1path);
+    tokenContainer->DefineStringToken("{seriesfanart2path}", (int)eScraperST::seriesfanart2path);
+    tokenContainer->DefineStringToken("{seriesfanart3path}", (int)eScraperST::seriesfanart3path);
+    tokenContainer->DefineStringToken("{seriesbanner1path}", (int)eScraperST::seriesbanner1path);
+    tokenContainer->DefineStringToken("{seriesbanner2path}", (int)eScraperST::seriesbanner2path);
+    tokenContainer->DefineStringToken("{seriesbanner3path}", (int)eScraperST::seriesbanner3path);
+    tokenContainer->DefineIntToken("{ismovie}", (int)eScraperIT::ismovie);
+    tokenContainer->DefineIntToken("{moviebudget}", (int)eScraperIT::moviebudget);
+    tokenContainer->DefineIntToken("{movierevenue}", (int)eScraperIT::movierevenue);
+    tokenContainer->DefineIntToken("{movieadult}", (int)eScraperIT::movieadult);
+    tokenContainer->DefineIntToken("{movieruntime}", (int)eScraperIT::movieruntime);
+    tokenContainer->DefineIntToken("{isseries}", (int)eScraperIT::isseries);
+    tokenContainer->DefineIntToken("{posterwidth}", (int)eScraperIT::posterwidth);
+    tokenContainer->DefineIntToken("{posterheight}", (int)eScraperIT::posterheight);
+    tokenContainer->DefineIntToken("{fanartwidth}", (int)eScraperIT::fanartwidth);
+    tokenContainer->DefineIntToken("{fanartheight}", (int)eScraperIT::fanartheight);
+    tokenContainer->DefineIntToken("{movieiscollection}", (int)eScraperIT::movieiscollection);
+    tokenContainer->DefineIntToken("{collectionposterwidth}", (int)eScraperIT::collectionposterwidth);
+    tokenContainer->DefineIntToken("{collectionposterheight}", (int)eScraperIT::collectionposterheight);
+    tokenContainer->DefineIntToken("{collectionfanartwidth}", (int)eScraperIT::collectionfanartwidth);
+    tokenContainer->DefineIntToken("{collectionfanartheight}", (int)eScraperIT::collectionfanartheight);
+    tokenContainer->DefineIntToken("{epgpicavailable}", (int)eScraperIT::epgpicavailable);
+    tokenContainer->DefineIntToken("{episodenumber}", (int)eScraperIT::episodenumber);
+    tokenContainer->DefineIntToken("{episodeseason}", (int)eScraperIT::episodeseason);
+    tokenContainer->DefineIntToken("{episodeimagewidth}", (int)eScraperIT::episodeimagewidth);
+    tokenContainer->DefineIntToken("{episodeimageheight}", (int)eScraperIT::episodeimageheight);
+    tokenContainer->DefineIntToken("{seasonposterwidth}", (int)eScraperIT::seasonposterwidth);
+    tokenContainer->DefineIntToken("{seasonposterheight}", (int)eScraperIT::seasonposterheight);
+    tokenContainer->DefineIntToken("{seriesposter1width}", (int)eScraperIT::seriesposter1width);
+    tokenContainer->DefineIntToken("{seriesposter1height}", (int)eScraperIT::seriesposter1height);
+    tokenContainer->DefineIntToken("{seriesposter2width}", (int)eScraperIT::seriesposter2width);
+    tokenContainer->DefineIntToken("{seriesposter2height}", (int)eScraperIT::seriesposter2height);
+    tokenContainer->DefineIntToken("{seriesposter3width}", (int)eScraperIT::seriesposter3width);
+    tokenContainer->DefineIntToken("{seriesposter3height}", (int)eScraperIT::seriesposter3height);
+    tokenContainer->DefineIntToken("{seriesfanart1width}", (int)eScraperIT::seriesfanart1width);
+    tokenContainer->DefineIntToken("{seriesfanart1height}", (int)eScraperIT::seriesfanart1height);
+    tokenContainer->DefineIntToken("{seriesfanart2width}", (int)eScraperIT::seriesfanart2width);
+    tokenContainer->DefineIntToken("{seriesfanart2height}", (int)eScraperIT::seriesfanart2height);
+    tokenContainer->DefineIntToken("{seriesfanart3width}", (int)eScraperIT::seriesfanart3width);
+    tokenContainer->DefineIntToken("{seriesfanart3height}", (int)eScraperIT::seriesfanart3height);
+    tokenContainer->DefineIntToken("{seriesbanner1width}", (int)eScraperIT::seriesbanner1width);
+    tokenContainer->DefineIntToken("{seriesbanner1height}", (int)eScraperIT::seriesbanner1height);
+    tokenContainer->DefineIntToken("{seriesbanner2width}", (int)eScraperIT::seriesbanner2width);
+    tokenContainer->DefineIntToken("{seriesbanner2height}", (int)eScraperIT::seriesbanner2height);
+    tokenContainer->DefineIntToken("{seriesbanner3width}", (int)eScraperIT::seriesbanner3width);
+    tokenContainer->DefineIntToken("{seriesbanner3height}", (int)eScraperIT::seriesbanner3height);
+    tokenContainer->DefineLoopToken("{actors[name]}", (int)eScraperLT::name);
+    tokenContainer->DefineLoopToken("{actors[role]}", (int)eScraperLT::role);
+    tokenContainer->DefineLoopToken("{actors[thumb]}", (int)eScraperLT::thumb);
+    tokenContainer->DefineLoopToken("{actors[thumbwidth]}", (int)eScraperLT::thumbwidth);
+    tokenContainer->DefineLoopToken("{actors[thumbheight]}", (int)eScraperLT::thumbheight);
+    actorsIndex = tokenContainer->LoopIndex("actors");
+    InheritTokenContainer();
+}
+
+void cVeDrOnPause::Set(const char *recfilename) {
+    if (!recfilename)
+        return;
+    free(this->recfilename);
+    this->recfilename = strdup(recfilename);
+}
+
+bool cVeDrOnPause::Parse(bool force) {
+    if (!cViewElement::Parse(force))
+        return false;
+    if (!recfilename)
+        return false;
+    const cRecording *recording = new cRecording(recfilename);
+    if (!recording)
+        return false;
+    tokenContainer->Clear();
+    tokenContainer->AddStringToken((int)eDROnpauseST::name, recording->Name());
+    const cRecordingInfo *info = recording->Info();
+    if (info) {
+        tokenContainer->AddStringToken((int)eDROnpauseST::shorttext, info->ShortText());
+        tokenContainer->AddStringToken((int)eDROnpauseST::description, info->Description());
+        const cEvent *event = info->GetEvent();
+        if (event) {
+            string recDate = *(event->GetDateString());
+            string recTime = *(event->GetTimeString());
+            if (recDate.find("1970") != string::npos) {
+                time_t start = recording->Start();
+                recDate = *DateString(start);
+                recTime = *TimeString(start);
+            }
+            tokenContainer->AddStringToken((int)eDROnpauseST::date, recDate.c_str());
+            tokenContainer->AddStringToken((int)eDROnpauseST::time, recTime.c_str());
+            time_t startTime = event->StartTime();
+            struct tm * sStartTime = localtime(&startTime);
+            tokenContainer->AddIntToken((int)eDROnpauseIT::year, sStartTime->tm_year + 1900);
+            tokenContainer->AddIntToken((int)eDROnpauseIT::daynumeric, sStartTime->tm_mday);
+            tokenContainer->AddIntToken((int)eDROnpauseIT::month, sStartTime->tm_mon+1);
+            int duration = event->Duration() / 60;
+            int recDuration = recording->LengthInSeconds();
+            recDuration = (recDuration>0)?(recDuration / 60):0;
+            tokenContainer->AddIntToken((int)eDROnpauseIT::duration, recDuration);
+            tokenContainer->AddIntToken((int)eDROnpauseIT::durationhours, recDuration / 60);
+            tokenContainer->AddStringToken((int)eDROnpauseST::durationminutes, *cString::sprintf("%.2d", recDuration%60));
+            tokenContainer->AddIntToken((int)eDROnpauseIT::durationevent, duration);
+            tokenContainer->AddIntToken((int)eDROnpauseIT::durationeventhours, duration / 60);
+            tokenContainer->AddStringToken((int)eDROnpauseST::durationeventminutes, *cString::sprintf("%.2d", duration%60));
+        }
+    }
+    
+    vector<int> loopInfo;
+    bool scrapInfoAvailable = LoadFullScrapInfo(NULL, recording);
+    int numActors = NumActors();
+    loopInfo.push_back(numActors);
+    tokenContainer->CreateLoopTokenContainer(&loopInfo);
+    if (scrapInfoAvailable) {
+        SetFullScrapInfo(tokenContainer, actorsIndex);
+    }
+
+    SetDirty();
+    delete recording;
+    return true;
+}
+
+/******************************************************************
+* cVeDrScraperContent
+******************************************************************/
+cVeDrScraperContent::cVeDrScraperContent(void) {
+    recording = NULL;
+}
+
+cVeDrScraperContent::~cVeDrScraperContent(void) {
+}
+
+void cVeDrScraperContent::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineStringToken("{posterpath}", (int)eScraperPosterBannerST::posterpath);
+    tokenContainer->DefineStringToken("{bannerpath}", (int)eScraperPosterBannerST::bannerpath);
+    tokenContainer->DefineStringToken("{mediapath}", (int)eScraperPosterBannerST::mediapath);
+    tokenContainer->DefineIntToken("{posterwidth}", (int)eScraperPosterBannerIT::posterwidth);
+    tokenContainer->DefineIntToken("{posterheight}", (int)eScraperPosterBannerIT::posterheight);
+    tokenContainer->DefineIntToken("{hasPoster}", (int)eScraperPosterBannerIT::hasposter);
+    tokenContainer->DefineIntToken("{bannerwidth}", (int)eScraperPosterBannerIT::bannerwidth);
+    tokenContainer->DefineIntToken("{bannerheight}", (int)eScraperPosterBannerIT::bannerheight);
+    tokenContainer->DefineIntToken("{hasBanner}", (int)eScraperPosterBannerIT::hasbanner);
+    tokenContainer->DefineIntToken("{mediawidth}", (int)eScraperPosterBannerIT::mediawidth);
+    tokenContainer->DefineIntToken("{mediaheight}", (int)eScraperPosterBannerIT::mediaheight);
+    tokenContainer->DefineIntToken("{isbanner}", (int)eScraperPosterBannerIT::isbanner);
+    InheritTokenContainer();
+}
+
+void cVeDrScraperContent::Set(const cRecording *recording) {
+    this->recording = recording;
+}
+
+bool cVeDrScraperContent::Parse(bool force) {
+    if (!cViewElement::Parse(force))
+        return false;
+    if (!recording)
+        return false;
+    SetPosterBanner(tokenContainer, NULL, recording);
+    SetDirty();
+    return true;
+}
diff --git a/coreengine/viewelementsdisplayreplay.h b/coreengine/viewelementsdisplayreplay.h
index fc25655..1543fe6 100644
--- a/coreengine/viewelementsdisplayreplay.h
+++ b/coreengine/viewelementsdisplayreplay.h
@@ -1,206 +1,206 @@
-#ifndef __VIEWELEMENTSDR_H

-#define __VIEWELEMENTSDR_H

-

-#include "viewelement.h"

-#include "../extensions/scrapmanager.h"

-

-/******************************************************************

-* cVeDrRecTitle

-******************************************************************/

-class cVeDrRecTitle : public cViewElement {

-private:

-    const cRecording *recording;

-    char *title;

-public:

-    cVeDrRecTitle(void);

-    virtual ~cVeDrRecTitle(void);

-    void SetTokenContainer(void);

-    void Set(const cRecording *recording);

-    void Set(const char *title);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDrRecInfo

-******************************************************************/

-class cVeDrRecInfo : public cViewElement {

-private:

-    const cRecording *recording;

-public:

-    cVeDrRecInfo(void);

-    virtual ~cVeDrRecInfo(void);

-    void SetTokenContainer(void);

-    void Set(const cRecording *recording);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDrCurrentTime

-******************************************************************/

-class cVeDrCurrentTime : public cViewElement {

-private:

-    bool changed;

-    char *current;

-public:

-    cVeDrCurrentTime(void);

-    virtual ~cVeDrCurrentTime(void);

-    void SetTokenContainer(void);

-    void Set(const char *current);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDrTotalTime

-******************************************************************/

-class cVeDrTotalTime : public cViewElement {

-private:

-    bool changed;

-    char *total;

-    bool timeshiftActive;

-    char *timeshiftDuration;

-public:

-    cVeDrTotalTime(void);

-    virtual ~cVeDrTotalTime(void);

-    void SetTokenContainer(void);

-    void Set(const char *total, bool timeshiftActive, const char *timeshiftDuration);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDrEndTime

-******************************************************************/

-class cVeDrEndTime : public cViewElement {

-private:

-    cString end;

-    bool changed;

-public:

-    cVeDrEndTime(void);

-    virtual ~cVeDrEndTime(void);

-    void SetTokenContainer(void);

-    void Set(cString end);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDrProgressBar

-******************************************************************/

-class cVeDrProgressBar : public cViewElement {

-private:

-    int current;

-    int total;

-    bool timeshiftActive;

-    int timeshiftTotal;

-    bool changed;

-public:

-    cVeDrProgressBar(void);

-    virtual ~cVeDrProgressBar(void);

-    void SetTokenContainer(void);

-    void Set(int current, int total, bool timeshiftActive, int timeshiftTotal);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDrCutMarks

-******************************************************************/

-class cVeDrCutMarks : public cViewElement {

-private:

-    int cutmarksIndex;

-    const cMarks *marks;

-    int current;

-    int total;

-    bool timeshiftActive;

-    int timeshiftTotal;

-    int numMarksLast;

-    int *lastMarks;

-    int markActive;

-    bool MarksChanged(void);

-    void RememberMarks(void);

-public:

-    cVeDrCutMarks(void);

-    virtual ~cVeDrCutMarks(void);

-    void SetTokenContainer(void);

-    void Set(const cMarks *marks, int current, int total, bool timeshiftActive, int timeshiftTotal);

-    void Reset(void);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDrControlIcons

-******************************************************************/

-class cVeDrControlIcons : public cViewElement {

-private:

-    bool play;

-    bool forward;

-    int speed;

-    bool changed;

-public:

-    cVeDrControlIcons(void);

-    virtual ~cVeDrControlIcons(void);

-    void SetTokenContainer(void);

-    void Set(bool play, bool forward, int speed);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDrProgressModeonly

-******************************************************************/

-class cVeDrProgressModeonly : public cViewElement {

-private:

-    double fps;

-    int current;

-    int total;

-    bool changed;

-public:

-    cVeDrProgressModeonly(void);

-    virtual ~cVeDrProgressModeonly(void);

-    void SetTokenContainer(void);

-    void Set(double fps, int current, int total);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDrJump

-******************************************************************/

-class cVeDrJump : public cViewElement {

-private:

-    char *jump;

-    bool changed;

-public:

-    cVeDrJump(void);

-    virtual ~cVeDrJump(void);

-    void SetTokenContainer(void);

-    void Set(const char *jump);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDrOnPause

-******************************************************************/

-class cVeDrOnPause : public cViewElement, public cScrapManager {

-private:

-    int actorsIndex;

-    char *recfilename;

-public:

-    cVeDrOnPause(void);

-    virtual ~cVeDrOnPause(void);

-    int Delay(void) { return attribs->Delay() * 1000; };

-    void SetTokenContainer(void);

-    void Set(const char *recfilename);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDrScraperContent

-******************************************************************/

-class cVeDrScraperContent : public cViewElement, public cScrapManager {

-private:

-    const cRecording *recording;

-public:

-    cVeDrScraperContent(void);

-    virtual ~cVeDrScraperContent(void);

-    void SetTokenContainer(void);

-    void Set(const cRecording *recording);

-    bool Parse(bool forced = false);

-};

-

+#ifndef __VIEWELEMENTSDR_H
+#define __VIEWELEMENTSDR_H
+
+#include "viewelement.h"
+#include "../extensions/scrapmanager.h"
+
+/******************************************************************
+* cVeDrRecTitle
+******************************************************************/
+class cVeDrRecTitle : public cViewElement {
+private:
+    const cRecording *recording;
+    char *title;
+public:
+    cVeDrRecTitle(void);
+    virtual ~cVeDrRecTitle(void);
+    void SetTokenContainer(void);
+    void Set(const cRecording *recording);
+    void Set(const char *title);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDrRecInfo
+******************************************************************/
+class cVeDrRecInfo : public cViewElement {
+private:
+    const cRecording *recording;
+public:
+    cVeDrRecInfo(void);
+    virtual ~cVeDrRecInfo(void);
+    void SetTokenContainer(void);
+    void Set(const cRecording *recording);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDrCurrentTime
+******************************************************************/
+class cVeDrCurrentTime : public cViewElement {
+private:
+    bool changed;
+    char *current;
+public:
+    cVeDrCurrentTime(void);
+    virtual ~cVeDrCurrentTime(void);
+    void SetTokenContainer(void);
+    void Set(const char *current);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDrTotalTime
+******************************************************************/
+class cVeDrTotalTime : public cViewElement {
+private:
+    bool changed;
+    char *total;
+    bool timeshiftActive;
+    char *timeshiftDuration;
+public:
+    cVeDrTotalTime(void);
+    virtual ~cVeDrTotalTime(void);
+    void SetTokenContainer(void);
+    void Set(const char *total, bool timeshiftActive, const char *timeshiftDuration);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDrEndTime
+******************************************************************/
+class cVeDrEndTime : public cViewElement {
+private:
+    cString end;
+    bool changed;
+public:
+    cVeDrEndTime(void);
+    virtual ~cVeDrEndTime(void);
+    void SetTokenContainer(void);
+    void Set(cString end);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDrProgressBar
+******************************************************************/
+class cVeDrProgressBar : public cViewElement {
+private:
+    int current;
+    int total;
+    bool timeshiftActive;
+    int timeshiftTotal;
+    bool changed;
+public:
+    cVeDrProgressBar(void);
+    virtual ~cVeDrProgressBar(void);
+    void SetTokenContainer(void);
+    void Set(int current, int total, bool timeshiftActive, int timeshiftTotal);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDrCutMarks
+******************************************************************/
+class cVeDrCutMarks : public cViewElement {
+private:
+    int cutmarksIndex;
+    const cMarks *marks;
+    int current;
+    int total;
+    bool timeshiftActive;
+    int timeshiftTotal;
+    int numMarksLast;
+    int *lastMarks;
+    int markActive;
+    bool MarksChanged(void);
+    void RememberMarks(void);
+public:
+    cVeDrCutMarks(void);
+    virtual ~cVeDrCutMarks(void);
+    void SetTokenContainer(void);
+    void Set(const cMarks *marks, int current, int total, bool timeshiftActive, int timeshiftTotal);
+    void Reset(void);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDrControlIcons
+******************************************************************/
+class cVeDrControlIcons : public cViewElement {
+private:
+    bool play;
+    bool forward;
+    int speed;
+    bool changed;
+public:
+    cVeDrControlIcons(void);
+    virtual ~cVeDrControlIcons(void);
+    void SetTokenContainer(void);
+    void Set(bool play, bool forward, int speed);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDrProgressModeonly
+******************************************************************/
+class cVeDrProgressModeonly : public cViewElement {
+private:
+    double fps;
+    int current;
+    int total;
+    bool changed;
+public:
+    cVeDrProgressModeonly(void);
+    virtual ~cVeDrProgressModeonly(void);
+    void SetTokenContainer(void);
+    void Set(double fps, int current, int total);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDrJump
+******************************************************************/
+class cVeDrJump : public cViewElement {
+private:
+    char *jump;
+    bool changed;
+public:
+    cVeDrJump(void);
+    virtual ~cVeDrJump(void);
+    void SetTokenContainer(void);
+    void Set(const char *jump);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDrOnPause
+******************************************************************/
+class cVeDrOnPause : public cViewElement, public cScrapManager {
+private:
+    int actorsIndex;
+    char *recfilename;
+public:
+    cVeDrOnPause(void);
+    virtual ~cVeDrOnPause(void);
+    int Delay(void) { return attribs->Delay() * 1000; };
+    void SetTokenContainer(void);
+    void Set(const char *recfilename);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDrScraperContent
+******************************************************************/
+class cVeDrScraperContent : public cViewElement, public cScrapManager {
+private:
+    const cRecording *recording;
+public:
+    cVeDrScraperContent(void);
+    virtual ~cVeDrScraperContent(void);
+    void SetTokenContainer(void);
+    void Set(const cRecording *recording);
+    bool Parse(bool forced = false);
+};
+
 #endif //__VIEWELEMENTSDR_H
\ No newline at end of file
diff --git a/coreengine/viewelementsdisplaytracks.c b/coreengine/viewelementsdisplaytracks.c
index d5ef124..bf5b218 100644
--- a/coreengine/viewelementsdisplaytracks.c
+++ b/coreengine/viewelementsdisplaytracks.c
@@ -1,84 +1,84 @@
-#include "viewelementsdisplaytracks.h"

-

-/******************************************************************

-* cVeDtBackground

-******************************************************************/

-cVeDtBackground::cVeDtBackground(void) {

-    numTracks = 0;

-}

-

-cVeDtBackground::~cVeDtBackground(void) {

-}

-

-void cVeDtBackground::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineIntToken("{numtracks}", (int)eDTBackgroundIT::numtracks);

-    InheritTokenContainer();

-}

-

-void cVeDtBackground::Set(int numTracks) {

-    this->numTracks = numTracks;

-}

-

-bool cVeDtBackground::Parse(bool forced) {

-    if (!cViewElement::Parse(forced))

-        return false;

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eDTBackgroundIT::numtracks, numTracks);

-    SetDirty();

-    return true;

-}

-

-/******************************************************************

-* cVeDtHeader

-******************************************************************/

-cVeDtHeader::cVeDtHeader(void) {

-    title = NULL;

-    audioChannel = 0;

-    numTracks = 0;

-    changed = true;

-}

-

-cVeDtHeader::~cVeDtHeader(void) {

-    free(title);

-}

-

-void cVeDtHeader::SetTokenContainer(void) {

-    tokenContainer = new skindesignerapi::cTokenContainer();

-    tokenContainer->DefineIntToken("{numtracks}", (int)eDTHeaderIT::numtracks);

-    tokenContainer->DefineIntToken("{isstereo}", (int)eDTHeaderIT::isstereo);

-    tokenContainer->DefineIntToken("{isac3}", (int)eDTHeaderIT::isac3);

-    tokenContainer->DefineStringToken("{title}", (int)eDTHeaderST::title);

-    InheritTokenContainer();

-}

-

-void cVeDtHeader::SetTitle(const char *title) {

-    if (!title)

-        return;

-    free(this->title);

-    this->title = strdup(title);

-    changed = true;

-}

-

-void cVeDtHeader::SetNumtracks(int numTracks) {    

-    this->numTracks = numTracks;

-    changed = true;

-}

-

-void cVeDtHeader::SetAudiochannel(int audioChannel) {

-    this->audioChannel = audioChannel;

-    changed = true;

-}

-

-bool cVeDtHeader::Parse(bool forced) {

-    if (!cViewElement::Parse(forced) || !changed)

-        return false;

-

-    tokenContainer->Clear();

-    tokenContainer->AddIntToken((int)eDTHeaderIT::numtracks, numTracks);

-    tokenContainer->AddIntToken((int)eDTHeaderIT::isstereo, (audioChannel < 0) ? false : true);

-    tokenContainer->AddIntToken((int)eDTHeaderIT::isac3, (audioChannel < 0) ? true : false);

-    tokenContainer->AddStringToken((int)eDTHeaderST::title, title);

-    SetDirty();

-    return true;

+#include "viewelementsdisplaytracks.h"
+
+/******************************************************************
+* cVeDtBackground
+******************************************************************/
+cVeDtBackground::cVeDtBackground(void) {
+    numTracks = 0;
+}
+
+cVeDtBackground::~cVeDtBackground(void) {
+}
+
+void cVeDtBackground::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineIntToken("{numtracks}", (int)eDTBackgroundIT::numtracks);
+    InheritTokenContainer();
+}
+
+void cVeDtBackground::Set(int numTracks) {
+    this->numTracks = numTracks;
+}
+
+bool cVeDtBackground::Parse(bool forced) {
+    if (!cViewElement::Parse(forced))
+        return false;
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eDTBackgroundIT::numtracks, numTracks);
+    SetDirty();
+    return true;
+}
+
+/******************************************************************
+* cVeDtHeader
+******************************************************************/
+cVeDtHeader::cVeDtHeader(void) {
+    title = NULL;
+    audioChannel = 0;
+    numTracks = 0;
+    changed = true;
+}
+
+cVeDtHeader::~cVeDtHeader(void) {
+    free(title);
+}
+
+void cVeDtHeader::SetTokenContainer(void) {
+    tokenContainer = new skindesignerapi::cTokenContainer();
+    tokenContainer->DefineIntToken("{numtracks}", (int)eDTHeaderIT::numtracks);
+    tokenContainer->DefineIntToken("{isstereo}", (int)eDTHeaderIT::isstereo);
+    tokenContainer->DefineIntToken("{isac3}", (int)eDTHeaderIT::isac3);
+    tokenContainer->DefineStringToken("{title}", (int)eDTHeaderST::title);
+    InheritTokenContainer();
+}
+
+void cVeDtHeader::SetTitle(const char *title) {
+    if (!title)
+        return;
+    free(this->title);
+    this->title = strdup(title);
+    changed = true;
+}
+
+void cVeDtHeader::SetNumtracks(int numTracks) {    
+    this->numTracks = numTracks;
+    changed = true;
+}
+
+void cVeDtHeader::SetAudiochannel(int audioChannel) {
+    this->audioChannel = audioChannel;
+    changed = true;
+}
+
+bool cVeDtHeader::Parse(bool forced) {
+    if (!cViewElement::Parse(forced) || !changed)
+        return false;
+
+    tokenContainer->Clear();
+    tokenContainer->AddIntToken((int)eDTHeaderIT::numtracks, numTracks);
+    tokenContainer->AddIntToken((int)eDTHeaderIT::isstereo, (audioChannel < 0) ? false : true);
+    tokenContainer->AddIntToken((int)eDTHeaderIT::isac3, (audioChannel < 0) ? true : false);
+    tokenContainer->AddStringToken((int)eDTHeaderST::title, title);
+    SetDirty();
+    return true;
 }
\ No newline at end of file
diff --git a/coreengine/viewelementsdisplaytracks.h b/coreengine/viewelementsdisplaytracks.h
index 7529855..345b42c 100644
--- a/coreengine/viewelementsdisplaytracks.h
+++ b/coreengine/viewelementsdisplaytracks.h
@@ -1,40 +1,40 @@
-#ifndef __VIEWELEMENTSDT_H

-#define __VIEWELEMENTSDT_H

-

-#include <vdr/menu.h>

-#include "viewelement.h"

-

-/******************************************************************

-* cVeDtBackground

-******************************************************************/

-class cVeDtBackground : public cViewElement {

-private:

-    int numTracks;

-public:

-    cVeDtBackground(void);

-    virtual ~cVeDtBackground(void);

-    void SetTokenContainer(void);

-    void Set(int numTracks);

-    bool Parse(bool forced = false);

-};

-

-/******************************************************************

-* cVeDtHeader

-******************************************************************/

-class cVeDtHeader : public cViewElement {

-private:

-    char *title;

-    int audioChannel;

-    int numTracks;

-    bool changed;

-public:

-    cVeDtHeader(void);

-    virtual ~cVeDtHeader(void);

-    void SetTokenContainer(void);

-    void SetTitle(const char *title);

-    void SetNumtracks(int numTracks);

-    void SetAudiochannel(int audioChannel);

-    bool Parse(bool forced = false);

-};

-

+#ifndef __VIEWELEMENTSDT_H
+#define __VIEWELEMENTSDT_H
+
+#include <vdr/menu.h>
+#include "viewelement.h"
+
+/******************************************************************
+* cVeDtBackground
+******************************************************************/
+class cVeDtBackground : public cViewElement {
+private:
+    int numTracks;
+public:
+    cVeDtBackground(void);
+    virtual ~cVeDtBackground(void);
+    void SetTokenContainer(void);
+    void Set(int numTracks);
+    bool Parse(bool forced = false);
+};
+
+/******************************************************************
+* cVeDtHeader
+******************************************************************/
+class cVeDtHeader : public cViewElement {
+private:
+    char *title;
+    int audioChannel;
+    int numTracks;
+    bool changed;
+public:
+    cVeDtHeader(void);
+    virtual ~cVeDtHeader(void);
+    void SetTokenContainer(void);
+    void SetTitle(const char *title);
+    void SetNumtracks(int numTracks);
+    void SetAudiochannel(int audioChannel);
+    bool Parse(bool forced = false);
+};
+
 #endif //__VIEWELEMENTSDT_H
\ No newline at end of file
diff --git a/coreengine/viewgrid.c b/coreengine/viewgrid.c
index 6f28ef4..f19383a 100644
--- a/coreengine/viewgrid.c
+++ b/coreengine/viewgrid.c
@@ -1,188 +1,188 @@
-#include "viewgrid.h"

-#include "../extensions/helpers.h"

-

-cViewGrid::cViewGrid(void) {

-    id = -1;

-    plugId = -1;

-    viewId = -1;

-    globals = NULL;

-    attribs = new cViewElementAttribs((int)eViewElementAttribs::count);

-    gridTpl = NULL;

-    gridsize = GRIDSIZE;

-    grid = new cGridElement*[gridsize];

-    for (int i=0; i < gridsize; i++) {

-        grid[i] = NULL;

-    }

-    gridMin = 0;

-    gridMax = -1;

-}

-

-cViewGrid::~cViewGrid(void) {

-    delete attribs;

-    delete gridTpl;

-}

-

-void cViewGrid::SetGlobals(cGlobals *globals) {

-    this->globals = globals;

-}

-

-void cViewGrid::SetContainer(int x, int y, int width, int height) {

-    container.SetX(x);

-    container.SetY(y);

-    container.SetWidth(width);

-    container.SetHeight(height);

-}

-

-void cViewGrid::SetAttributes(vector<stringpair> &attributes) {

-    attribs->Set(attributes);

-}

-

-void cViewGrid::AddGridElement(cGridElement *gridElement) {

-    gridTpl = gridElement;

-}

-

-const char *cViewGrid::Name(void) {

-    return attribs->Name();

-}

-

-void cViewGrid::SetTokenContainer(void) {

-    if (!gridTpl)

-        return;

-    gridTpl->SetId(id);

-    gridTpl->SetPluginId(plugId);

-    gridTpl->SetViewId(viewId);

-    gridTpl->SetTokenContainer();

-}

-

-void cViewGrid::PreCache(void) {

-    attribs->SetContainer(container.X(), container.Y(), container.Width(), container.Height());

-    attribs->SetGlobals(globals);

-    attribs->Cache();

-    gridTpl->SetGlobals(globals);

-    gridTpl->SetContainer(attribs->X(), attribs->Y(), attribs->Width(), attribs->Height());

-    gridTpl->Cache();

-    

-}

-

-void cViewGrid::CheckSize(int id) {

-    if (id < gridsize)

-        return;

-    int newgridsize = gridsize + GRIDSIZE;

-    while (newgridsize < id)

-        newgridsize += gridsize;

-    cGridElement **gridNew = new cGridElement*[newgridsize];

-    int i=0;

-    bool foundFirst = false;

-    for (; i < gridsize; i++) {

-        if (!foundFirst && grid[i]) {

-            foundFirst = true;

-            gridMin = i;

-        }

-        gridNew[i] = grid[i];

-    }

-    gridsize = newgridsize;

-    for (; i < gridsize; i++) {

-        gridNew[i] = NULL;

-    }

-    delete[] grid;

-    grid = gridNew;

-}

-

-void cViewGrid::SetTokens(int gId, skindesignerapi::cTokenContainer *tk) {

-    if (!grid[gId]) {

-        return;

-    }

-    grid[gId]->Set(tk);

-}

-

-void cViewGrid::PositionGrid(int gId, double x, double y, double width, double height) {

-    int gridX = attribs->X() + x * attribs->Width();

-    int gridY = attribs->Y() + y * attribs->Height();

-    int gridWidth = width * attribs->Width();

-    int gridHeight = height * attribs->Height();

-    if (!grid[gId]) {

-        if (gId >= gridMax)

-            gridMax = gId+1;

-        grid[gId] = CreateGrid(gridX, gridY, gridWidth, gridHeight);

-    } else {

-        if (grid[gId]->Width() == gridWidth && grid[gId]->Height() == gridHeight) {

-            grid[gId]->SetPosition(gridX, gridY, gridWidth, gridHeight);

-        } else {

-            cGridElement *ge = CreateGrid(gridX, gridY, gridWidth, gridHeight);

-            ge->Set(grid[gId]->GetTokenContainer());

-            grid[gId]->Close();

-            delete grid[gId];

-            grid[gId] = ge;

-        }

-        grid[gId]->SetDirty();

-    }

-}

-

-void cViewGrid::SetCurrentGrid(int gId, bool current) {

-    if (gId >= 0 && grid[gId]) {

-        grid[gId]->SetCurrent(current);

-    }

-}

-

-void cViewGrid::DeleteGrid(int gId) {

-    if (!grid[gId])

-        return;

-    grid[gId]->Close();

-    delete grid[gId];

-    grid[gId] = NULL;

-}

-

-void cViewGrid::ClearGrids(void) {

-    for (int i = 0; i < gridsize; i++) {

-        if (!grid[i])

-            continue;

-        grid[i]->Close();

-        delete grid[i];

-        grid[i] = NULL;

-    }

-}

-

-void cViewGrid::Render(void) {

-    for (int i = gridMin; i < gridMax; i++) {

-        if (grid[i] && grid[i]->Parse()) {

-            grid[i]->Render();

-        }

-    }

-}

-

-cGridElement *cViewGrid::CreateGrid(int x, int y, int width, int height) {

-    cGridElement *ge = new cGridElement(*gridTpl);

-    ge->SetAreaX(x);

-    ge->SetAreaY(y);

-    ge->SetAreaWidth(width);

-    ge->SetAreaHeight(height);

-    return ge;

-}

-

-void cViewGrid::Close(void) {

-    ClearGrids();

-    gridsize = GRIDSIZE;

-    delete[] grid;

-    grid = new cGridElement*[gridsize];

-    for (int i=0; i < gridsize; i++) {

-        grid[i] = NULL;

-    }

-    gridMin = 0;

-    gridMax = -1;

-}

-

-void cViewGrid::Hide(void) {

-    for (int i = 0; i < gridsize; i++) {

-        if (grid[i]) {

-            grid[i]->Hide();

-        }

-    }

-}

-

-void cViewGrid::Show(void) {

-    for (int i = 0; i < gridsize; i++) {

-        if (grid[i]) {

-            grid[i]->Show();

-        }

-    }

-}

+#include "viewgrid.h"
+#include "../extensions/helpers.h"
+
+cViewGrid::cViewGrid(void) {
+    id = -1;
+    plugId = -1;
+    viewId = -1;
+    globals = NULL;
+    attribs = new cViewElementAttribs((int)eViewElementAttribs::count);
+    gridTpl = NULL;
+    gridsize = GRIDSIZE;
+    grid = new cGridElement*[gridsize];
+    for (int i=0; i < gridsize; i++) {
+        grid[i] = NULL;
+    }
+    gridMin = 0;
+    gridMax = -1;
+}
+
+cViewGrid::~cViewGrid(void) {
+    delete attribs;
+    delete gridTpl;
+}
+
+void cViewGrid::SetGlobals(cGlobals *globals) {
+    this->globals = globals;
+}
+
+void cViewGrid::SetContainer(int x, int y, int width, int height) {
+    container.SetX(x);
+    container.SetY(y);
+    container.SetWidth(width);
+    container.SetHeight(height);
+}
+
+void cViewGrid::SetAttributes(vector<stringpair> &attributes) {
+    attribs->Set(attributes);
+}
+
+void cViewGrid::AddGridElement(cGridElement *gridElement) {
+    gridTpl = gridElement;
+}
+
+const char *cViewGrid::Name(void) {
+    return attribs->Name();
+}
+
+void cViewGrid::SetTokenContainer(void) {
+    if (!gridTpl)
+        return;
+    gridTpl->SetId(id);
+    gridTpl->SetPluginId(plugId);
+    gridTpl->SetViewId(viewId);
+    gridTpl->SetTokenContainer();
+}
+
+void cViewGrid::PreCache(void) {
+    attribs->SetContainer(container.X(), container.Y(), container.Width(), container.Height());
+    attribs->SetGlobals(globals);
+    attribs->Cache();
+    gridTpl->SetGlobals(globals);
+    gridTpl->SetContainer(attribs->X(), attribs->Y(), attribs->Width(), attribs->Height());
+    gridTpl->Cache();
+    
+}
+
+void cViewGrid::CheckSize(int id) {
+    if (id < gridsize)
+        return;
+    int newgridsize = gridsize + GRIDSIZE;
+    while (newgridsize < id)
+        newgridsize += gridsize;
+    cGridElement **gridNew = new cGridElement*[newgridsize];
+    int i=0;
+    bool foundFirst = false;
+    for (; i < gridsize; i++) {
+        if (!foundFirst && grid[i]) {
+            foundFirst = true;
+            gridMin = i;
+        }
+        gridNew[i] = grid[i];
+    }
+    gridsize = newgridsize;
+    for (; i < gridsize; i++) {
+        gridNew[i] = NULL;
+    }
+    delete[] grid;
+    grid = gridNew;
+}
+
+void cViewGrid::SetTokens(int gId, skindesignerapi::cTokenContainer *tk) {
+    if (!grid[gId]) {
+        return;
+    }
+    grid[gId]->Set(tk);
+}
+
+void cViewGrid::PositionGrid(int gId, double x, double y, double width, double height) {
+    int gridX = attribs->X() + x * attribs->Width();
+    int gridY = attribs->Y() + y * attribs->Height();
+    int gridWidth = width * attribs->Width();
+    int gridHeight = height * attribs->Height();
+    if (!grid[gId]) {
+        if (gId >= gridMax)
+            gridMax = gId+1;
+        grid[gId] = CreateGrid(gridX, gridY, gridWidth, gridHeight);
+    } else {
+        if (grid[gId]->Width() == gridWidth && grid[gId]->Height() == gridHeight) {
+            grid[gId]->SetPosition(gridX, gridY, gridWidth, gridHeight);
+        } else {
+            cGridElement *ge = CreateGrid(gridX, gridY, gridWidth, gridHeight);
+            ge->Set(grid[gId]->GetTokenContainer());
+            grid[gId]->Close();
+            delete grid[gId];
+            grid[gId] = ge;
+        }
+        grid[gId]->SetDirty();
+    }
+}
+
+void cViewGrid::SetCurrentGrid(int gId, bool current) {
+    if (gId >= 0 && grid[gId]) {
+        grid[gId]->SetCurrent(current);
+    }
+}
+
+void cViewGrid::DeleteGrid(int gId) {
+    if (!grid[gId])
+        return;
+    grid[gId]->Close();
+    delete grid[gId];
+    grid[gId] = NULL;
+}
+
+void cViewGrid::ClearGrids(void) {
+    for (int i = 0; i < gridsize; i++) {
+        if (!grid[i])
+            continue;
+        grid[i]->Close();
+        delete grid[i];
+        grid[i] = NULL;
+    }
+}
+
+void cViewGrid::Render(void) {
+    for (int i = gridMin; i < gridMax; i++) {
+        if (grid[i] && grid[i]->Parse()) {
+            grid[i]->Render();
+        }
+    }
+}
+
+cGridElement *cViewGrid::CreateGrid(int x, int y, int width, int height) {
+    cGridElement *ge = new cGridElement(*gridTpl);
+    ge->SetAreaX(x);
+    ge->SetAreaY(y);
+    ge->SetAreaWidth(width);
+    ge->SetAreaHeight(height);
+    return ge;
+}
+
+void cViewGrid::Close(void) {
+    ClearGrids();
+    gridsize = GRIDSIZE;
+    delete[] grid;
+    grid = new cGridElement*[gridsize];
+    for (int i=0; i < gridsize; i++) {
+        grid[i] = NULL;
+    }
+    gridMin = 0;
+    gridMax = -1;
+}
+
+void cViewGrid::Hide(void) {
+    for (int i = 0; i < gridsize; i++) {
+        if (grid[i]) {
+            grid[i]->Hide();
+        }
+    }
+}
+
+void cViewGrid::Show(void) {
+    for (int i = 0; i < gridsize; i++) {
+        if (grid[i]) {
+            grid[i]->Show();
+        }
+    }
+}
diff --git a/coreengine/viewgrid.h b/coreengine/viewgrid.h
index 1bcbd74..646b138 100644
--- a/coreengine/viewgrid.h
+++ b/coreengine/viewgrid.h
@@ -1,47 +1,47 @@
-#ifndef __VIEWGRID_H

-#define __VIEWGRID_H

-

-#define GRIDSIZE 500

-

-#include "gridelement.h"

-

-class cViewGrid {

-protected:

-    cRect container;

-    cGlobals *globals;

-    cViewElementAttribs *attribs;

-    cGridElement *gridTpl;

-    int gridsize;

-    cGridElement **grid;

-    int gridMin;

-    int gridMax;

-    int id;

-    int viewId;

-    int plugId;

-    cGridElement *CreateGrid(int x, int y, int width, int height);

-public:

-    cViewGrid(void);

-    virtual ~cViewGrid(void);

-    void SetGlobals(cGlobals *globals);

-    void SetContainer(int x, int y, int width, int height);

-    void SetAttributes(vector<stringpair> &attributes);

-    void SetId(int id) { this->id = id; };

-    void SetPluginId(int plugId) { this->plugId = plugId; };

-    void SetViewId(int viewId) { this->viewId = viewId; };

-    void AddGridElement(cGridElement *gridElement);

-    const char *Name(void);

-    void SetTokenContainer(void);

-    void PreCache(void);

-    void CheckSize(int id);

-    void SetTokens(int gId, skindesignerapi::cTokenContainer *tk);

-    void PositionGrid(int gId, double x, double y, double width, double height);

-    void SetCurrentGrid(int gId, bool current);

-    void DeleteGrid(int gId);

-    void ClearGrids(void);

-    void Render(void);

-    void Close(void);

-    void Hide(void);

-    void Show(void);

-};

-

+#ifndef __VIEWGRID_H
+#define __VIEWGRID_H
+
+#define GRIDSIZE 500
+
+#include "gridelement.h"
+
+class cViewGrid {
+protected:
+    cRect container;
+    cGlobals *globals;
+    cViewElementAttribs *attribs;
+    cGridElement *gridTpl;
+    int gridsize;
+    cGridElement **grid;
+    int gridMin;
+    int gridMax;
+    int id;
+    int viewId;
+    int plugId;
+    cGridElement *CreateGrid(int x, int y, int width, int height);
+public:
+    cViewGrid(void);
+    virtual ~cViewGrid(void);
+    void SetGlobals(cGlobals *globals);
+    void SetContainer(int x, int y, int width, int height);
+    void SetAttributes(vector<stringpair> &attributes);
+    void SetId(int id) { this->id = id; };
+    void SetPluginId(int plugId) { this->plugId = plugId; };
+    void SetViewId(int viewId) { this->viewId = viewId; };
+    void AddGridElement(cGridElement *gridElement);
+    const char *Name(void);
+    void SetTokenContainer(void);
+    void PreCache(void);
+    void CheckSize(int id);
+    void SetTokens(int gId, skindesignerapi::cTokenContainer *tk);
+    void PositionGrid(int gId, double x, double y, double width, double height);
+    void SetCurrentGrid(int gId, bool current);
+    void DeleteGrid(int gId);
+    void ClearGrids(void);
+    void Render(void);
+    void Close(void);
+    void Hide(void);
+    void Show(void);
+};
+
 #endif //__VIEWGRID_H
\ No newline at end of file
diff --git a/coreengine/viewlist.h b/coreengine/viewlist.h
index aadb5ed..a979723 100644
--- a/coreengine/viewlist.h
+++ b/coreengine/viewlist.h
@@ -1,155 +1,155 @@
-#ifndef __VIEWLIST_H

-#define __VIEWLIST_H

-

-#include "globals.h"

-#include "../libskindesignerapi/tokencontainer.h"

-#include "listelements.h"

-#include "area.h"

-

-class cViewList {

-protected:

-    int plugId;

-    int plugMenuId;

-    cViewListAttribs *attribs;

-    cRect container;

-    cGlobals *globals;

-    int numElements;

-    eOrientation orientation;

-    cViewElement *listElement;

-    cViewElement *currentElement;

-    cListElement **listElements;

-    virtual void Prepare(int start, int step) {};

-public:

-    cViewList(void);

-    virtual ~cViewList(void);

-    void SetGlobals(cGlobals *globals);    

-    void SetContainer(int x, int y, int width, int height);

-    void SetAttributes(vector<stringpair> &attributes);

-    void SetPlugId(int id) { plugId = id; };

-    void SetPlugMenuId(int id) { plugMenuId = id; };

-    static cViewList *CreateViewList(const char *name);

-    static cViewElement *CreateListElement(const char *name);

-    static cViewElement *CreateCurrentElement(const char *name);

-    void AddListElement(cViewElement *listElement);

-    void AddCurrentElement(cViewElement *currentElement);

-    virtual void PreCache(void);

-    int NumItems(void);

-    eOrientation Orientation(void);

-    void Draw(eMenuCategory menuCat);

-    void Clear(void);

-    virtual void Close(void);

-    void SetTransparency(int transparency);

-    void Debug(void);

-};

-

-class cViewListDefault : public cViewList {

-private:

-    cLeMenuDefault **listDefault;

-    int avrgFontWidth;

-    const cFont *listFont;

-    int *colX;

-    int *colWidths;

-    const char *plugName;

-protected:

-    void Prepare(int start, int step);

-public:

-    cViewListDefault(void);

-    virtual ~cViewListDefault(void);

-    void SetTabs(int tab1, int tab2, int tab3, int tab4, int tab5);

-    void SetPlugin(const char *plugName) { this->plugName = plugName; };

-    void Set(const char *text, int index, bool current, bool selectable);

-    const cFont *GetListFont(void);

-    int GetListWidth(void);

-};

-

-class cViewListMain : public cViewList {

-private:

-    cLeMenuMain **listMain;

-    cCeMenuMain *currentMain;

-protected:

-    void Prepare(int start, int step);

-public:

-    cViewListMain(void);

-    virtual ~cViewListMain(void);

-    void Set(const char *text, int index, bool current, bool selectable);

-    const char *GetPlugin(void);

-};

-

-class cViewListSchedules : public cViewList {

-private:

-    cLeMenuSchedules **listSchedules;

-    cCeMenuSchedules *currentSchedules;

-    bool epgSearchFav;

-protected:

-    void Prepare(int start, int step);

-public:

-    cViewListSchedules(void);

-    virtual ~cViewListSchedules(void);

-    void IsEpgSearchFav(bool isFav) { epgSearchFav = isFav; };

-    void Set(const cEvent *event, int index, bool current, bool selectable, const cChannel *channel, bool withDate, eTimerMatch timerMatch);

-};

-

-class cViewListTimers : public cViewList {

-private:

-    cLeMenuTimers **listTimers;

-    cCeMenuTimers *currentTimer;

-protected:

-    void Prepare(int start, int step);

-public:

-    cViewListTimers(void);

-    virtual ~cViewListTimers(void);

-    void Set(const cTimer *timer, int index, bool current, bool selectable);

-};

-

-class cViewListChannels : public cViewList {

-private:

-    cLeMenuChannels **listChannels;

-    cCeMenuChannels *currentChannel;

-protected:

-    void Prepare(int start, int step);

-public:

-    cViewListChannels(void);

-    virtual ~cViewListChannels(void);

-    void Set(const cChannel *channel, int index, bool current, bool selectable, bool withProvider);

-};

-

-class cViewListRecordings : public cViewList {

-private:

-    cLeMenuRecordings **listRecordings;

-    cCeMenuRecordings *currentRecording;

-protected:

-    void Prepare(int start, int step);

-public:

-    cViewListRecordings(void);

-    virtual ~cViewListRecordings(void);

-    void Set(const cRecording *recording, int index, bool current, bool selectable, int level, int total, int New);

-};

-

-class cViewListPlugin : public cViewList {

-private:

-    cLeMenuPlugin **listPlugin;

-    cCeMenuPlugin *currentPlugin;

-protected:

-    void Prepare(int start, int step);

-public:

-    cViewListPlugin(void);

-    virtual ~cViewListPlugin(void);

-    void Set(skindesignerapi::cTokenContainer *tk, int index, bool current, bool selectable);

-};

-

-class cViewListAudioTracks : public cViewList {

-private:

-    skindesignerapi::cTokenContainer *tokenContainer;

-    int numTracks;

-    cLeAudioTracks **listAudioTracks;

-public:

-    cViewListAudioTracks(void);

-    virtual ~cViewListAudioTracks(void);

-    void Close(void);

-    void PreCache(void);

-    void SetNumtracks(int numTracks);

-    void SetTracks(const char * const *tracks);

-    void SetCurrentTrack(int index);

-    void Draw(void);

-};

+#ifndef __VIEWLIST_H
+#define __VIEWLIST_H
+
+#include "globals.h"
+#include "../libskindesignerapi/tokencontainer.h"
+#include "listelements.h"
+#include "area.h"
+
+class cViewList {
+protected:
+    int plugId;
+    int plugMenuId;
+    cViewListAttribs *attribs;
+    cRect container;
+    cGlobals *globals;
+    int numElements;
+    eOrientation orientation;
+    cViewElement *listElement;
+    cViewElement *currentElement;
+    cListElement **listElements;
+    virtual void Prepare(int start, int step) {};
+public:
+    cViewList(void);
+    virtual ~cViewList(void);
+    void SetGlobals(cGlobals *globals);    
+    void SetContainer(int x, int y, int width, int height);
+    void SetAttributes(vector<stringpair> &attributes);
+    void SetPlugId(int id) { plugId = id; };
+    void SetPlugMenuId(int id) { plugMenuId = id; };
+    static cViewList *CreateViewList(const char *name);
+    static cViewElement *CreateListElement(const char *name);
+    static cViewElement *CreateCurrentElement(const char *name);
+    void AddListElement(cViewElement *listElement);
+    void AddCurrentElement(cViewElement *currentElement);
+    virtual void PreCache(void);
+    int NumItems(void);
+    eOrientation Orientation(void);
+    void Draw(eMenuCategory menuCat);
+    void Clear(void);
+    virtual void Close(void);
+    void SetTransparency(int transparency);
+    void Debug(void);
+};
+
+class cViewListDefault : public cViewList {
+private:
+    cLeMenuDefault **listDefault;
+    int avrgFontWidth;
+    const cFont *listFont;
+    int *colX;
+    int *colWidths;
+    const char *plugName;
+protected:
+    void Prepare(int start, int step);
+public:
+    cViewListDefault(void);
+    virtual ~cViewListDefault(void);
+    void SetTabs(int tab1, int tab2, int tab3, int tab4, int tab5);
+    void SetPlugin(const char *plugName) { this->plugName = plugName; };
+    void Set(const char *text, int index, bool current, bool selectable);
+    const cFont *GetListFont(void);
+    int GetListWidth(void);
+};
+
+class cViewListMain : public cViewList {
+private:
+    cLeMenuMain **listMain;
+    cCeMenuMain *currentMain;
+protected:
+    void Prepare(int start, int step);
+public:
+    cViewListMain(void);
+    virtual ~cViewListMain(void);
+    void Set(const char *text, int index, bool current, bool selectable);
+    const char *GetPlugin(void);
+};
+
+class cViewListSchedules : public cViewList {
+private:
+    cLeMenuSchedules **listSchedules;
+    cCeMenuSchedules *currentSchedules;
+    bool epgSearchFav;
+protected:
+    void Prepare(int start, int step);
+public:
+    cViewListSchedules(void);
+    virtual ~cViewListSchedules(void);
+    void IsEpgSearchFav(bool isFav) { epgSearchFav = isFav; };
+    void Set(const cEvent *event, int index, bool current, bool selectable, const cChannel *channel, bool withDate, eTimerMatch timerMatch);
+};
+
+class cViewListTimers : public cViewList {
+private:
+    cLeMenuTimers **listTimers;
+    cCeMenuTimers *currentTimer;
+protected:
+    void Prepare(int start, int step);
+public:
+    cViewListTimers(void);
+    virtual ~cViewListTimers(void);
+    void Set(const cTimer *timer, int index, bool current, bool selectable);
+};
+
+class cViewListChannels : public cViewList {
+private:
+    cLeMenuChannels **listChannels;
+    cCeMenuChannels *currentChannel;
+protected:
+    void Prepare(int start, int step);
+public:
+    cViewListChannels(void);
+    virtual ~cViewListChannels(void);
+    void Set(const cChannel *channel, int index, bool current, bool selectable, bool withProvider);
+};
+
+class cViewListRecordings : public cViewList {
+private:
+    cLeMenuRecordings **listRecordings;
+    cCeMenuRecordings *currentRecording;
+protected:
+    void Prepare(int start, int step);
+public:
+    cViewListRecordings(void);
+    virtual ~cViewListRecordings(void);
+    void Set(const cRecording *recording, int index, bool current, bool selectable, int level, int total, int New);
+};
+
+class cViewListPlugin : public cViewList {
+private:
+    cLeMenuPlugin **listPlugin;
+    cCeMenuPlugin *currentPlugin;
+protected:
+    void Prepare(int start, int step);
+public:
+    cViewListPlugin(void);
+    virtual ~cViewListPlugin(void);
+    void Set(skindesignerapi::cTokenContainer *tk, int index, bool current, bool selectable);
+};
+
+class cViewListAudioTracks : public cViewList {
+private:
+    skindesignerapi::cTokenContainer *tokenContainer;
+    int numTracks;
+    cLeAudioTracks **listAudioTracks;
+public:
+    cViewListAudioTracks(void);
+    virtual ~cViewListAudioTracks(void);
+    void Close(void);
+    void PreCache(void);
+    void SetNumtracks(int numTracks);
+    void SetTracks(const char * const *tracks);
+    void SetCurrentTrack(int index);
+    void Draw(void);
+};
 #endif //__VIEWLIST_H
\ No newline at end of file