diff options
Diffstat (limited to 'addons/skin.confluence/720p')
-rw-r--r-- | addons/skin.confluence/720p/MyPVRRecordings.xml | 26 | ||||
-rw-r--r-- | addons/skin.confluence/720p/ViewsFileMode.xml | 58 | ||||
-rw-r--r-- | addons/skin.confluence/720p/ViewsVideoLibrary.xml | 76 | ||||
-rw-r--r-- | addons/skin.confluence/720p/includes.xml | 4 |
4 files changed, 94 insertions, 70 deletions
diff --git a/addons/skin.confluence/720p/MyPVRRecordings.xml b/addons/skin.confluence/720p/MyPVRRecordings.xml index 00a36cfcd8..5c39911c90 100644 --- a/addons/skin.confluence/720p/MyPVRRecordings.xml +++ b/addons/skin.confluence/720p/MyPVRRecordings.xml @@ -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"> @@ -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> diff --git a/addons/skin.confluence/720p/ViewsFileMode.xml b/addons/skin.confluence/720p/ViewsFileMode.xml index 08852888fc..0b3be747e4 100644 --- a/addons/skin.confluence/720p/ViewsFileMode.xml +++ b/addons/skin.confluence/720p/ViewsFileMode.xml @@ -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"> @@ -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> @@ -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"> @@ -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> diff --git a/addons/skin.confluence/720p/ViewsVideoLibrary.xml b/addons/skin.confluence/720p/ViewsVideoLibrary.xml index 02ec2de473..443cd629d5 100644 --- a/addons/skin.confluence/720p/ViewsVideoLibrary.xml +++ b/addons/skin.confluence/720p/ViewsVideoLibrary.xml @@ -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> @@ -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> @@ -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> @@ -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> @@ -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> @@ -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> diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml index 94831a40d2..ce5ad24f2d 100644 --- a/addons/skin.confluence/720p/includes.xml +++ b/addons/skin.confluence/720p/includes.xml @@ -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> |