Video addons fixes (test)

This commit is contained in:
theDeadMan 2018-09-01 15:25:36 +01:00
parent ea21e6aa44
commit f5634644ac
13 changed files with 29 additions and 21 deletions

View File

@ -27,7 +27,7 @@
<include file="Includes_mediaShowcase.xml"/> <include file="Includes_mediaShowcase.xml"/>
<!--view type conditions--> <!--view type conditions-->
<expression name="isVideoList">!String.Contains(container.folderpath,special://profile/playlists/video) + !String.Contains(container.folderpath,videodb://) + !String.Contains(container.folderpath,plugin://) | container.content(files) | String.IsEmpty(container.content) | container.content(playlists) | container.content(addons)</expression> <expression name="isVideoList">!String.Contains(container.folderpath,special://profile/playlists/video) + !String.Contains(container.folderpath,videodb://) + !String.Contains(container.folderpath,plugin://) | container.content(files) | String.IsEmpty(container.content) | container.content(playlists) | container.content(addons) | container.content(videos) | container.content(episodes)</expression>
<expression name="isMovie">container.content(movies) + [String.Contains(container.folderpath,videodb://) | String.Contains(container.folderpath,special://profile/playlists/video)]</expression> <expression name="isMovie">container.content(movies) + [String.Contains(container.folderpath,videodb://) | String.Contains(container.folderpath,special://profile/playlists/video)]</expression>
<expression name="isAddonMovieOrTVshow">!String.Contains(container.folderpath,videodb://) + String.Contains(container.folderpath,plugin://) + [container.content(movies) | container.content(tvshows)]</expression> <expression name="isAddonMovieOrTVshow">!String.Contains(container.folderpath,videodb://) + String.Contains(container.folderpath,plugin://) + [container.content(movies) | container.content(tvshows)]</expression>
@ -182,7 +182,7 @@
<!--subtitle--> <!--subtitle-->
<control type="label"> <control type="label">
<posx>0</posx> <posx>0</posx>
<posy>32</posy> <posy>28</posy>
<width>12-col</width> <width>12-col</width>
<height>2-row</height> <height>2-row</height>
<font>itemTitle</font> <font>itemTitle</font>
@ -202,7 +202,7 @@
<!--date--> <!--date-->
<control type="label"> <control type="label">
<posx>24-col</posx> <posx>24-col</posx>
<posy>32</posy> <posy>28</posy>
<width>12-col</width> <width>12-col</width>
<height>2-row</height> <height>2-row</height>
<align>right</align> <align>right</align>

View File

@ -20,7 +20,7 @@
<visible>Control.IsVisible(60)</visible> <visible>Control.IsVisible(60)</visible>
<animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation> <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
<control type="scrollbar" id="60"> <control type="scrollbar" id="60">
<posx>52r</posx> <posx>54r</posx>
<posy>row-6-begin</posy> <posy>row-6-begin</posy>
<height>20-row</height> <height>20-row</height>
<onleft>9999</onleft> <onleft>9999</onleft>

View File

@ -46,7 +46,7 @@
<control type="scrollbar" id="60"> <control type="scrollbar" id="60">
<posx>54r</posx> <posx>54r</posx>
<posy>row-8-begin</posy> <posy>row-8-begin</posy>
<height>20-row</height> <height>17-row</height>
<onleft>9999</onleft> <onleft>9999</onleft>
<onback>9999</onback> <onback>9999</onback>
</control> </control>

View File

@ -29,7 +29,7 @@
<visible>Control.IsVisible(60) + !control.isvisible(10)</visible> <visible>Control.IsVisible(60) + !control.isvisible(10)</visible>
<animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(9400).hasfocus">conditional</animation> <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(9400).hasfocus">conditional</animation>
<control type="scrollbar" id="60"> <control type="scrollbar" id="60">
<posx>52r</posx> <posx>54r</posx>
<posy>row-6-begin</posy> <posy>row-6-begin</posy>
<height>20-row</height> <height>20-row</height>
<onleft>9999</onleft> <onleft>9999</onleft>

View File

@ -151,7 +151,7 @@
<visible>Control.IsVisible(60)</visible> <visible>Control.IsVisible(60)</visible>
<animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(9400).hasfocus">conditional</animation> <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(9400).hasfocus">conditional</animation>
<control type="scrollbar" id="60"> <control type="scrollbar" id="60">
<posx>52r</posx> <posx>54r</posx>
<posy>row-6-begin</posy> <posy>row-6-begin</posy>
<height>20-row</height> <height>20-row</height>
<onleft>9999</onleft> <onleft>9999</onleft>

View File

@ -184,7 +184,7 @@
<visible>Control.IsVisible(60) + !control.isvisible(10)</visible> <visible>Control.IsVisible(60) + !control.isvisible(10)</visible>
<animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(9400).hasfocus">conditional</animation> <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(9400).hasfocus">conditional</animation>
<control type="scrollbar" id="60"> <control type="scrollbar" id="60">
<posx>52r</posx> <posx>54r</posx>
<posy>row-6-begin</posy> <posy>row-6-begin</posy>
<height>20-row</height> <height>20-row</height>
<onleft>9999</onleft> <onleft>9999</onleft>

View File

@ -21,7 +21,7 @@
<visible>Control.IsVisible(60)</visible> <visible>Control.IsVisible(60)</visible>
<animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation> <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
<control type="scrollbar" id="60"> <control type="scrollbar" id="60">
<posx>52r</posx> <posx>54r</posx>
<posy>row-6-begin</posy> <posy>row-6-begin</posy>
<height>20-row</height> <height>20-row</height>
<onleft>9999</onleft> <onleft>9999</onleft>

View File

@ -36,7 +36,7 @@
<visible>Control.IsVisible(60)</visible> <visible>Control.IsVisible(60)</visible>
<animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation> <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
<control type="scrollbar" id="60"> <control type="scrollbar" id="60">
<posx>52r</posx> <posx>54r</posx>
<posy>row-6-begin</posy> <posy>row-6-begin</posy>
<height>20-row</height> <height>20-row</height>
<onleft>9999</onleft> <onleft>9999</onleft>

View File

@ -122,7 +122,7 @@
<visible>Control.IsVisible(60)</visible> <visible>Control.IsVisible(60)</visible>
<animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation> <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
<control type="scrollbar" id="60"> <control type="scrollbar" id="60">
<posx>52r</posx> <posx>54r</posx>
<posy>row-6-begin</posy> <posy>row-6-begin</posy>
<height>20-row</height> <height>20-row</height>
<onleft>9999</onleft> <onleft>9999</onleft>

View File

@ -4,7 +4,7 @@
<onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload> <onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
<onload>Skin.SetString(recentitems,video)</onload> <onload>Skin.SetString(recentitems,video)</onload>
<include>fadeInOut</include> <include>fadeInOut</include>
<views>50,51,52,53,54,58,59</views> <views>50,51,52,53,54,55,58,59</views>
<controls> <controls>
<include>globalBackground</include> <include>globalBackground</include>
<!--page container group--> <!--page container group-->
@ -32,7 +32,7 @@
<control type="scrollbar" id="60"> <control type="scrollbar" id="60">
<posx>54r</posx> <posx>54r</posx>
<posy>row-8-begin</posy> <posy>row-8-begin</posy>
<height>20-row</height> <height>17-row</height>
<onleft>9999</onleft> <onleft>9999</onleft>
<onback>9999</onback> <onback>9999</onback>
</control> </control>

View File

@ -2,6 +2,14 @@
<includes> <includes>
<include name="addonposters"> <include name="addonposters">
<control type="group"> <control type="group">
<visible>$EXP[isAddonMovieOrTVshow]</visible>
<control type="image">
<include>dimensionsFullscreen</include>
<texture fallback="colors/black.png">$INFO[listitem.art(fanart)]</texture>
<colordiffuse>FF555555</colordiffuse>
<aspectratio>scale</aspectratio>
<fadetime>250</fadetime>
</control>
<control type="panel" id="54"> <control type="panel" id="54">
<visible>$EXP[isAddonMovieOrTVshow]</visible> <visible>$EXP[isAddonMovieOrTVshow]</visible>
<posx>90</posx> <posx>90</posx>
@ -10,8 +18,8 @@
<height>22-row</height> <height>22-row</height>
<onleft>9000</onleft> <onleft>9000</onleft>
<onright>60</onright> <onright>60</onright>
<ondown>50</ondown> <ondown>54</ondown>
<onup>50</onup> <onup>54</onup>
<pagecontrol>60</pagecontrol> <pagecontrol>60</pagecontrol>
<scrolltime tween="cubic" easing="out">600</scrolltime> <scrolltime tween="cubic" easing="out">600</scrolltime>
<itemlayout width="252" height="426"> <itemlayout width="252" height="426">
@ -34,7 +42,7 @@
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
<texture>$INFO[ListItem.Art(poster)]</texture> <texture>$INFO[ListItem.Art(poster)]</texture>
<bordersize>6</bordersize> <bordersize>6</bordersize>
<colordiffuse>77ffffff</colordiffuse> <colordiffuse>BBffffff</colordiffuse>
</control> </control>
<control type="textbox"> <control type="textbox">
<visible>String.IsEmpty(listitem.title)</visible> <visible>String.IsEmpty(listitem.title)</visible>
@ -51,7 +59,7 @@
<visible>!controlgroup(9000).hasfocus</visible> <visible>!controlgroup(9000).hasfocus</visible>
<posx>12</posx> <posx>12</posx>
<posy>338</posy> <posy>338</posy>
<width>204</width> <width>192</width>
<height>1-row</height> <height>1-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<font>thumbTitle</font> <font>thumbTitle</font>

View File

@ -87,7 +87,7 @@
<width>1740</width> <width>1740</width>
<height>11-row</height> <height>11-row</height>
<onup>9102</onup> <onup>9102</onup>
<ondown>50</ondown> <ondown>51</ondown>
<onleft>9000</onleft> <onleft>9000</onleft>
<onback>9000</onback> <onback>9000</onback>
<orientation>horizontal</orientation> <orientation>horizontal</orientation>

View File

@ -13,7 +13,7 @@
<include>kenBurnsey</include> <include>kenBurnsey</include>
</control> </control>
</control> </control>
<control type="panel" id="50"> <control type="panel" id="55">
<visible>$EXP[isVideoList]</visible> <visible>$EXP[isVideoList]</visible>
<posx>col-1-begin</posx> <posx>col-1-begin</posx>
<posy>row-5-begin</posy> <posy>row-5-begin</posy>
@ -21,8 +21,8 @@
<height>23-row</height> <height>23-row</height>
<onleft>9000</onleft> <onleft>9000</onleft>
<onright>60</onright> <onright>60</onright>
<ondown>50</ondown> <ondown>55</ondown>
<onup>50</onup> <onup>55</onup>
<pagecontrol>60</pagecontrol> <pagecontrol>60</pagecontrol>
<itemlayout width="24-col" height="2-row"> <itemlayout width="24-col" height="2-row">
<control type="image"> <control type="image">