odds and sods

This commit is contained in:
chrisbevan 2016-08-12 18:24:31 +01:00
parent 51facdad2e
commit f188d76343
10 changed files with 366 additions and 219 deletions

View File

@ -6,170 +6,70 @@
<controls>
<!--background-->
<include>globalBackground</include>
<control type="group" id="9001">
<posx>col-2-begin</posx>
<posy>row-1-begin</posy>
<!--animations-->
<include>modalDialogInOutVertical</include>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>22-col</width>
<height>2-row</height>
<texture>colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<!--title-->
<control type="label">
<posx>24</posx>
<posy>0</posy>
<width>20-col</width>
<height>2-row</height>
<font>dialogTitle</font>
<label>$LOCALIZE[24001] $INFO[container.foldername,/ , ]$INFO[container.numitems,(,)]</label>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
</control>
<control type="image">
<posx>0</posx>
<posy>2-row</posy>
<width>22-col</width>
<height>25-row</height>
<texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<posx>0</posx>
<posy>2-row</posy>
<width>22-col</width>
<height>11-row</height>
<texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<posx>6-col</posx>
<posy>13-row</posy>
<width>16-col</width>
<height>14-row</height>
<texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<!--options-->
<control type="grouplist" id="9000">
<posx>0</posx>
<posy>13-row</posy>
<width>6-col</width>
<orientation>vertical</orientation>
<control type="radiobutton" id="7">
<width>6-col</width>
<texturenofocus>-</texturenofocus>
<textureradiofocus>-</textureradiofocus>
<textureradionofocus>-</textureradionofocus>
<radiowidth/>
<radioheight/>
<label>25001</label>
<onright>9999</onright>
</control>
<control type="radiobutton" id="8">
<width>6-col</width>
<texturenofocus>-</texturenofocus>
<textureradiofocus>-</textureradiofocus>
<textureradionofocus>-</textureradionofocus>
<radiowidth/>
<radioheight/>
<label>24999</label>
<onright>9999</onright>
</control>
<control type="button" id="5">
<width>6-col</width>
<texturenofocus>-</texturenofocus>
<label>10004</label>
<onright>9999</onright>
</control>
<control type="button" id="9">
<width>6-col</width>
<texturenofocus>-</texturenofocus>
<label>24034</label>
<onright>9999</onright>
</control>
</control>
<!--Info panel-->
<control type="group">
<posx>0</posx>
<posy>2-row</posy>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>22-col</width>
<height>11-row</height>
<aspectratio aligny="center">scale</aspectratio>
<texture fallback="addonDefaultBG.png">$INFO[ListItem.art(fanart)]</texture>
<colordiffuse>22ffffff</colordiffuse>
</control>
<control type="image">
<posx>4-col</posx>
<posy>1-row</posy>
<width>4-col</width>
<height>4-col</height>
<aspectratio scalediffuse="false" align="center" aligny="center">keep</aspectratio>
<texture border="0">$INFO[Listitem.icon]</texture>
<bordertexture border="3" colordiffuse="07FFFFFF">colors/white.png</bordertexture>
<bordersize>3</bordersize>
<fadetime>200</fadetime>
</control>
<control type="label">
<description>Addon Title</description>
<visible>!isempty(ListItem.AddonCreator)</visible>
<posx>9-col</posx>
<posy>58</posy>
<width>10-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>mediumLight</font>
<label>$INFO[ListItem.label]</label>
</control>
<control type="textbox" id="400">
<posx>9-col</posx>
<posy>4-row</posy>
<font>textbox</font>
<width>10-col-gutter</width>
<height>160</height>
<label>$INFO[ListItem.AddonDescription]</label>
<autoscroll delay="5000" time="1000" repeat="10000"/>
</control>
</control>
<!--content listing-->
<control type="group">
<!--shift page for certain modal dialogs-->
<include>modalDialogContentShift</include>
<!--Main content listing-->
<control type="group" id="9999">
<posx>6-col</posx>
<posy>13-row</posy>
<animation type="windowopen">
<effect type="fade" start="0" end="100" time="500"/>
</animation>
<!--source content-->
<control type="group" id="9500">
<control type="panel" id="50">
<posx>6</posx>
<posy>6</posy>
<width>16-col</width>
<height>492</height>
<posx>col-1-begin</posx>
<posy>row-5-begin</posy>
<width>15-col</width>
<height>23-row</height>
<onleft>9000</onleft>
<onright>60</onright>
<ondown>50</ondown>
<onup>50</onup>
<pagecontrol>60</pagecontrol>
<itemlayout height="75" width="8-col">
<itemlayout width="15-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>69</width>
<height>69</height>
<posy>3</posy>
<width>66</width>
<height>66</height>
<aspectratio scalediffuse="false">stretch</aspectratio>
<texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
<texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
</control>
<control type="image">
<posx>1-col</posx>
<posy>0</posy>
<width>12-col-textbox</width>
<height>69</height>
<aspectratio>stretch</aspectratio>
<texture border="0">colors/black.png</texture>
<colordiffuse>textboxInactive</colordiffuse>
</control>
<control type="image">
<posx>13-col</posx>
<posy>0</posy>
<width>1-col-textbox</width>
<height>69</height>
<aspectratio>stretch</aspectratio>
<texture border="0">colors/black.png</texture>
<colordiffuse>textboxInactive</colordiffuse>
</control>
<control type="image">
<posx>14-col</posx>
<posy>0</posy>
<width>1-col</width>
<height>69</height>
<aspectratio>stretch</aspectratio>
<texture border="0">colors/black.png</texture>
<colordiffuse>textboxInactive</colordiffuse>
</control>
<control type="label">
<posx>1-col-indent</posx>
<posy>0</posy>
<width>7-col-gutter</width>
<width>11-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>itemTitle</font>
@ -177,15 +77,41 @@
<shadowcolor>-</shadowcolor>
<label>$INFO[ListItem.Label]</label>
</control>
<control type="label">
<visible>ListItem.AddonBroken</visible>
<posx>12-col-gutter</posx>
<posy>0</posy>
<width>2-col</width>
<height>2-row</height>
<aligny>center</aligny>
<align>right</align>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label></label>
</control>
<control type="label">
<visible>ListItem.Property(Addon.IsInstalled)</visible>
<posx>985</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>
<focusedlayout height="75" width="8-col">
<focusedlayout width="15-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>69</width>
<height>69</height>
<posy>3</posy>
<width>66</width>
<height>66</height>
<aspectratio scalediffuse="false">stretch</aspectratio>
<texture fallback="colors/white.png" border="0">$INFO[Listitem.thumb]</texture>
<texture fallback="colors/white.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
<animation type="focus" loop="false" reversible="false">
<effect type="fade" time="500"/>
<effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
@ -194,37 +120,243 @@
<control type="image">
<posx>1-col</posx>
<posy>0</posy>
<width>490</width>
<height>69</height>
<width>14-col</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
<bordersize>0</bordersize>
<colordiffuse>ffffffff</colordiffuse>
<texture border="0">colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
</control>
<control type="label">
<posx>1-col-indent</posx>
<posy>0</posy>
<width>7-col-gutter</width>
<width>11-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>itemTitle</font>
<textcolor>black</textcolor>
<selectedcolor>black</selectedcolor>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label>$INFO[ListItem.Label]</label>
</control>
<control type="label">
<visible>ListItem.AddonBroken</visible>
<posx>12-col-gutter</posx>
<posy>0</posy>
<width>2-col</width>
<height>2-row</height>
<aligny>center</aligny>
<align>right</align>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label></label>
</control>
<control type="label">
<visible>ListItem.Property(Addon.IsInstalled)</visible>
<posx>985</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>
</control>
</control>
<!--cover art-->
<control type="group">
<posx>col-17-begin</posx>
<posy>222</posy>
<control type="group">
<animation type="windowopen">
<effect type="fade" start="0" end="100" time="300" delay="700"/>
<effect type="slide" start="3-col" end="0" center="auto" tween="cubic" easing="out" time="400" delay="700"/>
<effect type="zoom" end="90" time="0"/>
</animation>
<control type="group">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>8-col</width>
<height>8-col</height>
<aspectratio scalediffuse="false">stretch</aspectratio>
<texture background="true" fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
<fadetime>200</fadetime>
</control>
</control>
</control>
<control type="group">
<posy>13-row</posy>
<control type="label">
<description>Addon Title</description>
<visible>!isempty(ListItem.AddonCreator)</visible>
<posx>0</posx>
<posy>58</posy>
<width>7-col</width>
<height>2-row</height>
<aligny>center</aligny>
<font>mediumLight</font>
<label>$INFO[ListItem.label]</label>
</control>
<control type="textbox" id="400">
<posx>0</posx>
<posy>4-row</posy>
<font>textbox</font>
<width>7-col</width>
<height>178</height>
<label>$INFO[ListItem.AddonDescription]</label>
<autoscroll delay="5000" time="1000" repeat="10000"/>
</control>
</control>
</control>
</control>
<!--page scrollbar-->
<control type="group" id="8000">
<visible>Control.IsVisible(60)</visible>
<animation effect="fade" start="100" end="70" 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">
<right>2-col</right>
<posy>13-row</posy>
<height>14-row</height>
<posx>48r</posx>
<posy>row-5-begin</posy>
<height>23-row</height>
<onleft>9999</onleft>
<onback>9999</onback>
</control>
</control>
<!--Folder titles-->
<control type="group">
<posx>0</posx>
<posy>0</posy>
<animation type="Conditional" condition="IntegerGreaterThan(container.numitems,0)">
<effect type="fade" start="0" end="100" time="300"/>
</animation>
<!--source title-->
<control type="label">
<posx>col-1-begin</posx>
<posy>row-1-begin</posy>
<width>14-col</width>
<font>pageTitle</font>
<label>$LOCALIZE[24001]</label>
<textcolor>textActive</textcolor>
</control>
<!--source subtitle-->
<control type="label">
<posx>col-1-begin</posx>
<posy>96</posy>
<width>auto</width>
<font>pageSubTitle</font>
<label>$INFO[container.foldername] $INFO[container.numitems,(,)]</label>
<textcolor>textActive</textcolor>
</control>
<!--dateTime-->
<include>dateTime</include>
</control>
</control>
<!-- Options menu-->
<control type="group">
<animation type="Conditional" condition="controlgroup(9000).hasfocus">
<effect type="fade" start="0" end="100" time="300"/>
<effect type="slide" start="-200" end="0" tween="sine" easing="out" time="400"/>
</animation>
<animation type="Conditional" condition="!controlgroup(9000).hasfocus">
<effect type="fade" start="100" end="0" time="300"/>
<effect type="slide" start="0" end="-200" tween="sine" easing="out" time="400"/>
</animation>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>col-5-begin</width>
<height>fullscreenHeight</height>
<texture>colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<!--section logo-->
<control type="group">
<control type="label">
<posx>col-1-begin</posx>
<posy>row-1-begin</posy>
<width>2-col</width>
<height>1-col</height>
<font>symbolVeryLarge</font>
<aligny>center</aligny>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label></label>
</control>
</control>
<!--options-->
<control type="grouplist" id="9000">
<posx>0</posx>
<posy>row-4-begin</posy>
<width>6-col</width>
<orientation>vertical</orientation>
<control type="radiobutton" id="7">
<height>2-row</height>
<width>col-5-begin</width>
<font>menuTitle</font>
<textwidth>4-col-gutter</textwidth>
<textcolor>textActive</textcolor>
<focusedcolor>highlight</focusedcolor>
<disabledcolor>menuDisabled</disabledcolor>
<texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
<texturenofocus>-</texturenofocus>
<textureradiofocus>-</textureradiofocus>
<textureradionofocus>-</textureradionofocus>
<radiowidth/>
<radioheight/>
<textoffsetx>21</textoffsetx>
<label> $LOCALIZE[25001]</label>
<onright>9999</onright>
</control>
<control type="radiobutton" id="8">
<height>2-row</height>
<width>col-5-begin</width>
<font>menuTitle</font>
<textcolor>textActive</textcolor>
<focusedcolor>highlight</focusedcolor>
<disabledcolor>menuDisabled</disabledcolor>
<texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
<texturenofocus>-</texturenofocus>
<textureradiofocus>-</textureradiofocus>
<textureradionofocus>-</textureradionofocus>
<radiowidth/>
<radioheight/>
<textoffsetx>col-1-begin</textoffsetx>
<textwidth>4-col-gutter</textwidth>
<label>24999</label>
<onright>9999</onright>
</control>
<control type="button" id="5">
<height>2-row</height>
<width>col-5-begin</width>
<font>menuTitle</font>
<textcolor>textActive</textcolor>
<focusedcolor>highlight</focusedcolor>
<disabledcolor>menuDisabled</disabledcolor>
<texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
<texturenofocus>-</texturenofocus>
<textoffsetx>col-1-begin</textoffsetx>
<textwidth>4-col-gutter</textwidth>
<label>10004</label>
<onright>9999</onright>
</control>
<control type="button" id="9">
<height>2-row</height>
<width>col-5-begin</width>
<font>menuTitle</font>
<textcolor>textActive</textcolor>
<focusedcolor>highlight</focusedcolor>
<disabledcolor>menuDisabled</disabledcolor>
<texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
<texturenofocus>-</texturenofocus>
<textoffsetx>col-1-begin</textoffsetx>
<textwidth>4-col-gutter</textwidth>
<label>24034</label>
<onright>9999</onright>
</control>
</control>
</control>

View File

@ -87,8 +87,7 @@
<effect type="zoom" start="100" end="80" center="960,540" easing="in" tween="back" time="240" />
<effect type="fade" start="100" end="0" time="240" />
</animation>
<visible></visible>
<visible>!Window.IsActive(startup) + !isempty(container.foldername) + !IntegerGreaterThan(container.numitems,0) | window.isactive(busydialog)</visible>
<visible>!Window.IsActive(startup) + !isempty(container.foldername) + !IntegerGreaterThan(container.numitems,0) + !ListItem.IsParentFolder | window.isactive(busydialog)</visible>
<control type="image">
<texture>colors/black.png</texture>
<include>dimensionsFullscreen</include>

View File

@ -44,6 +44,19 @@
<value condition="Playlist.IsRandom">$LOCALIZE[191]: $LOCALIZE[16041]</value>
<value>$LOCALIZE[191]: $LOCALIZE[16039]</value>
</variable>
<!--offset song view, show artist / album if parent view is active-->
<variable name="songViewArtist">
<value condition="ListItem.IsParentFolder">$INFO[ListItem(1).Artist] $INFO[ListItem(1).Year,(,)]</value>
<value>$INFO[ListItem.Artist] $INFO[ListItem.Year,(,)]</value>
</variable>
<variable name="songViewAlbum">
<value condition="ListItem.IsParentFolder">$INFO[ListItem(1).Album]</value>
<value>$INFO[ListItem.Album]</value>
</variable>
<variable name="songViewThumb">
<value condition="ListItem.IsParentFolder">$INFO[ListItem(1).art(thumb)]</value>
<value>$INFO[ListItem.art(thumb)]</value>
</variable>
<!--Music player repeat state-->
<variable name="repeatState">
<value condition="Playlist.IsRepeat">$LOCALIZE[597]</value>

View File

@ -100,7 +100,7 @@
<include>DebugGrid</include>
<control type="label">
<include>WindowID</include>
<label>MyVideoNav.xml $INFO[container.folderpath]</label>
<label>MyVideoNav.xml</label>
</control>
</controls>
</window>

View File

@ -12,7 +12,7 @@
<aspectratio scalediffuse="false">stretch</aspectratio>
<texture background="true" fallback="colors/black.png" border="0">$INFO[container.art(fanart)]</texture>
<colordiffuse>ffffffff</colordiffuse>
<animation type="conditional" condition="!controlgroup(9000).hasfocus" loop="true" reversible="false">
<animation type="conditional" condition="!controlgroup(9000).hasfocus + !Skin.HasSetting(lowPowerMode)" loop="true" reversible="false">
<effect type="fade" start="0" end="100" time="2000"/>
<effect type="zoom" center="auto" start="130" end="100" time="15000"/>
<effect type="fade" start="100" end="0" time="1000" delay="14000"/>

View File

@ -13,7 +13,7 @@
<aspectratio scalediffuse="false">stretch</aspectratio>
<texture background="true" fallback="colors/offblack.png" border="0">$INFO[container.art(fanart)]</texture>
<colordiffuse>ffffffff</colordiffuse>
<animation type="conditional" condition="!controlgroup(9000).hasfocus" loop="true" reversible="false">
<animation type="conditional" condition="!controlgroup(9000).hasfocus + !Skin.HasSetting(lowPowerMode)" loop="true" reversible="false">
<effect type="fade" start="0" end="100" time="2000"/>
<effect type="zoom" center="auto" start="130" end="100" time="15000"/>
<effect type="fade" start="100" end="0" time="1000" delay="14000"/>

View File

@ -34,7 +34,7 @@
<width>8-col</width>
<height>8-col</height>
<aspectratio>stretch</aspectratio>
<texture fallback="DefaultAlbumCover.png" diffuse="masks/discSurface.png" border="6">$INFO[ListItem.art(thumb)]</texture>
<texture fallback="DefaultAlbumCover.png" diffuse="masks/discSurface.png" border="6">$VAR[songViewThumb]</texture>
<bordertexture border="6" colordiffuse="07FFFFFF">colors/white.png</bordertexture>
<bordersize>6</bordersize>
<fadetime>500</fadetime>
@ -51,7 +51,7 @@
<font>largeLight</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label>[B]$INFO[ListItem.Album][/B]</label>
<label>[B]$VAR[songViewAlbum][/B]</label>
</control>
<control type="label">
<posx>col-10-begin</posx>
@ -61,7 +61,7 @@
<font>regular</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label>$INFO[ListItem.Artist] $INFO[ListItem.Year,(,)]</label>
<label>$VAR[songViewArtist]</label>
</control>
</control>
<control type="panel" id="50">

View File

@ -1,6 +1,6 @@
[B]1.1.1[/B]
- [NEW] RPI bugfixes from Jarvis branch
- [NEW] RPI / general bugfixes from Jarvis branch
- [ADDED] Addon.xml: Assets tag
- [MODIFIED] Skinwide includes name / content tagging updated
- [REMOVED] Custom oninfo screen for recently added videos (nice one Team Kodi!)
@ -13,6 +13,8 @@
- [REMOVED] MyVideoPlaylist.xml
- [NEW] Busy spinner (nicked from Estuary)
- [NEW] DialogPlayerProcessInfo.xml
- Numerous misc tweaks and fixes
- [MODIFIED] Addon Browser design reworked
[TODO]
@ -26,6 +28,7 @@ Check yes / no progress bar works ok
check all active strings
MyPVRTimers needs creating and testing
Screenshots etc
Check if feedback notification appears when updating libraries

Binary file not shown.

Before

Width:  |  Height:  |  Size: 296 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB