Skip to content

Commit

Permalink
Merge pull request xbmc#7752 from arnova/watched_overlay_fix
Browse files Browse the repository at this point in the history 
fixed: Watched icon not displayed if item is also resumable (fixes xbmc#15766)
  • Loading branch information
@MartijnKaijser
MartijnKaijser committed Aug 10, 2015
2 parents 6b6b396 + 0823a6f commit 7da2e16
Show file tree
Hide file tree
Showing 4 changed files with 94 additions and 70 deletions.
26 changes: 12 additions & 14 deletions addons/skin.confluence/720p/MyPVRRecordings.xml
View file
Expand Up @@ -112,19 +112,18 @@
<control type="image">
<left>730</left>
<top>14</top>
<width>20</width>
<width>16</width>
<height>16</height>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio>keep</aspectratio>
<visible>!ListItem.IsResumable</visible>
<texture>OverlayWatching.png</texture>
<visible>ListItem.IsResumable</visible>
</control>
<control type="image">
<left>730</left>
<top>14</top>
<width>16</width>
<width>20</width>
<height>16</height>
<texture>OverlayWatching.png</texture>
<visible>ListItem.IsResumable</visible>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio>keep</aspectratio>
</control>
</itemlayout>
<focusedlayout height="40" width="760">
Expand Down Expand Up @@ -189,19 +188,18 @@
<control type="image">
<left>730</left>
<top>14</top>
<width>20</width>
<width>16</width>
<height>16</height>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio>keep</aspectratio>
<visible>!ListItem.IsResumable</visible>
<texture>OverlayWatching.png</texture>
<visible>ListItem.IsResumable</visible>
</control>
<control type="image">
<left>730</left>
<top>14</top>
<width>16</width>
<width>20</width>
<height>16</height>
<texture>OverlayWatching.png</texture>
<visible>ListItem.IsResumable</visible>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio>keep</aspectratio>
</control>
</focusedlayout>
</control>
Expand Down
58 changes: 29 additions & 29 deletions addons/skin.confluence/720p/ViewsFileMode.xml
View file
Expand Up @@ -75,19 +75,19 @@
<control type="image">
<left>665</left>
<top>14</top>
<width>20</width>
<width>16</width>
<height>16</height>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio>keep</aspectratio>
<visible>Window.IsVisible(Videos) + !ListItem.IsResumable</visible>
<texture>OverlayWatching.png</texture>
<visible>Window.IsVisible(Videos) + ListItem.IsResumable</visible>
</control>
<control type="image">
<left>665</left>
<top>14</top>
<width>16</width>
<width>20</width>
<height>16</height>
<texture>OverlayWatching.png</texture>
<visible>Window.IsVisible(Videos) + ListItem.IsResumable</visible>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio>keep</aspectratio>
<visible>Window.IsVisible(Videos)</visible>
</control>
</itemlayout>
<focusedlayout height="40" width="580">
Expand Down Expand Up @@ -168,19 +168,19 @@
<control type="image">
<left>665</left>
<top>14</top>
<width>20</width>
<width>16</width>
<height>16</height>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio>keep</aspectratio>
<visible>Window.IsVisible(Videos) + !ListItem.IsResumable</visible>
<texture>OverlayWatching.png</texture>
<visible>Window.IsVisible(Videos) + ListItem.IsResumable</visible>
</control>
<control type="image">
<control type="image">
<left>665</left>
<top>14</top>
<width>16</width>
<width>20</width>
<height>16</height>
<texture>OverlayWatching.png</texture>
<visible>Window.IsVisible(Videos) + ListItem.IsResumable</visible>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio>keep</aspectratio>
<visible>Window.IsVisible(Videos)</visible>
</control>
</focusedlayout>
</control>
Expand Down Expand Up @@ -575,19 +575,19 @@
<control type="image">
<left>1050</left>
<top>14</top>
<width>20</width>
<width>16</width>
<height>16</height>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio>keep</aspectratio>
<visible>Window.IsVisible(Videos) + !ListItem.IsResumable</visible>
<texture>OverlayWatching.png</texture>
<visible>Window.IsVisible(Videos) + ListItem.IsResumable</visible>
</control>
<control type="image">
<left>1050</left>
<top>14</top>
<width>16</width>
<width>20</width>
<height>16</height>
<texture>OverlayWatching.png</texture>
<visible>Window.IsVisible(Videos) + ListItem.IsResumable</visible>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio>keep</aspectratio>
<visible>Window.IsVisible(Videos)</visible>
</control>
</itemlayout>
<focusedlayout height="40" width="1080">
Expand Down Expand Up @@ -676,19 +676,19 @@
<control type="image">
<left>1050</left>
<top>14</top>
<width>20</width>
<width>16</width>
<height>16</height>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio>keep</aspectratio>
<visible>Window.IsVisible(Videos) + !ListItem.IsResumable</visible>
<texture>OverlayWatching.png</texture>
<visible>Window.IsVisible(Videos) + ListItem.IsResumable</visible>
</control>
<control type="image">
<left>1050</left>
<top>14</top>
<width>16</width>
<width>20</width>
<height>16</height>
<texture>OverlayWatching.png</texture>
<visible>Window.IsVisible(Videos) + ListItem.IsResumable</visible>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio>keep</aspectratio>
<visible>Window.IsVisible(Videos)</visible>
</control>
</focusedlayout>
</control>
Expand Down
76 changes: 53 additions & 23 deletions addons/skin.confluence/720p/ViewsVideoLibrary.xml
View file
Expand Up @@ -818,9 +818,17 @@
<control type="image">
<left>555</left>
<top>14</top>
<width>20</width>
<width>16</width>
<height>16</height>
<texture>OverlayWatching.png</texture>
<visible>ListItem.IsResumable</visible>
</control>
<control type="image">
<left>555</left>
<top>14</top>
<width>16</width>
<height>16</height>
<texture>$VAR[OverlayVar]</texture>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio align="left">keep</aspectratio>
</control>
</itemlayout>
Expand Down Expand Up @@ -889,9 +897,17 @@
<control type="image">
<left>555</left>
<top>14</top>
<width>20</width>
<width>16</width>
<height>16</height>
<texture>$VAR[OverlayVar]</texture>
<texture>OverlayWatching.png</texture>
<visible>ListItem.IsResumable</visible>
</control>
<control type="image">
<left>555</left>
<top>14</top>
<width>16</width>
<height>16</height>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio align="left">keep</aspectratio>
</control>
</focusedlayout>
Expand Down Expand Up @@ -1234,9 +1250,17 @@
<control type="image">
<left>555</left>
<top>14</top>
<width>20</width>
<width>16</width>
<height>16</height>
<texture>$VAR[OverlayVar]</texture>
<texture>OverlayWatching.png</texture>
<visible>ListItem.IsResumable</visible>
</control>
<control type="image">
<left>555</left>
<top>14</top>
<width>16</width>
<height>16</height>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio align="left">keep</aspectratio>
</control>
</itemlayout>
Expand Down Expand Up @@ -1305,9 +1329,17 @@
<control type="image">
<left>555</left>
<top>14</top>
<width>20</width>
<width>16</width>
<height>16</height>
<texture>$VAR[OverlayVar]</texture>
<texture>OverlayWatching.png</texture>
<visible>ListItem.IsResumable</visible>
</control>
<control type="image">
<left>555</left>
<top>14</top>
<width>16</width>
<height>16</height>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio align="left">keep</aspectratio>
</control>
</focusedlayout>
Expand Down Expand Up @@ -1595,21 +1627,20 @@
<control type="image">
<left>320</left>
<top>14</top>
<width>20</width>
<width>16</width>
<height>16</height>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio>keep</aspectratio>
<visible>!ListItem.IsResumable</visible>
<texture>OverlayWatching.png</texture>
<visible>ListItem.IsResumable</visible>
</control>
</itemlayout>
<control type="image">
<left>320</left>
<top>14</top>
<width>16</width>
<width>20</width>
<height>16</height>
<texture>OverlayWatching.png</texture>
<visible>ListItem.IsResumable</visible>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio>keep</aspectratio>
</control>
</itemlayout>
<focusedlayout height="40" width="345">
<control type="image">
<left>0</left>
Expand Down Expand Up @@ -1644,19 +1675,18 @@
<control type="image">
<left>320</left>
<top>14</top>
<width>20</width>
<width>16</width>
<height>16</height>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio>keep</aspectratio>
<visible>!ListItem.IsResumable</visible>
<texture>OverlayWatching.png</texture>
<visible>ListItem.IsResumable</visible>
</control>
<control type="image">
<left>320</left>
<top>14</top>
<width>16</width>
<width>20</width>
<height>16</height>
<texture>OverlayWatching.png</texture>
<visible>ListItem.IsResumable</visible>
<texture>$INFO[ListItem.Overlay]</texture>
<aspectratio>keep</aspectratio>
</control>
</focusedlayout>
</control>
Expand Down
4 changes: 0 additions & 4 deletions addons/skin.confluence/720p/includes.xml
View file
Expand Up @@ -21,10 +21,6 @@
<value condition="!ListItem.IsStereoscopic">$INFO[ListItem.VideoResolution,flagging/lists/,.png]</value>
<value>flagging/lists/3D.png</value>
</variable>
<variable name="OverlayVar">
<value condition="!ListItem.IsResumable">$INFO[ListItem.Overlay]</value>
<value>OverlayWatching.png</value>
</variable>
<variable name="BannerThumb">
<value condition="!IsEmpty(ListItem.Art(banner))">$INFO[ListItem.Art(banner)]</value>
<value>$INFO[ListItem.Icon]</value>
Expand Down

0 comments on commit 7da2e16

Please sign in to comment.