This commit is contained in:
theDeadMan 2018-03-29 16:45:19 +01:00
parent 320df252e2
commit 472f81c8c9
7 changed files with 96 additions and 106 deletions

View File

@ -55,8 +55,13 @@
<width>468</width> <width>468</width>
<height>2-row</height> <height>2-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<label>$INFO[player.volume]</label> <label>$INFO[Control.GetLabel(20),, %]</label>
</control> </control>
</control>
<!--provide % vals for volume-->
<control type="progress" id="20">
<visible>false</visible>
<info>Player.Volume</info>
</control> </control>
<!--debugging--> <!--debugging-->
<include>DebugGrid</include> <include>DebugGrid</include>

View File

@ -148,16 +148,16 @@
</include> </include>
<!--Global background--> <!--Global background-->
<include name="globalBackground"> <include name="globalBackground">
<control type="image"> <control type="image">
<include>dimensionsFullscreen</include> <include>dimensionsFullscreen</include>
<texture>backgroundImage.jpg</texture> <texture>colors/white.png</texture>
<colordiffuse>ffFFFFFF</colordiffuse> <colordiffuse>background</colordiffuse>
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
</control> </control>
<control type="image"> <control type="image">
<include>dimensionsFullscreen</include> <include>dimensionsFullscreen</include>
<texture>colors/black.png</texture> <texture>backgroundImage.jpg</texture>
<colordiffuse>CCFFFFFF</colordiffuse> <colordiffuse>ff333333</colordiffuse>
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
</control> </control>
</include> </include>

View File

@ -8,7 +8,7 @@
<control type="image"> <control type="image">
<include>dimensionsFullscreen</include> <include>dimensionsFullscreen</include>
<aspectratio scalediffuse="false">stretch</aspectratio> <aspectratio scalediffuse="false">stretch</aspectratio>
<texture border="0">$INFO[Container.Art(fanart)]</texture> <texture border="0">$INFO[Container.Art(artist.fanart)]</texture>
<fadetime>0</fadetime> <fadetime>0</fadetime>
<colordiffuse>66ffffff</colordiffuse> <colordiffuse>66ffffff</colordiffuse>
</control> </control>

View File

@ -4,101 +4,83 @@
<control type="panel" id="50"> <control type="panel" id="50">
<posx>col-1-begin</posx> <posx>col-1-begin</posx>
<posy>row-5-begin</posy> <posy>row-5-begin</posy>
<width>24-col</width> <width>1800</width>
<height>23-row</height> <height>24-row</height>
<onleft>9000</onleft> <onleft>9000</onleft>
<onright>60</onright> <onright>60</onright>
<ondown>50</ondown> <ondown>50</ondown>
<onup>50</onup> <onup>9998</onup>
<onback>9998</onback>
<pagecontrol>60</pagecontrol> <pagecontrol>60</pagecontrol>
<itemlayout width="24-col" height="2-row"> <scrolltime tween="cubic" easing="out">600</scrolltime>
<itemlayout width="293" height="348">
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
<posy>3</posy>
<width>66</width>
<height>66</height>
<aspectratio scalediffuse="false">stretch</aspectratio>
<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> <posy>0</posy>
<width>23-col</width> <width>4-col-gutter</width>
<height>69</height> <height>4-col-gutter</height>
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
<texture border="0">colors/black.png</texture> <texture>colors/black.png</texture>
<colordiffuse>textboxInactive</colordiffuse> <bordertexture colordiffuse="overlay">colors/black.png</bordertexture>
<bordersize>6</bordersize>
<colordiffuse>overlay</colordiffuse>
</control> </control>
<control type="label"> <control type="image">
<posx>1-col-indent</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>
<width>22-col-gutter</width> <width>4-col-gutter</width>
<height>2-row</height> <height>4-col-gutter</height>
<aligny>center</aligny> <aspectratio>scale</aspectratio>
<font>itemTitle</font> <texture>$INFO[ListItem.Art(thumb)]</texture>
<textcolor>textActive</textcolor> <bordersize>6</bordersize>
<shadowcolor></shadowcolor> <colordiffuse>77ffffff</colordiffuse>
<label>$INFO[ListItem.Label]</label>
</control> </control>
<control type="label"> <control type="textbox">
<visible>!String.IsEmpty(ListItem.playcount)</visible> <visible>!controlgroup(9000).hasfocus</visible>
<posx>23-col-gutter</posx> <posx>12</posx>
<posy>0</posy> <posy>258</posy>
<width>1-col</width> <width>240</width>
<height>2-row</height> <height>60</height>
<aligny>center</aligny> <aligny>center</aligny>
<align>right</align> <font>thumbTitle</font>
<font>symbolLarge</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<shadowcolor></shadowcolor> <label>[B]$INFO[ListItem.label][/B]</label>
<label></label>
</control> </control>
</itemlayout> </itemlayout>
<focusedlayout width="24-col" height="2-row"> <focusedlayout width="4-col" height="348">
<control type="image"> <control type="group">
<posx>0</posx> <include>focusThumb</include>
<posy>3</posy> <control type="image">
<width>66</width> <posx>0</posx>
<height>66</height> <posy>0</posy>
<aspectratio scalediffuse="false">stretch</aspectratio> <width>4-col-gutter</width>
<texture fallback="colors/white.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture> <height>4-col-gutter</height>
<animation type="focus" loop="false" reversible="false"> <aspectratio>stretch</aspectratio>
<effect type="fade" time="500"/> <texture>colors/black.png</texture>
<effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/> <bordertexture colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
</animation> <bordersize>6</bordersize>
</control> <colordiffuse>FF000000</colordiffuse>
<control type="image"> </control>
<posx>1-col</posx> <control type="image">
<posy>0</posy> <posx>0</posx>
<width>23-col</width> <posy>0</posy>
<height>2-row</height> <width>4-col-gutter</width>
<aspectratio>stretch</aspectratio> <height>4-col-gutter</height>
<texture border="0">colors/white.png</texture> <aspectratio>scale</aspectratio>
<colordiffuse>highlight</colordiffuse> <texture>$INFO[ListItem.Art(thumb)]</texture>
</control> <bordersize>6</bordersize>
<control type="label"> </control>
<posx>1-col-indent</posx> <control type="textbox">
<posy>0</posy> <visible>!controlgroup(9000).hasfocus</visible>
<width>22-col-gutter</width> <posx>12</posx>
<height>2-row</height> <posy>258</posy>
<aligny>center</aligny> <width>240</width>
<font>itemTitle</font> <height>60</height>
<textcolor>textActive</textcolor> <aligny>center</aligny>
<shadowcolor></shadowcolor> <font>thumbTitle</font>
<label>$INFO[ListItem.Label]</label> <textcolor>textActive</textcolor>
</control> <label>[B]$INFO[ListItem.label][/B]</label>
<control type="label"> </control>
<visible>!String.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> </control>
</focusedlayout> </focusedlayout>
</control> </control>

View File

@ -1,16 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<window type="dialog" id="1103"> <window type="dialog" id="1103">
<defaultcontrol always="true">9876</defaultcontrol> <defaultcontrol always="true">9876</defaultcontrol>
<onload condition="System.HasAddon(script.artistslideshow)">RunScript(script.artistslideshow)</onload>
<onunload>control.setfocus(9999)</onunload> <onunload>control.setfocus(9999)</onunload>
<controls> <controls>
<include>globalBackground</include> <control type="image">
<include>dimensionsFullscreen</include>
<texture>colors/black.png</texture>
<aspectratio>stretch</aspectratio>
</control>
<control type="group"> <control type="group">
<include>fadeInOut</include> <include>fadeInOut</include>
<control type="group"> <control type="group">
<!--fanart--> <!--fanart-->
<control type="image"> <control type="image">
<visible>String.IsEmpty(Window(Visualisation).Property(ArtistSlideshow))</visible> <visible>!Visualisation.Enabled</visible>
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>
<include>dimensionsFullscreen</include> <include>dimensionsFullscreen</include>
@ -19,22 +22,9 @@
<include>kenBurnsey</include> <include>kenBurnsey</include>
<colordiffuse>44ffffff</colordiffuse> <colordiffuse>44ffffff</colordiffuse>
</control> </control>
<!--artist slideshow (if active)-->
<control type="multiimage">
<visible>!String.IsEmpty(Window(Visualisation).Property(ArtistSlideshow))</visible>
<include>dimensionsFullscreen</include>
<aspectratio>scale</aspectratio>
<timeperimage>15000</timeperimage>
<randomize>true</randomize>
<fadetime>1000</fadetime>
<loop>yes</loop>
<imagepath>$INFO[Window(Visualisation).Property(ArtistSlideshow)]</imagepath>
<include>kenBurnsey</include>
<colordiffuse>88ffffff</colordiffuse>
</control>
<!--visualisation--> <!--visualisation-->
<control type="visualisation" id="2"> <control type="visualisation" id="2">
<visible>!SlideShow.IsActive</visible> <visible>Visualisation.Enabled</visible>
<description>visualisation</description> <description>visualisation</description>
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>

View File

@ -30,9 +30,8 @@
- [COMPLETE] global search addon skinned - [COMPLETE] global search addon skinned
- [COMPLETE] GameOSD.xml - [COMPLETE] GameOSD.xml
- ensure texture background doesn't appear behind ken burns effect
- restore player controls video - restore player controls video
- Add volume passthrough / % volume control (see https://github.com/xperience1080/skin.xperience1080/blob/master/1080i/DialogVolumeBar.xml)
- check controls for new window: MyGames.xml - check controls for new window: MyGames.xml
- Screenshots etc need updating - Screenshots etc need updating

14
colors/orange.xml Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<colors>
<color name="black">ff111111</color>
<color name="background">ff151515</color>
<color name="highlight">aace5621</color>
<color name="overlay">44ffffff</color>
<color name="textActive">fff0f0f0</color>
<color name="textDisabled">ff757575</color>
<color name="menuDisabled">aaf0f0f0</color>
<color name="menuUnselected">ff919191</color>
<color name="textboxInactive">99FFFFFF</color>
<color name="keyboardInactive">aa212121</color>
<color name="keyboardAccent">ffBDBDBD</color>
</colors>