pictures updated

This commit is contained in:
theDeadMan 2017-09-28 14:36:29 +01:00
parent 0a985fa9c5
commit 73f3bbf1ab
9 changed files with 124 additions and 268 deletions

View File

@ -17,7 +17,7 @@
<width>8-col-gutter</width>
<height>2-row</height>
<wrapmultiline>true</wrapmultiline>
<font>pageTitle</font>
<font>regularStrong</font>
<textcolor>textActive</textcolor>
</control>
<control type="textbox" id="9">

View File

@ -19,7 +19,7 @@
</animation>
<animation type="windowclose">
<effect type="fade" start="100" end="0" time="300"/>
<effect type="zoom" center="auto" start="100" end="90" time="300"/>
<effect type="zoom" center="auto" start="100" end="98" time="300"/>
</animation>
</include>
<!--ken burnsey style effect for fanart images-->

View File

@ -185,7 +185,7 @@
</control>
</include>
<!--pictures submenu items-->
<include name="addonsSideMenu">
<include name="addonsSideMenu">
<control type="radiobutton" id="7">
<width>6-col</width>
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>

View File

@ -27,6 +27,8 @@
<value condition="Window.isactive(TVRecordings)">$LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31165][/COLOR]</value>
<value condition="Window.isactive(programs)">$LOCALIZE[10506]</value>
<value condition="Window.isactive(musicplaylist) | Window.isactive(videoplaylist)">$LOCALIZE[31123]</value>
<value condition="Window.isactive(pictures)">$LOCALIZE[31056]</value>
</variable>
<variable name="listSubTitle">
<value condition="Window.isactive(Videos)">$INFO[container.Numitems,, $LOCALIZE[31014]] $VAR[unwatchedOnly]</value>
@ -36,7 +38,9 @@
<value condition="Window.isactive(TVRecordings)">$INFO[container.numitems] $LOCALIZE[31165]</value>
<value condition="Window.isactive(programs)">$INFO[container.Numitems,, $LOCALIZE[31145]]</value>
<value condition="Window.isactive(musicplaylist) | Window.isactive(videoplaylist)">$INFO[container.Numitems,, $LOCALIZE[31014]]</value>
</variable>
<value condition="Window.isactive(pictures) + IntegerGreaterThan(container.Numitems,0) + Container.HasFolders">$INFO[container.Numitems,, $LOCALIZE[31038]]</value>
<value condition="Window.isactive(pictures) + IntegerGreaterThan(container.Numitems,0) + !Container.HasFolders">$INFO[container.foldername,,] $INFO[container.Numitems,(, $LOCALIZE[31050])]</value>
</variable>
<!--list view item detail / subheader-->
<variable name="itemDetail">
<value condition="Container.Content(movies)">$INFO[Listitem.duration,, $LOCALIZE[31018]]</value>

View File

@ -27,41 +27,10 @@
<onback>9999</onback>
</control>
</control>
<!--Folder titles-->
<!--page header-->
<control type="group">
<posx>col-1-begin</posx>
<posy>row-1-begin</posy>
<!--source title-->
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>14-col</width>
<font>pageTitle</font>
<label>31056</label>
<textcolor>textActive</textcolor>
</control>
<!--source subtitle-->
<control type="label">
<visible>IntegerGreaterThan(container.Numitems,0) + Container.HasFolders</visible>
<posx>0</posx>
<posy>45</posy>
<width>24-col</width>
<font>regular</font>
<label>$INFO[container.Numitems,, $LOCALIZE[31038]]</label>
<textcolor>textActive</textcolor>
</control>
<control type="label">
<visible>IntegerGreaterThan(container.Numitems,0) + !Container.HasFolders</visible>
<posx>0</posx>
<posy>45</posy>
<width>24-col</width>
<font>regular</font>
<label>$INFO[container.Numitems,, $LOCALIZE[31050]]$INFO[container.foldername, - ,]</label>
<textcolor>textActive</textcolor>
</control>
<include>pageHeader</include>
</control>
<!--dateTime-->
<include>dateTime</include>
</control>
<!--hub menu-->
<include>hubMenu</include>

View File

@ -20,10 +20,10 @@
<width>6-col-gutter</width>
<height>4-col-gutter</height>
<aspectratio>scale</aspectratio>
<texture border="6">DefaultPoster.png</texture>
<bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
<texture border="6">colors/black.png</texture>
<bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
<bordersize>6</bordersize>
<colordiffuse>44FFFFFF</colordiffuse>
<colordiffuse>overlay</colordiffuse>
</control>
<control type="image">
<posx>0</posx>
@ -31,10 +31,8 @@
<width>6-col-gutter</width>
<height>4-col-gutter</height>
<aspectratio>scale</aspectratio>
<texture border="0">$INFO[Listitem.thumb]</texture>
<bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
<texture>$INFO[Listitem.thumb]</texture>
<bordersize>6</bordersize>
<colordiffuse>ffffffff</colordiffuse>
</control>
<control type="label">
<posx>12</posx>
@ -60,14 +58,24 @@
<focusedlayout width="444" height="360">
<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 border="6">colors/black.png</texture>
<bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
<bordersize>6</bordersize>
<colordiffuse>FF000000</colordiffuse>
</control>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>6-col-gutter</width>
<height>4-col-gutter</height>
<aspectratio>scale</aspectratio>
<texture fallback="DefaultPoster.png">$INFO[Listitem.thumb]</texture>
<bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
<texture>$INFO[Listitem.thumb]</texture>
<bordersize>6</bordersize>
</control>
<control type="label">

View File

@ -1,219 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
<window type="dialog" id="1103">
<defaultcontrol always="true">9876</defaultcontrol>
<onload condition="System.HasAddon(script.artistslideshow)">RunScript(script.artistslideshow)</onload>
<onunload>control.setfocus(9999)</onunload>
<controls>
<include>globalBackground</include>
<control type="group">
<include>fadeInOut</include>
<control type="group">
<!--fanart-->
<control type="image">
<visible>isempty(Window(Visualisation).Property(ArtistSlideshow))</visible>
<posx>0</posx>
<posy>0</posy>
<include>dimensionsFullscreen</include>
<texture fallback="special://skin/extras/backgrounds/music.jpg" border="0">$INFO[player.art(fanart)]</texture>
<aspectratio>stretch</aspectratio>
<include>kenBurnsey</include>
<colordiffuse>44ffffff</colordiffuse>
</control>
<!--artist slideshow (if active)-->
<control type="multiimage">
<visible>!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-->
<control type="visualisation" id="2">
<visible>!SlideShow.IsActive</visible>
<description>visualisation</description>
<posx>0</posx>
<posy>0</posy>
<include>dimensionsFullscreen</include>
</control>
</control>
<!--Track info-->
<control type="group">
<posx>col-1-begin</posx>
<posy>row-23-begin</posy>
<!--coverart (or channel art if radio)-->
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>5-row</width>
<height>182</height>
<aspectratio>stretch</aspectratio>
<texture border="0">DefaultAlbumCover.png</texture>
<bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
<bordersize>6</bordersize>
<colordiffuse>overlay</colordiffuse>
</control>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>5-row</width>
<height>182</height>
<aspectratio>stretch</aspectratio>
<texture border="6">$INFO[player.art(thumb)]</texture>
</control>
<!--track info-->
<control type="group">
<posx>182</posx>
<posy>0</posy>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>9-col</width>
<height>71</height>
<texture>colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
</control>
<control type="label">
<posx>24</posx>
<posy>0</posy>
<width>542</width>
<height>2-row</height>
<font>regularStrong</font>
<textcolor>textActive</textcolor>
<scroll>true</scroll>
<label>$INFO[MusicPlayer.Title]</label>
</control>
<control type="label">
<posx>8-col</posx>
<posy>0</posy>
<width>612</width>
<height>2-row</height>
<font>regularStrong</font>
<textcolor>textActive</textcolor>
<scroll>true</scroll>
<label>[B]$INFO[MusicPlayer.userrating,,*][/B]</label>
</control>
<control type="image">
<posx>0</posx>
<posy>2-row</posy>
<width>9-col</width>
<height>1-row</height>
<texture>colors/white.png</texture>
<colordiffuse>FFFFFFFF</colordiffuse>
</control>
<control type="label">
<posx>24</posx>
<posy>2-row</posy>
<width>612</width>
<height>1-row</height>
<font>smallStrong</font>
<textcolor>black</textcolor>
<scroll>false</scroll>
<label>[UPPERCASE][B]$INFO[MusicPlayer.artist,, ][/B]$INFO[MusicPlayer.Album, | , ]$INFO[MusicPlayer.year,(,)][/UPPERCASE]</label>
</control>
<control type="image">
<posx>0</posx>
<posy>3-row</posy>
<width>9-col</width>
<height>2-row</height>
<texture>colors/black.png</texture>
<colordiffuse>99000000</colordiffuse>
</control>
<control type="progress">
<description>Duration</description>
<posx>0</posx>
<posy>3-row</posy>
<width>9-col</width>
<height>2-row</height>
<reveal>false</reveal>
<texturebg>-</texturebg>
<lefttexture>-</lefttexture>
<midtexture border="36" colordiffuse="22FFFFFF">colors/white.png</midtexture>
<righttexture>-</righttexture>
<overlaytexture>-</overlaytexture>
<info>Player.Progress</info>
</control>
<control type="label">
<posx>24</posx>
<posy>3-row</posy>
<width>612</width>
<height>2-row</height>
<font>regularStrong</font>
<align>left</align>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<scroll>false</scroll>
<label>$INFO[MusicPlayer.time,, / ]$INFO[MusicPlayer.duration]</label>
</control>
<control type="label">
<posx>9-col-gutter</posx>
<posy>3-row</posy>
<width>612</width>
<height>2-row</height>
<font>regularStrong</font>
<align>right</align>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<scroll>false</scroll>
<label>$INFO[musicplayer.Playlistposition,$LOCALIZE[554] ]$INFO[musicplayer.Playlistlength, / ]</label>
</control>
<control type="label">
<visible>Playlist.IsRepeat | Playlist.IsRepeatOne</visible>
<posx>5-col-gutter</posx>
<posy>3-row</posy>
<width>612</width>
<height>2-row</height>
<font>symbolLarge</font>
<align>right</align>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label></label>
</control>
<control type="label">
<visible>Playlist.IsRandom</visible>
<posx>384</posx>
<posy>3-row</posy>
<width>612</width>
<height>2-row</height>
<font>symbolLarge</font>
<align>right</align>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label></label>
</control>
</control>
</control>
</control>
<!--vignette-->
<control type="image">
<posx>0</posx>
<posy>0</posy>
<include>dimensionsFullscreen</include>
<texture>vignette.png</texture>
<colordiffuse>ffffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<!--hidden buttons to handle dialog autohide-->
<control type="button" id="9876">
<posx>-100</posx>
<posy>-100</posy>
<height>1-col</height>
<width>1-col</width>
<onup>VolumeUp</onup>
<ondown>VolumeDown</ondown>
<onleft>playercontrol(previous)</onleft>
<onright>playercontrol(next)</onright>
<onclick>activatewindow(1105)</onclick>
</control>
<!--debugging-->
<include>DebugGrid</include>
<control type="label">
<include>DialogID</include>
<label>custom_musicPlayerFullscreen.xml</label>
</control>
</controls>
<defaultcontrol always="true">9876</defaultcontrol>
<onload condition="System.HasAddon(script.artistslideshow)">RunScript(script.artistslideshow)</onload>
<onunload>control.setfocus(9999)</onunload>
<controls>
<include>globalBackground</include>
<control type="group">
<include>fadeInOut</include>
<control type="group">
<!--fanart-->
<control type="image">
<visible>isempty(Window(Visualisation).Property(ArtistSlideshow))</visible>
<posx>0</posx>
<posy>0</posy>
<include>dimensionsFullscreen</include>
<texture fallback="special://skin/extras/backgrounds/music.jpg" border="0">$INFO[player.art(fanart)]</texture>
<aspectratio>stretch</aspectratio>
<include>kenBurnsey</include>
<colordiffuse>44ffffff</colordiffuse>
</control>
<!--artist slideshow (if active)-->
<control type="multiimage">
<visible>!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-->
<control type="visualisation" id="2">
<visible>!SlideShow.IsActive</visible>
<description>visualisation</description>
<posx>0</posx>
<posy>0</posy>
<include>dimensionsFullscreen</include>
</control>
</control>
<!--Track info-->
<control type="grouplist">
<posx>col-1-begin</posx>
<posy>row-20-begin</posy>
<orientation>vertical</orientation>
<itemgap>10</itemgap>
<control type="textbox">
<width>10-col</width>
<height>auto</height>
<font>mediumStrong</font>
<textcolor>textActive</textcolor>
<wrapmultiline>true</wrapmultiline>
<scroll>false</scroll>
<shadowcolor>33000000</shadowcolor>
<label>$INFO[MusicPlayer.Title]</label>
</control>
<control type="textbox">
<width>10-col</width>
<height>auto</height>
<font>regular</font>
<textcolor>textActive</textcolor>
<scroll>false</scroll>
<shadowcolor>33000000</shadowcolor>
<label>[B]$INFO[MusicPlayer.artist][/B][CR]$INFO[MusicPlayer.Album] $INFO[MusicPlayer.year,(,)]</label>
</control>
<control type="label">
<width>10-col</width>
<height>1-row</height>
<font>buttonTitle</font>
<textcolor>textActive</textcolor>
<scroll>false</scroll>
<shadowcolor>33000000</shadowcolor>
<label>[B]$INFO[musicplayer.Playlistposition,$LOCALIZE[554] ,]$INFO[musicplayer.Playlistlength, / ] $INFO[MusicPlayer.TimeRemaining,[ , ]][/B]</label>
</control>
</control>
</control>
<!--hidden buttons to handle dialog autohide-->
<control type="button" id="9876">
<posx>-100</posx>
<posy>-100</posy>
<height>1-col</height>
<width>1-col</width>
<onup>VolumeUp</onup>
<ondown>VolumeDown</ondown>
<onleft>playercontrol(previous)</onleft>
<onright>playercontrol(next)</onright>
<onclick>activatewindow(1105)</onclick>
</control>
<!--debugging-->
<include>DebugGrid</include>
<control type="label">
<include>DialogID</include>
<label>custom_musicPlayerFullscreen.xml</label>
</control>
</controls>
</window>

View File

@ -6,6 +6,8 @@ DONE - recent tvshow episode listing not working
DONE - Add progress bar to resumable content
DONE - playlist titles not working. (See Github for random label)
Librelec settings
[V1.2.4]
- [UPDATED] French language file
- [UPDATED] Norwegian language file

View File

@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<shortcuts>
<shortcut>
<label>31147</label>
<label2>32034</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<action>RunScript(script.globalsearch)</action>
</shortcut>
<shortcut>
<label>744</label>
<label2>32020</label2>