The branch, helix has been updated
via a4111aff0a940d4f2775340cc004de777f353f0a (commit)
from ecc3ee5aaa8fec27304990cc7c49fa2c007f6359 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/skins;a=commit;h=a4111aff0a940d4f2775340cc004de777f353f0a
commit a4111aff0a940d4f2775340cc004de777f353f0a
Author: ronie <ronie>
Date: Sat Oct 4 18:06:37 2014 +0200
skin.conq 2.1.0
diff --git a/skin.conq/16x9/DialogContentSettings.xml
b/skin.conq/16x9/DialogContentSettings.xml
index e69a773..6de38fb 100644
--- a/skin.conq/16x9/DialogContentSettings.xml
+++ b/skin.conq/16x9/DialogContentSettings.xml
@@ -100,15 +100,6 @@
<visible>!Control.HasFocus(20)</visible>
</control>
- <!-- Default divider -->
- <control type="image">
- <left>600</left>
- <top>284</top>
- <width>1200</width>
- <height>20</height>
- <texture border="1,12,1,1"
colordiffuse="DialogOverlayColorNF">common/ScrollBackgroundHorizontal.png</texture>
- </control>
-
<!-- Scraper list -->
<control type="list" id="21">
<left>600</left>
@@ -149,7 +140,6 @@
<width>1200</width>
<height>330</height>
<itemgap>0</itemgap>
- <itemgap>0</itemgap>
<onleft>noop</onleft>
<onright>noop</onright>
<onup>21</onup>
diff --git a/skin.conq/16x9/Include_Home_Default.xml
b/skin.conq/16x9/Include_Home_Default.xml
index 9415c26..651a0e2 100644
--- a/skin.conq/16x9/Include_Home_Default.xml
+++ b/skin.conq/16x9/Include_Home_Default.xml
@@ -113,8 +113,25 @@
<font>Font33</font>
<align>right</align>
<textcolor>$VAR[SubMenuColor]</textcolor>
+ <label>$INFO[Container(9002).ListItem.Label]</label>
+ <visible>Control.HasFocus(9002)</visible>
+ <animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
+ <animation effect="fade" start="0" end="100" time="200"
delay="100">Visible</animation>
+ <animation effect="slide" start="0,0" end="0,60"
time="0" condition="StringCompare(Container(9000).ListItem.Property(Widget),TV)
|
StringCompare(Container(9000).ListItem.Property(Widget),Radio)">conditional</animation>
+ <animation effect="slide" start="0,0" end="0,90"
time="0"
condition="StringCompare(Container(9000).ListItem.Property(Widget),VideoAddons)
| StringCompare(Container(9000).ListItem.Property(Widget),RecentAlbums) |
StringCompare(Container(9000).ListItem.Property(Widget),RandomAlbums) |
StringCompare(Container(9000).ListItem.Property(Widget),RecommendedAlbums) |
StringCompare(Container(9000).ListItem.Property(Widget),MusicAddons) |
StringCompare(Container(9000).ListItem.Property(Widget),PictureAddons) |
StringCompare(Container(9000).ListItem.Property(Widget),favourites) |
StringCompare(Container(9000).ListItem.Property(Widget),ProgramAddons)">conditional</animation>
+ </control>
+
+ <!-- Sub menu label -->
+ <control type="label">
+ <top>636</top>
+ <right>120</right>
+ <width>1000</width>
+ <height>33</height>
+ <font>Font33</font>
+ <align>right</align>
+ <textcolor>$VAR[SubMenuColor]</textcolor>
<label>$VAR[SubMenuHeading]</label>
- <visible>!Skin.HasSetting(HideSubmenuHeading)</visible>
+ <visible>!Control.HasFocus(9002)</visible>
<visible>!Container(9000).OnNext +
!Container(9000).OnPrevious</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
<animation effect="fade" start="0" end="100" time="200"
delay="100">Visible</animation>
@@ -1526,6 +1543,91 @@
</control>
+ <!-- Playlist menu -->
+ <control type="list" id="9002">
+ <left>2605</left>
+ <top>688</top>
+ <width>1218</width>
+ <height>306</height>
+ <onup>Control.Move(9000,-1)</onup>
+ <onup>PageUp</onup>
+ <onup>9000</onup>
+ <ondown>Control.Move(9000,1)</ondown>
+ <ondown>PageUp</ondown>
+ <ondown>9000</ondown>
+ <onleft>9000</onleft>
+ <onright>noop</onright>
+ <viewtype label="">list</viewtype>
+ <orientation>horizontal</orientation>
+ <defaultcontrol always="true">0</defaultcontrol>
+ <scrolltime tween="sine" easing="out">240</scrolltime>
+
<visible>StringCompare(Container(9000).ListItem.Property(Widget),Playlist)</visible>
+ <animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
+ <animation effect="fade" start="0" end="100" time="200"
delay="100" >Visible</animation>
+ <animation effect="slide" start="0,0" end="-1000,0"
time="0"
condition="StringCompare(Container(9002).NumItems,1)">conditional</animation>
+ <animation effect="slide" start="0,0" end="-1203,0"
time="0"
condition="StringCompare(Container(9002).NumItems,2)">conditional</animation>
+ <animation effect="slide" start="0,0" end="-1406,0"
time="0"
condition="StringCompare(Container(9002).NumItems,3)">conditional</animation>
+ <animation effect="slide" start="0,0" end="-1609,0"
time="0"
condition="StringCompare(Container(9002).NumItems,4)">conditional</animation>
+ <animation effect="slide" start="0,0" end="-1812,0"
time="0"
condition="StringCompare(Container(9002).NumItems,5)">conditional</animation>
+ <animation effect="slide" start="0,0" end="-2015,0"
time="0"
condition="IntegerGreaterThan(Container(9002).NumItems,5)">conditional</animation>
+
+ <itemlayout width="203" height="306">
+ <control type="image">
+ <left>13</left>
+ <top>0</top>
+ <width>183</width>
+ <height>306</height>
+ <texture colordiffuse="88f1f1f1"
background="true">$INFO[ListItem.Icon]</texture>
+ <aspectratio
align="center">scale</aspectratio>
+ <bordertexture
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
+ <bordersize>0,0,0,33</bordersize>
+ </control>
+ <control type="image">
+ <left>13</left>
+ <top>0</top>
+ <width>183</width>
+ <height>273</height>
+ <texture
border="14,14,14,100">views/OverlayEffectSmall.png</texture>
+
<visible>Skin.HasSetting(Overlays)</visible>
+ </control>
+ </itemlayout>
+
+ <focusedlayout width="203" height="306">
+ <control type="image">
+ <left>13</left>
+ <top>0</top>
+ <width>183</width>
+ <height>306</height>
+ <texture colordiffuse="88f1f1f1"
background="true">$INFO[ListItem.Icon]</texture>
+ <aspectratio
align="center">scale</aspectratio>
+ <bordertexture
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
+ <bordersize>0,0,0,33</bordersize>
+
<visible>!Control.HasFocus(9002)</visible>
+ </control>
+ <control type="image">
+ <left>13</left>
+ <top>0</top>
+ <width>183</width>
+ <height>306</height>
+ <texture
background="true">$INFO[ListItem.Icon]</texture>
+ <aspectratio
align="center">scale</aspectratio>
+ <bordertexture
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
+ <bordersize>0,0,0,33</bordersize>
+
<visible>Control.HasFocus(9002)</visible>
+ </control>
+ <control type="image">
+ <left>13</left>
+ <top>0</top>
+ <width>183</width>
+ <height>273</height>
+ <texture
border="14,14,14,100">views/OverlayEffectSmall.png</texture>
+
<visible>Skin.HasSetting(Overlays)</visible>
+ </control>
+ </focusedlayout>
+
<content>$INFO[Container(9000).ListItem.Property(widgetPlaylist)]</content>
+
+ </control>
+
<!-- PVR sub menu -->
<control type="list" id="9002">
<left>2605</left>
diff --git a/skin.conq/16x9/Includes_Widgets.xml
b/skin.conq/16x9/Includes_Widgets.xml
index 7f6f6ba..d438b4e 100644
--- a/skin.conq/16x9/Includes_Widgets.xml
+++ b/skin.conq/16x9/Includes_Widgets.xml
@@ -449,63 +449,63 @@
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RecentAlbum.1.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RecentAlbum.1.Title)]$INFO[Window.Property(RecentAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RecentAlbum.1.Title)]$INFO[Window.Property(RecentAlbum.1.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RecentAlbum.1.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RecentAlbum.1.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RecentAlbum.2.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RecentAlbum.2.Title)]$INFO[Window.Property(RecentAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RecentAlbum.2.Title)]$INFO[Window.Property(RecentAlbum.2.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RecentAlbum.2.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RecentAlbum.2.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RecentAlbum.3.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RecentAlbum.3.Title)]$INFO[Window.Property(RecentAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RecentAlbum.3.Title)]$INFO[Window.Property(RecentAlbum.3.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RecentAlbum.3.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RecentAlbum.3.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RecentAlbum.4.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RecentAlbum.4.Title)]$INFO[Window.Property(RecentAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RecentAlbum.4.Title)]$INFO[Window.Property(RecentAlbum.4.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RecentAlbum.4.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RecentAlbum.4.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RecentAlbum.5.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RecentAlbum.5.Title)]$INFO[Window.Property(RecentAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RecentAlbum.5.Title)]$INFO[Window.Property(RecentAlbum.5.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RecentAlbum.5.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RecentAlbum.5.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RecentAlbum.6.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RecentAlbum.6.Title)]$INFO[Window.Property(RecentAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RecentAlbum.6.Title)]$INFO[Window.Property(RecentAlbum.6.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RecentAlbum.6.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RecentAlbum.6.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RecentAlbum.7.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RecentAlbum.7.Title)]$INFO[Window.Property(RecentAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RecentAlbum.7.Title)]$INFO[Window.Property(RecentAlbum.7.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RecentAlbum.7.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RecentAlbum.7.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RecentAlbum.8.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RecentAlbum.8.Title)]$INFO[Window.Property(RecentAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RecentAlbum.8.Title)]$INFO[Window.Property(RecentAlbum.8.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RecentAlbum.8.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RecentAlbum.8.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RecentAlbum.9.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RecentAlbum.9.Title)]$INFO[Window.Property(RecentAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RecentAlbum.9.Title)]$INFO[Window.Property(RecentAlbum.9.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RecentAlbum.9.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RecentAlbum.9.Title))</visible>
</item>
@@ -523,63 +523,63 @@
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RecommendedAlbum.1.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RecommendedAlbum.1.Title)]$INFO[Window.Property(RecommendedAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RecommendedAlbum.1.Title)]$INFO[Window.Property(RecommendedAlbum.1.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RecommendedAlbum.1.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RecommendedAlbum.1.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RecommendedAlbum.2.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RecommendedAlbum.2.Title)]$INFO[Window.Property(RecommendedAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RecommendedAlbum.2.Title)]$INFO[Window.Property(RecommendedAlbum.2.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RecommendedAlbum.2.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RecommendedAlbum.2.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RecommendedAlbum.3.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RecommendedAlbum.3.Title)]$INFO[Window.Property(RecommendedAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RecommendedAlbum.3.Title)]$INFO[Window.Property(RecommendedAlbum.3.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RecommendedAlbum.3.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RecommendedAlbum.3.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RecommendedAlbum.4.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RecommendedAlbum.4.Title)]$INFO[Window.Property(RecommendedAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RecommendedAlbum.4.Title)]$INFO[Window.Property(RecommendedAlbum.4.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RecommendedAlbum.4.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RecommendedAlbum.4.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RecommendedAlbum.5.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RecommendedAlbum.5.Title)]$INFO[Window.Property(RecommendedAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RecommendedAlbum.5.Title)]$INFO[Window.Property(RecommendedAlbum.5.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RecommendedAlbum.5.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RecommendedAlbum.5.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RecommendedAlbum.6.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RecommendedAlbum.6.Title)]$INFO[Window.Property(RecommendedAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RecommendedAlbum.6.Title)]$INFO[Window.Property(RecommendedAlbum.6.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RecommendedAlbum.6.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RecommendedAlbum.6.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RecommendedAlbum.7.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RecommendedAlbum.7.Title)]$INFO[Window.Property(RecommendedAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RecommendedAlbum.7.Title)]$INFO[Window.Property(RecommendedAlbum.7.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RecommendedAlbum.7.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RecommendedAlbum.7.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RecommendedAlbum.8.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RecommendedAlbum.8.Title)]$INFO[Window.Property(RecommendedAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RecommendedAlbum.8.Title)]$INFO[Window.Property(RecommendedAlbum.8.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RecommendedAlbum.8.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RecommendedAlbum.8.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RecommendedAlbum.9.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RecommendedAlbum.9.Title)]$INFO[Window.Property(RecommendedAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RecommendedAlbum.9.Title)]$INFO[Window.Property(RecommendedAlbum.9.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RecommendedAlbum.9.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RecommendedAlbum.9.Title))</visible>
</item>
@@ -597,63 +597,63 @@
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RandomAlbum.1.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RandomAlbum.1.Title)]$INFO[Window.Property(RandomAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RandomAlbum.1.Title)]$INFO[Window.Property(RandomAlbum.1.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RandomAlbum.1.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RandomAlbum.1.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RandomAlbum.2.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RandomAlbum.2.Title)]$INFO[Window.Property(RandomAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RandomAlbum.2.Title)]$INFO[Window.Property(RandomAlbum.2.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RandomAlbum.2.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RandomAlbum.2.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RandomAlbum.3.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RandomAlbum.3.Title)]$INFO[Window.Property(RandomAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RandomAlbum.3.Title)]$INFO[Window.Property(RandomAlbum.3.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RandomAlbum.3.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RandomAlbum.3.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RandomAlbum.4.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RandomAlbum.4.Title)]$INFO[Window.Property(RandomAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RandomAlbum.4.Title)]$INFO[Window.Property(RandomAlbum.4.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RandomAlbum.4.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RandomAlbum.4.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RandomAlbum.5.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RandomAlbum.5.Title)]$INFO[Window.Property(RandomAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RandomAlbum.5.Title)]$INFO[Window.Property(RandomAlbum.5.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RandomAlbum.5.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RandomAlbum.5.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RandomAlbum.6.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RandomAlbum.6.Title)]$INFO[Window.Property(RandomAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RandomAlbum.6.Title)]$INFO[Window.Property(RandomAlbum.6.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RandomAlbum.6.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RandomAlbum.6.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RandomAlbum.7.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RandomAlbum.7.Title)]$INFO[Window.Property(RandomAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RandomAlbum.7.Title)]$INFO[Window.Property(RandomAlbum.7.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RandomAlbum.7.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RandomAlbum.7.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RandomAlbum.8.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RandomAlbum.8.Title)]$INFO[Window.Property(RandomAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RandomAlbum.8.Title)]$INFO[Window.Property(RandomAlbum.8.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RandomAlbum.8.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RandomAlbum.8.Title))</visible>
</item>
<item>
<icon>home/DefaultAlbum.png</icon>
<thumb>$INFO[Window.Property(RandomAlbum.9.Thumb)]</thumb>
-
<label>$INFO[Window.Property(RandomAlbum.9.Title)]$INFO[Window.Property(RandomAlbum.10.Artist),
- ]</label>
+
<label>$INFO[Window.Property(RandomAlbum.9.Title)]$INFO[Window.Property(RandomAlbum.9.Artist),
- ]</label>
<onclick>$INFO[Window.Property(RandomAlbum.9.Play)]</onclick>
<visible>!IsEmpty(Window.Property(RandomAlbum.9.Title))</visible>
</item>
diff --git a/skin.conq/16x9/Variables.xml b/skin.conq/16x9/Variables.xml
index ae2542b..906ddae 100644
--- a/skin.conq/16x9/Variables.xml
+++ b/skin.conq/16x9/Variables.xml
@@ -47,7 +47,7 @@
<variable name="BackgroundImage">
<value
condition="!IsEmpty(Skin.String(CustomBackgroundImage))">$INFO[Skin.String(CustomBackgroundImage)]</value>
- <value>special://skin/extras/backgrounds/blue.jpg</value>
+ <value>special://skin/extras/backgrounds/Blue.jpg</value>
</variable>
<variable name="SubMenuHeading">
diff --git a/skin.conq/16x9/script-skinshortcuts-includes.xml
b/skin.conq/16x9/script-skinshortcuts-includes.xml
index fc8f31d..62b671c 100644
--- a/skin.conq/16x9/script-skinshortcuts-includes.xml
+++ b/skin.conq/16x9/script-skinshortcuts-includes.xml
@@ -28,8 +28,9 @@
<visible>StringCompare(System.ProfileName,Master
user)</visible>
<property name="submenuVisibility">videos</property>
<property name="group">mainmenu</property>
- <property name="widget">VideoAddons</property>
- <property name="widgetName">Video addons</property>
+ <property name="widget">Playlist</property>
+ <property name="widgetName">test</property>
+ <property
name="widgetPlaylist">special://profile/playlists/video/test.xsp</property>
<property name="hasSubmenu">True</property>
</item>
<item id="3">
@@ -167,7 +168,7 @@
<item id="12">
<label>$LOCALIZE[137]</label>
<label2>Custom shortcut</label2>
- <icon />
+ <icon>DefaultShortcut.png</icon>
<thumb />
<property name="labelID">script.globalsearch</property>
<property
name="defaultID">script.globalsearch</property>
@@ -205,6 +206,21 @@
<property name="widgetName">PVR Status</property>
<property name="hasSubmenu">True</property>
</item>
+ <item id="15">
+ <label>test</label>
+ <label2>Video Playlist</label2>
+ <icon>DefaultPlaylist.png</icon>
+ <thumb />
+ <property name="labelID">test</property>
+ <property name="defaultID">test</property>
+
<onclick>ActivateWindow(VideoLibrary,special://profile/playlists/video/test.xsp,
return)</onclick>
+ <visible>StringCompare(System.ProfileName,Master
user)</visible>
+ <property name="submenuVisibility">test</property>
+ <property name="group">mainmenu</property>
+ <property name="widget">Playlist</property>
+ <property name="widgetName">test</property>
+ <property
name="widgetPlaylist">special://profile/playlists/video/test.xsp</property>
+ </item>
</include>
<include />
<include name="skinshortcuts-submenu">
@@ -1653,4 +1669,6 @@
<property name="group">livetv</property>
</item>
</include>
+ <include name="skinshortcuts-group-test" />
+ <include name="skinshortcuts-group-alt-test" />
</includes>
diff --git a/skin.conq/addon.xml b/skin.conq/addon.xml
index 5fea859..45777e5 100644
--- a/skin.conq/addon.xml
+++ b/skin.conq/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="skin.conq"
- version="2.0.4"
+ version="2.1.0"
name="Conq"
provider-name="Hitcher">
<requires>
diff --git a/skin.conq/changelog.txt b/skin.conq/changelog.txt
index fc762f1..5a636bf 100644
--- a/skin.conq/changelog.txt
+++ b/skin.conq/changelog.txt
@@ -1,3 +1,12 @@
+[B]2.1.0[/B]
+
+- Fixed case sensative problem
+- Fixed album widget artist problem
+
+[B]2.0.5[/B]
+
+- Fixed playlist widget for default home layout
+
[B]2.0.4[/B]
- Updated weather screen
-----------------------------------------------------------------------
Summary of changes:
skin.conq/16x9/DialogContentSettings.xml | 10 --
skin.conq/16x9/Include_Home_Default.xml | 104 +++++++++++++++++++++-
skin.conq/16x9/Includes_Widgets.xml | 54 ++++++------
skin.conq/16x9/Variables.xml | 2 +-
skin.conq/16x9/script-skinshortcuts-includes.xml | 24 +++++-
skin.conq/addon.xml | 2 +-
skin.conq/changelog.txt | 9 ++
7 files changed, 162 insertions(+), 43 deletions(-)
hooks/post-receive
--
Skins
------------------------------------------------------------------------------
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
