This commit is contained in:
Chris Bevan 2016-11-22 20:08:22 +00:00
parent 7d096bfa33
commit d5cb3bc869
4 changed files with 222 additions and 144 deletions

View File

@ -165,9 +165,9 @@
<control type="panel" id="50"> <control type="panel" id="50">
<visible>!String.IsEqual(container.folderpath,addons://)</visible> <visible>!String.IsEqual(container.folderpath,addons://)</visible>
<posx>0</posx> <posx>0</posx>
<posy>2-row</posy> <posy>75</posy>
<width>8-col</width> <width>8-col</width>
<height>20-row</height> <height>717</height>
<onleft>9000</onleft> <onleft>9000</onleft>
<onright>60</onright> <onright>60</onright>
<ondown>50</ondown> <ondown>50</ondown>

View File

@ -2,121 +2,203 @@
<window> <window>
<defaultcontrol>3</defaultcontrol> <defaultcontrol>3</defaultcontrol>
<controls> <controls>
<!--background-->
<control type="label"> <include>globalBackground</include>
<description>Controller types heading</description>
<posx>0</posx>
<posy>0</posy>
<width>220</width>
<height>25</height>
<font>font12</font>
<label>35050</label>
<align>center</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
<shadowcolor>black</shadowcolor>
</control>
<control type="scrollbar" id="30">
<posx>0</posx>
<posy>0</posy>
<width>25</width>
<height>405</height>
<onleft>50</onleft>
<onright>3</onright>
<ondown>3</ondown>
<onup>3</onup>
<showonepage>false</showonepage>
<orientation>vertical</orientation>
</control>
<control type="grouplist" id="3">
<description>Controller types grouplist</description>
<posx>0</posx>
<posy>0</posy>
<width>220</width>
<height>405</height>
<onleft>30</onleft>
<onright>5</onright>
<onup>9001</onup>
<ondown>9001</ondown>
<pagecontrol>30</pagecontrol>
</control>
<control type="button" id="10">
<description>Default controller types button</description>
<posx>0</posx>
<posy>0</posy>
<height>40</height>
<width>220</width>
<align>center</align>
<aligny>center</aligny>
<font>font12_title</font>
<textcolor>white</textcolor>
</control>
<control type="gamecontroller" id="31">
<posx>0</posx>
<posy>0</posy>
<width>480</width>
<height>286</height>
</control>
<control type="label">
<description>Feature types heading</description>
<posx>0</posx>
<posy>0</posy>
<width>220</width>
<height>25</height>
<font>font12</font>
<label>35059</label>
<align>center</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
<shadowcolor>black</shadowcolor>
</control>
<control type="scrollbar" id="50">
<posx>0</posx>
<posy>0</posy>
<width>25</width>
<height>405</height>
<onleft>5</onleft>
<onright>30</onright>
<ondown>5</ondown>
<onup>5</onup>
<showonepage>false</showonepage>
<orientation>vertical</orientation>
</control>
<control type="grouplist" id="5">
<description>Feature types grouplist</description>
<posx>0</posx>
<posy>0</posy>
<width>220</width>
<height>405</height>
<onleft>3</onleft>
<onright>50</onright>
<onup>9001</onup>
<ondown>9001</ondown>
<pagecontrol>50</pagecontrol>
</control>
<control type="button" id="7">
<description>Default feature types button</description>
<posx>0</posx>
<posy>0</posy>
<height>40</height>
<width>220</width>
<align>center</align>
<aligny>center</aligny>
<font>font12_title</font>
<textcolor>white</textcolor>
<pulseonselect>false</pulseonselect>
</control>
<!--dialog buttons-->
<control type="group"> <control type="group">
<posx>col-4-begin</posx>
<posy>row-5-begin</posy>
<!--animations-->
<include>modalDialogInOutVertical</include>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>18-col</width>
<height>2-row</height>
<texture>colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<posx>0</posx>
<posy>2-row</posy>
<width>18-col</width>
<height>18-row</height>
<texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<posx>4-col</posx>
<posy>2-row</posy>
<width>10-col</width>
<height>18-row</height>
<texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="label">
<posx>24</posx>
<posy>0</posy>
<width>16-col</width>
<height>2-row</height>
<aligny>center</aligny>
<font>dialogTitle</font>
<label>35050</label>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
</control>
<control type="grouplist" id="3">
<description>Controller types grouplist</description>
<posx>0</posx>
<posy>75</posy>
<width>4-col</width>
<height>18-row</height>
<onright>9001</onright>
</control>
<control type="gamecontroller" id="31">
<posx>5-col</posx>
<posy>5-row</posy>
<width>8-col</width>
<height>343</height>
</control>
<!--dialog buttons-->
<control type="panel" id="9001">
<posx>14-col</posx>
<posy>75</posy>
<width>4-col</width>
<height>10-row</height>
<orientation>vertical</orientation>
<onleft>3</onleft>
<itemlayout width="6-col" height="2-row">
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
</control>
<control type="label">
<posx>1-col-indent</posx>
<posy>-1</posy>
<width>3-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label]</label>
</control>
</itemlayout>
<focusedlayout width="6-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1-col-textbox</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
<include>spinFocusIcon</include>
</control>
<control type="image">
<posx>1-col</posx>
<posy>0</posy>
<width>3-col-textbox</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
<shadowcolor>-</shadowcolor>
</control>
<control type="label">
<posx>1-col-indent</posx>
<posy>-1</posy>
<width>5-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>black</textcolor>
<label>$INFO[ListItem.label]</label>
<shadowcolor>-</shadowcolor>
</control>
</focusedlayout>
<content>
<item id="1">
<description>Ok Button</description>
<label>186</label>
<label2></label2>
<thumb>-</thumb>
<onclick>SendClick(10820,18)</onclick>
</item>
<item id="2">
<description>Reset Button</description>
<label>409</label>
<label2></label2>
<thumb>-</thumb>
<onclick>SendClick(10820,19)</onclick>
</item>
<item id="3">
<description>Install more Button</description>
<label>$LOCALIZE[21452]</label>
<label2></label2>
<thumb>-</thumb>
<onclick>SendClick(10820,20)</onclick>
</item>
<item id="4">
<description>Help Button</description>
<label>$LOCALIZE[10043]</label>
<label2></label2>
<thumb>-</thumb>
<onclick>SendClick(10820,17)</onclick>
</item>
</content>
</control>
</control>
<!--button setup-->
<control type="group">
<animation type="conditional" condition="controlgroup(5).hasfocus()">
<effect type="fade" start="0" end="100" time="300"/>
</animation>
<animation type="conditional" condition="!controlgroup(5).hasfocus()">
<effect type="fade" start="100" end="0" time="300"/>
</animation>
<include>modalDialog</include>
<control type="grouplist" id="5">
<description>buttons grouplist</description>
<posx>col-10-begin</posx>
<posy>row-4-begin</posy>
<width>8-col</width>
<height>21-row</height>
<onleft>3</onleft>
<onright>3</onright>
<onback>3</onback>
</control>
</control>
<!--dialog buttons (hidden)-->
<control type="group">
<visible>false</visible>
<control type="button" id="10">
<description>Default controller types button</description>
</control>
<control type="button" id="7">
<description>Default feature types button</description>
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
<focusedcolor>textActive</focusedcolor>
<width>6-col</width>
</control>
<control type="button" id="18"> <control type="button" id="18">
<description>Ok Button</description> <description>Ok Button</description>
<label>186</label> <label>186</label>
@ -127,15 +209,11 @@
</control> </control>
<control type="button" id="20"> <control type="button" id="20">
<description>Link to install more controllers</description> <description>Link to install more controllers</description>
<label>$LOCALIZE[21452]</label>
</control> </control>
<control type="button" id="17"> <control type="button" id="17">
<description>Help button</description> <description>Help button</description>
<label>$LOCALIZE[10043]</label>
</control> </control>
</control> </control>
<!--debugging--> <!--debugging-->
<include>DebugGrid</include> <include>DebugGrid</include>
<control type="label"> <control type="label">

View File

@ -10,12 +10,12 @@
<include>modalDialogInOutVertical</include> <include>modalDialogInOutVertical</include>
<!--page title--> <!--page title-->
<control type="group"> <control type="group">
<posx>col-6-begin</posx> <posx>col-4-begin</posx>
<posy>row-4-begin</posy> <posy>row-5-begin</posy>
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>
<width>16-col</width> <width>18-col</width>
<height>2-row</height> <height>2-row</height>
<texture>colors/white.png</texture> <texture>colors/white.png</texture>
<colordiffuse>highlight</colordiffuse> <colordiffuse>highlight</colordiffuse>
@ -25,7 +25,7 @@
<control type="label"> <control type="label">
<posx>24</posx> <posx>24</posx>
<posy>0</posy> <posy>0</posy>
<width>16-col</width> <width>18-col</width>
<height>2-row</height> <height>2-row</height>
<font>dialogTitle</font> <font>dialogTitle</font>
<label>10003</label> <label>10003</label>
@ -35,7 +35,7 @@
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
<posy>2-row</posy> <posy>2-row</posy>
<width>16-col</width> <width>18-col</width>
<height>660</height> <height>660</height>
<texture>colors/black.png</texture> <texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse> <colordiffuse>overlay</colordiffuse>
@ -44,12 +44,13 @@
</control> </control>
<!--left panel--> <!--left panel-->
<control type="group"> <control type="group">
<posx>col-6-begin</posx> <posx>col-4-begin</posx>
<posy>row-7-begin</posy> <posy>row-7-begin</posy>
<control type="label" id="101"> <control type="label" id="101">
<description>Header Label</description> <description>Header Label</description>
<posx>24</posx> <posx>24</posx>
<posy>0</posy> <posy>0</posy>
<height>2-row</height>
<width>8-col-gutter</width> <width>8-col-gutter</width>
<label>-</label> <label>-</label>
<font>settingsCategoryTitle</font> <font>settingsCategoryTitle</font>
@ -60,13 +61,13 @@
<control type="list" id="20"> <control type="list" id="20">
<posx>12</posx> <posx>12</posx>
<posy>2-row</posy> <posy>2-row</posy>
<width>8-col</width> <width>9-col</width>
<height>15-row</height> <height>15-row</height>
<onright>21</onright> <onright>21</onright>
<itemlayout height="2-row" width="8-col"> <itemlayout height="2-row" width="9-col">
<control type="label"> <control type="label">
<posx>12</posx> <posx>12</posx>
<width>8-col-gutter</width> <width>9-col-gutter</width>
<height>2-row</height> <height>2-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<info>ListItem.Label</info> <info>ListItem.Label</info>
@ -83,16 +84,16 @@
<textcolor>highlight</textcolor> <textcolor>highlight</textcolor>
</control> </control>
</itemlayout> </itemlayout>
<focusedlayout height="2-row" width="8-col"> <focusedlayout height="2-row" width="9-col">
<control type="image"> <control type="image">
<width>8-col-gutter</width> <width>9-col-gutter</width>
<height>2-row</height> <height>2-row</height>
<texture>colors/white.png</texture> <texture>colors/white.png</texture>
<animation effect="fade" start="100" end="50" condition="!Control.HasFocus(20)">Conditional</animation> <animation effect="fade" start="100" end="50" condition="!Control.HasFocus(20)">Conditional</animation>
</control> </control>
<control type="label"> <control type="label">
<posx>12</posx> <posx>12</posx>
<width>8-col-gutter</width> <width>9-col-gutter</width>
<height>2-row</height> <height>2-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<info>ListItem.Label</info> <info>ListItem.Label</info>
@ -114,13 +115,14 @@
</control> </control>
<!--right panel--> <!--right panel-->
<control type="group"> <control type="group">
<posx>col-14-begin</posx> <posx>col-13-begin</posx>
<posy>row-7-begin</posy> <posy>row-7-begin</posy>
<control type="label" id="102"> <control type="label" id="102">
<description>Header Label</description> <description>Header Label</description>
<posx>12</posx> <posx>12</posx>
<posy>0</posy> <posy>0</posy>
<width>8-col-gutter</width> <width>9-col-gutter</width>
<height>2-row</height>
<label>-</label> <label>-</label>
<font>settingsCategoryTitle</font> <font>settingsCategoryTitle</font>
<textcolor>highlight</textcolor> <textcolor>highlight</textcolor>
@ -128,13 +130,13 @@
<control type="list" id="21"> <control type="list" id="21">
<posx>0</posx> <posx>0</posx>
<posy>2-row</posy> <posy>2-row</posy>
<width>8-col</width> <width>636</width>
<height>15-row</height> <height>15-row</height>
<onleft>20</onleft> <onleft>20</onleft>
<itemlayout height="2-row" width="8-col"> <itemlayout height="2-row" width="636">
<control type="label"> <control type="label">
<posx>12</posx> <posx>12</posx>
<width>8-col-gutter</width> <width>636</width>
<height>2-row</height> <height>2-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<info>ListItem.Label</info> <info>ListItem.Label</info>
@ -151,16 +153,16 @@
<textcolor>highlight</textcolor> <textcolor>highlight</textcolor>
</control> </control>
</itemlayout> </itemlayout>
<focusedlayout height="2-row" width="8-col"> <focusedlayout height="2-row" width="636">
<control type="image"> <control type="image">
<width>8-col-gutter</width> <width>636</width>
<height>2-row</height> <height>2-row</height>
<texture>colors/white.png</texture> <texture>colors/white.png</texture>
<animation effect="fade" start="100" end="50" condition="Control.HasFocus(20)">Conditional</animation> <animation effect="fade" start="100" end="50" condition="Control.HasFocus(20)">Conditional</animation>
</control> </control>
<control type="label"> <control type="label">
<posx>12</posx> <posx>12</posx>
<width>8-col-gutter</width> <width>636</width>
<height>2-row</height> <height>2-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<info>ListItem.Label</info> <info>ListItem.Label</info>

View File

@ -21,15 +21,13 @@
- Numerous misc tweaks and fixes - Numerous misc tweaks and fixes
- [MODIFIED] SmartPlaylistEditor.xml / SmartPlaylistRule.xml - [MODIFIED] SmartPlaylistEditor.xml / SmartPlaylistRule.xml
- [NEW] MyPVRTimers.xml - [NEW] MyPVRTimers.xml
- [NEW] DialogGameControllers.xml
[TODO] [TODO]
Gamepad setup
Add user option: Revise player stop on return Add user option: Revise player stop on return
Recent items video: Add in progress videos node Recent items video: - check recent episodes
- check recent episodes
Check all XMLS are present Check all XMLS are present