Aire-One
/
skin.pellucid
mirror of https://github.com/chrisbevan/skin.pellucid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Krypton-testing' into Krypton-testing 

# Conflicts:
#	changelog.txt
This commit is contained in:
Chris Bevan 2016-11-25 18:37:05 +00:00
parent 8d99705efa dc6c1378cb
commit da15cb2b0f
7 changed files with 332 additions and 1935 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
1080i/DialogFullScreenInfo.xml
View File

@ -10,7 +10,6 @@
<effect type="fade" start="100" end="0" time="200" tween="sine" easing="in"/> <effect type="fade" start="100" end="0" time="200" tween="sine" easing="in"/>
</animation> </animation>
<include>dateTime</include> <include>dateTime</include>
<!--thumbnail--> <!--thumbnail-->
<control type="group"> <control type="group">
<posx>col-1-begin</posx> <posx>col-1-begin</posx>
@ -24,15 +23,42 @@
<effect type="slide" end="0,-300" tween="cubic" easing="out" time="400"/> <effect type="slide" end="0,-300" tween="cubic" easing="out" time="400"/>
</animation> </animation>
<control type="image"> <control type="image">
<posx>0</posx> <visible>videoplayer.content(episodes)</visible>
<posx>0</posx>
<posy>0</posy> <posy>0</posy>
<width>2-col-textbox</width> <width>3-col-gutter</width>
<height>4-col-textbox</height> <height>288</height>
<aspectratio scalediffuse="false" aligny="top">keep</aspectratio> <aspectratio>stretch</aspectratio>
<texture border="0">$INFO[player.art(thumb)]</texture> <texture border="6">$INFO[Player.Art(tvshow.poster)]</texture>
</control> <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
<bordersize>6</bordersize>
<colordiffuse>ffffffff</colordiffuse>
</control>
<control type="image">
<visible>videoplayer.content(movies)</visible>
<posx>0</posx>
<posy>0</posy>
<width>3-col-gutter</width>
<height>288</height>
<aspectratio>stretch</aspectratio>
<texture border="6">$INFO[Player.Art(poster)]</texture>
<bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
<bordersize>6</bordersize>
<colordiffuse>ffffffff</colordiffuse>
</control>
<control type="image">
<visible>videoplayer.content(livetv)</visible>
<posx>0</posx>
<posy>0</posy>
<width>3-col-gutter</width>
<height>3-col-gutter</height>
<aspectratio>stretch</aspectratio>
<texture border="6">$INFO[Player.Art(thumb)]</texture>
<bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
<bordersize>6</bordersize>
<colordiffuse>ffffffff</colordiffuse>
</control>
</control> </control>
<control type="group"> <control type="group">
<posx>0</posx> <posx>0</posx>
<posy>row-22-begin</posy> <posy>row-22-begin</posy>
@ -70,7 +96,7 @@
<font>pageSubTitle</font> <font>pageSubTitle</font>
<aligny>center</aligny> <aligny>center</aligny>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<label>[B]$INFO[videoplayer.Title][/B]</label> <label>[B]$INFO[videoplayer.TVShowTitle,,: ]$INFO[videoplayer.Title][/B]</label>
</control> </control>
<control type="label"> <control type="label">
<visible>VideoPlayer.HasMenu</visible> <visible>VideoPlayer.HasMenu</visible>

2
1080i/Includes_variables.xml
View File

@ -23,7 +23,7 @@
</variable> </variable>
<variable name="listSubTitle"> <variable name="listSubTitle">
<value condition="Window.isactive(Videos)">$INFO[container.Numitems,, $LOCALIZE[31014]] $VAR[unwatchedOnly]</value> <value condition="Window.isactive(Videos)">$INFO[container.Numitems,, $LOCALIZE[31014]] $VAR[unwatchedOnly]</value>
<value condition="Window.isactive(1106)">$INFO[Window(Home).Property(Movies.Count),, $LOCALIZE[20342] / ]$INFO[Window(Home).Property(TVShows.Count),, $LOCALIZE[20343] / ]$INFO[Window(Home).Property(Music.AlbumsCount),, $LOCALIZE[132]]</value> <value condition="Window.isactive(1106)">$INFO[Window(Home).Property(Movies.Count),, $LOCALIZE[20342] • ]$INFO[Window(Home).Property(TVShows.Count),, $LOCALIZE[20343] • ]$INFO[Window(Home).Property(Music.AlbumsCount),, $LOCALIZE[132]]</value>
<value condition="Window.isactive(Music)">$INFO[container.Numitems,, $LOCALIZE[31014]]</value> <value condition="Window.isactive(Music)">$INFO[container.Numitems,, $LOCALIZE[31014]]</value>
</variable> </variable>
<!--list view item detail / subheader--> <!--list view item detail / subheader-->

17
1080i/VideoOSD.xml
View File

@ -4,6 +4,12 @@
<onload>Control.SetFocus(8001,3)</onload> <onload>Control.SetFocus(8001,3)</onload>
<include>fadeInOut</include> <include>fadeInOut</include>
<controls> <controls>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>colors/black.png</texture>
<aspectratio>stretch</aspectratio>
<colordiffuse>textboxInactive</colordiffuse>
</control>
<control type="group"> <control type="group">
<!--fade out if audio / video menu active--> <!--fade out if audio / video menu active-->
<animation type="Conditional" condition="Window.IsActive(seekbar) | Window.IsActive(osdvideosettings) | Window.IsActive(osdaudiosettings) | window.isactive(PVROSDChannels)"> <animation type="Conditional" condition="Window.IsActive(seekbar) | Window.IsActive(osdvideosettings) | Window.IsActive(osdaudiosettings) | window.isactive(PVROSDChannels)">
@ -12,15 +18,6 @@
<posx>col-10-begin</posx> <posx>col-10-begin</posx>
<posy>row-8-begin</posy> <posy>row-8-begin</posy>
<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>textboxInactive</colordiffuse>
</control>
<!--player controls--> <!--player controls-->
<control type="panel" id="8001"> <control type="panel" id="8001">
<posx>0</posx> <posx>0</posx>
@ -127,7 +124,7 @@
<control type="panel" id="8002"> <control type="panel" id="8002">
<posx>0</posx> <posx>0</posx>
<posy>2-row</posy> <posy>2-row</posy>
<width>6-col</width> <width>429</width>
<height>12-row</height> <height>12-row</height>
<itemgap>0</itemgap> <itemgap>0</itemgap>
<onup>8001</onup> <onup>8001</onup>

120
1080i/custom_recentContent.xml
View File

@ -89,7 +89,7 @@
<label>[B]$INFO[container(9998).listitem.title][/B][CR]$INFO[container(9998).listitem.director,$LOCALIZE[31196]. ,.] $INFO[container(9998).listitem.year,,]</label> <label>[B]$INFO[container(9998).listitem.title][/B][CR]$INFO[container(9998).listitem.director,$LOCALIZE[31196]. ,.] $INFO[container(9998).listitem.year,,]</label>
</control> </control>
<control type="label"> <control type="label">
<visible>Container(9123).HasFocus(2)</visible> <visible>Container(9123).HasFocus(7)</visible>
<posx>24-col</posx> <posx>24-col</posx>
<posy>0</posy> <posy>0</posy>
<width>24-col</width> <width>24-col</width>
@ -99,10 +99,10 @@
<textcolor>66ffffff</textcolor> <textcolor>66ffffff</textcolor>
<shadowcolor>-</shadowcolor> <shadowcolor>-</shadowcolor>
<wrapmultiline>true</wrapmultiline> <wrapmultiline>true</wrapmultiline>
<label>[B]$INFO[container(9998).listitem.tvshowtitle][/B][CR]$INFO[container(9998).ListItem.Season,$LOCALIZE[31011], ]$INFO[container(9998).ListItem.Episode,$LOCALIZE[31204], ]</label> <label>[B]$INFO[container(9998).listitem.tvshowtitle][/B][CR]$INFO[container(9998).ListItem.Season,$LOCALIZE[31011] , ]$INFO[container(9998).ListItem.Episode,$LOCALIZE[31204] ,]</label>
</control> </control>
<control type="label"> <control type="label">
<visible>Container(9123).HasFocus(7)</visible> <visible>Container(9123).HasFocus(2)</visible>
<posx>24-col</posx> <posx>24-col</posx>
<posy>0</posy> <posy>0</posy>
<width>24-col</width> <width>24-col</width>
@ -129,9 +129,9 @@
</control> </control>
</control> </control>
</control> </control>
<!--content listing--> <!--content listing: movies and tvshows-->
<control type="panel" id="9998"> <control type="panel" id="9998">
<visible>container(9123).hasfocus(1) | container(9123).hasfocus(2) | container(9123).hasfocus(6) | container(9123).hasfocus(7)</visible> <visible>container(9123).hasfocus(1) | container(9123).hasfocus(2) | container(9123).hasfocus(6)</visible>
<posx>72</posx> <posx>72</posx>
<posy>row-20-begin</posy> <posy>row-20-begin</posy>
<width>1848</width> <width>1848</width>
@ -295,6 +295,116 @@
</control> </control>
</focusedlayout> </focusedlayout>
</control> </control>
<!--content listing: episodes-->
<control type="panel" id="9998">
<visible>container(9123).hasfocus(7)</visible>
<posx>72</posx>
<posy>row-20-begin</posy>
<width>1848</width>
<height>9-row</height>
<onup>9123</onup>
<onleft>9000</onleft>
<onback>9000</onback>
<orientation>horizontal</orientation>
<onback>control.setfocus(9000)</onback>
<content>$INFO[control.getlabel(9123)]</content>
<itemlayout width="420" height="312">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>384</width>
<height>288</height>
<aspectratio>stretch</aspectratio>
<texture border="6">DefaultPoster.png</texture>
<bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
<bordersize>6</bordersize>
<colordiffuse>overlay</colordiffuse>
</control>
<control type="label">
<posx>12</posx>
<posy>2-row</posy>
<width>360</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>regularStrong</font>
<textcolor>textDisabled</textcolor>
<label>$INFO[ListItem.tvshowtitle]</label>
</control>
<control type="label">
<posx>12</posx>
<posy>3-row</posy>
<width>360</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>textDisabled</textcolor>
<label>$INFO[ListItem.Season,$LOCALIZE[31011] , ]$INFO[ListItem.Episode,$LOCALIZE[31204] ,]</label>
</control>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>384</width>
<height>288</height>
<aspectratio>scale</aspectratio>
<texture border="6">$INFO[ListItem.Art(thumb)]</texture>
<bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
<bordersize>6</bordersize>
<colordiffuse>ffffffff</colordiffuse>
</control>
</itemlayout>
<focusedlayout width="420" height="312">
<control type="group">
<include>focusThumb</include>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>384</width>
<height>288</height>
<aspectratio>stretch</aspectratio>
<texture border="6">DefaultPoster.png</texture>
<bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
<bordersize>6</bordersize>
<colordiffuse>ffffffff</colordiffuse>
</control>
<control type="label">
<posx>12</posx>
<posy>2-row</posy>
<width>360</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>regularStrong</font>
<textcolor>textDisabled</textcolor>
<label>$INFO[ListItem.tvshowtitle]</label>
</control>
<control type="label">
<posx>12</posx>
<posy>3-row</posy>
<width>360</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>textDisabled</textcolor>
<label>$INFO[ListItem.Season,$LOCALIZE[31011] , ]$INFO[ListItem.Episode,$LOCALIZE[31204] ,]</label>
</control>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>384</width>
<height>288</height>
<aspectratio>scale</aspectratio>
<texture border="6">$INFO[ListItem.Art(thumb)]</texture>
<bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
<bordersize>6</bordersize>
<colordiffuse>ffffffff</colordiffuse>
</control>
</control>
</focusedlayout>
</control>
<!--content listing: Music-->
<control type="panel" id="9998"> <control type="panel" id="9998">
<visible>container(9123).hasfocus(3) | container(9123).hasfocus(4) | container(9123).hasfocus(5)</visible> <visible>container(9123).hasfocus(3) | container(9123).hasfocus(4) | container(9123).hasfocus(5)</visible>
<posx>72</posx> <posx>72</posx>

2075
1080i/script-skinshortcuts-includes.xml
View File

File diff suppressed because it is too large Load Diff

2
1080i/script-skinshortcuts.xml
View File

@ -7,7 +7,7 @@
<!--background--> <!--background-->
<include>globalBackground</include> <include>globalBackground</include>
<control type="group"> <control type="group">
<visible>!isempty(skin.string(homeBackground))</visible> <visible>!skin.string(homeBackground)</visible>
<animation type="windowOpen" condition="!Skin.HasSetting(lowPowerMode)"> <animation type="windowOpen" condition="!Skin.HasSetting(lowPowerMode)">
<effect type="zoom" center="auto" start="105" tween="sine" end="100" time="1500"/> <effect type="zoom" center="auto" start="105" tween="sine" end="100" time="1500"/>
</animation> </animation>

7
changelog.txt
View File

@ -28,11 +28,14 @@
Gamecontrollers: button separators (see forum) Gamecontrollers: button separators (see forum)
dialogPVRinfo: extra button (see forum) dialogPVRinfo: extra button (see forum)
Check all PVR windows and consider including OSD Check all PVR windows
Add user option: Revise player stop on return Add user option: Revise player stop on return
PVR mini window
Recent items video: - check recent episodes Skin shortcuts default menus not quite right (need overrides?? Multiple actions not allowed in default)
Add user option: Revise player stop on return
Screenshots etc Screenshots etc