This commit is contained in:
Chris Bevan 2016-11-26 18:03:05 +00:00
parent fac8c7ed87
commit 0312cdb117
9 changed files with 3864 additions and 23 deletions

View File

@ -4,6 +4,7 @@
<animation type="windowClose"> <animation type="windowClose">
<effect type="fade" start="100" end="0" time="400" delay="400"/> <effect type="fade" start="100" end="0" time="400" delay="400"/>
</animation> </animation>
<onload condition="container.content(songs)">action(back)</onload>
<controls> <controls>
<!--fanart / coverart if available--> <!--fanart / coverart if available-->
<control type="group"> <control type="group">

View File

@ -134,6 +134,31 @@
<!--conditional positioning for progress dialogs (avoid overlaps)--> <!--conditional positioning for progress dialogs (avoid overlaps)-->
<include name="progressPosition1"><posy>row-2-begin</posy></include> <include name="progressPosition1"><posy>row-2-begin</posy></include>
<include name="progressPosition2"><posy>row-6-begin</posy></include> <include name="progressPosition2"><posy>row-6-begin</posy></include>
<!--mini player window-->
<include name="miniVideoPlayer">
<control type="group">
<visible>Player.HasVideo + !VideoPlayer.IsFullscreen + !SlideShow.IsActive</visible>
<posx>col-20-begin</posx>
<posy>12</posy>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>444</width>
<height>255</height>
<aspectratio>stretch</aspectratio>
<texture>colors/black.png</texture>
<bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
<bordersize>6</bordersize>
<colordiffuse>overlay</colordiffuse>
</control>
<control type="videowindow">
<posx>6</posx>
<posy>6</posy>
<width>6-col</width>
<height>243</height>
</control>
</control>
</include>
<!--debugging--> <!--debugging-->
<include name="DialogID"> <include name="DialogID">
<posx>15</posx> <posx>15</posx>

View File

@ -4,25 +4,20 @@
<include>fadeInOut</include> <include>fadeInOut</include>
<controls> <controls>
<include>globalBackground</include> <include>globalBackground</include>
<!--page container group--> <!--page container group-->
<control type="group"> <control type="group">
<!--window fader--> <!--window fader-->
<animation type="conditional" condition="window.next(0) | window.next(1)"> <animation type="conditional" condition="window.next(0) | window.next(1)">
<effect type="fade" start="100" end="0" time="300"/> <effect type="fade" start="100" end="0" time="300"/>
</animation> </animation>
<!--shift page for certain modal dialogs--> <!--shift page for certain modal dialogs-->
<include>modalDialogContentShift</include> <include>modalDialogContentShift</include>
<!--Main content listing--> <!--Main content listing-->
<control type="group" id="9999"> <control type="group" id="9999">
<!--initial animation--> <!--initial animation-->
<include>contentOpen</include> <include>contentOpen</include>
<include>liveTVChannels</include> <include>liveTVChannels</include>
</control> </control>
<!--page scrollbar--> <!--page scrollbar-->
<control type="group" id="9400"> <control type="group" id="9400">
<visible>Control.IsVisible(60) + !control.isvisible(10)</visible> <visible>Control.IsVisible(60) + !control.isvisible(10)</visible>
@ -35,7 +30,6 @@
<onback>9999</onback> <onback>9999</onback>
</control> </control>
</control> </control>
<!--Folder titles--> <!--Folder titles-->
<control type="group"> <control type="group">
<posx>col-1-begin</posx> <posx>col-1-begin</posx>
@ -70,6 +64,8 @@
</control> </control>
<!--dateTime--> <!--dateTime-->
<include>dateTime</include> <include>dateTime</include>
<!--mini window-->
<include>miniVideoPlayer</include>
</control> </control>
<!--hub menu--> <!--hub menu-->
<include>hubMenu</include> <include>hubMenu</include>

View File

@ -7,10 +7,8 @@
<include>globalBackground</include> <include>globalBackground</include>
<!--page container group--> <!--page container group-->
<control type="group"> <control type="group">
<!--shift page for certain modal dialogs--> <!--shift page for certain modal dialogs-->
<include>modalDialogContentShift</include> <include>modalDialogContentShift</include>
<!--Main content listing--> <!--Main content listing-->
<control type="group" id="9999"> <control type="group" id="9999">
<!--initial animation--> <!--initial animation-->
@ -164,6 +162,8 @@
</control> </control>
<!--dateTime--> <!--dateTime-->
<include>dateTime</include> <include>dateTime</include>
<!--mini window-->
<include>miniVideoPlayer</include>
</control> </control>
<!--hub menu--> <!--hub menu-->
<include>hubMenu</include> <include>hubMenu</include>

View File

@ -203,6 +203,8 @@
</control> </control>
<!--dateTime--> <!--dateTime-->
<include>dateTime</include> <include>dateTime</include>
<!--mini window-->
<include>miniVideoPlayer</include>
</control> </control>
<!--hub menu--> <!--hub menu-->
<include>hubMenu</include> <include>hubMenu</include>

View File

@ -20,6 +20,7 @@
</control> </control>
<!--visualisation--> <!--visualisation-->
<control type="visualisation" id="2"> <control type="visualisation" id="2">
<visible>!SlideShow.IsActive</visible>
<description>visualisation</description> <description>visualisation</description>
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>

View File

@ -1,22 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<window type="dialog" id="1105"> <window type="dialog" id="1105">
<defaultcontrol always="true">8001</defaultcontrol> <defaultcontrol always="true">8001</defaultcontrol>
<include>fadeInOut</include>
<controls> <controls>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>colors/black.png</texture>
<aspectratio>stretch</aspectratio>
<colordiffuse>overlay</colordiffuse>
</control>
<!-- options menu--> <!-- options menu-->
<control type="group"> <control type="group">
<posx>col-10-begin</posx> <posx>col-10-begin</posx>
<posy>row-6-begin</posy> <posy>row-6-begin</posy>
<!--animations--> <!--animations-->
<include>modalDialogInOutVertical</include> <include>modalDialogInOutVertical</include>
<control type="image">
<posx>-36</posx>
<posy>-36</posy>
<width>7-col</width>
<height>16-row</height>
<texture>colors/black.png</texture>
<aspectratio>stretch</aspectratio>
<colordiffuse>overlay</colordiffuse>
</control>
<!--player controls--> <!--player controls-->
<control type="panel" id="8001"> <control type="panel" id="8001">
<posx>0</posx> <posx>0</posx>
@ -172,7 +170,7 @@
<control type="panel" id="8003"> <control type="panel" id="8003">
<posx>0</posx> <posx>0</posx>
<posy>4-row</posy> <posy>4-row</posy>
<width>6-col</width> <width>429</width>
<height>10-row</height> <height>10-row</height>
<orientation>vertical</orientation> <orientation>vertical</orientation>
<onup>8002</onup> <onup>8002</onup>

File diff suppressed because it is too large Load Diff

View File

@ -25,11 +25,7 @@
[TODO] [TODO]
Check all PVR windows Mini video window. Add user option: Revise player stop on return
Add user option: Revise player stop on return
PVR mini window
[B]1.1.0[/B] [B]1.1.0[/B]