summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Bieringer <pb@bieringer.de>2021-01-27 20:41:27 +0100
committerPeter Bieringer <pb@bieringer.de>2021-01-27 20:41:27 +0100
commit6751c4cd4ee3e81a6d0926d706dd42086ab85bbc (patch)
tree8ad30ef00cb7c36e4a737eb85e33f9b779cbc2dc
parent646fcad7d53c9622cfe3c9c8273f797f723a26f9 (diff)
parent4500b62b5c545035d50c64af4e1535c5567cce80 (diff)
downloadvdr-plugin-skindesigner-6751c4cd4ee3e81a6d0926d706dd42086ab85bbc.tar.gz
vdr-plugin-skindesigner-6751c4cd4ee3e81a6d0926d706dd42086ab85bbc.tar.bz2
Merge branch 'master' of gitlab.com:kamel5/skindesigner
-rw-r--r--HISTORY7
-rw-r--r--skindesigner.c2
-rw-r--r--skins/estuary4vdr/xmlfiles/displaymenudetailrecording.xml21
-rw-r--r--skins/estuary4vdr/xmlfiles/plug-tvguideng-recmenu.xml4
-rw-r--r--skins/estuary4vdr/xmlfiles/plug-tvguideng-root.xml326
5 files changed, 129 insertions, 231 deletions
diff --git a/HISTORY b/HISTORY
index 7acd942..d19b6a2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -465,7 +465,6 @@ Version 1.2.9
Version 1.2.10
- [pbiering] added tokens for recordings: isUHD, isRadio
- [pbiering] added token for channels: isUHD
-
-Version 1.2.11
-- expose to displaymenurecordings: recchannelname, recchannelid
-- retrieve ChannelName from 'info' and fallback via ChannelID from active channel list
+- [pbiering] expose to displaymenurecordings: recchannelname, recchannelid
+- [pbiering] retrieve ChannelName from 'info' and fallback via ChannelID from active channel list
+- [kamel5] Update skin estuary4vdr
diff --git a/skindesigner.c b/skindesigner.c
index 7714879..c3f3e66 100644
--- a/skindesigner.c
+++ b/skindesigner.c
@@ -21,7 +21,7 @@
#endif
-static const char *VERSION = "1.2.11";
+static const char *VERSION = "1.2.10";
static const char *DESCRIPTION = trNOOP("Skin Designer");
class cPluginSkinDesigner : public cPlugin, public skindesignerapi::SkindesignerAPI {
diff --git a/skins/estuary4vdr/xmlfiles/displaymenudetailrecording.xml b/skins/estuary4vdr/xmlfiles/displaymenudetailrecording.xml
index 56fb858..4f88562 100644
--- a/skins/estuary4vdr/xmlfiles/displaymenudetailrecording.xml
+++ b/skins/estuary4vdr/xmlfiles/displaymenudetailrecording.xml
@@ -1,4 +1,5 @@
<menudetailedrecording x="0" y="0" width="100%" height="100%" fadetime="0">
+
<background>
<area x="0" y="0" width="100%" height="100%" layer="1">
<drawimage imagetype="skinpart" x="0" y="0" width="100%" height="100%" path="background_menu" />
@@ -10,12 +11,6 @@
</area>
</background>
- <scrollbar>
- <area x="97%" y="23%" width="{areawidth}*0.01" height="61%" layer="3">
- <drawrectangle x="0" y="{areaheight} * {offset} / 1000" width="100%" height="{areaheight} * {height} / 1000" color="{progressbar}" />
- </area>
- </scrollbar>
-
<detailheader>
<area x="3%" y="11%" width="95%" height="10%" layer="3">
<drawtext x="0" y="{areaheight}*{detailheaderdateposy}/100" font="{regular}" fontsize="{areaheight}*{detailheaderdatesize}/100" color="{fontdefault}" text="{date} {time}, {duration} min" />
@@ -23,6 +18,12 @@
</area>
</detailheader>
+ <scrollbar>
+ <area x="97%" y="23%" width="{areawidth}*0.01" height="61%" layer="3">
+ <drawrectangle x="0" y="{areaheight} * {offset} / 1000" width="100%" height="{areaheight} * {height} / 1000" color="{progressbar}" />
+ </area>
+ </scrollbar>
+
<!-- TAB EPGINFO -->
<tab name="Info" x="3%" y="23%" width="94%" height="61%" layer="4" scrollheight="{areaheight}/4">
<drawtextbox condition="not{isseries}++not{ismovie}" name="shorttext" x="0" y="1%" width="96%" font="{regular}" fontsize="{areaheight}*{detailtextheadersize}/100" color="{fontdefault}" text="{shorttext}" />
@@ -36,6 +37,7 @@
<drawtextbox condition="{ismovie}" name="shorttextmovie" x="0" y="0" width="75%" font="{regular}" fontsize="{areaheight}*{detailtextheadersize}/100" color="{fontdefault}" text="{shorttext}" />
<drawtextbox condition="{ismovie}" x="0" y="{height(shorttextmovie)} + 5" width="96%" float="topright" floatwidth="{width(movieposter)} + 10" floatheight="{height(movieposter)} - {height(shorttextmovie)}" font="{regular}" fontsize="{areaheight}*{detailtextsize}/100" color="{fontdefault}" text="{description}" />
</tab>
+
<!-- TAB RECINFO -->
<tab name="{tr(recinfo)}" x="3%" y="23%" width="94%" height="61%" layer="4" scrollheight="{areaheight}/4">
<drawtext align="center" y="0" name="title" font="{regular}" fontsize="{areaheight}*{detailtextheadersize}/100" color="{fontdefault}" text="{tr(recinfo)}" />
@@ -47,6 +49,7 @@
<drawtext name="line6" x="0" y="{posy(line5)} + {height(line5)} + 10" width="96%" font="{regular}" fontsize="{areaheight}*{detailtextsize}/100" color="{fontdefault}" text="{tr(format)}: {recordingformat}" />
<drawtext x="0" y="{posy(line6)} + {height(line6)} + 10" width="96%" font="{regular}" fontsize="{areaheight}*{detailtextsize}/100" color="{fontdefault}" text="{tr(searchtimer)}: {searchtimer}" />
</tab>
+
<!-- TAB ACTORS -->
<tab condition="{isseries}||{ismovie}" name="{tr(actors)}" x="3%" y="23%" width="94%" height="61%" layer="4" scrollheight="{areaheight}/4">
<drawtext align="center" name="title" y="0" font="{regular}" fontsize="{areaheight}*{detailtextheadersize}/100" color="{fontdefault}" text="{tr(actors)}" />
@@ -56,6 +59,7 @@
<drawtext align="center" y="{height(thumb)} + 10 + {height(actorname)}" width="{columnwidth}" font="{regular}" fontsize="{areaheight}*{detailactors}/100" color="{fontdefault}" text="{actors[role]}" />
</loop>
</tab>
+
<!-- TAB TVDBINFO -->
<tab condition="{isseries}" name="TvDBInfo" x="3%" y="23%" width="94%" height="61%" layer="4" scrollheight="{areaheight}/4">
<drawimage name="banner" imagetype="image" path="{seriesbanner1path}" align="center" y="10" width="{areawidth}*0.7" height="{areawidth} * 0.7 * {seriesbanner1height} / {seriesbanner1width}"/>
@@ -63,11 +67,13 @@
<drawimage name="seasonposter" imagetype="image" path="{seasonposterpath}" x="{areawidth}*0.7" y="{height(banner)} + {height(episodeimage)} + 30" width="{areawidth}*0.3" height="{areawidth} * 0.3 * {seasonposterheight} / {seasonposterwidth}"/>
<drawtextbox x="0" y="{height(banner)} + 20" width="96%" float="topright" floatwidth="{width(seasonposter)} + 10" floatheight="{height(episodeimage)} + {height(seasonposter)} + 30" font="{regular}" fontsize="{areaheight}*{detailtextsize}/100" color="{fontdefault}" text="{tr(episode)}: {episodetitle} ({tr(season)} {episodeseason}, {tr(episode)} {episodenumber}) &#10;&#10;{episodeoverview}|&#10;&#10;{tr(gueststars)}: {episodegueststars}||&#10;&#10;{tr(seriesfirstaired)}: {seriesfirstaired}||&#10;{tr(episodefirstaired)}: {episodefirstaired}||&#10;{tr(network)}: {seriesnetwork}||&#10;{tr(genre)}: {seriesgenre}||&#10;{tr(status)}: {seriesstatus}||&#10;{tr(rating)}: {seriesrating}||&#10;{tr(episoderating)}: {episoderating}&#10;|{seriesoverview}&#10;" />
</tab>
+
<!-- TAB MOVIEDBINFO -->
<tab condition="{ismovie}" name="MovieDBInfo" x="3%" y="23%" width="94%" height="61%" layer="4" scrollheight="{areaheight}/4">
<drawimage name="poster" imagetype="image" path="{posterpath}" x="70%" y="10" width="{areawidth}*0.3" height="{areawidth} * 0.3 * {posterheight} / {posterwidth}"/>
<drawtextbox x="0" y="10" width="96%" float="topright" floatwidth="{width(poster)} + 10" floatheight="{height(poster)} + 20" font="{regular}" fontsize="{areaheight}*{detailtextsize}/100" color="{fontdefault}" text="{tr(originaltitle)}: {movieoriginalTitle}&#10;&#10;|{tr(genre)}: {moviegenres}&#10;&#10;||{movietagline}&#10;&#10;|{movieoverview}&#10;&#10;|{tr(budget)}: {moviebudget}&#10;||{tr(revenue)}: {movierevenue}&#10;&#10;||{tr(adult)}: {movieadult}&#10;||{tr(releasedate)}: {moviereleasedate}&#10;||{tr(runtime)}: {movieruntime} min&#10;||&#10;{tr(popularity)}: {moviepopularity}&#10;||&#10;{tr(voteaverage)}: {movievoteaverage}&#10;||&#10;{tr(homepage)}: {moviehomepage}|&#10;" />
</tab>
+
<!-- TAB SERIESGALERY -->
<tab condition="{isseries}" name="{tr(seriesgalery)}" x="3%" y="23%" width="94%" height="61%" layer="4" scrollheight="{areaheight}*0.61">
<drawimage name="banner1" imagetype="image" path="{seriesbanner1path}" align="center" y="{areaheight}/2 - {height(banner1)}/2" width="{areawidth}*0.9" height="{areawidth} * 0.9 * {seriesbanner1height} / {seriesbanner1width}"/>
@@ -81,13 +87,14 @@
<drawimage name="poster2" imagetype="image" path="{seriesposter2path}" x="20" y="6*{areaheight}" width="{areaheight} * 0.95 * {seriesposter2width} / {seriesposter2height}" height="{areaheight} * 0.95"/>
<drawimage name="poster3" imagetype="image" path="{seriesposter3path}" x="{areawidth} - {width(poster3)} - 20" y="6*{areaheight}" width="{areaheight} * 0.95 * {seriesposter3width} / {seriesposter3height}" height="{areaheight} * 0.95"/>
</tab>
+
<!-- TAB MOVIEGALERY -->
<tab condition="{ismovie}" name="{tr(moviegalery)}" x="3%" y="23%" width="94%" height="61%" layer="4" scrollheight="{areaheight}*0.61">
<drawimage name="fanart" imagetype="image" path="{fanartpath}" align="center" y="10" width="{areaheight} * 0.95 * {fanartwidth} / {fanartheight}" height="{areaheight} * 0.95"/>
<drawimage name="poster" imagetype="image" path="{posterpath}" align="center" y="{areaheight}" width="{areaheight} * 0.95 * {posterwidth} / {posterheight}" height="{areaheight} * 0.95"/>
<drawimage condition="{movieiscollection}" name="collectionfanart" imagetype="image" path="{collectionfanartpath}" align="center" y="2*{areaheight}" width="{areaheight} * 0.95 * {collectionfanartwidth} / {collectionfanartheight}" height="{areaheight} * 0.95"/>
<drawimage condition="{movieiscollection}" name="collectionposter" imagetype="image" path="{collectionposterpath}" align="center" y="3*{areaheight}" width="{areaheight} * 0.95 * {collectionposterwidth} / {collectionposterheight}" height="{areaheight} * 0.95"/>
- </tab>
+ </tab>
<tablabels>
<area x="2%" y="85%" width="{areawidth} - 60" height="6%" layer="3">
diff --git a/skins/estuary4vdr/xmlfiles/plug-tvguideng-recmenu.xml b/skins/estuary4vdr/xmlfiles/plug-tvguideng-recmenu.xml
index b3c9c0c..a09a666 100644
--- a/skins/estuary4vdr/xmlfiles/plug-tvguideng-recmenu.xml
+++ b/skins/estuary4vdr/xmlfiles/plug-tvguideng-recmenu.xml
@@ -20,8 +20,10 @@
<grid name="recmenu" x="0" y="0" width="100%" height="100%">
<!-- background -->
- <area condition="not{info}++not{buttonyesno}++not{timerconflictheader}++not{timerconflict}++not{timelineheader}++not{timelinetimer}" layer="5">
+ <!-- <area condition="not{info}++not{buttonyesno}++not{timerconflictheader}++not{timerconflict}++not{timelineheader}++not{timelinetimer}" layer="5"> -->
+ <area condition="not{buttonyesno}" layer="5">
<fill condition="{current}" color="{menubackactive}" />
+ <fill condition="not{current}" color="{tvgrecmenuback}" />
<drawrectangle condition="not{current}" x="0" y="{areaheight}-1" width="100%" height="1" color="{menubackline}" />
</area>
<!-- info -->
diff --git a/skins/estuary4vdr/xmlfiles/plug-tvguideng-root.xml b/skins/estuary4vdr/xmlfiles/plug-tvguideng-root.xml
index ed217e3..e2b74a4 100644
--- a/skins/estuary4vdr/xmlfiles/plug-tvguideng-root.xml
+++ b/skins/estuary4vdr/xmlfiles/plug-tvguideng-root.xml
@@ -67,238 +67,126 @@
</viewelement>
<viewelement name="footer_hor">
- <!--red-->
- <area condition="{red1}" x="0" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{red1}" x="0" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
- </area>
- <!--green-->
- <area condition="{green1}" x="0" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{green1}" x="0" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
- </area>
- <!--yellow-->
- <area condition="{yellow1}" x="0" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{yellow1}" x="0" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
- </area>
- <!--blue-->
- <area condition="{blue1}" x="0" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{blue1}" x="0" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
+ <area x="0" y="94%" width="25%" height="6%" layer="2">
+ <!--red-->
+ <drawimage condition="{red1}" imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{red1}++isset{red}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
+ <!--green-->
+ <drawimage condition="{green1}" imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{green1}++isset{green}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
+ <!--yellow-->
+ <drawimage condition="{yellow1}" imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{yellow1}++isset{yellow}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
+ <!--blue-->
+ <drawimage condition="{blue1}" imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{blue1}++isset{blue}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
</area>
- <!--red-->
- <area condition="{red2}" x="25%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{red2}" x="25%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
- </area>
- <!--green-->
- <area condition="{green2}" x="25%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{green2}" x="25%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
- </area>
- <!--yellow-->
- <area condition="{yellow2}" x="25%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{yellow2}" x="25%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
- </area>
- <!--blue-->
- <area condition="{blue2}" x="25%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{blue2}" x="25%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
+ <area x="25%" y="94%" width="25%" height="6%" layer="2">
+ <!--red-->
+ <drawimage condition="{red2}" imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{red2}++isset{red}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
+ <!--green-->
+ <drawimage condition="{green2}" imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{green2}++isset{green}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
+ <!--yellow-->
+ <drawimage condition="{yellow2}" imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{yellow2}++isset{yellow}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
+ <!--blue-->
+ <drawimage condition="{blue2}" imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{blue2}++isset{blue}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
</area>
- <!--red-->
- <area condition="{red3}" x="50%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{red3}" x="50%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
- </area>
- <!--green-->
- <area condition="{green3}" x="50%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{green3}" x="50%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
- </area>
- <!--yellow-->
- <area condition="{yellow3}" x="50%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{yellow3}" x="50%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
- </area>
- <!--blue-->
- <area condition="{blue3}" x="50%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{blue3}" x="50%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
+ <area x="50%" y="94%" width="25%" height="6%" layer="2">
+ <!--red-->
+ <drawimage condition="{red3}" imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{red3}++isset{red}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
+ <!--green-->
+ <drawimage condition="{green3}" imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{green3}++isset{green}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
+ <!--yellow-->
+ <drawimage condition="{yellow3}" imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{yellow3}++isset{yellow}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
+ <!--blue-->
+ <drawimage condition="{blue3}" imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{blue3}++isset{blue}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
</area>
- <!--red-->
- <area condition="{red4}" x="75%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{red4}" x="75%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
- </area>
- <!--green-->
- <area condition="{green4}" x="75%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{green4}" x="75%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
- </area>
- <!--yellow-->
- <area condition="{yellow4}" x="75%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{yellow4}" x="75%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
- </area>
- <!--blue-->
- <area condition="{blue4}" x="75%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{blue4}" x="75%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
+ <area x="75%" y="94%" width="25%" height="6%" layer="2">
+ <!--red-->
+ <drawimage condition="{red4}" imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{red4}++isset{red}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
+ <!--green-->
+ <drawimage condition="{green4}" imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{green4}++isset{green}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
+ <!--yellow-->
+ <drawimage condition="{yellow4}" imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{yellow4}++isset{yellow}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
+ <!--blue-->
+ <drawimage condition="{blue4}" imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{blue4}++isset{blue}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
</area>
</viewelement>
<viewelement name="footer_ver">
- <!--red-->
- <area condition="{red1}" x="0" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{red1}" x="0" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
- </area>
- <!--green-->
- <area condition="{green1}" x="0" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{green1}" x="0" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
- </area>
- <!--yellow-->
- <area condition="{yellow1}" x="0" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{yellow1}" x="0" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
- </area>
- <!--blue-->
- <area condition="{blue1}" x="0" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{blue1}" x="0" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
+ <area x="0" y="94%" width="25%" height="6%" layer="2">
+ <!--red-->
+ <drawimage condition="{red1}" imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{red1}++isset{red}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
+ <!--green-->
+ <drawimage condition="{green1}" imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{green1}++isset{green}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
+ <!--yellow-->
+ <drawimage condition="{yellow1}" imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{yellow1}++isset{yellow}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
+ <!--blue-->
+ <drawimage condition="{blue1}" imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{blue1}++isset{blue}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
</area>
- <!--red-->
- <area condition="{red2}" x="25%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{red2}" x="25%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
- </area>
- <!--green-->
- <area condition="{green2}" x="25%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{green2}" x="25%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
- </area>
- <!--yellow-->
- <area condition="{yellow2}" x="25%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{yellow2}" x="25%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
- </area>
- <!--blue-->
- <area condition="{blue2}" x="25%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{blue2}" x="25%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
+ <area x="25%" y="94%" width="25%" height="6%" layer="2">
+ <!--red-->
+ <drawimage condition="{red2}" imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{red2}++isset{red}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
+ <!--green-->
+ <drawimage condition="{green2}" imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{green2}++isset{green}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
+ <!--yellow-->
+ <drawimage condition="{yellow2}" imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{yellow2}++isset{yellow}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
+ <!--blue-->
+ <drawimage condition="{blue2}" imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{blue2}++isset{blue}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
</area>
- <!--red-->
- <area condition="{red3}" x="50%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{red3}" x="50%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
- </area>
- <!--green-->
- <area condition="{green3}" x="50%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{green3}" x="50%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
- </area>
- <!--yellow-->
- <area condition="{yellow3}" x="50%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{yellow3}" x="50%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
- </area>
- <!--blue-->
- <area condition="{blue3}" x="50%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{blue3}" x="50%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
+ <area x="50%" y="94%" width="25%" height="6%" layer="2">
+ <!--red-->
+ <drawimage condition="{red3}" imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{red3}++isset{red}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
+ <!--green-->
+ <drawimage condition="{green3}" imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{green3}++isset{green}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
+ <!--yellow-->
+ <drawimage condition="{yellow3}" imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{yellow3}++isset{yellow}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
+ <!--blue-->
+ <drawimage condition="{blue3}" imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{blue3}++isset{blue}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
</area>
- <!--red-->
- <area condition="{red4}" x="75%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{red4}" x="75%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
- </area>
- <!--green-->
- <area condition="{green4}" x="75%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{green4}" x="75%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
- </area>
- <!--yellow-->
- <area condition="{yellow4}" x="75%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{yellow4}" x="75%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
- </area>
- <!--blue-->
- <area condition="{blue4}" x="75%" y="94%" width="25%" height="6%" layer="2">
- <drawimage imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
- </area>
- <area condition="{blue4}" x="75%" y="94%" width="25%" height="6%" layer="3">
- <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
+ <area x="75%" y="94%" width="25%" height="6%" layer="2">
+ <!--red-->
+ <drawimage condition="{red4}" imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{red4}++isset{red}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
+ <!--green-->
+ <drawimage condition="{green4}" imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{green4}++isset{green}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
+ <!--yellow-->
+ <drawimage condition="{yellow4}" imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{yellow4}++isset{yellow}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
+ <!--blue-->
+ <drawimage condition="{blue4}" imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
+ <drawtext condition="{blue4}++isset{blue}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
</area>
</viewelement>
@@ -426,7 +314,8 @@
<drawrectangle x="0" y="0" width="2" height="100%" color="{menubackline}" />
<drawrectangle x="0" y="{areaheight}-2" width="100%" height="2" color="{menubackline}" />
<!--<drawrectangle x="{areawidth}-2" y="0" width="2" height="100%" color="{menubackline}" />-->
- <drawimage condition="{timer}" imagetype="icon" path="ico_rec_selected" x="{areawidth} - {areaheight}*0.4 - 5" y="5" width="0.4*{areaheight}" height="0.4*{areaheight}" />
+ <drawimage condition="{timer}++{timerisactive}" imagetype="icon" path="ico_timer_is_active" x="{areawidth} - {areaheight}*0.4 - 5" y="5" width="0.4*{areaheight}" height="0.4*{areaheight}" />
+ <drawimage condition="{timer}++not{timerisactive}" imagetype="icon" path="ico_timer_is_inactive" x="{areawidth} - {areaheight}*0.4 - 5" y="5" width="0.4*{areaheight}" height="0.4*{areaheight}" />
</area>
<!--EPG without time-->
<area condition="not{tvgshowtime}" layer="4">
@@ -435,7 +324,8 @@
<drawrectangle x="0" y="0" width="2" height="100%" color="{menubackline}" />
<drawrectangle x="0" y="{areaheight}-2" width="100%" height="2" color="{menubackline}" />
<!--<drawrectangle x="{areawidth}-2" y="0" width="2" height="100%" color="{menubackline}" />-->
- <drawimage condition="{timer}" imagetype="icon" path="ico_rec_selected" x="{areawidth} - {areaheight}*0.4 - 5" y="5" width="0.4*{areaheight}" height="0.4*{areaheight}" />
+ <drawimage condition="{timer}++{timerisactive}" imagetype="icon" path="ico_timer_is_active" x="{areawidth} - {areaheight}*0.4 - 5" y="5" width="0.4*{areaheight}" height="0.4*{areaheight}" />
+ <drawimage condition="{timer}++not{timerisactive}" imagetype="icon" path="ico_timer_is_inactive" x="{areawidth} - {areaheight}*0.4 - 5" y="5" width="0.4*{areaheight}" height="0.4*{areaheight}" />
</area>
</grid>