aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--addons/skin.confluence/720p/MyVideo.xml5
-rw-r--r--addons/skin.confluence/720p/MyVideoNav.xml5
-rw-r--r--addons/skin.confluence/720p/ViewsFileMode.xml1
-rw-r--r--addons/skin.confluence/720p/ViewsLiveTV.xml192
-rw-r--r--addons/skin.confluence/720p/ViewsVideoLibrary.xml1
-rw-r--r--addons/skin.confluence/720p/includes.xml1
6 files changed, 201 insertions, 4 deletions
diff --git a/addons/skin.confluence/720p/MyVideo.xml b/addons/skin.confluence/720p/MyVideo.xml
index 1805d83e19..465c41c25f 100644
--- a/addons/skin.confluence/720p/MyVideo.xml
+++ b/addons/skin.confluence/720p/MyVideo.xml
@@ -1,7 +1,7 @@
<window id="6">
<defaultcontrol always="true">50</defaultcontrol>
<allowoverlay>no</allowoverlay>
- <views>50,51,550,500,501,508,505</views>
+ <views>50,51,550,560,500,501,508,505</views>
<controls>
<include>CommonVideoBackground</include>
<control type="image">
@@ -90,7 +90,7 @@
<height>725</height>
<texture border="0,5,0,0">ContentPanel4.png</texture>
<include>VisibleFadeEffect</include>
- <visible>Control.IsVisible(550)</visible>
+ <visible>Control.IsVisible(550) | Control.IsVisible(560)</visible>
</control>
</control>
<control type="group">
@@ -102,6 +102,7 @@
<include>PosterWrapView2_Fanart</include> <!-- view id = 508 -->
<include>WideIconView</include> <!-- view id = 505 -->
<include>AddonInfoListView1</include> <!-- view id = 550 -->
+ <include>LiveTVView1</include> <!-- view id = 560 -->
</control>
<include>CommonPageCount</include>
<include>BehindDialogFadeOut</include>
diff --git a/addons/skin.confluence/720p/MyVideoNav.xml b/addons/skin.confluence/720p/MyVideoNav.xml
index 5d38a504a7..672cba51c4 100644
--- a/addons/skin.confluence/720p/MyVideoNav.xml
+++ b/addons/skin.confluence/720p/MyVideoNav.xml
@@ -1,7 +1,7 @@
<window id="25">
<defaultcontrol always="true">50</defaultcontrol>
<allowoverlay>no</allowoverlay>
- <views>50,500,550,501,508,504,503,505,511</views>
+ <views>50,500,550,560,501,508,504,503,505,511</views>
<controls>
<include>CommonVideoBackground</include>
<control type="group">
@@ -117,7 +117,7 @@
<height>725</height>
<texture border="0,5,0,0">ContentPanel4.png</texture>
<include>VisibleFadeEffect</include>
- <visible>Control.IsVisible(504) | Control.IsVisible(511) | Control.IsVisible(550)</visible>
+ <visible>Control.IsVisible(504) | Control.IsVisible(511) | Control.IsVisible(550) | Control.IsVisible(560)</visible>
</control>
<control type="group">
<include>VisibleFadeEffect</include>
@@ -150,6 +150,7 @@
<include>WideIconView</include> <!-- view id = 505 -->
<include>MusicVideoInfoListView</include> <!-- view id = 511 -->
<include>AddonInfoListView1</include> <!-- view id = 550 -->
+ <include>LiveTVView1</include> <!-- view id = 560 -->
</control>
<include>CommonPageCount</include>
<include>BehindDialogFadeOut</include>
diff --git a/addons/skin.confluence/720p/ViewsFileMode.xml b/addons/skin.confluence/720p/ViewsFileMode.xml
index 1b46dd66e5..91684f85a6 100644
--- a/addons/skin.confluence/720p/ViewsFileMode.xml
+++ b/addons/skin.confluence/720p/ViewsFileMode.xml
@@ -270,6 +270,7 @@
<include>VisibleFadeEffect</include>
<control type="panel" id="505">
<visible>[Container.Content(TVShows) + !Skin.HasSetting(TVShowsUsePosters)] | Window.IsVisible(VideoFiles)</visible>
+ <visible>!Container.Content(LiveTV)</visible>
<posx>95</posx>
<posy>80</posy>
<width>1080</width>
diff --git a/addons/skin.confluence/720p/ViewsLiveTV.xml b/addons/skin.confluence/720p/ViewsLiveTV.xml
new file mode 100644
index 0000000000..321fbc7871
--- /dev/null
+++ b/addons/skin.confluence/720p/ViewsLiveTV.xml
@@ -0,0 +1,192 @@
+<includes>
+ <include name="LiveTVView1">
+ <control type="group">
+ <visible>Control.IsVisible(560)</visible>
+ <include>VisibleFadeEffect</include>
+ <control type="list" id="560">
+ <posx>460</posx>
+ <posy>60</posy>
+ <width>760</width>
+ <height>601</height>
+ <onleft>2</onleft>
+ <onright>60</onright>
+ <onup>560</onup>
+ <ondown>560</ondown>
+ <viewtype label="$LOCALIZE[4]">list</viewtype>
+ <pagecontrol>60</pagecontrol>
+ <scrolltime>200</scrolltime>
+ <visible>Container.Content(LiveTV)</visible>
+ <itemlayout height="40" width="760">
+ <control type="image">
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>760</width>
+ <height>41</height>
+ <texture border="0,2,0,2">MenuItemNF.png</texture>
+ </control>
+ <control type="label">
+ <posx>10</posx>
+ <posy>0</posy>
+ <width>730</width>
+ <height>40</height>
+ <font>font13</font>
+ <textcolor>grey2</textcolor>
+ <selectedcolor>selected</selectedcolor>
+ <align>left</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Label]</label>
+ </control>
+ <control type="label">
+ <posx>750</posx>
+ <posy>0</posy>
+ <width>700</width>
+ <height>40</height>
+ <font>font12</font>
+ <textcolor>grey2</textcolor>
+ <selectedcolor>selected</selectedcolor>
+ <align>right</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Label2]</label>
+ </control>
+ </itemlayout>
+ <focusedlayout height="40" width="760">
+ <control type="image">
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>760</width>
+ <height>41</height>
+ <texture border="0,2,0,2">MenuItemNF.png</texture>
+ <visible>!Control.HasFocus(560)</visible>
+ <include>VisibleFadeEffect</include>
+ </control>
+ <control type="image">
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>760</width>
+ <height>41</height>
+ <texture border="0,2,0,2">MenuItemFO.png</texture>
+ <visible>Control.HasFocus(560)</visible>
+ <include>VisibleFadeEffect</include>
+ </control>
+ <control type="image">
+ <posx>560</posx>
+ <posy>5</posy>
+ <width>200</width>
+ <height>31</height>
+ <texture border="0,0,14,0">MediaItemDetailBG.png</texture>
+ <visible>Control.HasFocus(560) + !IsEmpty(ListItem.Label2)</visible>
+ </control>
+ <control type="label">
+ <posx>10</posx>
+ <posy>0</posy>
+ <width>730</width>
+ <height>40</height>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <selectedcolor>selected</selectedcolor>
+ <align>left</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Label]</label>
+ </control>
+ <control type="label">
+ <posx>750</posx>
+ <posy>0</posy>
+ <width>700</width>
+ <height>40</height>
+ <font>font12</font>
+ <textcolor>grey2</textcolor>
+ <selectedcolor>selected</selectedcolor>
+ <align>right</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Label2]</label>
+ </control>
+ </focusedlayout>
+ </control>
+ <control type="group">
+ <visible>Control.IsVisible(560)</visible>
+ <control type="scrollbar" id="60">
+ <posx>1220</posx>
+ <posy>60</posy>
+ <width>25</width>
+ <height>600</height>
+ <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
+ <texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
+ <texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
+ <textureslidernib>ScrollBarNib.png</textureslidernib>
+ <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
+ <onleft>560</onleft>
+ <onright>2</onright>
+ <showonepage>false</showonepage>
+ <orientation>vertical</orientation>
+ <visible>Control.IsVisible(506)</visible>
+ </control>
+ <control type="image">
+ <posx>40</posx>
+ <posy>60</posy>
+ <width>400</width>
+ <height>300</height>
+ <aspectratio aligny="bottom">keep</aspectratio>
+ <fadetime>IconCrossfadeTime</fadetime>
+ <texture background="true">$INFO[ListItem.Icon]</texture>
+ <bordertexture border="8">ThumbShadow.png</bordertexture>
+ <bordersize>8</bordersize>
+ </control>
+ <control type="image">
+ <posx>40</posx>
+ <posy>350</posy>
+ <width>400</width>
+ <height>100</height>
+ <aspectratio>stretch</aspectratio>
+ <texture>GlassTitleBar.png</texture>
+ <colordiffuse>AAFFFFFF</colordiffuse>
+ </control>
+ <control type="image">
+ <posx>48</posx>
+ <posy>352</posy>
+ <width>384</width>
+ <height>284</height>
+ <aspectratio aligny="top">keep</aspectratio>
+ <fadetime>IconCrossfadeTime</fadetime>
+ <texture background="true" flipy="true" diffuse="diffuse_mirror2.png">$INFO[ListItem.Icon]</texture>
+ </control>
+ <control type="label">
+ <posx>40</posx>
+ <posy>380</posy>
+ <width>400</width>
+ <height>25</height>
+ <label>$INFO[ListItem.Label]</label>
+ <scroll>true</scroll>
+ <align>center</align>
+ <aligny>center</aligny>
+ <font>font13_title</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="label">
+ <posx>40</posx>
+ <posy>410</posy>
+ <width>400</width>
+ <height>25</height>
+ <label>$INFO[ListItem.Label2]</label>
+ <align>center</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>grey2</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="textbox">
+ <description>Description Value for TV Show</description>
+ <posx>40</posx>
+ <posy>450</posy>
+ <width>400</width>
+ <height>220</height>
+ <font>font12</font>
+ <align>justify</align>
+ <textcolor>white</textcolor>
+ <label>$INFO[ListItem.Plot]</label>
+ <autoscroll time="2000" delay="3000" repeat="5000">Skin.HasSetting(AutoScroll)</autoscroll>
+ </control>
+ </control>
+ </control>
+ </include>
+</includes>
diff --git a/addons/skin.confluence/720p/ViewsVideoLibrary.xml b/addons/skin.confluence/720p/ViewsVideoLibrary.xml
index 6e915a023f..005a79f381 100644
--- a/addons/skin.confluence/720p/ViewsVideoLibrary.xml
+++ b/addons/skin.confluence/720p/ViewsVideoLibrary.xml
@@ -15,6 +15,7 @@
</control>
<control type="wraplist" id="501">
<visible>Container.Content(Movies) | Container.Content(Seasons) | [Container.Content(TVShows) + Skin.HasSetting(TVShowsUsePosters)] | Window.IsVisible(VideoFiles)</visible>
+ <visible>!Container.Content(LiveTV)</visible>
<posx>-123</posx>
<posy>0</posy>
<width>1526</width>
diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml
index 6cce9f061b..db9cf9b555 100644
--- a/addons/skin.confluence/720p/includes.xml
+++ b/addons/skin.confluence/720p/includes.xml
@@ -5,6 +5,7 @@
<include file="ViewsFileMode.xml" />
<include file="ViewsPictures.xml" />
<include file="ViewsAddonBrowser.xml" />
+ <include file="ViewsLiveTV.xml" />
<include file="IncludesCodecFlagging.xml" />
<include file="IncludesHomeRecentlyAdded.xml" />