The branch, helix has been updated
via ecc3ee5aaa8fec27304990cc7c49fa2c007f6359 (commit)
from 51cfcd47ce386a80040fe914335b5712266f3566 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/skins;a=commit;h=ecc3ee5aaa8fec27304990cc7c49fa2c007f6359
commit ecc3ee5aaa8fec27304990cc7c49fa2c007f6359
Author: ronie <ronie>
Date: Fri Sep 26 17:03:38 2014 +0200
skin.conq 2.0.4
diff --git a/skin.conq/16x9/DialogBusy.xml b/skin.conq/16x9/DialogBusy.xml
index 43e72f3..42541d1 100644
--- a/skin.conq/16x9/DialogBusy.xml
+++ b/skin.conq/16x9/DialogBusy.xml
@@ -1,25 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<!-- busydialog -->
- <include>DialogZoomAnimation</include>
<controls>
<!-- Background -->
- <include>DialogBackgroundImage</include>
+ <include>DialogFadeBackgroundImage</include>
<!-- Main group -->
<control type="group">
+ <include>DialogZoomAnimation</include>
<centerleft>50%</centerleft>
- <top>310</top>
- <width>1200</width>
- <height>792</height>
+ <centertop>50%</centertop>
+ <width>680</width>
+ <height>220</height>
+
+ <!-- Background -->
+ <control type="image">
+ <centerleft>50%</centerleft>
+ <width>680</width>
+ <height>220</height>
+ <texture
border="20">dialogs/DialogBackground.png</texture>
+ </control>
<!-- Heading -->
<control type="label">
- <left>0</left>
- <top>0</top>
- <width>1200</width>
+ <centerleft>50%</centerleft>
+ <top>40</top>
+ <width>600</width>
<height>48</height>
<align>center</align>
<font>Font48</font>
@@ -28,11 +36,11 @@
</control>
<!-- Details -->
- <control type="textbox">
- <left>0</left>
- <top>86</top>
- <width>1200</width>
- <height>158</height>
+ <control type="label">
+ <centerleft>50%</centerleft>
+ <top>96</top>
+ <width>600</width>
+ <height>42</height>
<align>center</align>
<font>Font42</font>
<textcolor>DialogColor2</textcolor>
@@ -41,19 +49,19 @@
<!-- Scroll -->
<control type="image">
- <left>514</left>
- <top>280</top>
+ <centerleft>50%</centerleft>
+ <top>152</top>
<width>176</width>
<height>20</height>
<texture border="1,12,1,1"
colordiffuse="DialogOverlayColorNF">common/ScrollBackgroundHorizontal.png</texture>
</control>
<control type="image">
- <left>514</left>
- <top>280</top>
+ <centerleft>50%</centerleft>
+ <top>152</top>
<width>24</width>
<height>20</height>
<texture border="1,12,1,1"
colordiffuse="DialogOverlayColorFO">common/ScrollbarGripHorizontalFO.png</texture>
- <animation effect="slide" start="0,0"
end="152,0" time="800" loop="true" tween="cubic" easing="out"
condition="true">Conditional</animation>
+ <animation effect="slide" start="-76,0"
end="76,0" time="800" loop="true" tween="cubic" easing="out"
condition="true">Conditional</animation>
</control>
</control>
diff --git a/skin.conq/16x9/DialogContextMenu.xml
b/skin.conq/16x9/DialogContextMenu.xml
index f71dda5..9eb5295 100644
--- a/skin.conq/16x9/DialogContextMenu.xml
+++ b/skin.conq/16x9/DialogContextMenu.xml
@@ -2,22 +2,22 @@
<window>
<!-- contextmenu -->
<defaultcontrol always="true">996</defaultcontrol>
- <include>DialogZoomAnimation</include>
+ <coordinates>
+ <origin x="0" y="0"/>
+ </coordinates>
<controls>
<!-- Background -->
- <include>DialogBackgroundImage</include>
+ <include>DialogFadeBackgroundImage</include>
- <!-- Default grouplist -->
- <control type="grouplist" id="996">
- <centerleft>50%</centerleft>
+ <!-- Dialog group -->
+ <control type="group">
+ <include>DialogZoomAnimation</include>
<top>125</top>
- <width>1200</width>
+ <centerleft>50%</centerleft>
+ <width>440</width>
<height>825</height>
- <onup>noop</onup>
- <ondown>noop</ondown>
- <itemgap>0</itemgap>
<animation effect="slide" end="0,37.5" time="0"
condition="!Control.IsVisible(1001)">Conditional</animation>
<animation effect="slide" end="0,37.5" time="0"
condition="!Control.IsVisible(1002)">Conditional</animation>
<animation effect="slide" end="0,37.5" time="0"
condition="!Control.IsVisible(1003)">Conditional</animation>
@@ -29,14 +29,34 @@
<animation effect="slide" end="0,37.5" time="0"
condition="!Control.IsVisible(1009)">Conditional</animation>
<animation effect="slide" end="0,37.5" time="0"
condition="!Control.IsVisible(1010)">Conditional</animation>
<animation effect="slide" end="0,37.5" time="0"
condition="!Control.IsVisible(1011)">Conditional</animation>
- </control>
- <!-- Default button -->
- <control type="button" id="1000">
- <width>1200</width>
- <height>75</height>
- <align>center</align>
- <font>Font36</font>
+ <!-- Background -->
+ <control type="image" id="999">
+ <left>-20</left>
+ <top>-20</top>
+ <width>480</width>
+ <height>865</height>
+ <texture
border="20">dialogs/DialogBackground.png</texture>
+ </control>
+
+ <!-- Default grouplist -->
+ <control type="grouplist" id="996">
+ <centerleft>50%</centerleft>
+ <width>440</width>
+ <height max="825">auto</height>
+ <onup>noop</onup>
+ <ondown>noop</ondown>
+ <itemgap>0</itemgap>
+ </control>
+
+ <!-- Default button -->
+ <control type="button" id="1000">
+ <width>440</width>
+ <height>75</height>
+ <align>center</align>
+ <font>Font36</font>
+ </control>
+
</control>
</controls>
diff --git a/skin.conq/16x9/DialogOk.xml b/skin.conq/16x9/DialogOk.xml
index f2471de..cae663c 100644
--- a/skin.conq/16x9/DialogOk.xml
+++ b/skin.conq/16x9/DialogOk.xml
@@ -2,25 +2,33 @@
<window>
<!-- okdialog -->
<defaultcontrol always="true">10</defaultcontrol>
- <include>DialogZoomAnimation</include>
<controls>
<!-- Background -->
- <include>DialogBackgroundImage</include>
+ <include>DialogFadeBackgroundImage</include>
<!-- Main group -->
<control type="group">
+ <include>DialogZoomAnimation</include>
<centerleft>50%</centerleft>
- <top>310</top>
- <width>1200</width>
- <height>792</height>
+ <centertop>50%</centertop>
+ <width>680</width>
+ <height>340</height>
+
+ <!-- Background -->
+ <control type="image">
+ <centerleft>50%</centerleft>
+ <width>680</width>
+ <height>340</height>
+ <texture
border="20">dialogs/DialogBackground.png</texture>
+ </control>
<!-- Heading -->
<control type="label" id="1">
- <left>0</left>
- <top>0</top>
- <width>1200</width>
+ <centerleft>50%</centerleft>
+ <top>40</top>
+ <width>600</width>
<height>48</height>
<align>center</align>
<font>Font48</font>
@@ -29,9 +37,9 @@
<!-- Details -->
<control type="textbox" id="9">
- <left>0</left>
- <top>86</top>
- <width>1200</width>
+ <centerleft>50%</centerleft>
+ <top>96</top>
+ <width>600</width>
<height>158</height>
<align>center</align>
<font>Font42</font>
@@ -41,9 +49,9 @@
<!-- OK -->
<control type="button" id="10">
- <left>0</left>
- <top>340</top>
- <width>1200</width>
+ <centerleft>50%</centerleft>
+ <top>262</top>
+ <width>600</width>
<height>36</height>
<align>center</align>
<label>106</label>
diff --git a/skin.conq/16x9/DialogYesNo.xml b/skin.conq/16x9/DialogYesNo.xml
index a63d7a6..694a82b 100644
--- a/skin.conq/16x9/DialogYesNo.xml
+++ b/skin.conq/16x9/DialogYesNo.xml
@@ -2,25 +2,33 @@
<window>
<!-- yesnodialog -->
<defaultcontrol always="true">10</defaultcontrol>
- <include>DialogZoomAnimation</include>
<controls>
<!-- Background -->
- <include>DialogBackgroundImage</include>
+ <include>DialogFadeBackgroundImage</include>
<!-- Main group -->
<control type="group">
+ <include>DialogZoomAnimation</include>
<centerleft>50%</centerleft>
- <top>310</top>
- <width>1200</width>
- <height>792</height>
+ <centertop>50%</centertop>
+ <width>680</width>
+ <height>340</height>
+
+ <!-- Background -->
+ <control type="image">
+ <centerleft>50%</centerleft>
+ <width>680</width>
+ <height>340</height>
+ <texture
border="20">dialogs/DialogBackground.png</texture>
+ </control>
<!-- Heading -->
<control type="label" id="1">
- <left>0</left>
- <top>0</top>
- <width>1200</width>
+ <centerleft>50%</centerleft>
+ <top>40</top>
+ <width>600</width>
<height>48</height>
<align>center</align>
<font>Font48</font>
@@ -29,9 +37,9 @@
<!-- Details -->
<control type="textbox" id="9">
- <left>0</left>
- <top>86</top>
- <width>1200</width>
+ <centerleft>50%</centerleft>
+ <top>96</top>
+ <width>600</width>
<height>158</height>
<align>center</align>
<font>Font42</font>
@@ -42,8 +50,8 @@
<!-- No -->
<control type="button" id="10">
<left>0</left>
- <top>340</top>
- <width>550</width>
+ <top>262</top>
+ <width>270</width>
<height>36</height>
<align>right</align>
<onleft>noop</onleft>
@@ -55,8 +63,8 @@
<!-- Yes -->
<control type="button" id="11">
<right>0</right>
- <top>340</top>
- <width>550</width>
+ <top>262</top>
+ <width>270</width>
<height>36</height>
<onleft>10</onleft>
<onright>noop</onright>
diff --git a/skin.conq/16x9/Include_Home_Default.xml
b/skin.conq/16x9/Include_Home_Default.xml
index 9fb9403..9415c26 100644
--- a/skin.conq/16x9/Include_Home_Default.xml
+++ b/skin.conq/16x9/Include_Home_Default.xml
@@ -267,8 +267,9 @@
<ondown>9000</ondown>
<onleft>9000</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),VideoAddons)</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
@@ -355,8 +356,9 @@
<ondown>9000</ondown>
<onleft>9000</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),RecentMovies)</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
@@ -421,11 +423,13 @@
<visible>Skin.HasSetting(Overlays)</visible>
</control>
</focusedlayout>
- <content
target="video">plugin://service.library.data.provider?type=recentmovies&reload=$INFO[Window.Property(recentmovies)]&limit=12</content>
+ <content>
+ <include>RecentMovies</include>
+ </content>
</control>
- <!-- Random Movies sub menu -->
+ <!-- Recommended Movies sub menu -->
<control type="list" id="9002">
<left>2605</left>
<top>688</top>
@@ -439,10 +443,11 @@
<ondown>9000</ondown>
<onleft>9000</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),RandomMovies)</visible>
+
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecommendedMovies)</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>
@@ -505,11 +510,13 @@
<visible>Skin.HasSetting(Overlays)</visible>
</control>
</focusedlayout>
- <content
target="video">plugin://service.library.data.provider?type=randommovies&reload=$INFO[Window.Property(randommovies)]&limit=12</content>
+ <content>
+ <include>RecommendedMovies</include>
+ </content>
</control>
- <!-- Recommended Movies sub menu -->
+ <!-- Random Movies sub menu -->
<control type="list" id="9002">
<left>2605</left>
<top>688</top>
@@ -523,10 +530,11 @@
<ondown>9000</ondown>
<onleft>9000</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),RecommendedMovies)</visible>
+
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RandomMovies)</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>
@@ -589,7 +597,9 @@
<visible>Skin.HasSetting(Overlays)</visible>
</control>
</focusedlayout>
- <content
target="video">plugin://service.library.data.provider?type=recommendedmovies&reload=$INFO[Window.Property(recommendedmovies)]&limit=12</content>
+ <content>
+ <include>RandomMovies</include>
+ </content>
</control>
@@ -607,8 +617,9 @@
<ondown>9000</ondown>
<onleft>9000</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),RecentEpisodes)</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
@@ -626,7 +637,7 @@
<top>0</top>
<width>183</width>
<height>306</height>
- <texture colordiffuse="88f1f1f1"
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+ <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>
@@ -647,7 +658,7 @@
<top>0</top>
<width>183</width>
<height>306</height>
- <texture colordiffuse="88f1f1f1"
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+ <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>
@@ -658,7 +669,7 @@
<top>0</top>
<width>183</width>
<height>306</height>
- <texture
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+ <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>
@@ -673,11 +684,13 @@
<visible>Skin.HasSetting(Overlays)</visible>
</control>
</focusedlayout>
- <content
target="video">plugin://service.library.data.provider?type=recentepisodes&reload=$INFO[Window.Property(recentepisodes)]&limit=12</content>
+ <content>
+ <include>RecentEpisodes</include>
+ </content>
</control>
- <!-- Random episodes -->
+ <!-- Recommended episodes -->
<control type="list" id="9002">
<left>2605</left>
<top>688</top>
@@ -691,10 +704,11 @@
<ondown>9000</ondown>
<onleft>9000</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),RandomEpisodes)</visible>
+
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecommendedEpisodes)</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>
@@ -710,7 +724,7 @@
<top>0</top>
<width>183</width>
<height>306</height>
- <texture colordiffuse="88f1f1f1"
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+ <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>
@@ -731,7 +745,7 @@
<top>0</top>
<width>183</width>
<height>306</height>
- <texture colordiffuse="88f1f1f1"
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+ <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>
@@ -742,7 +756,7 @@
<top>0</top>
<width>183</width>
<height>306</height>
- <texture
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+ <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>
@@ -757,11 +771,13 @@
<visible>Skin.HasSetting(Overlays)</visible>
</control>
</focusedlayout>
- <content
target="video">plugin://service.library.data.provider?type=randomepisodes&reload=$INFO[Window.Property(randomepisodes)]&limit=12</content>
+ <content>
+ <include>RecommendedEpisodes</include>
+ </content>
</control>
- <!-- Recommended episodes -->
+ <!-- Random episodes -->
<control type="list" id="9002">
<left>2605</left>
<top>688</top>
@@ -775,10 +791,11 @@
<ondown>9000</ondown>
<onleft>9000</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),RecommendedEpisodes)</visible>
+
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RandomEpisodes)</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>
@@ -794,7 +811,7 @@
<top>0</top>
<width>183</width>
<height>306</height>
- <texture colordiffuse="88f1f1f1"
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+ <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>
@@ -815,7 +832,7 @@
<top>0</top>
<width>183</width>
<height>306</height>
- <texture colordiffuse="88f1f1f1"
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+ <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>
@@ -826,7 +843,7 @@
<top>0</top>
<width>183</width>
<height>306</height>
- <texture
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+ <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>
@@ -841,7 +858,9 @@
<visible>Skin.HasSetting(Overlays)</visible>
</control>
</focusedlayout>
- <content
target="video">plugin://service.library.data.provider?type=recommendedepisodes&reload=$INFO[Window.Property(recommendedepisodes)]&limit=12</content>
+ <content>
+ <include>RandomEpisodes</include>
+ </content>
</control>
@@ -859,8 +878,9 @@
<ondown>9000</ondown>
<onleft>9000</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),RecentAlbums)</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
@@ -925,11 +945,13 @@
<visible>Skin.HasSetting(Overlays)</visible>
</control>
</focusedlayout>
- <content
target="music">plugin://service.library.data.provider?type=recentalbums&reload=$INFO[Window.Property(recentalbums)]&limit=12</content>
+ <content>
+ <include>RecentAlbums</include>
+ </content>
</control>
- <!-- Random Albums -->
+ <!-- Recommended Albums -->
<control type="list" id="9002">
<left>2605</left>
<top>778</top>
@@ -943,10 +965,11 @@
<ondown>9000</ondown>
<onleft>9000</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),RandomAlbums)</visible>
+
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecommendedAlbums)</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>
@@ -1009,11 +1032,13 @@
<visible>Skin.HasSetting(Overlays)</visible>
</control>
</focusedlayout>
- <content
target="music">plugin://service.library.data.provider?type=randomalbums&reload=$INFO[Window.Property(randomalbums)]&limit=12</content>
+ <content>
+ <include>RandomAlbums</include>
+ </content>
</control>
- <!-- Recommended Albums -->
+ <!-- Random Albums -->
<control type="list" id="9002">
<left>2605</left>
<top>778</top>
@@ -1027,10 +1052,11 @@
<ondown>9000</ondown>
<onleft>9000</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),RecommendedAlbums)</visible>
+
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RandomAlbums)</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>
@@ -1093,7 +1119,9 @@
<visible>Skin.HasSetting(Overlays)</visible>
</control>
</focusedlayout>
- <content
target="music">plugin://service.library.data.provider?type=recommendedalbums&reload=$INFO[Window.Property(recommendedalbums)]&limit=12</content>
+ <content>
+ <include>RecommendedAlbums</include>
+ </content>
</control>
@@ -1111,8 +1139,9 @@
<ondown>9000</ondown>
<onleft>9000</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),MusicAddons)</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
@@ -1195,8 +1224,9 @@
<ondown>9000</ondown>
<onleft>9000</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),PictureAddons)</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
@@ -1279,8 +1309,9 @@
<ondown>9000</ondown>
<onleft>9000</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),favourites)</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
@@ -1424,8 +1455,9 @@
<ondown>9000</ondown>
<onleft>9000</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),ProgramAddons)</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
@@ -1510,8 +1542,9 @@
<ondown>9000</ondown>
<onleft>9000</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),TV) |
StringCompare(Container(9000).ListItem.Property(Widget),Radio)</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
diff --git a/skin.conq/16x9/Include_Home_Horizontal.xml
b/skin.conq/16x9/Include_Home_Horizontal.xml
index 3ff71b6..b415b3b 100644
--- a/skin.conq/16x9/Include_Home_Horizontal.xml
+++ b/skin.conq/16x9/Include_Home_Horizontal.xml
@@ -110,12 +110,28 @@
<font>Font33</font>
<align>center</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,90"
time="0"
condition="StringCompare(Container(9000).ListItem.Property(Widget),VideoAddons)
| StringCompare(Container(9000).ListItem.Property(Widget),RecentAlbums) |
StringCompare(Container(9000).ListItem.Property(Widget),RecommendedAlbums) |
StringCompare(Container(9000).ListItem.Property(Widget),RandomAlbums) |
StringCompare(Container(9000).ListItem.Property(Widget),MusicAddons) |
StringCompare(Container(9000).ListItem.Property(Widget),PictureAddons) |
StringCompare(Container(9000).ListItem.Property(Widget),ProgramAddons) |
StringCompare(Container(9000).ListItem.Property(Widget),favourites) |
StringCompare(Container(9000).ListItem.Property(Widget),PVR)">conditional</animation>
+ </control>
+
+ <!-- Sub menu label -->
+ <control type="label">
+ <top>636</top>
+ <left>120</left>
+ <width>1680</width>
+ <height>33</height>
+ <font>Font33</font>
+ <align>center</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>
- <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),RecommendedAlbums) |
StringCompare(Container(9000).ListItem.Property(Widget),RandomAlbums) |
StringCompare(Container(9000).ListItem.Property(Widget),MusicAddons) |
StringCompare(Container(9000).ListItem.Property(Widget),PictureAddons) |
StringCompare(Container(9000).ListItem.Property(Widget),ProgramAddons) |
StringCompare(Container(9000).ListItem.Property(Widget),favourites) |
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),RecommendedAlbums) |
StringCompare(Container(9000).ListItem.Property(Widget),RandomAlbums) |
StringCompare(Container(9000).ListItem.Property(Widget),MusicAddons) |
StringCompare(Container(9000).ListItem.Property(Widget),PictureAddons) |
StringCompare(Container(9000).ListItem.Property(Widget),ProgramAddons) |
StringCompare(Container(9000).ListItem.Property(Widget),favourites) |
StringCompare(Container(9000).ListItem.Property(Widget),PVR)">conditional</animation>
</control>
<!-- Weather sub menu -->
@@ -271,8 +287,9 @@
<ondown>noop</ondown>
<onleft>noop</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),VideoAddons)</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
@@ -357,9 +374,10 @@
<ondown>noop</ondown>
<onleft>noop</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecentMovies)</visible>
<viewtype label="">list</viewtype>
+ <orientation>horizontal</orientation>
+ <defaultcontrol always="true">0</defaultcontrol>
<scrolltime tween="sine" easing="out">240</scrolltime>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
<animation effect="fade" start="0" end="100" time="200"
delay="100" >Visible</animation>
@@ -425,11 +443,13 @@
<visible>Skin.HasSetting(Overlays)</visible>
</control>
</focusedlayout>
- <content
target="video">plugin://service.library.data.provider?type=recentmovies&reload=$INFO[Window.Property(recentmovies)]&limit=12</content>
+ <content>
+ <include>RecentMovies</include>
+ </content>
</control>
- <!-- Random Movies sub menu -->
+ <!-- Recommended Movies sub menu -->
<control type="list" id="9002">
<left>-1894</left>
<top>688</top>
@@ -439,9 +459,10 @@
<ondown>noop</ondown>
<onleft>noop</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
-
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RandomMovies)</visible>
+
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecommendedMovies)</visible>
<viewtype label="">list</viewtype>
+ <orientation>horizontal</orientation>
+ <defaultcontrol always="true">0</defaultcontrol>
<scrolltime tween="sine" easing="out">240</scrolltime>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
<animation effect="fade" start="0" end="100" time="200"
delay="100" >Visible</animation>
@@ -507,11 +528,13 @@
<visible>Skin.HasSetting(Overlays)</visible>
</control>
</focusedlayout>
- <content
target="video">plugin://service.library.data.provider?type=randommovies&reload=$INFO[Window.Property(randommovies)]&limit=12</content>
+ <content>
+ <include>RecommendedMovies</include>
+ </content>
</control>
- <!-- Recommended Movies sub menu -->
+ <!-- Random Movies sub menu -->
<control type="list" id="9002">
<left>-1894</left>
<top>688</top>
@@ -521,9 +544,10 @@
<ondown>noop</ondown>
<onleft>noop</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
-
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecommendedMovies)</visible>
+
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RandomMovies)</visible>
<viewtype label="">list</viewtype>
+ <orientation>horizontal</orientation>
+ <defaultcontrol always="true">0</defaultcontrol>
<scrolltime tween="sine" easing="out">240</scrolltime>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
<animation effect="fade" start="0" end="100" time="200"
delay="100" >Visible</animation>
@@ -589,7 +613,9 @@
<visible>Skin.HasSetting(Overlays)</visible>
</control>
</focusedlayout>
- <content
target="video">plugin://service.library.data.provider?type=recommendedmovies&reload=$INFO[Window.Property(recommendedmovies)]&limit=12</content>
+ <content>
+ <include>RandomMovies</include>
+ </content>
</control>
@@ -603,8 +629,9 @@
<ondown>noop</ondown>
<onleft>noop</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),RecentEpisodes)</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
@@ -624,7 +651,7 @@
<top>0</top>
<width>183</width>
<height>306</height>
- <texture colordiffuse="88f1f1f1"
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+ <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>
@@ -645,7 +672,7 @@
<top>0</top>
<width>183</width>
<height>306</height>
- <texture colordiffuse="88f1f1f1"
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+ <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>
@@ -656,7 +683,7 @@
<top>0</top>
<width>183</width>
<height>306</height>
- <texture
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+ <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>
@@ -671,7 +698,9 @@
<visible>Skin.HasSetting(Overlays)</visible>
</control>
</focusedlayout>
- <content
target="video">plugin://service.library.data.provider?type=recentepisodes&reload=$INFO[Window.Property(recentepisodes)]&limit=12</content>
+ <content>
+ <include>RecentEpisodes</include>
+ </content>
</control>
@@ -685,8 +714,9 @@
<ondown>noop</ondown>
<onleft>noop</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),RecommendedEpisodes)</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
@@ -706,7 +736,7 @@
<top>0</top>
<width>183</width>
<height>306</height>
- <texture colordiffuse="88f1f1f1"
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+ <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>
@@ -727,7 +757,7 @@
<top>0</top>
<width>183</width>
<height>306</height>
- <texture colordiffuse="88f1f1f1"
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+ <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>
@@ -738,7 +768,7 @@
<top>0</top>
<width>183</width>
<height>306</height>
- <texture
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+ <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>
@@ -753,7 +783,9 @@
<visible>Skin.HasSetting(Overlays)</visible>
</control>
</focusedlayout>
- <content
target="video">plugin://service.library.data.provider?type=recommendedepisodes&reload=$INFO[Window.Property(recommendedepisodes)]&limit=12</content>
+ <content>
+ <include>RecommendedEpisodes</include>
+ </content>
</control>
@@ -767,8 +799,9 @@
<ondown>noop</ondown>
<onleft>noop</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),RandomEpisodes)</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
@@ -788,7 +821,7 @@
<top>0</top>
<width>183</width>
<height>306</height>
- <texture colordiffuse="88f1f1f1"
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+ <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>
@@ -809,7 +842,7 @@
<top>0</top>
<width>183</width>
<height>306</height>
- <texture colordiffuse="88f1f1f1"
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+ <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>
@@ -820,7 +853,7 @@
<top>0</top>
<width>183</width>
<height>306</height>
- <texture
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+ <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>
@@ -835,7 +868,9 @@
<visible>Skin.HasSetting(Overlays)</visible>
</control>
</focusedlayout>
- <content
target="video">plugin://service.library.data.provider?type=randomepisodes&reload=$INFO[Window.Property(randomepisodes)]&limit=12</content>
+ <content>
+ <include>RandomEpisodes</include>
+ </content>
</control>
@@ -849,8 +884,9 @@
<ondown>noop</ondown>
<onleft>noop</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),RecentAlbums)</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
@@ -917,11 +953,13 @@
<visible>Skin.HasSetting(Overlays)</visible>
</control>
</focusedlayout>
- <content
target="music">plugin://service.library.data.provider?type=recentalbums&reload=$INFO[Window.Property(recentalbums)]&limit=12</content>
+ <content>
+ <include>RecentAlbums</include>
+ </content>
</control>
- <!-- Random Albums -->
+ <!-- Recommended Albums -->
<control type="list" id="9002">
<left>-1894</left>
<top>778</top>
@@ -931,10 +969,11 @@
<ondown>noop</ondown>
<onleft>noop</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),RandomAlbums)</visible>
+
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecommendedAlbums)</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="2749,0"
time="0"
condition="StringCompare(Container(9002).NumItems,1)">conditional</animation>
@@ -999,11 +1038,13 @@
<visible>Skin.HasSetting(Overlays)</visible>
</control>
</focusedlayout>
- <content
target="music">plugin://service.library.data.provider?type=randomalbums&reload=$INFO[Window.Property(randomalbums)]&limit=12</content>
+ <content>
+ <include>RandomAlbums</include>
+ </content>
</control>
- <!-- Recommended Albums -->
+ <!-- Random Albums -->
<control type="list" id="9002">
<left>-1894</left>
<top>778</top>
@@ -1013,10 +1054,11 @@
<ondown>noop</ondown>
<onleft>noop</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),RecommendedAlbums)</visible>
+
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RandomAlbums)</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="2749,0"
time="0"
condition="StringCompare(Container(9002).NumItems,1)">conditional</animation>
@@ -1081,7 +1123,9 @@
<visible>Skin.HasSetting(Overlays)</visible>
</control>
</focusedlayout>
- <content
target="music">plugin://service.library.data.provider?type=recommendedalbums&reload=$INFO[Window.Property(recommendedalbums)]&limit=12</content>
+ <content>
+ <include>RecommendedAlbums</include>
+ </content>
</control>
@@ -1095,8 +1139,9 @@
<ondown>noop</ondown>
<onleft>noop</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),MusicAddons)</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
@@ -1177,8 +1222,9 @@
<ondown>noop</ondown>
<onleft>noop</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),PictureAddons)</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
@@ -1259,8 +1305,9 @@
<ondown>noop</ondown>
<onleft>noop</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),Favourites)</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
@@ -1402,8 +1449,9 @@
<ondown>noop</ondown>
<onleft>noop</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),ProgramAddons)</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
@@ -1484,8 +1532,9 @@
<ondown>noop</ondown>
<onleft>noop</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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>
@@ -1566,8 +1615,9 @@
<ondown>noop</ondown>
<onleft>noop</onleft>
<onright>noop</onright>
- <orientation>horizontal</orientation>
<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),TV) |
StringCompare(Container(9000).ListItem.Property(Widget),Radio)</visible>
<animation effect="fade" start="100" end="0"
time="0">Hidden</animation>
@@ -1624,4 +1674,4 @@
</include>
-</includes>
\ No newline at end of file
+</includes>
diff --git a/skin.conq/16x9/Includes.xml b/skin.conq/16x9/Includes.xml
index 9fdc2ed..9ee7705 100644
--- a/skin.conq/16x9/Includes.xml
+++ b/skin.conq/16x9/Includes.xml
@@ -3,6 +3,7 @@
<include file="Defaults.xml" />
<include file="Include_Home_Default.xml" />
<include file="Include_Home_Horizontal.xml" />
+ <include file="Includes_Widgets.xml" />
<include file="script-skinshortcuts-includes.xml"/>
<include file="Viewtype50.xml" />
<include file="Viewtype51.xml" />
@@ -66,6 +67,16 @@
</control>
</include>
+ <!-- Dialog fade background image -->
+ <include name="DialogFadeBackgroundImage">
+ <control type="image">
+ <include>FullscreenDimensions</include>
+ <texture
colordiffuse="44000000">dialogs/DialogTextBackground.png</texture>
+ <animation effect="fade" start="0" end="100"
time="200">WindowOpen</animation>
+ <animation effect="fade" start="100" end="0"
time="200">WindowClose</animation>
+ </control>
+ </include>
+
<!-- Options background image -->
<include name="OptionsBackgroundImage">
<control type="image">
diff --git a/skin.conq/16x9/MyWeather.xml b/skin.conq/16x9/MyWeather.xml
index 46d5db7..a131181 100644
--- a/skin.conq/16x9/MyWeather.xml
+++ b/skin.conq/16x9/MyWeather.xml
@@ -23,7 +23,7 @@
<left>20</left>
<top>20</top>
<width>1880</width>
- <height>714</height>
+ <height>688</height>
<texture
border="0,0,0,40">common/CurveHorz.png</texture>
<visible>Skin.HasSetting(ShowCurve)</visible>
</control>
@@ -37,7 +37,7 @@
<!-- View -->
<control type="list" id="50">
- <left>140</left>
+ <left>120</left>
<top>288</top>
<width>1680</width>
<height>400</height>
@@ -52,11 +52,10 @@
<animation effect="slide" start="0,0"
end="406,0" time="0"
condition="StringCompare(Container(50).NumItems,4)">conditional</animation>
<animation effect="slide" start="0,0"
end="203,0" time="0"
condition="StringCompare(Container(50).NumItems,5)">conditional</animation>
- <itemlayout width="260" height="400">
+ <itemlayout width="280" height="400">
<control type="label">
<top>2</top>
- <left>130</left>
- <width>260</width>
+ <width>280</width>
<height>42</height>
<font>Font42</font>
<align>center</align>
@@ -65,7 +64,7 @@
<label>$INFO[ListItem.Label]</label>
</control>
<control type="image">
- <left>30</left>
+ <left>40</left>
<top>80</top>
<width>200</width>
<height>200</height>
@@ -73,9 +72,8 @@
<aspectratio align="center"
aligny="bottom">keep</aspectratio>
</control>
<control type="label">
- <left>130</left>
<top>320</top>
- <width>260</width>
+ <width>280</width>
<height>36</height>
<font>Font36</font>
<align>center</align>
@@ -84,11 +82,10 @@
</control>
</itemlayout>
- <focusedlayout width="360" height="439">
+ <focusedlayout width="280" height="400">
<control type="label">
<top>2</top>
- <left>170</left>
- <width>340</width>
+ <width>280</width>
<height>42</height>
<font>Font42</font>
<align>center</align>
@@ -97,23 +94,26 @@
<shadowcolor>TextColor4</shadowcolor>
</control>
<control type="image">
- <top>40</top>
- <width>340</width>
- <height>340</height>
+ <left>40</left>
+ <top>80</top>
+ <width>200</width>
+ <height>200</height>
<texture
background="true">$INFO[ListItem.Icon]</texture>
<aspectratio align="center"
aligny="bottom">keep</aspectratio>
</control>
+ <control type="label">
+ <top>320</top>
+ <width>280</width>
+ <height>36</height>
+ <font>Font36</font>
+ <align>center</align>
+
<textcolor>TextColor2</textcolor>
+
<label>$INFO[ListItem.Label2]</label>
+ </control>
</focusedlayout>
<content>
<item>
<onclick>noop</onclick>
- <label>33006</label>
-
<label2>$INFO[Window(Weather).Property(Day0.LowTemp)]$INFO[System.TemperatureUnits]
/
$INFO[Window(Weather).Property(Day0.HighTemp)]$INFO[System.TemperatureUnits]</label2>
-
<icon>$INFO[Window(Weather).Property(Day0.OutlookIcon)]</icon>
-
<visible>!IsEmpty(Window(Weather).Property(Day0.OutlookIcon))</visible>
- </item>
- <item>
- <onclick>noop</onclick>
<label>$VAR[Day1]</label>
<label2>$INFO[Window(Weather).Property(Day1.LowTemp)]$INFO[System.TemperatureUnits]
/
$INFO[Window(Weather).Property(Day1.HighTemp)]$INFO[System.TemperatureUnits]</label2>
<icon>$INFO[Window(Weather).Property(Day1.OutlookIcon)]</icon>
@@ -147,14 +147,31 @@
<icon>$INFO[Window(Weather).Property(Day5.OutlookIcon)]</icon>
<visible>!IsEmpty(Window(Weather).Property(Day5.OutlookIcon))</visible>
</item>
+ <item>
+ <onclick>noop</onclick>
+ <label>$VAR[Day6]</label>
+
<label2>$INFO[Window(Weather).Property(Day6.LowTemp)]$INFO[System.TemperatureUnits]
/
$INFO[Window(Weather).Property(Day6.HighTemp)]$INFO[System.TemperatureUnits]</label2>
+
<icon>$INFO[Window(Weather).Property(Day6.OutlookIcon)]</icon>
+
<visible>!IsEmpty(Window(Weather).Property(Day6.OutlookIcon))</visible>
+ </item>
</content>
</control>
+ <!-- Current icon -->
+ <control type="image">
+ <left>120</left>
+ <bottom>120</bottom>
+ <width>220</width>
+ <height>220</height>
+ <texture
background="true">$INFO[Window(Weather).Property(Day0.OutlookIcon)]</texture>
+ <aspectratio align="center"
aligny="bottom">keep</aspectratio>
+ </control>
+
<!-- Weather Info -->
<control type="group">
- <left>120</left>
- <top>458</top>
+ <left>420</left>
+ <top>438</top>
<control type="label">
<left>0</left>
<top>314</top>
diff --git a/skin.conq/16x9/Pointer.xml b/skin.conq/16x9/Pointer.xml
index 2e0d2e6..53723c9 100644
--- a/skin.conq/16x9/Pointer.xml
+++ b/skin.conq/16x9/Pointer.xml
@@ -10,6 +10,7 @@
<width>200</width>
<height>50</height>
<texture>mouse.png</texture>
+ <visible>!Skin.HasSetting(HideMouse)</visible>
</control>
<!-- Pointer focus -->
@@ -17,6 +18,7 @@
<width>200</width>
<height>50</height>
<texture>mouse.png</texture>
+ <visible>!Skin.HasSetting(HideMouse)</visible>
</control>
<!-- Pointer drag -->
@@ -24,6 +26,7 @@
<width>200</width>
<height>50</height>
<texture>mouse.png</texture>
+ <visible>!Skin.HasSetting(HideMouse)</visible>
</control>
<!-- Pointer click -->
@@ -31,6 +34,7 @@
<width>200</width>
<height>50</height>
<texture>mouse.png</texture>
+ <visible>!Skin.HasSetting(HideMouse)</visible>
</control>
</controls>
diff --git a/skin.conq/16x9/SkinSettings.xml b/skin.conq/16x9/SkinSettings.xml
index 4b78149..93a31fb 100644
--- a/skin.conq/16x9/SkinSettings.xml
+++ b/skin.conq/16x9/SkinSettings.xml
@@ -585,7 +585,7 @@
<onup>101</onup>
<textwidth>1120</textwidth>
<label>31064</label>
-
<onclick>Skin.SetFile(CustomBackground,,special://skin/extras/backgrounds/)</onclick>
+
<onclick>Skin.SetImage(CustomBackgroundImage)</onclick>
<visible>ControlGroup(9).HasFocus(11)</visible>
</control>
<!-- Background video -->
@@ -651,6 +651,16 @@
<selected>Skin.HasSetting(ShowCurve)</selected>
<visible>ControlGroup(9).HasFocus(12)</visible>
</control>
+ <!-- Hide 'Mouse' warning -->
+ <control type="radiobutton" id="1008">
+ <width>1200</width>
+ <height>66</height>
+ <textwidth>1120</textwidth>
+ <label>31065</label>
+
<onclick>Skin.ToggleSetting(HideMouse)</onclick>
+
<selected>Skin.HasSetting(HideMouse)</selected>
+
<visible>ControlGroup(9).HasFocus(12)</visible>
+ </control>
<!-- Enable Debug Grid -->
<control type="radiobutton" id="1302">
<width>1200</width>
diff --git a/skin.conq/16x9/Variables.xml b/skin.conq/16x9/Variables.xml
index e6f15d9..ae2542b 100644
--- a/skin.conq/16x9/Variables.xml
+++ b/skin.conq/16x9/Variables.xml
@@ -46,32 +46,26 @@
</variable>
<variable name="BackgroundImage">
- <value
condition="!IsEmpty(Skin.String(CustomBackground))">$INFO[Skin.String(CustomBackground)]</value>
+ <value
condition="!IsEmpty(Skin.String(CustomBackgroundImage))">$INFO[Skin.String(CustomBackgroundImage)]</value>
<value>special://skin/extras/backgrounds/blue.jpg</value>
</variable>
<variable name="SubMenuHeading">
- <value condition="Control.HasFocus(9002) +
!IsEmpty(Container(9002).ListItem.Episode) +
IntegerGreaterThan(Container(9002).ListItem.Season,9) +
IntegerGreaterThan(Container(9002).ListItem.Episode,9) +
!SubString(Container(9002).ListItem.Episode,s)">$INFO[Container(9002).ListItem.TVShowTitle]$INFO[Container(9002).ListItem.Season,
- S]$INFO[Container(9002).ListItem.Episode,E]</value>
- <value condition="Control.HasFocus(9002) +
!IsEmpty(Container(9002).ListItem.Episode) +
!IntegerGreaterThan(Container(9002).ListItem.Season,9) +
IntegerGreaterThan(Container(9002).ListItem.Episode,9) +
!SubString(Container(9002).ListItem.Episode,s)">$INFO[Container(9002).ListItem.TVShowTitle]$INFO[Container(9002).ListItem.Season,
- S0]$INFO[Container(9002).ListItem.Episode,E]</value>
- <value condition="Control.HasFocus(9002) +
!IsEmpty(Container(9002).ListItem.Episode) +
IntegerGreaterThan(Container(9002).ListItem.Season,9) +
!IntegerGreaterThan(Container(9002).ListItem.Episode,9) +
!SubString(Container(9002).ListItem.Episode,s)">$INFO[Container(9002).ListItem.TVShowTitle]$INFO[Container(9002).ListItem.Season,
- S]$INFO[Container(9002).ListItem.Episode,E0]</value>
- <value condition="Control.HasFocus(9002) +
!IsEmpty(Container(9002).ListItem.Episode) +
!SubString(Container(9002).ListItem.Episode,s)">$INFO[Container(9002).ListItem.TVShowTitle]$INFO[Container(9002).ListItem.Season,
- S0]$INFO[Container(9002).ListItem.Episode,E0]</value>
- <value condition="Control.HasFocus(9002) +
!IsEmpty(Container(9002).ListItem.Episode)">$INFO[Container(9002).ListItem.TVShowTitle]$INFO[Container(9002).ListItem.Episode,
- ]</value>
- <value condition="Control.HasFocus(9002) +
!IsEmpty(Container(9002).ListItem.Artist)">$INFO[Container(9002).ListItem.Label]$INFO[Container(9002).ListItem.Artist,
- ]</value>
- <value condition="Control.HasFocus(9002) +
!IsEmpty(Container(9002).ListItem.Year)">$INFO[Container(9002).ListItem.Label]$INFO[Container(9002).ListItem.Year,
(,)]</value>
- <value
condition="Control.HasFocus(9002)">$INFO[Container(9002).ListItem.Label]</value>
- <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),VideoAddons)
+ !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[1037]</value>
- <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecentMovies)
+ !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[31031]</value>
- <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecommendedMovies)
+ !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[31032]</value>
- <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),RandomMovies)
+ !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[31054]</value>
- <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecentEpisodes)
+ !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[31035]</value>
- <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecommendedEpisodes)
+ !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[31036]</value>
- <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),RandomEpisodes)
+ !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[31055]</value>
- <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecentAlbums)
+ !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[31038]</value>
- <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecommendedAlbums)
+ !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[31039]</value>
- <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),RandomAlbums)
+ !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[31056]</value>
- <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),MusicAddons)
+ !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[1038]</value>
- <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),PictureAddons)
+ !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[1039]</value>
- <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),ProgramAddons)
+ !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[1043]</value>
+ <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),VideoAddons)
+ !IsEmpty(Container(9002).ListItem.Label) +
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[1037]</value>
+ <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecentMovies)
+ !IsEmpty(Container(9002).ListItem.Label) +
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[31031]</value>
+ <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecommendedMovies)
+ !IsEmpty(Container(9002).ListItem.Label) +
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[31032]</value>
+ <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),RandomMovies)
+ !IsEmpty(Container(9002).ListItem.Label) +
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[31054]</value>
+ <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecentEpisodes)
+ !IsEmpty(Container(9002).ListItem.Label) +
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[31035]</value>
+ <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecommendedEpisodes)
+ !IsEmpty(Container(9002).ListItem.Label) +
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[31036]</value>
+ <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),RandomEpisodes)
+ !IsEmpty(Container(9002).ListItem.Label) +
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[31055]</value>
+ <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecentAlbums)
+ !IsEmpty(Container(9002).ListItem.Label) +
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[31038]</value>
+ <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecommendedAlbums)
+ !IsEmpty(Container(9002).ListItem.Label) +
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[31039]</value>
+ <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),RandomAlbums)
+ !IsEmpty(Container(9002).ListItem.Label) +
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[31056]</value>
+ <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),MusicAddons)
+ !IsEmpty(Container(9002).ListItem.Label) +
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[1038]</value>
+ <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),PictureAddons)
+ !IsEmpty(Container(9002).ListItem.Label) +
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[1039]</value>
+ <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),ProgramAddons)
+ !IsEmpty(Container(9002).ListItem.Label) +
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[1043]</value>
+ <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),Favourites)
+ !IsEmpty(Container(9002).ListItem.Label) +
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[1036]</value>
+ <value
condition="StringCompare(Container(9000).ListItem.Property(Widget),Playlist) +
!IsEmpty(Container(9002).ListItem.Label) +
!Skin.HasSetting(Hide_Widget_Headings)">$INFO[Container(9002).ListItem.Label]</value>
</variable>
<variable name="SubMenuColor">
diff --git a/skin.conq/16x9/script-skinshortcuts-includes.xml
b/skin.conq/16x9/script-skinshortcuts-includes.xml
index 72cf12b..fc8f31d 100644
--- a/skin.conq/16x9/script-skinshortcuts-includes.xml
+++ b/skin.conq/16x9/script-skinshortcuts-includes.xml
@@ -95,7 +95,7 @@
</item>
<item id="7">
<label>$LOCALIZE[10005]</label>
- <label2>Custom shortcut</label2>
+ <label2>Common Shortcut</label2>
<icon>DefaultMusicAlbums.png</icon>
<thumb />
<property name="labelID">music</property>
@@ -190,35 +190,19 @@
<property name="hasSubmenu">True</property>
</item>
<item id="14">
- <label>TV</label>
- <label2>Live TV</label2>
+ <label>$ADDON[script.skinshortcuts 32022]</label>
+ <label2>Common Shortcut</label2>
<icon>DefaultTVShows.png</icon>
<thumb />
- <property name="labelID">tv</property>
- <property name="defaultID">tv</property>
- <visible>PVR.HasTVChannels</visible>
- <onclick>ActivateWindow(TVChannels)</onclick>
+ <property name="labelID">livetv</property>
+ <property name="defaultID">livetv</property>
+ <visible>System.GetBool(pvrmanager.enabled)</visible>
+ <onclick>ActivateWindowAndFocus(MyPVR,34,0
,13,0)</onclick>
<visible>StringCompare(System.ProfileName,Master
user)</visible>
- <property name="submenuVisibility">tv</property>
+ <property name="submenuVisibility">livetv</property>
<property name="group">mainmenu</property>
- <property name="widget">TV</property>
- <property name="widgetName">TV</property>
- <property name="hasSubmenu">True</property>
- </item>
- <item id="15">
- <label>Radio</label>
- <label2>Radio</label2>
- <icon>DefaultAudio.png</icon>
- <thumb />
- <property name="labelID">radio</property>
- <property name="defaultID">radio</property>
- <visible>PVR.HasRadioChannels</visible>
- <onclick>ActivateWindow(RadioChannels)</onclick>
- <visible>StringCompare(System.ProfileName,Master
user)</visible>
- <property name="submenuVisibility">radio</property>
- <property name="group">mainmenu</property>
- <property name="widget">Radio</property>
- <property name="widgetName">Radio</property>
+ <property name="widget">PVR</property>
+ <property name="widgetName">PVR Status</property>
<property name="hasSubmenu">True</property>
</item>
</include>
@@ -639,133 +623,68 @@
</item>
<item id="1">
<label>$LOCALIZE[19019]</label>
- <label2>Live TV</label2>
- <icon>home/tvshows.png</icon>
+ <label2>$ADDON[script.skinshortcuts 32017]</label2>
+ <icon>DefaultTVShows.png</icon>
<thumb />
<property name="labelID">19019</property>
<property name="defaultID">19019</property>
<visible>PVR.HasTVChannels</visible>
<onclick>ActivateWindow(TVChannels)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+
[StringCompare(Container(9000).ListItem.Property(submenuVisibility),tv)]</visible>
+ <visible>StringCompare(System.ProfileName,Master user)
+
[StringCompare(Container(9000).ListItem.Property(submenuVisibility),livetv)]</visible>
<property name="isSubmenu">True</property>
- <property name="group">tv</property>
+ <property name="group">livetv</property>
</item>
<item id="2">
<label>$LOCALIZE[22020]</label>
- <label2>Live TV</label2>
- <icon>home/epg.png</icon>
+ <label2>$ADDON[script.skinshortcuts 32017]</label2>
+ <icon>DefaultTVShows.png</icon>
<thumb />
<property name="labelID">22020</property>
<property name="defaultID">22020</property>
<visible>PVR.HasTVChannels</visible>
<onclick>ActivateWindow(TVGuide)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+
[StringCompare(Container(9000).ListItem.Property(submenuVisibility),tv)]</visible>
+ <visible>StringCompare(System.ProfileName,Master user)
+
[StringCompare(Container(9000).ListItem.Property(submenuVisibility),livetv)]</visible>
<property name="isSubmenu">True</property>
- <property name="group">tv</property>
+ <property name="group">livetv</property>
</item>
<item id="3">
<label>$LOCALIZE[19163]</label>
- <label2>Live TV</label2>
- <icon>home/recordings.png</icon>
+ <label2>$ADDON[script.skinshortcuts 32017]</label2>
+ <icon>DefaultTVShows.png</icon>
<thumb />
<property name="labelID">19163</property>
<property name="defaultID">19163</property>
<visible>PVR.HasTVChannels</visible>
<onclick>ActivateWindow(TVRecordings)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+
[StringCompare(Container(9000).ListItem.Property(submenuVisibility),tv)]</visible>
+ <visible>StringCompare(System.ProfileName,Master user)
+
[StringCompare(Container(9000).ListItem.Property(submenuVisibility),livetv)]</visible>
<property name="isSubmenu">True</property>
- <property name="group">tv</property>
+ <property name="group">livetv</property>
</item>
<item id="4">
<label>$LOCALIZE[19040]</label>
- <label2>Live TV</label2>
- <icon>home/timers.png</icon>
+ <label2>$ADDON[script.skinshortcuts 32017]</label2>
+ <icon>DefaultTVShows.png</icon>
<thumb />
<property name="labelID">19040</property>
<property name="defaultID">19040</property>
<visible>PVR.HasTVChannels</visible>
<onclick>ActivateWindow(TVTimers)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+
[StringCompare(Container(9000).ListItem.Property(submenuVisibility),tv)]</visible>
+ <visible>StringCompare(System.ProfileName,Master user)
+
[StringCompare(Container(9000).ListItem.Property(submenuVisibility),livetv)]</visible>
<property name="isSubmenu">True</property>
- <property name="group">tv</property>
+ <property name="group">livetv</property>
</item>
<item id="5">
<label>$LOCALIZE[137]</label>
- <label2>Live TV</label2>
- <icon>home/search-tv.png</icon>
+ <label2>$ADDON[script.skinshortcuts 32017]</label2>
+ <icon>DefaultTVShows.png</icon>
<thumb />
<property name="labelID">137</property>
<property name="defaultID">137</property>
<visible>PVR.HasTVChannels</visible>
<onclick>ActivateWindow(TVSearch)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+
[StringCompare(Container(9000).ListItem.Property(submenuVisibility),tv)]</visible>
- <property name="isSubmenu">True</property>
- <property name="group">tv</property>
- </item>
- <item id="1">
- <label>$LOCALIZE[19019]</label>
- <label2>Radio</label2>
- <icon>home/radio.png</icon>
- <thumb />
- <property name="labelID">19019</property>
- <property name="defaultID">19019</property>
- <visible>PVR.HasRadioChannels</visible>
- <onclick>ActivateWindow(RadioChannels)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+
[StringCompare(Container(9000).ListItem.Property(submenuVisibility),radio)]</visible>
- <property name="isSubmenu">True</property>
- <property name="group">radio</property>
- </item>
- <item id="2">
- <label>$LOCALIZE[22020]</label>
- <label2>Radio</label2>
- <icon>home/epg.png</icon>
- <thumb />
- <property name="labelID">22020</property>
- <property name="defaultID">22020</property>
- <visible>PVR.HasRadioChannels</visible>
- <onclick>ActivateWindow(RadioGuide)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+
[StringCompare(Container(9000).ListItem.Property(submenuVisibility),radio)]</visible>
- <property name="isSubmenu">True</property>
- <property name="group">radio</property>
- </item>
- <item id="3">
- <label>$LOCALIZE[19163]</label>
- <label2>Radio</label2>
- <icon>home/recordings.png</icon>
- <thumb />
- <property name="labelID">19163</property>
- <property name="defaultID">19163</property>
- <visible>PVR.HasRadioChannels</visible>
- <onclick>ActivateWindow(RadioRecordings)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+
[StringCompare(Container(9000).ListItem.Property(submenuVisibility),radio)]</visible>
- <property name="isSubmenu">True</property>
- <property name="group">radio</property>
- </item>
- <item id="4">
- <label>$LOCALIZE[19040]</label>
- <label2>Radio</label2>
- <icon>home/timers.png</icon>
- <thumb />
- <property name="labelID">19040</property>
- <property name="defaultID">19040</property>
- <visible>PVR.HasRadioChannels</visible>
- <onclick>ActivateWindow(RadioTimers)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+
[StringCompare(Container(9000).ListItem.Property(submenuVisibility),radio)]</visible>
- <property name="isSubmenu">True</property>
- <property name="group">radio</property>
- </item>
- <item id="5">
- <label>$LOCALIZE[137]</label>
- <label2>Radio</label2>
- <icon>home/search-tv.png</icon>
- <thumb />
- <property name="labelID">137</property>
- <property name="defaultID">137</property>
- <visible>PVR.HasRadioChannels</visible>
- <onclick>ActivateWindow(RadioSearch)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+
[StringCompare(Container(9000).ListItem.Property(submenuVisibility),radio)]</visible>
+ <visible>StringCompare(System.ProfileName,Master user)
+
[StringCompare(Container(9000).ListItem.Property(submenuVisibility),livetv)]</visible>
<property name="isSubmenu">True</property>
- <property name="group">radio</property>
+ <property name="group">livetv</property>
</item>
</include>
<include name="skinshortcuts-group-weather">
@@ -1605,262 +1524,133 @@
<property name="group">13005</property>
</item>
</include>
- <include name="skinshortcuts-group-tv">
+ <include name="skinshortcuts-group-livetv">
<item id="1">
<label>$LOCALIZE[19019]</label>
- <label2>Live TV</label2>
- <icon>home/tvshows.png</icon>
+ <label2>$ADDON[script.skinshortcuts 32017]</label2>
+ <icon>DefaultTVShows.png</icon>
<thumb />
<property name="labelID">19019</property>
<property name="defaultID">19019</property>
<visible>PVR.HasTVChannels</visible>
<onclick>ActivateWindow(TVChannels)</onclick>
<visible>StringCompare(System.ProfileName,Master
user)</visible>
- <property name="group">tv</property>
+ <property name="group">livetv</property>
</item>
<item id="2">
<label>$LOCALIZE[22020]</label>
- <label2>Live TV</label2>
- <icon>home/epg.png</icon>
+ <label2>$ADDON[script.skinshortcuts 32017]</label2>
+ <icon>DefaultTVShows.png</icon>
<thumb />
<property name="labelID">22020</property>
<property name="defaultID">22020</property>
<visible>PVR.HasTVChannels</visible>
<onclick>ActivateWindow(TVGuide)</onclick>
<visible>StringCompare(System.ProfileName,Master
user)</visible>
- <property name="group">tv</property>
+ <property name="group">livetv</property>
</item>
<item id="3">
<label>$LOCALIZE[19163]</label>
- <label2>Live TV</label2>
- <icon>home/recordings.png</icon>
+ <label2>$ADDON[script.skinshortcuts 32017]</label2>
+ <icon>DefaultTVShows.png</icon>
<thumb />
<property name="labelID">19163</property>
<property name="defaultID">19163</property>
<visible>PVR.HasTVChannels</visible>
<onclick>ActivateWindow(TVRecordings)</onclick>
<visible>StringCompare(System.ProfileName,Master
user)</visible>
- <property name="group">tv</property>
+ <property name="group">livetv</property>
</item>
<item id="4">
<label>$LOCALIZE[19040]</label>
- <label2>Live TV</label2>
- <icon>home/timers.png</icon>
+ <label2>$ADDON[script.skinshortcuts 32017]</label2>
+ <icon>DefaultTVShows.png</icon>
<thumb />
<property name="labelID">19040</property>
<property name="defaultID">19040</property>
<visible>PVR.HasTVChannels</visible>
<onclick>ActivateWindow(TVTimers)</onclick>
<visible>StringCompare(System.ProfileName,Master
user)</visible>
- <property name="group">tv</property>
+ <property name="group">livetv</property>
</item>
<item id="5">
<label>$LOCALIZE[137]</label>
- <label2>Live TV</label2>
- <icon>home/search-tv.png</icon>
+ <label2>$ADDON[script.skinshortcuts 32017]</label2>
+ <icon>DefaultTVShows.png</icon>
<thumb />
<property name="labelID">137</property>
<property name="defaultID">137</property>
<visible>PVR.HasTVChannels</visible>
<onclick>ActivateWindow(TVSearch)</onclick>
<visible>StringCompare(System.ProfileName,Master
user)</visible>
- <property name="group">tv</property>
+ <property name="group">livetv</property>
</item>
</include>
- <include name="skinshortcuts-group-alt-tv">
+ <include name="skinshortcuts-group-alt-livetv">
<item id="1">
<label>$LOCALIZE[19019]</label>
- <label2>Live TV</label2>
- <icon>home/tvshows.png</icon>
+ <label2>$ADDON[script.skinshortcuts 32017]</label2>
+ <icon>DefaultTVShows.png</icon>
<thumb />
<property name="labelID">19019</property>
<property name="defaultID">19019</property>
<visible>PVR.HasTVChannels</visible>
<onclick>ActivateWindow(TVChannels)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+ [StringCompare(Window(10000).Property(submenuVisibility),tv)]</visible>
+ <visible>StringCompare(System.ProfileName,Master user)
+ [StringCompare(Window(10000).Property(submenuVisibility),livetv)]</visible>
<property name="isSubmenu">True</property>
- <property name="group">tv</property>
+ <property name="group">livetv</property>
</item>
<item id="2">
<label>$LOCALIZE[22020]</label>
- <label2>Live TV</label2>
- <icon>home/epg.png</icon>
+ <label2>$ADDON[script.skinshortcuts 32017]</label2>
+ <icon>DefaultTVShows.png</icon>
<thumb />
<property name="labelID">22020</property>
<property name="defaultID">22020</property>
<visible>PVR.HasTVChannels</visible>
<onclick>ActivateWindow(TVGuide)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+ [StringCompare(Window(10000).Property(submenuVisibility),tv)]</visible>
+ <visible>StringCompare(System.ProfileName,Master user)
+ [StringCompare(Window(10000).Property(submenuVisibility),livetv)]</visible>
<property name="isSubmenu">True</property>
- <property name="group">tv</property>
+ <property name="group">livetv</property>
</item>
<item id="3">
<label>$LOCALIZE[19163]</label>
- <label2>Live TV</label2>
- <icon>home/recordings.png</icon>
+ <label2>$ADDON[script.skinshortcuts 32017]</label2>
+ <icon>DefaultTVShows.png</icon>
<thumb />
<property name="labelID">19163</property>
<property name="defaultID">19163</property>
<visible>PVR.HasTVChannels</visible>
<onclick>ActivateWindow(TVRecordings)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+ [StringCompare(Window(10000).Property(submenuVisibility),tv)]</visible>
+ <visible>StringCompare(System.ProfileName,Master user)
+ [StringCompare(Window(10000).Property(submenuVisibility),livetv)]</visible>
<property name="isSubmenu">True</property>
- <property name="group">tv</property>
+ <property name="group">livetv</property>
</item>
<item id="4">
<label>$LOCALIZE[19040]</label>
- <label2>Live TV</label2>
- <icon>home/timers.png</icon>
+ <label2>$ADDON[script.skinshortcuts 32017]</label2>
+ <icon>DefaultTVShows.png</icon>
<thumb />
<property name="labelID">19040</property>
<property name="defaultID">19040</property>
<visible>PVR.HasTVChannels</visible>
<onclick>ActivateWindow(TVTimers)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+ [StringCompare(Window(10000).Property(submenuVisibility),tv)]</visible>
+ <visible>StringCompare(System.ProfileName,Master user)
+ [StringCompare(Window(10000).Property(submenuVisibility),livetv)]</visible>
<property name="isSubmenu">True</property>
- <property name="group">tv</property>
+ <property name="group">livetv</property>
</item>
<item id="5">
<label>$LOCALIZE[137]</label>
- <label2>Live TV</label2>
- <icon>home/search-tv.png</icon>
+ <label2>$ADDON[script.skinshortcuts 32017]</label2>
+ <icon>DefaultTVShows.png</icon>
<thumb />
<property name="labelID">137</property>
<property name="defaultID">137</property>
<visible>PVR.HasTVChannels</visible>
<onclick>ActivateWindow(TVSearch)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+ [StringCompare(Window(10000).Property(submenuVisibility),tv)]</visible>
- <property name="isSubmenu">True</property>
- <property name="group">tv</property>
- </item>
- </include>
- <include name="skinshortcuts-group-radio">
- <item id="1">
- <label>$LOCALIZE[19019]</label>
- <label2>Radio</label2>
- <icon>home/radio.png</icon>
- <thumb />
- <property name="labelID">19019</property>
- <property name="defaultID">19019</property>
- <visible>PVR.HasRadioChannels</visible>
- <onclick>ActivateWindow(RadioChannels)</onclick>
- <visible>StringCompare(System.ProfileName,Master
user)</visible>
- <property name="group">radio</property>
- </item>
- <item id="2">
- <label>$LOCALIZE[22020]</label>
- <label2>Radio</label2>
- <icon>home/epg.png</icon>
- <thumb />
- <property name="labelID">22020</property>
- <property name="defaultID">22020</property>
- <visible>PVR.HasRadioChannels</visible>
- <onclick>ActivateWindow(RadioGuide)</onclick>
- <visible>StringCompare(System.ProfileName,Master
user)</visible>
- <property name="group">radio</property>
- </item>
- <item id="3">
- <label>$LOCALIZE[19163]</label>
- <label2>Radio</label2>
- <icon>home/recordings.png</icon>
- <thumb />
- <property name="labelID">19163</property>
- <property name="defaultID">19163</property>
- <visible>PVR.HasRadioChannels</visible>
- <onclick>ActivateWindow(RadioRecordings)</onclick>
- <visible>StringCompare(System.ProfileName,Master
user)</visible>
- <property name="group">radio</property>
- </item>
- <item id="4">
- <label>$LOCALIZE[19040]</label>
- <label2>Radio</label2>
- <icon>home/timers.png</icon>
- <thumb />
- <property name="labelID">19040</property>
- <property name="defaultID">19040</property>
- <visible>PVR.HasRadioChannels</visible>
- <onclick>ActivateWindow(RadioTimers)</onclick>
- <visible>StringCompare(System.ProfileName,Master
user)</visible>
- <property name="group">radio</property>
- </item>
- <item id="5">
- <label>$LOCALIZE[137]</label>
- <label2>Radio</label2>
- <icon>home/search-tv.png</icon>
- <thumb />
- <property name="labelID">137</property>
- <property name="defaultID">137</property>
- <visible>PVR.HasRadioChannels</visible>
- <onclick>ActivateWindow(RadioSearch)</onclick>
- <visible>StringCompare(System.ProfileName,Master
user)</visible>
- <property name="group">radio</property>
- </item>
- </include>
- <include name="skinshortcuts-group-alt-radio">
- <item id="1">
- <label>$LOCALIZE[19019]</label>
- <label2>Radio</label2>
- <icon>home/radio.png</icon>
- <thumb />
- <property name="labelID">19019</property>
- <property name="defaultID">19019</property>
- <visible>PVR.HasRadioChannels</visible>
- <onclick>ActivateWindow(RadioChannels)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+ [StringCompare(Window(10000).Property(submenuVisibility),radio)]</visible>
- <property name="isSubmenu">True</property>
- <property name="group">radio</property>
- </item>
- <item id="2">
- <label>$LOCALIZE[22020]</label>
- <label2>Radio</label2>
- <icon>home/epg.png</icon>
- <thumb />
- <property name="labelID">22020</property>
- <property name="defaultID">22020</property>
- <visible>PVR.HasRadioChannels</visible>
- <onclick>ActivateWindow(RadioGuide)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+ [StringCompare(Window(10000).Property(submenuVisibility),radio)]</visible>
- <property name="isSubmenu">True</property>
- <property name="group">radio</property>
- </item>
- <item id="3">
- <label>$LOCALIZE[19163]</label>
- <label2>Radio</label2>
- <icon>home/recordings.png</icon>
- <thumb />
- <property name="labelID">19163</property>
- <property name="defaultID">19163</property>
- <visible>PVR.HasRadioChannels</visible>
- <onclick>ActivateWindow(RadioRecordings)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+ [StringCompare(Window(10000).Property(submenuVisibility),radio)]</visible>
- <property name="isSubmenu">True</property>
- <property name="group">radio</property>
- </item>
- <item id="4">
- <label>$LOCALIZE[19040]</label>
- <label2>Radio</label2>
- <icon>home/timers.png</icon>
- <thumb />
- <property name="labelID">19040</property>
- <property name="defaultID">19040</property>
- <visible>PVR.HasRadioChannels</visible>
- <onclick>ActivateWindow(RadioTimers)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+ [StringCompare(Window(10000).Property(submenuVisibility),radio)]</visible>
- <property name="isSubmenu">True</property>
- <property name="group">radio</property>
- </item>
- <item id="5">
- <label>$LOCALIZE[137]</label>
- <label2>Radio</label2>
- <icon>home/search-tv.png</icon>
- <thumb />
- <property name="labelID">137</property>
- <property name="defaultID">137</property>
- <visible>PVR.HasRadioChannels</visible>
- <onclick>ActivateWindow(RadioSearch)</onclick>
- <visible>StringCompare(System.ProfileName,Master user)
+ [StringCompare(Window(10000).Property(submenuVisibility),radio)]</visible>
+ <visible>StringCompare(System.ProfileName,Master user)
+ [StringCompare(Window(10000).Property(submenuVisibility),livetv)]</visible>
<property name="isSubmenu">True</property>
- <property name="group">radio</property>
+ <property name="group">livetv</property>
</item>
</include>
</includes>
diff --git a/skin.conq/16x9/script-skinshortcuts.xml
b/skin.conq/16x9/script-skinshortcuts.xml
index 03c81af..b02ab87 100644
--- a/skin.conq/16x9/script-skinshortcuts.xml
+++ b/skin.conq/16x9/script-skinshortcuts.xml
@@ -147,7 +147,7 @@
<control type="button" id="405">
<width>1200</width>
<label>$ADDON[script.skinshortcuts
32072]</label>
-
<visible>StringCompare(Window.Property(groupname),mainmenu) +
Skin.HasSetting(HomeHorizontal)</visible>
+
<visible>StringCompare(Window.Property(groupname),mainmenu)</visible>
</control>
<!-- Edit widget -->
@@ -188,7 +188,7 @@
<!-- OK Button -->
<control type="button" id="10">
- <width>400</width>
+ <width>200</width>
<label>186</label>
<onback
condition="StringCompare(Window.Property(groupname),mainmenu)">RunScript(script.skinshortcuts,type=buildxml&mainmenuID=9000&levels=0)</onback>
<onclick
condition="StringCompare(Window.Property(groupname),mainmenu)">RunScript(script.skinshortcuts,type=buildxml&mainmenuID=9000&levels=0)</onclick>
@@ -201,6 +201,13 @@
<label>$ADDON[script.skinshortcuts
32028]</label>
</control>
+ <!-- Reset all -->
+ <control type="button" id="999">
+ <width>400</width>
+
<onclick>RunScript(script.skinshortcuts,type=resetall)</onclick>
+ <label>$ADDON[script.skinshortcuts
32037]</label>
+ </control>
+
</control>
</controls>
diff --git a/skin.conq/addon.xml b/skin.conq/addon.xml
index 4aaa2ba..5fea859 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.3"
+ version="2.0.4"
name="Conq"
provider-name="Hitcher">
<requires>
diff --git a/skin.conq/changelog.txt b/skin.conq/changelog.txt
index 82aa0d9..fc762f1 100644
--- a/skin.conq/changelog.txt
+++ b/skin.conq/changelog.txt
@@ -1,3 +1,15 @@
+[B]2.0.4[/B]
+
+- Updated weather screen
+- Changed Movie, Episode, and Album widgets
+- Added 'Reset all' button to Shortcuts Menu
+- Added hide mouse warning options
+- Re-designed some dialogs
+
+[B]2.0.31[/B]
+
+- Fixed another background problem
+
[B]2.0.3[/B]
- Added 'Arial' font option
diff --git a/skin.conq/language/English/strings.po
b/skin.conq/language/English/strings.po
index 0184779..52854a2 100644
--- a/skin.conq/language/English/strings.po
+++ b/skin.conq/language/English/strings.po
@@ -236,4 +236,8 @@ msgstr ""
msgctxt "#31064"
msgid "Custom background image"
+msgstr ""
+
+msgctxt "#31065"
+msgid "Hide 'Mouse' warning"
msgstr ""
\ No newline at end of file
diff --git a/skin.conq/shortcuts/1036.DATA.xml
b/skin.conq/shortcuts/1036.DATA.xml
index ca87eac..4faa401 100644
--- a/skin.conq/shortcuts/1036.DATA.xml
+++ b/skin.conq/shortcuts/1036.DATA.xml
@@ -1 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
<shortcuts />
\ No newline at end of file
diff --git a/skin.conq/shortcuts/13005.DATA.xml
b/skin.conq/shortcuts/13005.DATA.xml
index 9a8a26b..9dd5c10 100644
--- a/skin.conq/shortcuts/13005.DATA.xml
+++ b/skin.conq/shortcuts/13005.DATA.xml
@@ -1,8 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
<shortcuts>
<shortcut>
<action>PowerDown</action>
<label>Power off</label>
<label2>32054</label2>
+ <defaultID>power-off</defaultID>
<icon>DefaultShortcut.png</icon>
<thumb />
<visible>System.CanPowerDown</visible>
@@ -11,6 +13,7 @@
<action>Reboot</action>
<label>13013</label>
<label2>32054</label2>
+ <defaultID>13013</defaultID>
<icon>DefaultShortcut.png</icon>
<visible>System.CanReboot</visible>
<thumb />
@@ -19,6 +22,7 @@
<action>Quit</action>
<label>13009</label>
<label2>32054</label2>
+ <defaultID>13009</defaultID>
<icon>DefaultShortcut.png</icon>
<thumb />
</shortcut>
@@ -26,6 +30,7 @@
<action>Hibernate</action>
<label>13010</label>
<label2>32054</label2>
+ <defaultID>13010</defaultID>
<icon>DefaultShortcut.png</icon>
<visible>System.CanHibernate</visible>
<thumb />
@@ -34,6 +39,7 @@
<action>Suspend</action>
<label>13011</label>
<label2>32054</label2>
+ <defaultID>13011</defaultID>
<icon>DefaultShortcut.png</icon>
<visible>System.CanSuspend</visible>
<thumb />
diff --git a/skin.conq/shortcuts/31063.DATA.xml
b/skin.conq/shortcuts/31063.DATA.xml
index ca87eac..4faa401 100644
--- a/skin.conq/shortcuts/31063.DATA.xml
+++ b/skin.conq/shortcuts/31063.DATA.xml
@@ -1 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
<shortcuts />
\ No newline at end of file
diff --git a/skin.conq/shortcuts/dvd.DATA.xml b/skin.conq/shortcuts/dvd.DATA.xml
index d1c41c0..64a8096 100644
--- a/skin.conq/shortcuts/dvd.DATA.xml
+++ b/skin.conq/shortcuts/dvd.DATA.xml
@@ -1,8 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
<shortcuts>
<shortcut>
<action>EjectTray()</action>
<label>32033</label>
<label2>32034</label2>
+ <defaultID>32033</defaultID>
<icon>DefaultDVDFull.png</icon>
<thumb />
</shortcut>
diff --git a/skin.conq/shortcuts/mainmenu.DATA.xml
b/skin.conq/shortcuts/mainmenu.DATA.xml
index c68815c..265d5f2 100644
--- a/skin.conq/shortcuts/mainmenu.DATA.xml
+++ b/skin.conq/shortcuts/mainmenu.DATA.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<shortcuts>
<shortcut>
- <label>12600</label>
+ <label>$LOCALIZE[12600]</label>
<label2>Common Shortcut</label2>
<defaultID>weather</defaultID>
<icon>DefaultShortcut.png</icon>
@@ -9,7 +9,7 @@
<action>ActivateWindow(Weather)</action>
</shortcut>
<shortcut>
- <label>10006</label>
+ <label>$LOCALIZE[10006]</label>
<label2>Common Shortcut</label2>
<defaultID>videos</defaultID>
<icon>DefaultVideo.png</icon>
@@ -17,7 +17,7 @@
<action>ActivateWindow(Videos,root)</action>
</shortcut>
<shortcut>
- <label>32032</label>
+ <label>$LOCALIZE[32032]</label>
<label2>Common Shortcut</label2>
<defaultID>dvd</defaultID>
<icon>DefaultDVDFull.png</icon>
@@ -25,7 +25,7 @@
<action>XBMC.PlayDVD()</action>
</shortcut>
<shortcut>
- <label>342</label>
+ <label>$LOCALIZE[342]</label>
<label2>Common Shortcut</label2>
<defaultID>movies</defaultID>
<icon>DefaultMovies.png</icon>
@@ -33,7 +33,7 @@
<action>ActivateWindow(Videos,MovieTitles,return)</action>
</shortcut>
<shortcut>
- <label>20343</label>
+ <label>$LOCALIZE[20343]</label>
<label2>Common Shortcut</label2>
<defaultID>tvshows</defaultID>
<icon>DefaultTVShows.png</icon>
@@ -41,15 +41,15 @@
<action>ActivateWindow(Videos,TVShowTitles,return)</action>
</shortcut>
<shortcut>
- <label>132</label>
+ <label>$LOCALIZE[132]</label>
<label2>Common Shortcut</label2>
- <defaultID>132</defaultID>
+ <defaultID>albums</defaultID>
<icon>DefaultMusicAlbums.png</icon>
<thumb />
<action>ActivateWindow(MusicLibrary,Albums,return)</action>
</shortcut>
<shortcut>
- <label>10005</label>
+ <label>$LOCALIZE[10005]</label>
<label2>Common Shortcut</label2>
<defaultID>music</defaultID>
<icon>DefaultMusicAlbums.png</icon>
@@ -57,7 +57,7 @@
<action>ActivateWindow(Music,root)</action>
</shortcut>
<shortcut>
- <label>10002</label>
+ <label>$LOCALIZE[10002]</label>
<label2>Common Shortcut</label2>
<defaultID>pictures</defaultID>
<icon>DefaultPicture.png</icon>
@@ -65,7 +65,7 @@
<action>ActivateWindow(Pictures)</action>
</shortcut>
<shortcut>
- <label>1036</label>
+ <label>$LOCALIZE[1036]</label>
<label2>Common Shortcut</label2>
<defaultID>1036</defaultID>
<icon>DefaultFavourite.png</icon>
@@ -73,7 +73,7 @@
<action>ActivateWindow(favourites)</action>
</shortcut>
<shortcut>
- <label>$SKIN[31063|skin.conq|Addons]</label>
+ <label>$LOCALIZE[31063]</label>
<label2>Common Shortcut</label2>
<defaultID>31063</defaultID>
<icon>DefaultProgram.png</icon>
@@ -81,7 +81,7 @@
<action>ActivateWindow(Programs,Addons,return)</action>
</shortcut>
<shortcut>
- <label>10004</label>
+ <label>$LOCALIZE[10004]</label>
<label2>Common Shortcut</label2>
<defaultID>settings</defaultID>
<icon>DefaultShortcut.png</icon>
@@ -89,7 +89,7 @@
<action>ActivateWindow(Settings)</action>
</shortcut>
<shortcut>
- <label>137</label>
+ <label>$LOCALIZE[137]</label>
<label2>Custom shortcut</label2>
<defaultID>script.globalsearch</defaultID>
<icon />
@@ -97,27 +97,19 @@
<action>RunScript(script.globalsearch)</action>
</shortcut>
<shortcut>
- <label>13005</label>
+ <label>$LOCALIZE[13005]</label>
<label2>XBMC Command</label2>
- <defaultID>13005</defaultID>
+ <defaultID>shutdown</defaultID>
<icon>DefaultShortcut.png</icon>
<thumb />
<action>ShutDown</action>
</shortcut>
<shortcut>
- <label>TV</label>
- <label2>Live TV</label2>
- <defaultID>19019</defaultID>
+ <label>$LOCALIZE[32022]</label>
+ <label2>Common Shortcut</label2>
+ <defaultID>livetv</defaultID>
<icon>DefaultTVShows.png</icon>
<thumb />
- <action>ActivateWindow(TVChannels)</action>
- </shortcut>
- <shortcut>
- <label>Radio</label>
- <label2>Radio</label2>
- <defaultID>19019</defaultID>
- <icon>DefaultAudio.png</icon>
- <thumb />
- <action>ActivateWindow(RadioChannels)</action>
+ <action>ActivateWindowAndFocus(MyPVR,34,0 ,13,0)</action>
</shortcut>
</shortcuts>
diff --git a/skin.conq/shortcuts/movies.DATA.xml
b/skin.conq/shortcuts/movies.DATA.xml
index 7b3d44d..70dbbed 100644
--- a/skin.conq/shortcuts/movies.DATA.xml
+++ b/skin.conq/shortcuts/movies.DATA.xml
@@ -1,8 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
<shortcuts>
<shortcut>
<action>ActivateWindow(Videos,plugin://service.library.data.provider?type=recentmovies,return)</action>
<label>$SKIN[31031|skin.conq|Recent movies]</label>
<label2>32014</label2>
+ <defaultID>31031</defaultID>
<icon>DefaultRecentlyAddedMovies.png</icon>
<thumb />
</shortcut>
@@ -10,6 +12,7 @@
<action>ActivateWindow(Videos,plugin://service.library.data.provider?type=recommendedmovies,return)</action>
<label>$SKIN[31032|skin.conq|Recommended movies]</label>
<label2>32014</label2>
+ <defaultID>31032</defaultID>
<icon>DefaultMovies.png</icon>
<thumb />
</shortcut>
@@ -17,6 +20,7 @@
<action>ActivateWindow(Videos,plugin://service.library.data.provider?type=randommovies,return)</action>
<label>$SKIN[31054|skin.conq|Random movies]</label>
<label2>32014</label2>
+ <defaultID>31054</defaultID>
<icon>DefaultMovies.png</icon>
<thumb />
</shortcut>
@@ -24,6 +28,7 @@
<action>ActivateWindow(Videos,MovieSets,return)</action>
<label>20434</label>
<label2>342</label2>
+ <defaultID>20434</defaultID>
<icon>DefaultSets.png</icon>
<thumb />
</shortcut>
@@ -31,6 +36,7 @@
<action>ActivateWindow(Videos,MovieGenres,return)</action>
<label>135</label>
<label2>342</label2>
+ <defaultID>135</defaultID>
<icon>DefaultGenre.png</icon>
<thumb />
</shortcut>
@@ -38,6 +44,7 @@
<action>ActivateWindow(Videos,MovieYears,return)</action>
<label>562</label>
<label2>342</label2>
+ <defaultID>562</defaultID>
<icon>DefaultYear.png</icon>
<thumb />
</shortcut>
@@ -45,6 +52,7 @@
<action>ActivateWindow(Videos,MovieActors,return)</action>
<label>344</label>
<label2>342</label2>
+ <defaultID>344</defaultID>
<icon>DefaultActor.png</icon>
<thumb />
</shortcut>
diff --git a/skin.conq/shortcuts/music.DATA.xml
b/skin.conq/shortcuts/music.DATA.xml
index 724ed47..cd25c2a 100644
--- a/skin.conq/shortcuts/music.DATA.xml
+++ b/skin.conq/shortcuts/music.DATA.xml
@@ -1,8 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
<shortcuts>
<shortcut>
<action>ActivateWindow(MusicLibrary,Artists,return)</action>
<label>133</label>
<label2>32019</label2>
+ <defaultID>133</defaultID>
<icon>DefaultMusicArtists.png</icon>
<thumb />
</shortcut>
@@ -10,6 +12,7 @@
<action>ActivateWindow(MusicLibrary,Albums,return)</action>
<label>132</label>
<label2>32019</label2>
+ <defaultID>132</defaultID>
<icon>DefaultMusicAlbums.png</icon>
<thumb />
</shortcut>
@@ -17,6 +20,7 @@
<action>ActivateWindow(MusicLibrary,Songs,return)</action>
<label>134</label>
<label2>32019</label2>
+ <defaultID>134</defaultID>
<icon>DefaultMusicSongs.png</icon>
<thumb />
</shortcut>
@@ -24,6 +28,7 @@
<action>ActivateWindow(MusicFiles)</action>
<label>744</label>
<label2>32019</label2>
+ <defaultID>744</defaultID>
<icon>DefaultFolder.png</icon>
<thumb />
</shortcut>
@@ -31,6 +36,7 @@
<action>ActivateWindow(MusicLibrary,MusicLibrary,return)</action>
<label>15100</label>
<label2>32019</label2>
+ <defaultID>15100</defaultID>
<icon>DefaultFolder.png</icon>
<thumb />
</shortcut>
@@ -38,6 +44,7 @@
<action>ActivateWindow(MusicLibrary,Addons,return)</action>
<label>1038</label>
<label2>32019</label2>
+ <defaultID>1038</defaultID>
<icon>DefaultAddonMusic.png</icon>
<thumb />
</shortcut>
diff --git a/skin.conq/shortcuts/overrides.xml
b/skin.conq/shortcuts/overrides.xml
index 7cf3101..3de4cfc 100644
--- a/skin.conq/shortcuts/overrides.xml
+++ b/skin.conq/shortcuts/overrides.xml
@@ -14,7 +14,7 @@
<!-- Recent episodes -->
<widget label="Recent episodes">RecentEpisodes</widget>
<widgetdefault labelID="tvshows">RecentEpisodes</widgetdefault>
- <!-- Recommended Recommended movies -->
+ <!-- Recommended Recommended episodes -->
<widget label="Recommended episodes">RecommendedEpisodes</widget>
<!-- Random episodes -->
<widget label="Random episodes">RandomEpisodes</widget>
@@ -52,13 +52,9 @@
<widget label="Favourites">Favourites</widget>
<widgetdefault labelID="1036">Favourites</widgetdefault>
- <!-- TV -->
- <widget label="TV">TV</widget>
- <widgetdefault labelID="tv">TV</widgetdefault>
-
- <!-- Radio -->
- <widget label="Radio">Radio</widget>
- <widgetdefault labelID="radio">Radio</widgetdefault>
+ <!-- PVR -->
+ <widget label="PVR Status">PVR</widget>
+ <widgetdefault labelID="livetv">PVR</widgetdefault>
<!-- Playlists -->
<widgetPlaylists>True</widgetPlaylists>
diff --git a/skin.conq/shortcuts/pictures.DATA.xml
b/skin.conq/shortcuts/pictures.DATA.xml
index 0f13a4d..5754e12 100644
--- a/skin.conq/shortcuts/pictures.DATA.xml
+++ b/skin.conq/shortcuts/pictures.DATA.xml
@@ -1,8 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
<shortcuts>
<shortcut>
<action>ActivateWindow(Pictures,Addons,return)</action>
<label>1039</label>
<label2>32020</label2>
+ <defaultID>1039</defaultID>
<icon>DefaultAddonPicture.png</icon>
<thumb />
</shortcut>
diff --git a/skin.conq/shortcuts/script-globalsearch.DATA.xml
b/skin.conq/shortcuts/script-globalsearch.DATA.xml
index ca87eac..4faa401 100644
--- a/skin.conq/shortcuts/script-globalsearch.DATA.xml
+++ b/skin.conq/shortcuts/script-globalsearch.DATA.xml
@@ -1 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
<shortcuts />
\ No newline at end of file
diff --git a/skin.conq/shortcuts/settings.DATA.xml
b/skin.conq/shortcuts/settings.DATA.xml
index cb367b3..5e446e0 100644
--- a/skin.conq/shortcuts/settings.DATA.xml
+++ b/skin.conq/shortcuts/settings.DATA.xml
@@ -1,8 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
<shortcuts>
<shortcut>
<action>ActivateWindow(FileManager)</action>
<label>7</label>
<label2>32034</label2>
+ <defaultID>7</defaultID>
<icon>DefaultFolder.png</icon>
<thumb />
</shortcut>
@@ -10,6 +12,7 @@
<action>ActivateWindow(Profiles)</action>
<label>13200</label>
<label2>32034</label2>
+ <defaultID>13200</defaultID>
<icon>UnknownUser.png</icon>
<thumb />
</shortcut>
@@ -17,6 +20,7 @@
<action>ActivateWindow(SystemInfo)</action>
<label>10007</label>
<label2>32034</label2>
+ <defaultID>10007</defaultID>
<icon>DefaultShortcut.png</icon>
<thumb />
</shortcut>
diff --git a/skin.conq/shortcuts/tvshows.DATA.xml
b/skin.conq/shortcuts/tvshows.DATA.xml
index e6d1fc9..f6410d7 100644
--- a/skin.conq/shortcuts/tvshows.DATA.xml
+++ b/skin.conq/shortcuts/tvshows.DATA.xml
@@ -1,8 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
<shortcuts>
<shortcut>
<action>ActivateWindow(Videos,plugin://service.library.data.provider?type=recentepisodes,return)</action>
<label>$SKIN[31035|skin.conq|Recent episodes]</label>
<label2>32014</label2>
+ <defaultID>31035</defaultID>
<icon>DefaultRecentlyAddedEpisodes.png</icon>
<thumb />
</shortcut>
@@ -10,6 +12,7 @@
<action>ActivateWindow(Videos,plugin://service.library.data.provider?type=recommendedepisodes,return)</action>
<label>$SKIN[31036|skin.conq|Recommended episodes]</label>
<label2>32014</label2>
+ <defaultID>31036</defaultID>
<icon>DefaultEpisodes.png</icon>
<thumb />
</shortcut>
@@ -17,6 +20,7 @@
<action>ActivateWindow(Videos,plugin://service.library.data.provider?type=randomepisodes,return)</action>
<label>$SKIN[31055|skin.conq|Random episodes]</label>
<label2>32014</label2>
+ <defaultID>31055</defaultID>
<icon>DefaultEpisodes.png</icon>
<thumb />
</shortcut>
@@ -24,6 +28,7 @@
<action>ActivateWindow(Videos,TvShowGenres,return)</action>
<label>135</label>
<label2>20343</label2>
+ <defaultID>135</defaultID>
<icon>DefaultGenre.png</icon>
<thumb />
</shortcut>
@@ -31,6 +36,7 @@
<action>ActivateWindow(Videos,TvShowYears,return)</action>
<label>562</label>
<label2>20343</label2>
+ <defaultID>562</defaultID>
<icon>DefaultYear.png</icon>
<thumb />
</shortcut>
@@ -38,6 +44,7 @@
<action>ActivateWindow(Videos,TvShowActors,return)</action>
<label>344</label>
<label2>20343</label2>
+ <defaultID>344</defaultID>
<icon>DefaultActor.png</icon>
<thumb />
</shortcut>
diff --git a/skin.conq/shortcuts/videos.DATA.xml
b/skin.conq/shortcuts/videos.DATA.xml
index a1d71d5..803fa45 100644
--- a/skin.conq/shortcuts/videos.DATA.xml
+++ b/skin.conq/shortcuts/videos.DATA.xml
@@ -1,8 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
<shortcuts>
<shortcut>
<action>ActivateWindow(Videos,Addons,return)</action>
<label>1037</label>
<label2>32014</label2>
+ <defaultID>1037</defaultID>
<icon>DefaultAddonVideo.png</icon>
<thumb />
</shortcut>
@@ -10,6 +12,7 @@
<action>ActivateWindow(Videos,Files,return)</action>
<label>744</label>
<label2>32014</label2>
+ <defaultID>744</defaultID>
<icon>DefaultFolder.png</icon>
<thumb />
</shortcut>
@@ -17,6 +20,7 @@
<action>ActivateWindow(MusicLibrary,MusicVideos,return)</action>
<label>20389</label>
<label2>32034</label2>
+ <defaultID>musicvideos</defaultID>
<icon>DefaultMusicVideos.png</icon>
<thumb />
</shortcut>
diff --git a/skin.conq/shortcuts/weather.DATA.xml
b/skin.conq/shortcuts/weather.DATA.xml
index 27ad47c..e36d263 100644
--- a/skin.conq/shortcuts/weather.DATA.xml
+++ b/skin.conq/shortcuts/weather.DATA.xml
@@ -1,8 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
<shortcuts>
<shortcut>
<action>ActivateWindow(Settings)</action>
<label>10004</label>
<label2>32034</label2>
+ <defaultID>settings</defaultID>
<icon>DefaultShortcut.png</icon>
<thumb />
</shortcut>
-----------------------------------------------------------------------
Summary of changes:
skin.conq/16x9/DialogBusy.xml | 44 +-
skin.conq/16x9/DialogContextMenu.xml | 52 ++-
skin.conq/16x9/DialogOk.xml | 36 +-
skin.conq/16x9/DialogYesNo.xml | 38 +-
skin.conq/16x9/Include_Home_Default.xml | 123 +++--
skin.conq/16x9/Include_Home_Horizontal.xml | 140 +++--
skin.conq/16x9/Includes.xml | 11 +
skin.conq/16x9/Includes_Widgets.xml | 669 ++++++++++++++++++++++
skin.conq/16x9/MyWeather.xml | 63 ++-
skin.conq/16x9/Pointer.xml | 4 +
skin.conq/16x9/SkinSettings.xml | 12 +-
skin.conq/16x9/Variables.xml | 38 +-
skin.conq/16x9/script-skinshortcuts-includes.xml | 344 +++---------
skin.conq/16x9/script-skinshortcuts.xml | 11 +-
skin.conq/addon.xml | 2 +-
skin.conq/changelog.txt | 12 +
skin.conq/language/English/strings.po | 4 +
skin.conq/media/home/DefaultAlbum.png | Bin 0 -> 4985 bytes
skin.conq/media/home/DefaultEpisode.png | Bin 0 -> 6570 bytes
skin.conq/media/home/DefaultMovie.png | Bin 0 -> 6237 bytes
skin.conq/shortcuts/1036.DATA.xml | 1 +
skin.conq/shortcuts/13005.DATA.xml | 6 +
skin.conq/shortcuts/31063.DATA.xml | 1 +
skin.conq/shortcuts/albums.DATA.xml | 27 +
skin.conq/shortcuts/dvd.DATA.xml | 2 +
skin.conq/shortcuts/mainmenu.DATA.xml | 46 +-
skin.conq/shortcuts/movies.DATA.xml | 8 +
skin.conq/shortcuts/music.DATA.xml | 7 +
skin.conq/shortcuts/overrides.xml | 12 +-
skin.conq/shortcuts/pictures.DATA.xml | 2 +
skin.conq/shortcuts/script-globalsearch.DATA.xml | 1 +
skin.conq/shortcuts/settings.DATA.xml | 4 +
skin.conq/shortcuts/shutdown.DATA.xml | 47 ++
skin.conq/shortcuts/tvshows.DATA.xml | 7 +
skin.conq/shortcuts/videos.DATA.xml | 4 +
skin.conq/shortcuts/weather.DATA.xml | 2 +
36 files changed, 1266 insertions(+), 514 deletions(-)
create mode 100644 skin.conq/16x9/Includes_Widgets.xml
create mode 100644 skin.conq/media/home/DefaultAlbum.png
create mode 100644 skin.conq/media/home/DefaultEpisode.png
create mode 100644 skin.conq/media/home/DefaultMovie.png
create mode 100644 skin.conq/shortcuts/albums.DATA.xml
create mode 100644 skin.conq/shortcuts/shutdown.DATA.xml
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
