diff options
author | jezz_x <jezz_x@svn> | 2010-06-15 00:24:13 +0000 |
---|---|---|
committer | jezz_x <jezz_x@svn> | 2010-06-15 00:24:13 +0000 |
commit | 820a5cff8251b2b2ff400557043e47fbe2a0753f (patch) | |
tree | 959d0a35ea59260d79664ffab54be4da745ff465 /addons | |
parent | 9c0943a76610d45bd87e2aa91c0e41dbc5beb80c (diff) |
Changes: [Confluence] Improved the divx and file name flag reading and added "VHS" flag for filename and paths (don't ask for Betamax :)
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@31104 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'addons')
-rw-r--r-- | addons/skin.confluence/720p/DialogFullScreenInfo.xml | 4 | ||||
-rw-r--r-- | addons/skin.confluence/720p/IncludesCodecFlagging.xml | 14 | ||||
-rw-r--r-- | addons/skin.confluence/media/Makefile | 1 | ||||
-rw-r--r-- | addons/skin.confluence/media/flagging/video/vhs.png | bin | 0 -> 7417 bytes |
4 files changed, 14 insertions, 5 deletions
diff --git a/addons/skin.confluence/720p/DialogFullScreenInfo.xml b/addons/skin.confluence/720p/DialogFullScreenInfo.xml index 571f193332..806364688e 100644 --- a/addons/skin.confluence/720p/DialogFullScreenInfo.xml +++ b/addons/skin.confluence/720p/DialogFullScreenInfo.xml @@ -82,7 +82,7 @@ <aspectratio>keep</aspectratio>
<texture>$INFO[VideoPlayer.VideoCodec,flagging/video/,.png]</texture>
<!-- Don't show if its one of the 500 divx codecs -->
- <visible>![stringcompare(VideoPlayer.VideoCodec,divx) | stringcompare(VideoPlayer.VideoCodec,div3) |stringcompare(VideoPlayer.VideoCodec,div4) | stringcompare(VideoPlayer.VideoCodec,div5)]</visible>
+ <visible>![substring(VideoPlayer.VideoCodec,div,left) | stringcompare(VideoPlayer.VideoCodec,dx50)]</visible>
</control>
<control type="image">
<description>Divx Codec Image</description>
@@ -90,7 +90,7 @@ <height>40</height>
<aspectratio>keep</aspectratio>
<texture>flagging/video/divx.png</texture>
- <visible>stringcompare(VideoPlayer.VideoCodec,divx) | stringcompare(VideoPlayer.VideoCodec,div3) |stringcompare(VideoPlayer.VideoCodec,div4) | stringcompare(VideoPlayer.VideoCodec,div5)</visible>
+ <visible>[substring(VideoPlayer.VideoCodec,div,left) | stringcompare(VideoPlayer.VideoCodec,dx50)]</visible>
</control>
<control type="image">
diff --git a/addons/skin.confluence/720p/IncludesCodecFlagging.xml b/addons/skin.confluence/720p/IncludesCodecFlagging.xml index 104d32d1c0..3db0311648 100644 --- a/addons/skin.confluence/720p/IncludesCodecFlagging.xml +++ b/addons/skin.confluence/720p/IncludesCodecFlagging.xml @@ -14,7 +14,7 @@ <aspectratio>keep</aspectratio>
<texture>$INFO[ListItem.VideoCodec,flagging/video/,.png]</texture>
<!-- Don't show if its one of the 500 divx codecs -->
- <visible>![stringcompare(ListItem.VideoCodec,divx) | stringcompare(ListItem.VideoCodec,div3) |stringcompare(ListItem.VideoCodec,div4) | stringcompare(ListItem.VideoCodec,div5)]</visible>
+ <visible>![substring(ListItem.VideoCodec,div,left) | stringcompare(ListItem.VideoCodec,dx50)]</visible>
</control>
<control type="image">
<description>Divx Codec Image</description>
@@ -22,7 +22,7 @@ <height>33</height>
<aspectratio>keep</aspectratio>
<texture>flagging/video/divx.png</texture>
- <visible>stringcompare(ListItem.VideoCodec,divx) | stringcompare(ListItem.VideoCodec,div3) |stringcompare(ListItem.VideoCodec,div4) | stringcompare(ListItem.VideoCodec,div5)</visible>
+ <visible>[substring(ListItem.VideoCodec,div,left) | stringcompare(ListItem.VideoCodec,dx50)]</visible>
</control>
</include>
<include name="VideoTypeHackFlaggingConditions">
@@ -48,7 +48,7 @@ <height>33</height>
<aspectratio>keep</aspectratio>
<texture>flagging/video/dvd.png</texture>
- <visible>[substring(ListItem.FilenameAndPath,dvd) + !substring(ListItem.FilenameAndPath,hddvd)] + !Skin.HasSetting(HideFilenameFlagging)</visible>
+ <visible>[substring(ListItem.FilenameAndPath,dvd) + ![substring(ListItem.FilenameAndPath,hddvd) | substring(ListItem.FilenameAndPath,bluray) | substring(ListItem.FilenameAndPath,bdrip)]] + !Skin.HasSetting(HideFilenameFlagging)</visible>
</control>
<control type="image">
<description>TV Types Image</description>
@@ -58,6 +58,14 @@ <texture>flagging/video/TV.png</texture>
<visible>[substring(ListItem.FilenameAndPath,pdtv) | substring(ListItem.FilenameAndPath,hdtv) | substring(ListItem.FilenameAndPath,dsr)] + !Skin.HasSetting(HideFilenameFlagging)</visible>
</control>
+ <control type="image">
+ <description>VHS Image</description>
+ <width>90</width>
+ <height>33</height>
+ <aspectratio>keep</aspectratio>
+ <texture>flagging/video/vhs.png</texture>
+ <visible>substring(ListItem.FilenameAndPath,vhs) + !Skin.HasSetting(HideFilenameFlagging)</visible>
+ </control>
</include>
<include name="VideoMPAAFlaggingConditions">
<control type="image">
diff --git a/addons/skin.confluence/media/Makefile b/addons/skin.confluence/media/Makefile index ca02ae56bc..a5a75c9a25 100644 --- a/addons/skin.confluence/media/Makefile +++ b/addons/skin.confluence/media/Makefile @@ -163,6 +163,7 @@ IMAGES= \ flagging/video/vc-1.png \ flagging/video/wvc1.png \ flagging/video/xvid.png \ + flagging/video/vhs.png \ floor.png \ folder-focus.png \ GlassOverlay.png \ diff --git a/addons/skin.confluence/media/flagging/video/vhs.png b/addons/skin.confluence/media/flagging/video/vhs.png Binary files differnew file mode 100644 index 0000000000..0499b47986 --- /dev/null +++ b/addons/skin.confluence/media/flagging/video/vhs.png |