diff options
| author | louis <louis.braun@gmx.de> | 2014-11-02 10:58:00 +0100 |
|---|---|---|
| committer | louis <louis.braun@gmx.de> | 2014-11-02 10:58:00 +0100 |
| commit | e258e9d9a6e221bfc5782dca176316a64d33c6cb (patch) | |
| tree | 91b29a9c7c3e4f5ffe1bd04c378c9578fec0c882 | |
| parent | 53c1eefa016b1482e16f98c74e5663ac888653d0 (diff) | |
| download | vdr-plugin-skindesigner-e258e9d9a6e221bfc5782dca176316a64d33c6cb.tar.gz vdr-plugin-skindesigner-e258e9d9a6e221bfc5782dca176316a64d33c6cb.tar.bz2 | |
fixed bug that eventstart token was not cleared
| -rw-r--r-- | skins/nopacity/xmlfiles/displaymenutimers.xml | 6 | ||||
| -rw-r--r-- | views/displaymenuitemcurrentview.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/skins/nopacity/xmlfiles/displaymenutimers.xml b/skins/nopacity/xmlfiles/displaymenutimers.xml index 2536ce8..38274a3 100644 --- a/skins/nopacity/xmlfiles/displaymenutimers.xml +++ b/skins/nopacity/xmlfiles/displaymenutimers.xml @@ -80,7 +80,7 @@ <area x="32%" y="2%" width="67%" height="96%" layer="2"> <fill color="{clrTransBlack}" /> </area> - <area x="32%" y="2%" width="67%" height="96%" layer="2"> + <area condition="{flagactive}" x="32%" y="2%" width="67%" height="96%" layer="2"> <!-- title --> <drawtext name="title" align="center" y="0" font="{vdrOsd}" width="{areawidth}-20" fontsize="8%" color="{clrWhite}" text="{eventtitle} - {eventshorttext}" /> <!-- start and stop if event is not running --> @@ -91,6 +91,10 @@ <drawtextbox condition="{hasposter}" x="10" y="{posy(poster)}" width="99%" height="{areaheight} - {posy(poster)}" float="topright" floatwidth="{width(poster)} + 10" floatheight="{height(poster)} + 20" font="{vdrOsd}" fontsize="5%" color="{clrWhite}" text="{eventdescription}" /> <drawtextbox condition="not{hasposter}" x="10" y="{posy(poster)}" width="99%" height="{areaheight} - {posy(poster)}" font="{vdrOsd}" fontsize="5%" color="{clrWhite}" text="{eventdescription}" /> </area> + <area condition="not{flagactive}" x="32%" y="2%" width="67%" height="96%" layer="2"> + <drawtext x="10" y="0" font="{vdrOsd}" fontsize="8%" color="{clrWhite}" text="{channelname}" /> + <drawtext x="10" y="10%" font="{vdrOsd}" fontsize="6%" color="{clrWhite}" text="{timerstart} - {timerstop}" /> + </area> </currentelement> </menuitems> diff --git a/views/displaymenuitemcurrentview.c b/views/displaymenuitemcurrentview.c index ce9fb22..741c7d1 100644 --- a/views/displaymenuitemcurrentview.c +++ b/views/displaymenuitemcurrentview.c @@ -457,7 +457,7 @@ void cDisplayMenuItemCurrentTimerView::Render(void) { SetScraperPoster(event); } else { stringTokens.insert(pair<string,string>("eventtitle", "")); - stringTokens.insert(pair<string,string>("eventtitle", "")); + stringTokens.insert(pair<string,string>("eventstart", "")); stringTokens.insert(pair<string,string>("eventstop", "")); stringTokens.insert(pair<string,string>("eventshorttext", "")); stringTokens.insert(pair<string,string>("eventdescription", "")); |