Skip to content

Commit

Permalink
PVR updates + better isplaying highlight in views
Browse files Browse the repository at this point in the history
  • Loading branch information
@Black09
Black09 committed May 18, 2013
1 parent bfb1c0d commit 7dd1b45
Show file tree
Hide file tree
Showing 13 changed files with 1,652 additions and 1,434 deletions.
8 changes: 4 additions & 4 deletions 1080i/DialogPVRChannelManager.xml
View file
Expand Up @@ -676,13 +676,13 @@
<ondown>ClearProperty(Focus)</ondown>
</control>
<control type="button" id="5">
<posx>883</posx>
<posx>733</posx>
<description>Apply changes</description>
<label>$LOCALIZE[14070]</label>
<width>400</width>
<width>500</width>
<include>DialogButtonDimensionsRightAlign</include>
<texturefocus>buttons/options-right-fo.png</texturefocus>
<texturenofocus>buttons/options-right-nf.png</texturenofocus>
<texturefocus border="0,0,100,0">buttons/options-right-fo.png</texturefocus>
<texturenofocus border="0,0,100,0">buttons/options-right-nf.png</texturenofocus>
<onleft>6</onleft>
<onright>4</onright>
<onup condition="!IsEmpty(Window.Property(Focus))">33</onup>
Expand Down
280 changes: 143 additions & 137 deletions 1080i/DialogPVRChannelsOSD.xml
View file

Large diffs are not rendered by default.

170 changes: 120 additions & 50 deletions 1080i/DialogPVRGuideOSD.xml
View file
Expand Up @@ -51,44 +51,87 @@
</control>
<control type="label">
<description>Label</description>
<posx>30</posx>
<posx>102</posx>
<posy>0</posy>
<width>620</width>
<width>90</width>
<height>76</height>
<font>Font-Condensed-S34</font>
<align>left</align>
<font>Font-Condensed-S33-B</font>
<align>right</align>
<label>$INFO[ListItem.StartTime]</label>
<textcolor>99FFFFFF</textcolor>
<selectedcolor>99FFFFFF</selectedcolor>
<scroll>false</scroll>
<visible>!substring(ListItem.StartTime,AM) + !substring(ListItem.StartTime,PM)</visible>
</control>
<control type="label">
<description>Label</description>
<posx>650</posx>
<posx>152</posx>
<posy>0</posy>
<width>620</width>
<width>130</width>
<height>76</height>
<font>Font-Condensed-S34-B</font>
<font>Font-Condensed-S33-B</font>
<align>right</align>
<label>$INFO[ListItem.StartTime]</label>
<textcolor>99FFFFFF</textcolor>
<selectedcolor>99FFFFFF</selectedcolor>
<scroll>false</scroll>
<visible>substring(ListItem.StartTime,AM) | substring(ListItem.StartTime,PM)</visible>
</control>
<control type="label">
<description>Label</description>
<posx>122</posx>
<posy>0</posy>
<width>530</width>
<height>76</height>
<font>Font-Condensed-S34</font>
<align>left</align>
<label>$INFO[ListItem.Label]</label>
<textcolor>77white</textcolor>
<selectedcolor>77white</selectedcolor>
<textcolor>99FFFFFF</textcolor>
<selectedcolor>99FFFFFF</selectedcolor>
<scroll>false</scroll>
<visible>!ListItem.HasTimer + !ListItem.IsRecording</visible>
<visible>!ListItem.HasTimer + !ListItem.IsRecording + !substring(ListItem.StartTime,AM) + !substring(ListItem.StartTime,PM)</visible>
</control>
<control type="label">
<description>Label</description>
<posx>597</posx>
<posx>122</posx>
<posy>0</posy>
<width>567</width>
<width>477</width>
<height>76</height>
<font>Font-Condensed-S34-B</font>
<align>right</align>
<font>Font-Condensed-S34</font>
<align>left</align>
<label>$INFO[ListItem.Label]</label>
<textcolor>77white</textcolor>
<selectedcolor>77white</selectedcolor>
<textcolor>99FFFFFF</textcolor>
<selectedcolor>99FFFFFF</selectedcolor>
<scroll>false</scroll>
<visible>ListItem.HasTimer | ListItem.IsRecording</visible>
<visible>[ListItem.HasTimer | ListItem.IsRecording] + !substring(ListItem.StartTime,AM) + !substring(ListItem.StartTime,PM)</visible>
</control>
<control type="label">
<description>Label</description>
<posx>172</posx>
<posy>0</posy>
<width>480</width>
<height>76</height>
<font>Font-Condensed-S34</font>
<align>left</align>
<label>$INFO[ListItem.Label]</label>
<textcolor>99FFFFFF</textcolor>
<selectedcolor>99FFFFFF</selectedcolor>
<scroll>false</scroll>
<visible>!ListItem.HasTimer + !ListItem.IsRecording + [substring(ListItem.StartTime,AM) | substring(ListItem.StartTime,PM)]</visible>
</control>
<control type="label">
<description>Label</description>
<posx>172</posx>
<posy>0</posy>
<width>427</width>
<height>76</height>
<font>Font-Condensed-S34</font>
<align>left</align>
<label>$INFO[ListItem.Label]</label>
<textcolor>99FFFFFF</textcolor>
<selectedcolor>99FFFFFF</selectedcolor>
<scroll>false</scroll>
<visible>[ListItem.HasTimer | ListItem.IsRecording] + [substring(ListItem.StartTime,AM) | substring(ListItem.StartTime,PM)]</visible>
</control>
<control type="group">
<visible>ListItem.IsRecording</visible>
Expand Down Expand Up @@ -116,14 +159,6 @@
<texture>windows/pvr/epg-timer.png</texture>
<visible>ListItem.HasTimer + !ListItem.IsRecording</visible>
</control>
<control type="image">
<posx>651</posx>
<posy>-10</posy>
<width>39</width>
<height>39</height>
<texture>windows/filemanager/selected.png</texture>
<visible>ListItem.IsSelected | ListItem.IsPlaying</visible>
</control>
</itemlayout>
<focusedlayout width="1080" height="76">
<control type="image">
Expand All @@ -147,44 +182,87 @@
<animation effect="fade" start="100" end="64" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(11)">Conditional</animation>
<control type="label">
<description>Label</description>
<posx>30</posx>
<posx>102</posx>
<posy>0</posy>
<width>620</width>
<width>90</width>
<height>76</height>
<font>Font-Condensed-S34</font>
<align>left</align>
<font>Font-Condensed-S33-B</font>
<align>right</align>
<label>$INFO[ListItem.StartTime]</label>
<textcolor>eewhite</textcolor>
<selectedcolor>eewhite</selectedcolor>
<scroll>false</scroll>
<visible>!substring(ListItem.StartTime,AM) + !substring(ListItem.StartTime,PM)</visible>
</control>
<control type="label">
<description>Label</description>
<posx>650</posx>
<posx>152</posx>
<posy>0</posy>
<width>620</width>
<width>130</width>
<height>76</height>
<font>Font-Condensed-S34-B</font>
<font>Font-Condensed-S33-B</font>
<align>right</align>
<label>$INFO[ListItem.StartTime]</label>
<textcolor>eewhite</textcolor>
<selectedcolor>eewhite</selectedcolor>
<scroll>false</scroll>
<visible>substring(ListItem.StartTime,AM) | substring(ListItem.StartTime,PM)</visible>
</control>
<control type="label">
<description>Label</description>
<posx>122</posx>
<posy>0</posy>
<width>530</width>
<height>76</height>
<font>Font-Condensed-S34</font>
<align>left</align>
<label>$INFO[ListItem.Label]</label>
<textcolor>D4FFFFFF</textcolor>
<selectedcolor>77white</selectedcolor>
<textcolor>eewhite</textcolor>
<selectedcolor>eewhite</selectedcolor>
<scroll>false</scroll>
<visible>!ListItem.HasTimer + !ListItem.IsRecording</visible>
<visible>!ListItem.HasTimer + !ListItem.IsRecording + !substring(ListItem.StartTime,AM) + !substring(ListItem.StartTime,PM)</visible>
</control>
<control type="label">
<description>Label</description>
<posx>597</posx>
<posx>122</posx>
<posy>0</posy>
<width>567</width>
<width>477</width>
<height>76</height>
<font>Font-Condensed-S34-B</font>
<align>right</align>
<font>Font-Condensed-S34</font>
<align>left</align>
<label>$INFO[ListItem.Label]</label>
<textcolor>D4FFFFFF</textcolor>
<selectedcolor>D4FFFFFF</selectedcolor>
<textcolor>eewhite</textcolor>
<selectedcolor>eewhite</selectedcolor>
<scroll>false</scroll>
<visible>ListItem.HasTimer | ListItem.IsRecording</visible>
<visible>[ListItem.HasTimer | ListItem.IsRecording] + !substring(ListItem.StartTime,AM) + !substring(ListItem.StartTime,PM)</visible>
</control>
<control type="label">
<description>Label</description>
<posx>172</posx>
<posy>0</posy>
<width>480</width>
<height>76</height>
<font>Font-Condensed-S34</font>
<align>left</align>
<label>$INFO[ListItem.Label]</label>
<textcolor>eewhite</textcolor>
<selectedcolor>eewhite</selectedcolor>
<scroll>false</scroll>
<visible>!ListItem.HasTimer + !ListItem.IsRecording + [substring(ListItem.StartTime,AM) | substring(ListItem.StartTime,PM)]</visible>
</control>
<control type="label">
<description>Label</description>
<posx>172</posx>
<posy>0</posy>
<width>427</width>
<height>76</height>
<font>Font-Condensed-S34</font>
<align>left</align>
<label>$INFO[ListItem.Label]</label>
<textcolor>eewhite</textcolor>
<selectedcolor>eewhite</selectedcolor>
<scroll>false</scroll>
<visible>[ListItem.HasTimer | ListItem.IsRecording] + [substring(ListItem.StartTime,AM) | substring(ListItem.StartTime,PM)]</visible>
</control>
</control>
<control type="group">
Expand Down Expand Up @@ -213,14 +291,6 @@
<texture>windows/pvr/epg-timer.png</texture>
<visible>ListItem.HasTimer + !ListItem.IsRecording</visible>
</control>
<control type="image">
<posx>651</posx>
<posy>-10</posy>
<width>39</width>
<height>39</height>
<texture>windows/filemanager/selected.png</texture>
<visible>ListItem.IsSelected | ListItem.IsPlaying</visible>
</control>
</focusedlayout>
</control>
<control type="image" id="62">
Expand Down
8 changes: 4 additions & 4 deletions 1080i/Includes_Animations.xml
View file
Expand Up @@ -274,10 +274,10 @@
</animation>
</include>
<include name="defaultfocusanim3">
<animation type="Focus" condition="Container(50).OnNext | Container(52).OnNext" reversible="false">
<animation type="Focus" condition="[Container(50).OnNext + !Container(50).ListItem.IsPlaying] | [Container(52).OnNext + !Container(52).ListItem.IsPlaying]" reversible="false">
<effect type="fade" start="10" end="100" tween="sine" easing="inout" time="800" />
</animation>
<animation type="Focus" condition="Container(50).OnPrevious | Container(52).OnPrevious" reversible="false">
<animation type="Focus" condition="[Container(50).OnPrevious + !Container(50).ListItem.IsPlaying] | [Container(52).OnPrevious + !Container(52).ListItem.IsPlaying]" reversible="false">
<effect type="fade" start="10" end="100" tween="sine" easing="inout" time="800" />
</animation>
</include>
Expand Down Expand Up @@ -413,11 +413,11 @@
<effect type="fade" start="100" end="0" tween="sine" easing="out" time="300" />
<effect type="zoom" start="100" end="50" center="960,540" tween="sine" easing="inout" time="300" />
</animation>
<animation type="Conditional" condition="!Window.IsActive(movieinformation) + !Window.IsActive(musicinformation) + !Window.IsActive(1122) + !Window.IsActive(script-Actors-DialogInfo.xml) + !Window.IsActive(script-Actors-DialogVideoInfo.xml) + IsEmpty(Window(Home).Property(script.metadata.actors.hasparent))" reversible="false">
<animation type="Conditional" condition="!Window.IsActive(movieinformation) + !Window.IsActive(musicinformation) + !Window.IsActive(1122) + !Window.IsActive(script-Actors-DialogInfo.xml) + !Window.IsActive(script-Actors-DialogVideoInfo.xml) + IsEmpty(Window(Home).Property(script.metadata.actors.hasparent)) + !Window.IsActive(favourites)" reversible="false">
<effect type="fade" start="0" end="100" time="300" delay="350" tween="sine" easing="in" />
<effect type="zoom" start="115" end="100" time="300" delay="350" center="auto" tween="sine" easing="out" />
</animation>
<animation type="Conditional" condition="Window.IsActive(movieinformation) | Window.IsActive(musicinformation) | Window.IsActive(1122) | Window.IsActive(script-Actors-DialogInfo.xml) | Window.IsActive(script-Actors-DialogVideoInfo.xml) | !IsEmpty(Window(Home).Property(script.metadata.actors.hasparent))" reversible="false">
<animation type="Conditional" condition="Window.IsActive(movieinformation) | Window.IsActive(musicinformation) | Window.IsActive(1122) | Window.IsActive(script-Actors-DialogInfo.xml) | Window.IsActive(script-Actors-DialogVideoInfo.xml) | !IsEmpty(Window(Home).Property(script.metadata.actors.hasparent)) | Window.IsActive(favourites)" reversible="false">
<effect type="zoom" start="100" end="115" center="auto" tween="sine" delay="0" easing="out" time="300" />
<effect type="fade" start="100" end="0" tween="cubic" easing="out" delay="0" time="300" />
</animation>
Expand Down
5 changes: 0 additions & 5 deletions 1080i/Includes_Dialogs.xml
View file
Expand Up @@ -34,11 +34,6 @@
<value>$INFO[Container(11).NumItems,, $LOCALIZE[19019]]$INFO[Container(11).CurrentPage, • $LOCALIZE[41819] ,]$INFO[Container(11).NumPages,/,]</value>
</variable>

<variable name="PVRChannelsOSDTitleLabel">
<value condition="PVR.IsPlayingRadio">$LOCALIZE[19024]$INFO[VideoPlayer.ChannelGroup, • ,]</value>
<value>$LOCALIZE[19023]$INFO[VideoPlayer.ChannelGroup, • ,]</value>
</variable>

<variable name="FileBrowserArtThumb">
<value condition="!IsEmpty(ListItem.Thumb)">$INFO[ListItem.Thumb]</value>
<value>$INFO[ListItem.ActualIcon,views/fallbacks/,/medium.png]</value>
Expand Down
19 changes: 19 additions & 0 deletions 1080i/Includes_SongInfo.xml
View file
Expand Up @@ -106,6 +106,25 @@
<onclick>IncreaseRating</onclick>
<animation effect="fade" start="100" end="75" time="0" condition="!Control.IsEnabled(15)">Conditional</animation>
</control>
<control type="image">
<posx>1167</posx>
<posy>-3</posy>
<width>105</width>
<height>105</height>
<texture>views/thumb/other/star_fo.png</texture>
</control>
<control type="label">
<posx>1296</posx>
<posy>0</posy>
<width>100</width>
<height>100</height>
<font>Font-Condensed-S34-B</font>
<align>right</align>
<label fallback="[COLOR=47FFFFFF]0.0[/COLOR]">$INFO[ListItem.Rating,,.0]</label>
<textcolor>eewhite</textcolor>
<selectedcolor>eewhite</selectedcolor>
<scroll>false</scroll>
</control>
</control>
</control>
</control>
Expand Down

0 comments on commit 7dd1b45

Please sign in to comment.