more Krypton

This commit is contained in:
chrisbevan 2016-08-09 20:18:07 +01:00
parent 25d26ab5cd
commit 51facdad2e
10 changed files with 284 additions and 179 deletions

View File

@ -106,18 +106,10 @@
<posy>0</posy> <posy>0</posy>
<width>22-col</width> <width>22-col</width>
<height>11-row</height> <height>11-row</height>
<aspectratio aligny="center">keep</aspectratio> <aspectratio aligny="center">scale</aspectratio>
<texture fallback="addonDefaultBG.png">$INFO[ListItem.art(fanart)]</texture> <texture fallback="addonDefaultBG.png">$INFO[ListItem.art(fanart)]</texture>
<colordiffuse>22ffffff</colordiffuse> <colordiffuse>22ffffff</colordiffuse>
</control> </control>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>22-col</width>
<height>11-row</height>
<aspectratio aligny="center">scale</aspectratio>
<texture>vignette.png</texture>
</control>
<control type="image"> <control type="image">
<posx>4-col</posx> <posx>4-col</posx>
<posy>1-row</posy> <posy>1-row</posy>
@ -137,7 +129,7 @@
<width>10-col-gutter</width> <width>10-col-gutter</width>
<height>2-row</height> <height>2-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<font>medium</font> <font>mediumLight</font>
<label>$INFO[ListItem.label]</label> <label>$INFO[ListItem.label]</label>
</control> </control>
<control type="textbox" id="400"> <control type="textbox" id="400">

View File

@ -48,7 +48,48 @@
<aspectratio aligny="center">scale</aspectratio> <aspectratio aligny="center">scale</aspectratio>
<texture fallback="colors/offblack.png">$INFO[ListItem.art(fanart)]</texture> <texture fallback="colors/offblack.png">$INFO[ListItem.art(fanart)]</texture>
</control> </control>
<control type="image"> <!--screenshots-->
<control type="panel" id="50">
<posx>6-col</posx>
<posy>3-row</posy>
<width>12-col</width>
<height>8-row</height>
<onleft>50</onleft>
<onright>50</onright>
<ondown>8000</ondown>
<orientation>horizontal</orientation>
<scrolltime tween="cubic" easing="out">600</scrolltime>
<itemlayout width="444" height="336">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>6-col-gutter</width>
<height>4-col-gutter</height>
<aspectratio>scale</aspectratio>
<texture border="6">$INFO[Listitem.thumb]</texture>
<bordertexture border="3" colordiffuse="07FFFFFF">colors/white.png</bordertexture>
<bordersize>3</bordersize>
<colordiffuse>ffffffff</colordiffuse>
</control>
</itemlayout>
<focusedlayout width="444" height="336">
<control type="group">
<include>focusThumb</include>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>6-col-gutter</width>
<height>4-col-gutter</height>
<aspectratio>scale</aspectratio>
<texture>$INFO[Listitem.thumb]</texture>
<bordertexture border="6">colors/white.png</bordertexture>
<bordersize>6</bordersize>
<colordiffuse>ffffffff</colordiffuse>
</control>
</control>
</focusedlayout>
</control>
<control type="image">
<posx>0</posx> <posx>0</posx>
<posy>2-row</posy> <posy>2-row</posy>
<width>18-col</width> <width>18-col</width>
@ -58,9 +99,9 @@
</control> </control>
<control type="image"> <control type="image">
<posx>1-col</posx> <posx>1-col</posx>
<posy>3-row</posy> <posy>7-row</posy>
<width>4-col</width> <width>2-col</width>
<height>4-col</height> <height>2-col</height>
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
<texture fallback="colors/offblack.png">$INFO[ListItem.art(thumb)]</texture> <texture fallback="colors/offblack.png">$INFO[ListItem.art(thumb)]</texture>
<bordertexture border="3" colordiffuse="07FFFFFF">colors/white.png</bordertexture> <bordertexture border="3" colordiffuse="07FFFFFF">colors/white.png</bordertexture>
@ -94,7 +135,7 @@
<width>12-col-gutter</width> <width>12-col-gutter</width>
<font>small</font> <font>small</font>
<textcolor>highlight</textcolor> <textcolor>highlight</textcolor>
<label>[B]$LOCALIZE[31082] $INFO[ListItem.AddonVersion], $INFO[ListItem.AddonCreator][/B]</label> <label>[B]$INFO[ListItem.AddonCreator,$LOCALIZE[31082] ,][/B]</label>
</control> </control>
<control type="textbox" id="400"> <control type="textbox" id="400">
<posx>12</posx> <posx>12</posx>
@ -118,6 +159,7 @@
<height>14-row</height> <height>14-row</height>
<itemgap>3</itemgap> <itemgap>3</itemgap>
<orientation>vertical</orientation> <orientation>vertical</orientation>
<onup>50</onup>
<itemlayout width="6-col" height="2-row"> <itemlayout width="6-col" height="2-row">
<control type="label"> <control type="label">
<posx>0</posx> <posx>0</posx>
@ -233,13 +275,6 @@
<thumb>-</thumb> <thumb>-</thumb>
<onclick>SendClick(146,7)</onclick> <onclick>SendClick(146,7)</onclick>
</item> </item>
<item>
<visible>Control.IsEnabled(10)</visible>
<label>$INFO[Control.GetLabel(10)]</label>
<label2></label2>
<thumb>-</thumb>
<onclick>SendClick(146,10)</onclick>
</item>
</content> </content>
</control> </control>
</control> </control>
@ -262,10 +297,6 @@
<description>Addon Settings</description> <description>Addon Settings</description>
<label>24020</label> <label>24020</label>
</control> </control>
<control type="button" id="10">
<description>Changelog button</description>
<label>24036</label>
</control>
<control type="button" id="12"> <control type="button" id="12">
<description>Launch addon</description> <description>Launch addon</description>
</control> </control>

View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<window> <window>
<defaultcontrol always="true">-</defaultcontrol> <defaultcontrol always="true">-</defaultcontrol>
<controls> <controls>
<control type="label"> <control type="label">
<posy>0</posy> <posy>0</posy>

View File

@ -10,13 +10,13 @@
<include>modalDialogInOut</include> <include>modalDialogInOut</include>
<!--text--> <!--text-->
<control type="group"> <control type="group">
<posx>col-9-begin</posx> <posx>col-7-begin</posx>
<posy>0</posy> <posy>0</posy>
<control type="label" id="1"> <control type="label" id="1">
<description>heading</description> <description>heading</description>
<posx>12</posx> <posx>12</posx>
<posy>0</posy> <posy>0</posy>
<width>540</width> <width>12-col-gutter</width>
<height>2-row</height> <height>2-row</height>
<wrapmultiline>true</wrapmultiline> <wrapmultiline>true</wrapmultiline>
<font>dialogTitle</font> <font>dialogTitle</font>
@ -26,129 +26,170 @@
<description>Progressbar</description> <description>Progressbar</description>
<posx>12</posx> <posx>12</posx>
<posy>2-row</posy> <posy>2-row</posy>
<width>540</width> <width>12-col-gutter</width>
<height>24</height> <height>1-row</height>
<info>System.Progressbar</info> <info>System.Progressbar</info>
</control> </control>
<control type="textbox" id="9"> <control type="textbox" id="9">
<posx>12</posx> <posx>12</posx>
<posy>3-row</posy> <posy>2-row</posy>
<width>540</width> <width>828</width>
<height>78</height> <height>156</height>
<font>textbox</font> <font>textbox</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<autoscroll delay="3000" time="2000" repeat="5000"/>
</control> </control>
</control> </control>
<!--Yes / No--> <!--Yes / No-->
<control type="image"> <control type="group">
<posx>col-9-begin</posx> <posx>col-7-begin</posx>
<posy>6-row</posy> <posy>8-row</posy>
<width>1-col</width> <control type="image">
<height>2-row</height> <posx>0</posx>
<aspectratio>stretch</aspectratio> <posy>0</posy>
<texture>colors/black.png</texture> <width>1-col</width>
</control> <height>2-row</height>
<control type="image"> <aspectratio>stretch</aspectratio>
<visible>control.hasfocus(10)</visible> <texture>colors/black.png</texture>
<posx>col-9-begin</posx> </control>
<posy>6-row</posy> <control type="image">
<width>1-col</width> <visible>control.hasfocus(10)</visible>
<height>2-row</height> <posx>0</posx>
<aspectratio>stretch</aspectratio> <posy>0</posy>
<texture>colors/white.png</texture> <width>1-col</width>
<colordiffuse>highlight</colordiffuse> <height>2-row</height>
<animation type="conditional" condition="control.hasfocus(10)" loop="false" reversible="false"> <aspectratio>stretch</aspectratio>
<effect type="fade" time="500"/> <texture>colors/white.png</texture>
<effect type="rotatey" end="180" center="708" tween="back" easing="out" time="1000"/> <colordiffuse>highlight</colordiffuse>
</animation> <animation type="conditional" condition="control.hasfocus(10)" loop="false" reversible="false">
</control> <effect type="fade" time="500"/>
<control type="label"> <effect type="rotatey" end="180" center="36" tween="back" easing="out" time="1000"/>
<posx>col-9-begin</posx> </animation>
<posy>6-row</posy> </control>
<width>1-col</width> <control type="label">
<height>2-row</height> <posx>0</posx>
<align>center</align> <posy>0</posy>
<aligny>center</aligny> <width>1-col</width>
<font>symbolLarge</font> <height>2-row</height>
<textcolor>textActive</textcolor> <align>center</align>
<label>×</label> <aligny>center</aligny>
</control> <font>symbolLarge</font>
<control type="image"> <textcolor>textActive</textcolor>
<posx>col-13-begin</posx> <label>×</label>
<posy>6-row</posy> </control>
<width>1-col</width> <control type="image">
<height>2-row</height> <posx>4-col</posx>
<aspectratio>stretch</aspectratio> <posy>0</posy>
<texture>colors/black.png</texture> <width>1-col</width>
</control> <height>2-row</height>
<control type="image"> <aspectratio>stretch</aspectratio>
<visible>control.hasfocus(11)</visible> <texture>colors/black.png</texture>
<posx>col-13-begin</posx> </control>
<posy>6-row</posy> <control type="image">
<width>1-col</width> <visible>control.hasfocus(11)</visible>
<height>2-row</height> <posx>4-col</posx>
<aspectratio>stretch</aspectratio> <posy>0</posy>
<texture>colors/white.png</texture> <width>1-col</width>
<colordiffuse>highlight</colordiffuse> <height>2-row</height>
<animation type="conditional" condition="control.hasfocus(11)" loop="false" reversible="false"> <aspectratio>stretch</aspectratio>
<effect type="fade" time="500"/> <texture>colors/white.png</texture>
<effect type="rotatey" end="180" center="996" tween="back" easing="out" time="1000"/> <colordiffuse>highlight</colordiffuse>
</animation> <animation type="conditional" condition="control.hasfocus(11)" loop="false" reversible="false">
</control> <effect type="fade" time="500"/>
<control type="label"> <effect type="rotatey" end="180" center="324" tween="back" easing="out" time="1000"/>
<posx>col-13-begin</posx> </animation>
<posy>6-row</posy> </control>
<width>1-col</width> <control type="label">
<height>2-row</height> <posx>4-col</posx>
<align>center</align> <posy>0</posy>
<aligny>center</aligny> <width>1-col</width>
<font>symbolLarge</font> <height>2-row</height>
<textcolor>textActive</textcolor> <align>center</align>
<label></label> <aligny>center</aligny>
</control> <font>symbolLarge</font>
<control type="grouplist" id="9000"> <textcolor>textActive</textcolor>
<posx>col-10-begin</posx> <label></label>
<posy>6-row</posy> </control>
<width>8-col</width> <control type="group">
<height>2-row</height> <visible>Control.IsVisible(12)</visible>
<itemgap>1-col</itemgap> <control type="image">
<onleft>50</onleft> <posx>8-col</posx>
<onright>50</onright> <posy>0</posy>
<onup>9999</onup> <width>1-col</width>
<ondown>9999</ondown> <height>2-row</height>
<orientation>horizontal</orientation> <aspectratio>stretch</aspectratio>
<!--selection buttons--> <texture>colors/black.png</texture>
<control type="button" id="10"> </control>
<description>OK</description> <control type="image">
<texturefocus>colors/white.png</texturefocus> <visible>control.hasfocus(12)</visible>
<texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus> <posx>8-col</posx>
<focusedcolor>black</focusedcolor> <posy>0</posy>
<width>3-col</width> <width>1-col</width>
<label>106</label> <height>2-row</height>
</control> <aspectratio>stretch</aspectratio>
<control type="button" id="11"> <texture>colors/white.png</texture>
<description>Cancel</description> <colordiffuse>highlight</colordiffuse>
<texturefocus>colors/white.png</texturefocus> <animation type="conditional" condition="control.hasfocus(12)" loop="false" reversible="false">
<texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus> <effect type="fade" time="500"/>
<focusedcolor>black</focusedcolor> <effect type="rotatey" end="180" center="612" tween="back" easing="out" time="1000"/>
<width>3-col</width> </animation>
<label>107</label> </control>
</control> <control type="label">
<control type="button" id="12"> <posx>8-col</posx>
<description>Custom Button</description> <posy>0</posy>
<texturefocus>colors/white.png</texturefocus> <width>1-col</width>
<texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus> <height>2-row</height>
<focusedcolor>black</focusedcolor> <align>center</align>
<width>3-col</width> <aligny>center</aligny>
<label>107</label> <font>symbolLarge</font>
</control> <textcolor>textActive</textcolor>
</control> <label></label>
</control> </control>
</control>
<control type="grouplist" id="9000">
<posx>1-col</posx>
<posy>0</posy>
<width>12-col</width>
<height>2-row</height>
<itemgap>1-col</itemgap>
<onleft>50</onleft>
<onright>50</onright>
<onup>9999</onup>
<ondown>9999</ondown>
<orientation>horizontal</orientation>
<!--selection buttons-->
<control type="button" id="10">
<description>OK</description>
<texturefocus>colors/white.png</texturefocus>
<texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
<focusedcolor>black</focusedcolor>
<width>3-col</width>
<label>106</label>
</control>
<control type="button" id="11">
<description>Cancel</description>
<texturefocus>colors/white.png</texturefocus>
<texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
<focusedcolor>black</focusedcolor>
<width>3-col</width>
<label>107</label>
</control>
<control type="button" id="12">
<description>Custom Button</description>
<texturefocus>colors/white.png</texturefocus>
<texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
<focusedcolor>black</focusedcolor>
<width>3-col</width>
<label>107</label>
</control>
</control>
</control>
</control>
<!--debugging--> <!--debugging-->
<include>DebugGrid</include> <include>DebugGrid</include>
<control type="label"> <control type="label">
<include>DialogID</include> <include>DialogID</include>
<label>DialogYesNo.xml</label> <label>DialogConfirm.xml</label>
</control> </control>
</controls> </controls>
</window> </window>

View File

View File

@ -78,40 +78,48 @@
</include> </include>
<!--busy indicator--> <!--busy indicator-->
<include name="loadingIndicator"> <include name="loadingIndicator">
<control type="group"> <control type="group">
<visible>!isempty(container.foldername) + !IntegerGreaterThan(container.numitems,0) | window.isactive(busydialog)</visible> <animation type="Visible" reversible="false">
<posx>0</posx> <effect type="zoom" start="80" end="100" center="960,540" tween="back" time="240" />
<posy>0</posy> <effect type="fade" end="100" time="240" />
<!--animations--> </animation>
<animation type="visible"> <animation type="Hidden" reversible="false">
<effect type="fade" start="0" end="100" time="400"/> <effect type="zoom" start="100" end="80" center="960,540" easing="in" tween="back" time="240" />
</animation> <effect type="fade" start="100" end="0" time="240" />
<animation type="hidden"> </animation>
<effect type="fade" start="100" end="0" time="200"/> <visible></visible>
</animation> <visible>!Window.IsActive(startup) + !isempty(container.foldername) + !IntegerGreaterThan(container.numitems,0) | window.isactive(busydialog)</visible>
<control type="image"> <control type="image">
<include>dimensionsFullscreen</include> <texture>colors/black.png</texture>
<texture>colors/black.png</texture> <include>dimensionsFullscreen</include>
<colordiffuse>77FFFFFF</colordiffuse> <animation effect="fade" start="100" end="70" time="0" condition="true">Conditional</animation>
<aspectratio>stretch</aspectratio> <animation effect="fade" start="100" end="0" time="240" condition="Window.IsVisible(fullscreenvideo)">Conditional</animation>
</control> <animation effect="fade" end="100" time="560">WindowOpen</animation>
<control type="image"> <animation effect="fade" start="100" end="0" time="240">WindowClose</animation>
<include>dimensionsFullscreen</include> </control>
<texture>backgrounds/vignette.png</texture> <control type="image">
<colordiffuse>ffffffff</colordiffuse> <depth>DepthMax</depth>
<aspectratio>stretch</aspectratio> <left>920</left>
</control> <top>513</top>
<control type="image"> <width>80</width>
<posx>13-col</posx> <height>80</height>
<posy>row-14-begin</posy> <aspectratio>keep</aspectratio>
<width>50</width> <animation effect="rotate" end="-45" center="auto" time="200" delay="600" loop="true" reversible="false" condition="true">Conditional</animation>
<height>50</height> <texture colordiffuse="44ffffff">spinner.png</texture>
<aspectratio>keep</aspectratio> <animation effect="fade" end="100" time="300" delay="200">WindowOpen</animation>
<texture border="0">busy.gif</texture> </control>
<bordertexture border="0">-</bordertexture> <control type="image">
<colordiffuse>99FFFFFF</colordiffuse> <depth>DepthMax</depth>
</control> <left>935</left>
</control> <top>528</top>
<width>50</width>
<height>50</height>
<aspectratio>keep</aspectratio>
<animation effect="rotate" end="45" center="auto" time="200" delay="600" loop="true" reversible="false" condition="true">Conditional</animation>
<texture flipx="true" colordiffuse="11ffffff">spinner.png</texture>
<animation effect="fade" end="100" time="300" delay="200">WindowOpen</animation>
</control>
</control>
</include> </include>
<!--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>

View File

@ -31,9 +31,9 @@
<colordiffuse>textboxInactive</colordiffuse> <colordiffuse>textboxInactive</colordiffuse>
</control> </control>
<control type="label"> <control type="label">
<posx>1-col-indent</posx> <posx>1-col-indent</posx>
<posy>0</posy> <posy>0</posy>
<width>23-col-gutter</width> <width>22-col-gutter</width>
<height>2-row</height> <height>2-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<font>itemTitle</font> <font>itemTitle</font>
@ -41,6 +41,19 @@
<shadowcolor>-</shadowcolor> <shadowcolor>-</shadowcolor>
<label>$INFO[ListItem.Label]</label> <label>$INFO[ListItem.Label]</label>
</control> </control>
<control type="label">
<visible>!isempty(ListItem.playcount)</visible>
<posx>23-col-gutter</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<aligny>center</aligny>
<align>right</align>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label></label>
</control>
</itemlayout> </itemlayout>
<focusedlayout width="24-col" height="2-row"> <focusedlayout width="24-col" height="2-row">
<control type="image"> <control type="image">
@ -65,9 +78,9 @@
<colordiffuse>highlight</colordiffuse> <colordiffuse>highlight</colordiffuse>
</control> </control>
<control type="label"> <control type="label">
<posx>1-col-indent</posx> <posx>1-col-indent</posx>
<posy>0</posy> <posy>0</posy>
<width>23-col-gutter</width> <width>22-col-gutter</width>
<height>2-row</height> <height>2-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<font>itemTitle</font> <font>itemTitle</font>
@ -75,6 +88,19 @@
<shadowcolor>-</shadowcolor> <shadowcolor>-</shadowcolor>
<label>$INFO[ListItem.Label]</label> <label>$INFO[ListItem.Label]</label>
</control> </control>
<control type="label">
<visible>!isempty(ListItem.playcount)</visible>
<posx>23-col-gutter</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<aligny>center</aligny>
<align>right</align>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label></label>
</control>
</focusedlayout> </focusedlayout>
</control> </control>
</include> </include>

View File

@ -11,14 +11,22 @@
- [NEW] MyPlaylist.xml - [NEW] MyPlaylist.xml
- [REMOVED] MyMusicPlaylist.xml - [REMOVED] MyMusicPlaylist.xml
- [REMOVED] MyVideoPlaylist.xml - [REMOVED] MyVideoPlaylist.xml
- [NEW] Busy spinner (nicked from Estuary)
- [NEW] DialogPlayerProcessInfo.xml
[TODO] [TODO]
Revise player stop on return
DialogAudioDSPManager.xml DialogAudioDSPManager.xml
Check yes / no dialogs working correctly DialogPlayerProcessInfo.xml
Check screenshots work in dialogAddonSettings
Check yes / no progress bar works ok
[DONE] Check layouts for newly aggregated dialogs (dialogSettings.xml) [DONE] Check layouts for newly aggregated dialogs (dialogSettings.xml)
[Finalise] strings for settings dialog [Finalise] strings for settings dialog
check all active strings check all active strings
MyPVRTimers needs creating and testing MyPVRTimers needs creating and testing
Screenshots etc

View File

@ -342,7 +342,7 @@ msgid "Digital Television Setup"
msgstr "" msgstr ""
msgctxt "#31082" msgctxt "#31082"
msgid "Version" msgid "By"
msgstr "" msgstr ""
msgctxt "#31083" msgctxt "#31083"

BIN
media/spinner.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB