Skip to content

Commit 5552e00

Browse files
MikeSiLVOMikeSiLVO
committed
[PVR] Cleanup, fixes, and additions
1 parent e572ef8 commit 5552e00

File tree

6 files changed

+117
-132
lines changed

6 files changed

+117
-132
lines changed

‎16x9/DialogPVRChannelGuide.xml

Lines changed: 37 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@
2727
<font>font60</font>
2828
<label>$INFO[VideoPlayer.ChannelNumberlabel]$INFO[VideoPlayer.ChannelName, ]</label>
2929
</control>
30+
<control type="label">
31+
<left>202</left>
32+
<top>120</top>
33+
<width>800</width>
34+
<height>60</height>
35+
<font>font16</font>
36+
<textcolor>$VAR[ThemeLabelColor]</textcolor>
37+
<label>$INFO[ListItem.StartDate]</label>
38+
</control>
3039
<control type="list" id="11">
3140
<top>200</top>
3241
<width>937</width>
@@ -46,7 +55,7 @@
4655
<height>60</height>
4756
<font>font15</font>
4857
<label>$INFO[ListItem.StartTime]$INFO[ListItem.Label, - ]</label>
49-
<animation effect="slide" start="0,0" end="40,0" time="0" tween="sine" easing="in" condition="[ListItem.HasTimer | ListItem.IsRecording]">Conditional</animation>
58+
<animation effect="slide" end="45" time="0" condition="[ListItem.HasTimer | ListItem.IsRecording]">Conditional</animation>
5059
</control>
5160
<control type="label">
5261
<top>20</top>
@@ -76,37 +85,39 @@
7685
<visible>Control.HasFocus(11)</visible>
7786
<include>VisibleFadeAnimation</include>
7887
</control>
88+
<control type="group">
89+
<animation effect="slide" end="0,-15" time="0" condition="[!String.IsEmpty(VideoPlayer.Season) | !String.IsEmpty(VideoPlayer.Episode)]">Conditional</animation>
90+
<control type="label">
91+
<left>10</left>
92+
<top>5</top>
93+
<width>700</width>
94+
<height>60</height>
95+
<font>font15</font>
96+
<textcolor>$VAR[ThemeLabelColor]</textcolor>
97+
<label>$INFO[ListItem.StartTime]$INFO[ListItem.Label, - ]</label>
98+
<animation effect="slide" end="45" time="0" condition="[ListItem.HasTimer | ListItem.IsRecording]">Conditional</animation>
99+
</control>
100+
<control type="label">
101+
<left>570</left>
102+
<top>5</top>
103+
<width>350</width>
104+
<height>60</height>
105+
<font>font12</font>
106+
<align>right</align>
107+
<label>$VAR[ItemDurationVar]</label>
108+
</control>
109+
</control>
79110
<control type="label">
80111
<left>10</left>
81-
<top>5</top>
112+
<top>28</top>
82113
<width>700</width>
83114
<height>60</height>
84-
<font>font15</font>
85-
<label>$INFO[ListItem.StartTime]$INFO[ListItem.Label, - ]</label>
86-
<animation effect="slide" end="45" time="0" condition="[ListItem.HasTimer | ListItem.IsRecording]">Conditional</animation>
87-
</control>
88-
<control type="label">
89-
<left>490</left>
90-
<top>23</top>
91-
<width>437</width>
92-
<height>60</height>
93-
<font>font12</font>
94-
<align>right</align>
95-
<label>$INFO[ListItem.StartDate]</label>
96-
</control>
97-
<control type="label">
98-
<left>690</left>
99-
<top>-10</top>
100-
<width>237</width>
101-
<height>60</height>
102115
<font>font12</font>
103-
<align>right</align>
104-
<textcolor>white2</textcolor>
105-
<label>$INFO[ListItem.EndTime,$LOCALIZE[31393]: ]</label>
116+
<label>$INFO[VideoPlayer.Season,$LOCALIZE[20373] ,: ]$INFO[VideoPlayer.Episode,$LOCALIZE[20359] ]</label>
106117
</control>
107118
<control type="textbox">
108119
<top>75</top>
109-
<left>15</left>
120+
<left>10</left>
110121
<width>907</width>
111122
<height>80</height>
112123
<font>font14</font>
@@ -147,14 +158,14 @@
147158
</focusedlayout>
148159
</control>
149160
<control type="scrollbar" id="60">
150-
<left>937</left>
161+
<left>935</left>
151162
<top>215</top>
152163
<width>14</width>
153164
<height>840</height>
154165
<showonepage>false</showonepage>
155166
<texturesliderbackground />
156167
<texturesliderbar colordiffuse="80FFFFFF" border="1">scrollbar/texturesliderbar2.png</texturesliderbar>
157-
<texturesliderbarfocus border="1">scrollbar/texturesliderbar2.png</texturesliderbarfocus>
168+
<texturesliderbarfocus colordiffuse="$VAR[ThemeLabelColor]" border="1">scrollbar/texturesliderbar2.png</texturesliderbarfocus>
158169
<onleft>11</onleft>
159170
<onright>Dialog.Close(pvrchannelguide)</onright>
160171
<ondown>61</ondown>

‎16x9/DialogPVRInfo.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<font>font15</font>
5959
<textcolor>$VAR[ThemeLabelColor]</textcolor>
6060
<scroll>true</scroll>
61-
<label>$INFO[ListItem.EpisodeName]</label>
61+
<label>$VAR[EpisodeCountVar,, - ]$INFO[ListItem.EpisodeName]</label>
6262
</control>
6363
</control>
6464
<control type="image">
@@ -223,7 +223,6 @@
223223
<control type="button" id="6">
224224
<description>Record</description>
225225
<width>auto</width>
226-
<label />
227226
</control>
228227
<control type="button" id="9">
229228
<description>Timer</description>

‎16x9/Includes.xml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2873,15 +2873,15 @@
28732873
<left>15</left>
28742874
<visible>VideoPlayer.HasInfo + Skin.HasSetting(Enable.AddonInfo) + ![VideoPlayer.Content(LiveTV) | Pvr.IsPlayingRecording | VideoPlayer.Content(movies) | VideoPlayer.Content(episodes) | VideoPlayer.Content(musicvideos)] | [VideoPlayer.HasInfo + Skin.HasSetting(Enable.RecordingInfo) + Pvr.IsPlayingRecording]</visible>
28752875
<control type="image">
2876-
<top>67</top>
2876+
<top>65</top>
28772877
<width>400</width>
28782878
<height>263</height>
28792879
<aspectratio aligny="top">keep</aspectratio>
28802880
<texture background="true" diffuse="thumbs/movieposter_mask.png" fallback="$INFO[Player.Art(thumb)]">$INFO[VideoPlayer.Cover]</texture>
28812881
</control>
28822882
<control type="group">
28832883
<left>400</left>
2884-
<top>60</top>
2884+
<top>40</top>
28852885
<width>1420</width>
28862886
<height>500</height>
28872887
<control type="grouplist">
@@ -2923,8 +2923,15 @@
29232923
<height>60</height>
29242924
<font>font15</font>
29252925
<textcolor>$VAR[ThemeLabelColor]</textcolor>
2926-
<label>$INFO[VideoPlayer.ChannelName] $INFO[VideoPlayer.EpisodeName, - ]</label>
2927-
<visible>![String.IsEmpty(VideoPlayer.ChannelName) + String.IsEmpty(VideoPlayer.EpisodeName)]</visible>
2926+
<label>$INFO[VideoPlayer.ChannelName]</label>
2927+
<visible>!String.IsEmpty(VideoPlayer.ChannelName)</visible>
2928+
</control>
2929+
<control type="label">
2930+
<width>1480</width>
2931+
<height>60</height>
2932+
<font>font15</font>
2933+
<label>$INFO[VideoPlayer.Season,$LOCALIZE[20373] ,: ]$INFO[VideoPlayer.Episode,$LOCALIZE[20359], - ]$INFO[VideoPlayer.EpisodeName]</label>
2934+
<visible>!String.IsEmpty(VideoPlayer.EpisodeName)</visible>
29282935
</control>
29292936
<control type="label">
29302937
<width>1480</width>
@@ -3002,9 +3009,9 @@
30023009
<control type="label">
30033010
<width>auto</width>
30043011
<height>55</height>
3005-
<font>font48</font>
3012+
<font>font48_bold</font>
30063013
<scroll>true</scroll>
3007-
<label>[B]$INFO[VideoPlayer.Title][/B]</label>
3014+
<label>$INFO[VideoPlayer.Season,$LOCALIZE[20373] ,: ]$INFO[VideoPlayer.Episode,$LOCALIZE[20359] ]$INFO[VideoPlayer.Title, - ]</label>
30083015
<visible>String.IsEmpty(Window(fullscreeninfo).Property(LiveTVNext))</visible>
30093016
</control>
30103017
<control type="grouplist">

‎16x9/Includes_Backgrounds.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<control type="group">
5454
<include>WindowOpenCloseAnimation</include>
5555
<control type="group">
56-
<visible>[Control.IsVisible(50) + ![Window.Next(visualisation) + Window.IsActive(musicplaylist) + Skin.HasSetting(launchmusicfullscreen)]] | [Control.IsVisible(51) + !Skin.HasSetting(Enable.AlternateInfowall)] | Control.IsVisible(52) | Control.IsVisible(53) | Control.IsVisible(54) | Control.IsVisible(55) | Control.IsVisible(56) | Control.IsVisible(57) | Control.IsVisible(58) | Control.IsVisible(499) | Control.IsVisible(500) | Control.IsVisible(601) | Control.IsVisible(602) | Control.IsVisible(509) | [Control.IsVisible(507) + !Skin.HasSetting(alternatebiglistlayout)] | Window.IsActive(script-NextAired-TVGuide.xml) | Window.IsActive(script-NextAired-TVGuide2.xml) | Window.IsActive(SettingsCategory.xml) | Window.IsActive(systeminfo) | Window.IsActive(script-globalsearch.xml) | Window.IsActive(weather) | [Control.IsVisible(506) + Container.Content(movies) + String.IsEmpty(Skin.String(506.movies.ViewFloorStatus))] | [Control.IsVisible(506) + [Container.Content(tvshows) | Container.Content(seasons)] + String.IsEmpty(Skin.String(506.tvshows.ViewFloorStatus))] | [Control.IsVisible(506) + Container.Content(episodes) + String.IsEmpty(Skin.String(506.episodes.ViewFloorStatus))] | Window.IsActive(script-globalsearch.xml) | Window.IsActive(skinsettings) | Window.IsActive(filemanager) | [Window.IsActive(addoninformation) + Control.IsVisible(503)] | Window.IsActive(profiles) | Control.IsVisible(603)</visible>
56+
<visible>[Control.IsVisible(50) + ![Window.Next(visualisation) + Window.IsActive(musicplaylist) + Skin.HasSetting(launchmusicfullscreen)]] | [Control.IsVisible(51) + !Skin.HasSetting(Enable.AlternateInfowall)] | Control.IsVisible(52) | Control.IsVisible(53) | Control.IsVisible(54) | Control.IsVisible(55) | Control.IsVisible(56) | Control.IsVisible(57) | Control.IsVisible(58) | Control.IsVisible(499) | Control.IsVisible(500) | Control.IsVisible(601) | Control.IsVisible(602) | Control.IsVisible(509) | [Control.IsVisible(507) + !Skin.HasSetting(alternatebiglistlayout)] | Window.IsActive(script-NextAired-TVGuide.xml) | Window.IsActive(script-NextAired-TVGuide2.xml) | Window.IsActive(SettingsCategory.xml) | Window.IsActive(systeminfo) | Window.IsActive(script-globalsearch.xml) | Window.IsActive(weather) | [Control.IsVisible(506) + Container.Content(movies) + String.IsEmpty(Skin.String(506.movies.ViewFloorStatus))] | [Control.IsVisible(506) + [Container.Content(tvshows) | Container.Content(seasons)] + String.IsEmpty(Skin.String(506.tvshows.ViewFloorStatus))] | [Control.IsVisible(506) + Container.Content(episodes) + String.IsEmpty(Skin.String(506.episodes.ViewFloorStatus))] | Window.IsActive(script-globalsearch.xml) | Window.IsActive(skinsettings) | Window.IsActive(filemanager) | [Window.IsActive(addoninformation) + Control.IsVisible(503)] | Window.IsActive(profiles) | Control.IsVisible(603) | Window.IsActive(tvrecordings)</visible>
5757
<include>ViewAnimation</include>
5858
<animation effect="slide" end="0,57" time="320" tween="cubic" easing="inout" condition="![Control.IsVisible(52) | Control.IsVisible(53) | Control.IsVisible(54) | Control.IsVisible(56) | Control.IsVisible(57) | Control.IsVisible(58)] | Window.IsActive(1140)">Conditional</animation>
5959
<animation effect="slide" end="0,42" time="320" tween="cubic" easing="inout" condition="Control.IsVisible(53)">Conditional</animation>

‎16x9/MyPVRChannels.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@
265265
<top>94</top>
266266
<width>791</width>
267267
<height>27</height>
268-
<label>[B]$INFO[Container(50).ListItem.EpisodeName][/B]</label>
268+
<label>[B]$VAR[EpisodeCountVar,, - ]$INFO[Container(50).ListItem.EpisodeName][/B]</label>
269269
<font>font14</font>
270270
</control>
271271
<control type="textbox" id="70">
@@ -527,7 +527,7 @@
527527
<label>$INFO[Container(51).ListItem.StartTime]$INFO[Container(51).ListItem.EndTime, - ,: ][COLOR grey2]$INFO[Container(51).ListItem.Title][/COLOR]$INFO[Container(51).ListItem.Genre, $LOCALIZE[515]: [COLOR grey2],[/COLOR]]</label>
528528
</control>
529529
<control type="textbox" id="71">
530-
<label>[B]$INFO[Container(51).ListItem.EpisodeName,,[CR]][/B]$INFO[Container(51).ListItem.Plot]</label>
530+
<label>[B]$VAR[EpisodeCountVar,, - ]$INFO[Container(51).ListItem.EpisodeName,,[CR]][/B]$INFO[Container(51).ListItem.Plot]</label>
531531
<left>15</left>
532532
<top>50</top>
533533
<width>1286</width>
@@ -815,7 +815,7 @@
815815
<width>700</width>
816816
<height>27</height>
817817
<align>center</align>
818-
<label>[B]$INFO[Container(52).ListItem.EpisodeName][/B]</label>
818+
<label>[B]$VAR[EpisodeCountVar,, - ]$INFO[Container(52).ListItem.EpisodeName][/B]</label>
819819
<textcolor>$VAR[ThemeLabelColor]</textcolor>
820820
</control>
821821
<control type="textbox" id="72">

0 commit comments

Comments
 (0)