optimised some settings in skin blackhole

This commit is contained in:
louis 2015-01-06 11:11:05 +01:00
parent 0bcdb0f386
commit e5eaa8b054
6 changed files with 37 additions and 32 deletions

View File

@ -133,5 +133,6 @@ Version 0.1.1
- fixed some minor bugs - fixed some minor bugs
- added skin "blackhole" - added skin "blackhole"
- added customtokens view element in displayreplay - added customtokens view element in displayreplay
- optimised some settings in skin blackhole
Version 0.1.2 Version 0.1.2

View File

@ -65,8 +65,8 @@
<drawtext x="3%" y="60%" width="96%" font="{regular}" fontsize="20%" color="{clrWhite}" text="{shorttext}" /> <drawtext x="3%" y="60%" width="96%" font="{regular}" fontsize="20%" color="{clrWhite}" text="{shorttext}" />
</area> </area>
<area condition="{isseries}" x="55%" y="52%" width="43%" height="20%" layer="3"> <area condition="{isseries}" x="55%" y="52%" width="43%" height="20%" layer="3">
<drawimage name="banner" imagetype="image" path="{bannerpath}" align="center" y="1%" width="{areawidth}-20" height="{areawidth} * {bannerheight} / {bannerwidth}"/> <drawimage name="banner" imagetype="image" path="{bannerpath}" align="center" y="1%" width="70%" height="{areawidth} * 0.7 * {bannerheight} / {bannerwidth}"/>
<drawtext name="datetime" x="3%" y="{posy(banner)} + {height(banner)}" font="{regular}" fontsize="15%" color="{clrWhite}" text="{day} {date} {start} - {stop} ({duration} mins)" /> <drawtext name="datetime" x="3%" y="{posy(banner)} + {height(banner)} + 5" font="{regular}" fontsize="15%" color="{clrWhite}" text="{day} {date} {start} - {stop} ({duration} mins)" />
<drawtext x="3%" y="{posy(datetime)} + {height(datetime)}" width="96%" font="{semibold}" fontsize="30%" color="{clrWhite}" text="{title} - {shorttext}" /> <drawtext x="3%" y="{posy(datetime)} + {height(datetime)}" width="96%" font="{semibold}" fontsize="30%" color="{clrWhite}" text="{title} - {shorttext}" />
</area> </area>
<area condition="{ismovie}" x="55%" y="52%" width="43%" height="20%" layer="3"> <area condition="{ismovie}" x="55%" y="52%" width="43%" height="20%" layer="3">
@ -217,14 +217,14 @@
<!-- TAB EPGINFO --> <!-- TAB EPGINFO -->
<tab name="EPG Info" x="2%" y="11%" width="48%" height="78%" layer="3" scrollheight="{areaheight}/4"> <tab name="EPG Info" x="2%" y="11%" width="48%" height="78%" layer="3" scrollheight="{areaheight}/4">
<drawtext x="0" y="0" font="{semibold}" fontsize="6%" color="{clrWhite}" text="{day} {date} {start} - {stop} ({duration} mins)" /> <drawtext x="0" y="0" font="{semibold}" fontsize="6%" color="{clrWhite}" text="{day} {date} {start} - {stop} ({duration} mins)" />
<drawtext x="0" y="6%" width="100%" font="{semibold}" fontsize="8%" color="{clrWhite}" text="{title}" /> <drawtext x="0" y="6%" width="100%" font="{semibold}" fontsize="9%" color="{clrWhite}" text="{title}" />
<drawtext x="0" y="14%" width="100%" font="{regular}" fontsize="6%" color="{clrWhite}" text="{shorttext}" /> <drawtext x="0" y="14%" width="100%" font="{regular}" fontsize="7%" color="{clrWhite}" text="{shorttext}" />
<drawtextbox condition="not{isseries}++not{ismovie}" x="0" y="20%" width="96%" font="{regular}" fontsize="6%" color="{clrWhite}" text="{description}" /> <drawtextbox condition="not{isseries}++not{ismovie}" x="0" y="24%" width="96%" font="{regular}" fontsize="5%" color="{clrWhite}" text="{description}" />
<drawimage condition="{isseries}" name="seriesposter" imagetype="image" path="{seriesposter1path}" x="{areawidth}*0.6" y="20%" width="{areawidth}*0.4" height="{areawidth} * 0.4 * {seriesposter1height} / {seriesposter1width}"/> <drawimage condition="{isseries}" name="seriesposter" imagetype="image" path="{seriesposter1path}" x="{areawidth}*0.7" y="20%" width="{areawidth}*0.3" height="{areawidth} * 0.3 * {seriesposter1height} / {seriesposter1width}"/>
<drawimage condition="{ismovie}" name="movieposter" imagetype="image" path="{posterpath}" x="{areawidth}*0.6" y="20%" width="{areawidth}*0.4" height="{areawidth} * 0.4 * {posterheight} / {posterwidth}" /> <drawimage condition="{ismovie}" name="movieposter" imagetype="image" path="{posterpath}" x="{areawidth}*0.7" y="20%" width="{areawidth}*0.3" height="{areawidth} * 0.3 * {posterheight} / {posterwidth}" />
<drawtextbox condition="{isseries}" x="0" y="20%" width="96%" float="topright" floatwidth="{width(seriesposter)} + 10" floatheight="{height(seriesposter)} + 20" font="{regular}" fontsize="6%" color="{clrWhite}" text="{description}" /> <drawtextbox condition="{isseries}" x="0" y="24%" width="96%" float="topright" floatwidth="{width(seriesposter)} + 10" floatheight="{height(seriesposter)} + 20" font="{regular}" fontsize="5%" color="{clrWhite}" text="{description}" />
<drawtextbox condition="{ismovie}" x="0" y="20%" width="96%" float="topright" floatwidth="{width(movieposter)} + 10" floatheight="{height(movieposter)} + 20" font="{regular}" fontsize="6%" color="{clrWhite}" text="{description}" /> <drawtextbox condition="{ismovie}" x="0" y="24%" width="96%" float="topright" floatwidth="{width(movieposter)} + 10" floatheight="{height(movieposter)} + 20" font="{regular}" fontsize="5%" color="{clrWhite}" text="{description}" />
</tab> </tab>
<!-- TAB RERUNS --> <!-- TAB RERUNS -->

View File

@ -49,7 +49,7 @@
<drawtext x="3%" y="60%" width="96%" font="{regular}" fontsize="20%" color="{clrWhite}" text="{shorttext}" /> <drawtext x="3%" y="60%" width="96%" font="{regular}" fontsize="20%" color="{clrWhite}" text="{shorttext}" />
</area> </area>
<area condition="{isseries}" x="55%" y="52%" width="43%" height="20%" layer="3"> <area condition="{isseries}" x="55%" y="52%" width="43%" height="20%" layer="3">
<drawimage name="banner" imagetype="image" path="{bannerpath}" align="center" y="1%" width="{areawidth}-20" height="{areawidth} * {bannerheight} / {bannerwidth}"/> <drawimage name="banner" imagetype="image" path="{bannerpath}" align="center" y="1%" width="70%" height="{areawidth} * 0.7 * {bannerheight} / {bannerwidth}"/>
<drawtext name="datetime" x="3%" y="{posy(banner)} + {height(banner)}" font="{regular}" fontsize="15%" color="{clrWhite}" text="{date} {time} ({duration} mins)" /> <drawtext name="datetime" x="3%" y="{posy(banner)} + {height(banner)}" font="{regular}" fontsize="15%" color="{clrWhite}" text="{date} {time} ({duration} mins)" />
<drawtext x="3%" y="{posy(datetime)} + {height(datetime)}" width="96%" font="{semibold}" fontsize="30%" color="{clrWhite}" text="{name} - {shorttext}" /> <drawtext x="3%" y="{posy(datetime)} + {height(datetime)}" width="96%" font="{semibold}" fontsize="30%" color="{clrWhite}" text="{name} - {shorttext}" />
</area> </area>
@ -191,13 +191,13 @@
<!-- just define as many tabs as needed --> <!-- just define as many tabs as needed -->
<tab name="Info" x="2%" y="11%" width="48%" height="78%" layer="3" scrollheight="{areaheight}/4"> <tab name="Info" x="2%" y="11%" width="48%" height="78%" layer="3" scrollheight="{areaheight}/4">
<drawtext x="0" y="0" font="{semibold}" fontsize="6%" color="{clrWhite}" text="{date} {time} ({duration} mins)" /> <drawtext x="0" y="0" font="{semibold}" fontsize="6%" color="{clrWhite}" text="{date} {time} ({duration} mins)" />
<drawtext x="0" y="6%" font="{semibold}" fontsize="8%" color="{clrWhite}" text="{name}" /> <drawtext x="0" y="6%" font="{semibold}" fontsize="9%" color="{clrWhite}" text="{name}" />
<drawtext x="0" y="14%" font="{regular}" fontsize="6%" color="{clrWhite}" text="{shorttext}" /> <drawtext x="0" y="14%" font="{regular}" fontsize="7%" color="{clrWhite}" text="{shorttext}" />
<drawtextbox condition="not{isseries}++not{ismovie}" x="0" y="20%" width="96%" font="{regular}" fontsize="8%" color="{clrWhite}" text="{description}" /> <drawtextbox condition="not{isseries}++not{ismovie}" x="0" y="24%" width="96%" font="{regular}" fontsize="5%" color="{clrWhite}" text="{description}" />
<drawimage condition="{isseries}" name="seriesposter" imagetype="image" path="{seriesposter1path}" x="{areawidth}*0.7" y="20%" width="{areawidth}*0.3" height="{areawidth} * 0.3 * {seriesposter1height} / {seriesposter1width}"/> <drawimage condition="{isseries}" name="seriesposter" imagetype="image" path="{seriesposter1path}" x="{areawidth}*0.7" y="20%" width="{areawidth}*0.3" height="{areawidth} * 0.3 * {seriesposter1height} / {seriesposter1width}"/>
<drawimage condition="{ismovie}" name="movieposter" imagetype="image" path="{posterpath}" x="{areawidth}*0.7" y="20%" width="{areawidth}*0.3" height="{areawidth} * 0.3 * {posterheight} / {posterwidth}" /> <drawimage condition="{ismovie}" name="movieposter" imagetype="image" path="{posterpath}" x="{areawidth}*0.7" y="20%" width="{areawidth}*0.3" height="{areawidth} * 0.3 * {posterheight} / {posterwidth}" />
<drawtextbox condition="{isseries}" x="0" y="20%" width="96%" float="topright" floatwidth="{width(seriesposter)} + 10" floatheight="{height(seriesposter)} + 20" font="{regular}" fontsize="6%" color="{clrWhite}" text="{description}" /> <drawtextbox condition="{isseries}" x="0" y="24%" width="96%" float="topright" floatwidth="{width(seriesposter)} + 10" floatheight="{height(seriesposter)} + 20" font="{regular}" fontsize="5%" color="{clrWhite}" text="{description}" />
<drawtextbox condition="{ismovie}" x="0" y="20%" width="96%" float="topright" floatwidth="{width(movieposter)} + 10" floatheight="{height(movieposter)} + 20" font="{regular}" fontsize="6%" color="{clrWhite}" text="{description}" /> <drawtextbox condition="{ismovie}" x="0" y="24%" width="96%" float="topright" floatwidth="{width(movieposter)} + 10" floatheight="{height(movieposter)} + 20" font="{regular}" fontsize="5%" color="{clrWhite}" text="{description}" />
</tab> </tab>
<tab name="{tr(recinfo)}" x="2%" y="11%" width="48%" height="78%" layer="3" scrollheight="{areaheight}/4"> <tab name="{tr(recinfo)}" x="2%" y="11%" width="48%" height="78%" layer="3" scrollheight="{areaheight}/4">
<drawtext align="center" y="0" name="title" font="{regular}" fontsize="8%" color="{clrWhite}" text="{tr(recinfo)}" /> <drawtext align="center" y="0" name="title" font="{regular}" fontsize="8%" color="{clrWhite}" text="{tr(recinfo)}" />

View File

@ -22,17 +22,21 @@
<area x="55%" y="51%" width="44%" height="19%" layer="2"> <area x="55%" y="51%" width="44%" height="19%" layer="2">
<drawimage imagetype="skinpart" path="tachos_back" x="0" y="0" width="100%" height="100%"/> <drawimage imagetype="skinpart" path="tachos_back" x="0" y="0" width="100%" height="100%"/>
</area> </area>
<!-- tacho disc usage -->
<area x="55%" y="51%" width="44%" height="19%" layer="3"> <area x="55%" y="51%" width="44%" height="19%" layer="3">
<drawimage imagetype="skinpart" path="tacho_percent_back" x="{areawidth}*0.005" y="5%" width="24%" height="{areawidth}*0.24"/> <drawimage imagetype="skinpart" path="tacho_percent_back" x="{areawidth}*0.025" y="5%" width="20%" height="{areawidth}*0.2"/>
</area> </area>
<!-- tacho load -->
<area x="55%" y="51%" width="44%" height="19%" layer="3"> <area x="55%" y="51%" width="44%" height="19%" layer="3">
<drawimage imagetype="skinpart" path="tacho_load_back" x="{areawidth}*0.255" y="5%" width="24%" height="{areawidth}*0.24"/> <drawimage imagetype="skinpart" path="tacho_load_back" x="{areawidth}*0.28" y="5%" width="20%" height="{areawidth}*0.20"/>
</area> </area>
<!-- tacho cpu temp -->
<area x="55%" y="51%" width="44%" height="19%" layer="3"> <area x="55%" y="51%" width="44%" height="19%" layer="3">
<drawimage imagetype="skinpart" path="tacho_temp_back" x="{areawidth}*0.505" y="5%" width="24%" height="{areawidth}*0.24"/> <drawimage imagetype="skinpart" path="tacho_temp_back" x="{areawidth}*0.530" y="5%" width="20%" height="{areawidth}*0.20"/>
</area> </area>
<!-- tacho gpu temp -->
<area x="55%" y="51%" width="44%" height="19%" layer="3"> <area x="55%" y="51%" width="44%" height="19%" layer="3">
<drawimage imagetype="skinpart" path="tacho_temp_back" x="{areawidth}*0.755" y="5%" width="24%" height="{areawidth}*0.24"/> <drawimage imagetype="skinpart" path="tacho_temp_back" x="{areawidth}*0.78" y="5%" width="20%" height="{areawidth}*0.20"/>
</area> </area>
<area x="55%" y="71%" width="44%" height="19%" layer="2"> <area x="55%" y="71%" width="44%" height="19%" layer="2">
<drawimage imagetype="skinpart" path="tachos_back" x="0" y="0" width="100%" height="100%"/> <drawimage imagetype="skinpart" path="tachos_back" x="0" y="0" width="100%" height="100%"/>
@ -88,10 +92,10 @@
--> -->
<discusage> <discusage>
<area x="55%" y="51%" width="44%" height="19%" layer="5"> <area x="55%" y="51%" width="44%" height="19%" layer="5">
<drawimage imagetype="skinpart" path="tachohands/perc_{usedpercent}" x="{areawidth}*0.005" y="5%" width="24%" height="{areawidth}*0.24"/> <drawimage imagetype="skinpart" path="tachohands/perc_{usedpercent}" x="{areawidth}*0.025" y="5%" width="20%" height="{areawidth}*0.20"/>
</area> </area>
<area x="55%" y="51%" width="11%" height="19%" layer="4"> <area x="55%" y="51%" width="11%" height="19%" layer="4">
<drawtext align="center" y="80%" font="{regular}" fontsize="14%" color="{clrWhite}" text="Disc Usage: {usedpercent}%" /> <drawtext align="center" y="85%" font="{regular}" fontsize="15%" color="{clrWhite}" text="Disc Usage: {usedpercent}%" />
</area> </area>
</discusage> </discusage>
@ -122,10 +126,10 @@
--> -->
<systemload> <systemload>
<area x="55%" y="51%" width="44%" height="19%" layer="5"> <area x="55%" y="51%" width="44%" height="19%" layer="5">
<drawimage imagetype="skinpart" path="tachohands/load_{loadhand}" x="{areawidth}*0.255" y="5%" width="24%" height="{areawidth}*0.24"/> <drawimage imagetype="skinpart" path="tachohands/load_{loadhand}" x="{areawidth}*0.28" y="5%" width="20%" height="{areawidth}*0.20"/>
</area> </area>
<area x="66%" y="51%" width="11%" height="19%" layer="4"> <area x="66%" y="51%" width="11%" height="19%" layer="4">
<drawtext align="center" y="80%" font="{regular}" fontsize="14%" color="{clrWhite}" text="Load: {load}" /> <drawtext align="center" y="85%" font="{regular}" fontsize="15%" color="{clrWhite}" text="Load: {load}" />
</area> </area>
</systemload> </systemload>
@ -135,16 +139,16 @@
--> -->
<temperatures> <temperatures>
<area x="55%" y="51%" width="44%" height="19%" layer="5"> <area x="55%" y="51%" width="44%" height="19%" layer="5">
<drawimage condition="gt({cputemp}, 80)" imagetype="skinpart" path="tachohands/temp_81" x="{areawidth}*0.505" y="5%" width="24%" height="{areawidth}*0.24"/> <drawimage condition="gt({cputemp}, 80)" imagetype="skinpart" path="tachohands/temp_81" x="{areawidth}*0.53" y="5%" width="20%" height="{areawidth}*0.2"/>
<drawimage condition="lt({cputemp}, 81)" imagetype="skinpart" path="tachohands/temp_{cputemp}" x="{areawidth}*0.505" y="5%" width="24%" height="{areawidth}*0.24"/> <drawimage condition="lt({cputemp}, 81)" imagetype="skinpart" path="tachohands/temp_{cputemp}" x="{areawidth}*0.53" y="5%" width="20%" height="{areawidth}*0.2"/>
<drawimage condition="gt({gputemp}, 80)" imagetype="skinpart" path="tachohands/temp_81" x="{areawidth}*0.755" y="5%" width="24%" height="{areawidth}*0.24"/> <drawimage condition="gt({gputemp}, 80)" imagetype="skinpart" path="tachohands/temp_81" x="{areawidth}*0.78" y="5%" width="20%" height="{areawidth}*0.2"/>
<drawimage condition="lt({cputemp}, 81)" imagetype="skinpart" path="tachohands/temp_{gputemp}" x="{areawidth}*0.755" y="5%" width="24%" height="{areawidth}*0.24"/> <drawimage condition="lt({cputemp}, 81)" imagetype="skinpart" path="tachohands/temp_{gputemp}" x="{areawidth}*0.78" y="5%" width="20%" height="{areawidth}*0.2"/>
</area> </area>
<area x="77%" y="51%" width="11%" height="19%" layer="4"> <area x="77%" y="51%" width="11%" height="19%" layer="4">
<drawtext align="center" y="80%" font="{regular}" fontsize="14%" color="{clrWhite}" text="CPU Temp: {cputemp}°C" /> <drawtext align="center" y="85%" font="{regular}" fontsize="15%" color="{clrWhite}" text="CPU Temp: {cputemp}°C" />
</area> </area>
<area x="88%" y="51%" width="11%" height="19%" layer="4"> <area x="88%" y="51%" width="11%" height="19%" layer="4">
<drawtext align="center" y="80%" font="{regular}" fontsize="14%" color="{clrWhite}" text="GPU Temp: {gputemp}°C" /> <drawtext align="center" y="85%" font="{regular}" fontsize="15%" color="{clrWhite}" text="GPU Temp: {gputemp}°C" />
</area> </area>
</temperatures> </temperatures>

View File

@ -0,0 +1 @@
Description = default

View File

@ -423,6 +423,5 @@ bool cViewHelpers::SetDate(map < string, string > &stringTokens, map < string, i
stringTokens.insert(pair<string,string>("daynameshort", *WeekDayName(now->tm_wday))); stringTokens.insert(pair<string,string>("daynameshort", *WeekDayName(now->tm_wday)));
stringTokens.insert(pair<string,string>("time", *TimeString(t))); stringTokens.insert(pair<string,string>("time", *TimeString(t)));
lastMinute = min;
return true; return true;
} }