Skip to content

Commit

Permalink
Watch Recordings: add some extra information to this screen
Browse files Browse the repository at this point in the history 
* Add season/episode for series and year for movies to the recording list
* Add season/episode for series and year for movies, category and first aired
  to the program details area.

NOTE: this probably looks best if the 'Date Format' is dd/mm/yyyy or similar
and the 'Short Date Format' is dd/mm or similar.
  • Loading branch information
@paul-h
paul-h committed Dec 5, 2020
1 parent 671150f commit 4930770
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 24 deletions.
4 changes: 4 additions & 0 deletions base.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@
<shadowalpha>200</shadowalpha>
</fontdef>

<fontdef name="small_info" from="basesmaller">
<color>#f0f0f0</color>
</fontdef>

<!-- State variations on small font -->
<fontdef name="basesmall_normal_selected" from="basesmallbold">
<color>#ffffff</color>
Expand Down
73 changes: 49 additions & 24 deletions recordings-ui.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,6 @@
<filename>schedule_other.png</filename>
</imagetype>
</state>
<!-- <state name="normal">
<imagetype name="statusimage">
<filename>schedule_record.png</filename>
</imagetype>
</state> -->
<state name="running">
<imagetype name="statusimage">
<filename>schedule_recording.png</filename>
Expand All @@ -210,16 +205,21 @@
<state name="marked"></state>
</statetype>
<textarea name="titlesubtitle" from="buttontext">
<area>32,2,636,28</area>
<area>32,2,547,28</area>
<align>vcenter</align>
</textarea>
<textarea name="shortstartdate" from="titlesubtitle">
<area>614,2,120,28</area>
<textarea name="s00e00">
<area>584,2,120,28</area>
<align>right, vcenter</align>
</textarea>
<textarea name="syndicatedepisode" from="s00e00" depends="!s00e00"/>
<textarea name="year" from="s00e00" depends="!s00e00&amp;!syndicatedepisode"/>
<textarea name="shortstartdate">
<area>709,2,70,28</area>
<align>right,vcenter</align>
</textarea>
<textarea name="starttime" from="shortstartdate">
<area>740,2,114,28</area>
<align>right,vcenter</align>
<area>784,2,70,28</area>
</textarea>
<statetype name="watched">
<position>8,7</position>
Expand Down Expand Up @@ -250,7 +250,7 @@
<area>0,0,865,30</area>
</shape>
<textarea name="titlesubtitle" from="buttontext">
<area>32,2,636,28</area>
<area>32,2,547,28</area>
<font>basesmall_normal_selected</font>
<font state="disabled">basesmall_disabled_selected</font>
<font state="error">basesmall_error_selected</font>
Expand All @@ -259,13 +259,19 @@
<font state="running">basesmall_running_selected</font>
<align>vcenter</align>
</textarea>
<textarea name="shortstartdate" from="titlesubtitle">
<area>614,2,120,28</area>
<textarea name="s00e00">
<area>584,2,120,28</area>
<align>right, vcenter</align>
</textarea>
<textarea name="syndicatedepisode" from="s00e00" depends="!s00e00"/>
<textarea name="year" from="s00e00" depends="!s00e00&amp;!syndicatedepisode"/>

<textarea name="shortstartdate">
<area>709,2,70,28</area>
<align>right,vcenter</align>
</textarea>
<textarea name="starttime" from="shortstartdate">
<area>740,2,114,28</area>
<align>right,vcenter</align>
<area>784,2,70,28</area>
</textarea>
</state>
</statetype>
Expand Down Expand Up @@ -361,11 +367,6 @@
</state>
</statetype>

<!-- <imagetype name="watched">
<filename>watched.png</filename>
<position>716,500</position>
</imagetype>-->

<imagetype name="processing">
<filename>processing.png</filename>
<position>1230,660</position>
Expand All @@ -385,7 +386,7 @@
<textarea name="timedate" from="baselabel">
<area>295,444,415,30</area>
<align>hcenter</align>
<template>%startdate%%| startyear%, %starttime% </template>
<template>%startdate%, %starttime% </template>
</textarea>

<textarea name="filesize_str" from="baselabel">
Expand All @@ -394,13 +395,37 @@
</textarea>

<textarea name="description" from="basetextarea">
<area>30,480,885,210</area>
<area>30,480,885,190</area>
<multiline>yes</multiline>
<scroll direction="vertical" />
<cutdown>no</cutdown>
<cutdown>yes</cutdown>
<template>%"|SUBTITLE|" %%(|STARS|) %%DESCRIPTION%</template>
</textarea>

<textarea name="category" from="baselabel">
<area>30,665,310,30</area>
<font>small_info</font>
<align>left, vcenter</align>
<template>CATEGORY</template>
</textarea>

<textarea name="seasonepisode" from="category">
<area>348,665,250,30</area>
<align>center, vcenter</align>
<template>%Season: |SEASON%% Episode: |EPISODE%</template>
</textarea>

<textarea name="year" from="category" depends="!seasonepisode">
<area>348,665,250,30</area>
<align>center, vcenter</align>
<template>%Year: |YEAR%</template>
</textarea>

<textarea name="originalairdate" from="category">
<area>615,665,300,30</area>
<align>right, vcenter</align>
<template>%First Aired: |ORIGINALAIRDATE%</template>
</textarea>

<imagetype name="preview" depends="!coverart">
<area>920,410,320,240</area>
<preserveaspect>true</preserveaspect>
Expand Down

0 comments on commit 4930770

Please sign in to comment.