diff options
| author | Philipp Te <philipptemminghoff@gmx.de> | 2015-01-02 00:49:31 +0100 |
|---|---|---|
| committer | Philipp Te <philipptemminghoff@gmx.de> | 2015-01-10 17:18:12 +0100 |
| commit | 5351af5318b47c76cf06db01d63cf8db8370c03b (patch) | |
| tree | b20a57191e42c30b732286867838b4a714b95883 /addons/skin.confluence | |
| parent | 16fd3bdc0c62dee1ed9427c4167d2c0c45bbf5fa (diff) | |
[CONFLUENCE] use VARs for list overlays
[CONFLUENCE] removed some unneccessary condition checks, moved Vars to Includes.xml
Diffstat (limited to 'addons/skin.confluence')
| -rw-r--r-- | addons/skin.confluence/720p/ViewsVideoLibrary.xml | 108 | ||||
| -rw-r--r-- | addons/skin.confluence/720p/includes.xml | 9 |
2 files changed, 24 insertions, 93 deletions
diff --git a/addons/skin.confluence/720p/ViewsVideoLibrary.xml b/addons/skin.confluence/720p/ViewsVideoLibrary.xml index 5e3c2e7c5d..d9867b5c89 100644 --- a/addons/skin.confluence/720p/ViewsVideoLibrary.xml +++ b/addons/skin.confluence/720p/ViewsVideoLibrary.xml @@ -811,36 +811,17 @@ <top>8</top> <width>40</width> <height>26</height> - <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture> + <texture>$VAR[ResolutionOverlayVar]</texture> <aspectratio>keep</aspectratio> - <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible> - <visible>!ListItem.IsStereoscopic</visible> - </control> - <control type="image"> - <left>515</left> - <top>8</top> - <width>40</width> - <height>26</height> - <texture>flagging/lists/3D.png</texture> - <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible> - <visible>ListItem.IsStereoscopic</visible> + <visible>Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)</visible> </control> <control type="image"> <left>555</left> <top>14</top> <width>20</width> <height>16</height> - <texture>$INFO[ListItem.Overlay]</texture> - <aspectratio>keep</aspectratio> - <visible>!ListItem.IsResumable</visible> - </control> - <control type="image"> - <left>555</left> - <top>14</top> - <width>16</width> - <height>16</height> - <texture>OverlayWatching.png</texture> - <visible>ListItem.IsResumable</visible> + <texture>$VAR[OverlayVar]</texture> + <aspectratio align="left">keep</aspectratio> </control> </itemlayout> <focusedlayout height="40" width="580"> @@ -901,36 +882,17 @@ <top>8</top> <width>40</width> <height>26</height> - <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture> + <texture>$VAR[ResolutionOverlayVar]</texture> <aspectratio>keep</aspectratio> - <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible> - <visible>!ListItem.IsStereoscopic</visible> - </control> - <control type="image"> - <left>515</left> - <top>8</top> - <width>40</width> - <height>26</height> - <texture>flagging/lists/3D.png</texture> - <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible> - <visible>ListItem.IsStereoscopic</visible> + <visible>Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)</visible> </control> <control type="image"> <left>555</left> <top>14</top> <width>20</width> <height>16</height> - <texture>$INFO[ListItem.Overlay]</texture> - <aspectratio>keep</aspectratio> - <visible>!ListItem.IsResumable</visible> - </control> - <control type="image"> - <left>555</left> - <top>14</top> - <width>16</width> - <height>16</height> - <texture>OverlayWatching.png</texture> - <visible>ListItem.IsResumable</visible> + <texture>$VAR[OverlayVar]</texture> + <aspectratio align="left">keep</aspectratio> </control> </focusedlayout> </control> @@ -1265,36 +1227,17 @@ <top>8</top> <width>40</width> <height>26</height> - <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture> + <texture>$VAR[ResolutionOverlayVar]</texture> <aspectratio>keep</aspectratio> - <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible> - <visible>!ListItem.IsStereoscopic</visible> - </control> - <control type="image"> - <left>515</left> - <top>8</top> - <width>40</width> - <height>26</height> - <texture>flagging/lists/3D.png</texture> - <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible> - <visible>ListItem.IsStereoscopic</visible> + <visible>Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)</visible> </control> <control type="image"> <left>555</left> <top>14</top> <width>20</width> <height>16</height> - <texture>$INFO[ListItem.Overlay]</texture> - <aspectratio>keep</aspectratio> - <visible>!ListItem.IsResumable</visible> - </control> - <control type="image"> - <left>555</left> - <top>14</top> - <width>16</width> - <height>16</height> - <texture>OverlayWatching.png</texture> - <visible>ListItem.IsResumable</visible> + <texture>$VAR[OverlayVar]</texture> + <aspectratio align="left">keep</aspectratio> </control> </itemlayout> <focusedlayout height="40" width="580"> @@ -1355,36 +1298,17 @@ <top>8</top> <width>40</width> <height>26</height> - <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture> + <texture>$VAR[ResolutionOverlayVar]</texture> <aspectratio>keep</aspectratio> - <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible> - <visible>!ListItem.IsStereoscopic</visible> - </control> - <control type="image"> - <left>515</left> - <top>8</top> - <width>40</width> - <height>26</height> - <texture>flagging/lists/3D.png</texture> - <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible> - <visible>ListItem.IsStereoscopic</visible> + <visible>Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)</visible> </control> <control type="image"> <left>555</left> <top>14</top> <width>20</width> <height>16</height> - <texture>$INFO[ListItem.Overlay]</texture> - <aspectratio>keep</aspectratio> - <visible>!ListItem.IsResumable</visible> - </control> - <control type="image"> - <left>555</left> - <top>14</top> - <width>16</width> - <height>16</height> - <texture>OverlayWatching.png</texture> - <visible>ListItem.IsResumable</visible> + <texture>$VAR[OverlayVar]</texture> + <aspectratio align="left">keep</aspectratio> </control> </focusedlayout> </control> diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml index 3bf5f7e458..d7ce3c79b0 100644 --- a/addons/skin.confluence/720p/includes.xml +++ b/addons/skin.confluence/720p/includes.xml @@ -17,7 +17,14 @@ <constant name="FanartCrossfadeTime">500</constant> <constant name="IconCrossfadeTime">400</constant> - + <variable name="ResolutionOverlayVar"> + <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> |