changed handling of channel logos, width and height are now mandatory

This commit is contained in:
louis
2014-11-21 19:19:59 +01:00
parent e7abb8557e
commit a34a824527
21 changed files with 26 additions and 95 deletions

View File

@@ -23,7 +23,7 @@
-->
<channelinfo>
<area x="2%" y="80%" width="14%" height="18%" layer="2">
<drawimage cache="true" imagetype="channellogo" path="{channelid}" height="98%" align="center" valign="center"/>
<drawimage cache="true" imagetype="channellogo" path="{channelid}" width="94%" height="94%" align="center" valign="center"/>
</area>
<area x="18%" y="74%" width="60%" height="6%" layer="2">
<drawtext x="0" valign="center" font="{vdrOsd}" fontsize="95%" color="{clrWhite}" text="{channelnumber} {channelname}" />
@@ -151,7 +151,7 @@
-->
<channelgroup>
<area x="2%" y="80%" width="14%" height="18%" layer="2">
<drawimage condition="{sepexists}" imagetype="seplogo" path="{seppath}" height="98%" align="center" valign="center" />
<drawimage condition="{sepexists}" imagetype="seplogo" path="{seppath}" width="96%" height="96%" align="center" valign="center" />
<drawimage condition="not{sepexists}" imagetype="icon" path="ico_channelsep" align="center" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
</area>
<area x="18%" y="82%" width="80%" height="10%" layer="2">

View File

@@ -35,7 +35,7 @@
</area>
<!-- channel logo -->
<area condition="not{separator}" x="5" width="6%" layer="3">
<drawimage name="logo" imagetype="channellogo" path="{channelid}" x="0" height="100%" valign="center" />
<drawimage name="logo" imagetype="channellogo" path="{channelid}" x="0" width="100%" height="100%" valign="center" />
</area>
<!-- scrollable channel name -->
<areascroll condition="not{separator}++not{current}" scrollelement="channelname" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="7%" width="20%" layer="3">
@@ -104,7 +104,7 @@
</area>
<area x="32%" y="2%" width="67%" height="76%" layer="2">
<!-- Logo and Header -->
<drawimage name="logo" imagetype="channellogo" path="{channelid}" x="1%" y="1%" width="20%" />
<drawimage name="logo" imagetype="channellogo" path="{channelid}" x="1%" y="1%" width="20%" height="15%" />
<drawtext name="channelname" x="23%" y="{height(logo)} * 3 / 10" font="{vdrOsd}" fontsize="10%" color="{clrWhite}" text="{number} - {name}" />
<drawtext x="23%" y="{posy(channelname)} + {height(channelname)}" font="{vdrOsd}" fontsize="7%" color="{clrWhite}" text="{sourcedescription}, {tr(transponder)} {transponder}" />
<!-- NOW -->

View File

@@ -44,7 +44,7 @@
<fill color="{clrTransBlack}" />
</area>
<area x="1%" y="10%" width="98%" height="15%" layer="3">
<drawimage name="logo" imagetype="channellogo" path="{channelid}" x="0" height="80%" valign="center" />
<drawimage name="logo" imagetype="channellogo" path="{channelid}" x="0" width="15%" height="80%" valign="center" />
<drawimage condition="{isseries}++{banneravailable}++not{epgpicavailable}" imagetype="image" path="{bannerpath}" x="{areawidth} - {areawidth}/3 - 10" valign="center" width="{areawidth}/3" height="{areawidth}/3 * {bannerheight} / {bannerwidth}"/>
<drawimage condition="{ismovie}++{posteravailable}++not{epgpicavailable}" imagetype="image" path="{posterpath}" x="{areawidth} - {areaheight}*8/10" valign="center" width="{areaheight}*8 / 10 * {posterheight} / {posterwidth}" height="{areaheight}*8 / 10"/>
@@ -192,7 +192,7 @@
<tab condition="{hasreruns}" name="{tr(reruns)}" x="2%" y="25%" width="94%" height="60%" layer="2" scrollheight="{areaheight}/4">
<drawtext align="center" y="0" name="title" font="{vdrOsd}" fontsize="10%" color="{clrWhite}" text="{tr(rerunsof)} '{title}'" />
<loop name="reruns" x="0" y="{height(title)} + 10" width="{areawidth}" orientation="vertical">
<drawimage name="logo" condition="{reruns[channellogoexists]}" imagetype="channellogo" path="{reruns[channelid]}" x="0" height="10%" />
<drawimage name="logo" condition="{reruns[channellogoexists]}" imagetype="channellogo" path="{reruns[channelid]}" x="0" width="10%" height="10%" />
<drawtext name="channelname" condition="not{reruns[channellogoexists]}" x="-5" font="{vdrOsd}" fontsize="10%" color="{clrWhite}" text="{reruns[channelname]}" />
<drawtext condition="{reruns[channellogoexists]}" x="{width(logo)}+20" y="-5" width="{areawidth} - {width(logo)} - 20" font="{vdrOsd}" fontsize="8%" color="{clrWhite}" text="{reruns[day]} {reruns[date]} {reruns[start]} - {reruns[stop]}: {reruns[title]} {reruns[shorttext]}" />
<drawtext condition="not{reruns[channellogoexists]}" x="{width(channelname)}+20" y="-5" width="{areawidth} - {width(logo)} - 20" font="{vdrOsd}" fontsize="8%" color="{clrWhite}" text="{reruns[day]} {reruns[date]} {reruns[start]} - {reruns[stop]}: {reruns[title]} {reruns[shorttext]}" />

View File

@@ -38,7 +38,7 @@
<area x="85%" y="28%" width="14%" height="60%" layer="2">
<loop name="timers" x="0" y="0" orientation="vertical" columnwidth="100%" rowheight="{areaheight} / 4" overflow="cut">
<drawrectangle condition="{timers[recording]}" x="0" y="0" width="{columnwidth}" height="{rowheight} * 99 / 100" color="{clrTransRed}" />
<drawimage cache="true" name="logo" imagetype="channellogo" path="{timers[channelid]}" height="{rowheight} / 2" align="center" y="5" />
<drawimage cache="true" name="logo" imagetype="channellogo" path="{timers[channelid]}" width="98%" height="{rowheight} / 2" align="center" y="5" />
<drawtextbox x="5" y="{height(logo)}+2" width="{columnwidth}-10" align="center" maxlines="2" font="{vdrOsd}" fontsize="4%" color="{clrWhite}" text="{timers[title]}" />
<drawtext name="datetime" align="center" y="{rowheight}*84/100" font="{vdrOsd}" fontsize="4%" color="{clrWhite}" text="{timers[datetime]}" />
</loop>

View File

@@ -13,7 +13,7 @@
<header>
<area x="1%" y="0" width="64%" height="10%" layer="2">
<drawtext condition="{whatsonnow}||{whatsonnext}" x="5" valign="center" font="{vdrOsd}" fontsize="80%" color="{clrWhite}" text="{title}" />
<drawimage name="logo" condition="{whatson}" imagetype="channellogo" path="{channelid}" x="0" height="100%" align="left" valign="center" />
<drawimage name="logo" condition="{whatson}" imagetype="channellogo" path="{channelid}" x="0" width="15%" height="100%" align="left" valign="center" />
<drawtext condition="{whatson}" x="{width(logo)}+20" valign="center" font="{vdrOsd}" fontsize="50%" color="{clrWhite}" text="{channelnumber} - {channelname}" />
</area>
</header>
@@ -78,7 +78,7 @@
</areascroll>
<!-- element whatsonnow -->
<area condition="not{separator}++{whatsonnow}" x="5" width="8%" layer="3">
<drawimage name="logo" imagetype="channellogo" path="{channelid}" x="0" height="100%" valign="center" />
<drawimage name="logo" imagetype="channellogo" path="{channelid}" x="0" width="100%" height="94%" valign="center" />
</area>
<area condition="not{separator}++{whatsonnow}++not{current}" x="9%" width="18%" layer="3">
<drawtext x="0" y="5%" font="{vdrOsd}" fontsize="40%" color="{clrFontMenuItem}" text="{start} - {stop}" />
@@ -104,7 +104,7 @@
</area>
<!-- element whatsonnext -->
<area condition="not{separator}++{whatsonnext}" x="5" width="8%" layer="3">
<drawimage name="logo" imagetype="channellogo" path="{channelid}" x="0" height="100%" valign="center" />
<drawimage name="logo" imagetype="channellogo" path="{channelid}" x="0" width="100%" height="94%" valign="center" />
</area>
<area condition="not{separator}++{whatsonnext}++not{current}" x="9%" width="18%" layer="3">
<drawtext x="0" y="5%" font="{vdrOsd}" fontsize="40%" color="{clrFontMenuItem}" text="{start} - {stop}" />

View File

@@ -35,7 +35,7 @@
</area>
<!-- channel logo -->
<area x="5" width="6%" layer="3">
<drawimage imagetype="channellogo" path="{channelid}" x="0" height="100%" valign="center" />
<drawimage imagetype="channellogo" path="{channelid}" x="0" width="100%" height="100%" valign="center" />
</area>
<!-- datetime and icons -->
<area x="1%" width="28%" layer="3">