This commit is contained in:
theDeadMan 2018-10-08 23:42:17 +01:00
parent 9545c64ae8
commit ba64b9c017
5 changed files with 159 additions and 43 deletions

View File

@ -59,6 +59,10 @@
<expression name="isMusicSong">container.content(songs) + [String.Contains(Container.folderpath,musicdb://) | String.Contains(Container.folderpath,spotify)]</expression>
<expression name="isMusicPlaylist">container.content(songs) + [String.Contains(Container.folderpath,.xsp) | String.Contains(Container.foldername,PartyMode) | String.Contains(Container.folderpath,playlistmusic://)]</expression>
<!--photos-->
<expression name="isPhotoAlbum">container.content(images)</expression>
<!--weather-->
<expression name="hasWeather">!String.IsEmpty(Window(Weather).Property(WeatherProvider)) + !String.String.IsEmpty(weather.temperature) + !String.String.IsEmpty(weather.conditions)</expression>

View File

@ -40,8 +40,7 @@
<value condition="Window.isactive(programs)">$INFO[container.NumAllItems,, $LOCALIZE[31145]]</value>
<value condition="Window.isactive(games)">$INFO[container.NumAllItems,, $LOCALIZE[31145]]</value>
<value condition="Window.isactive(musicplaylist) | Window.isactive(videoplaylist)">$INFO[container.NumAllItems,, $LOCALIZE[31014]]</value>
<value condition="Window.isactive(pictures) + Integer.IsGreater(container.Numitems,0) + Container.HasFolders">$INFO[container.NumAllItems,, $LOCALIZE[31038]]</value>
<value condition="Window.isactive(pictures) + Integer.IsGreater(container.Numitems,0) + !Container.HasFolders">$INFO[container.foldername,,] $INFO[container.NumAllItems,(, $LOCALIZE[31050])]</value>
<value condition="Window.isactive(pictures) + Integer.IsGreater(container.Numitems,0)">$INFO[container.NumAllItems,, $LOCALIZE[31014]]</value>
</variable>
<!--list view item detail / subheader-->
<variable name="itemDetail">

View File

@ -3,7 +3,7 @@
<defaultcontrol always="true">9999</defaultcontrol>
<onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
<include>fadeInOut</include>
<views>50</views>
<views>50,51</views>
<controls>
<include>globalBackground</include>
<!--page container group-->
@ -18,7 +18,7 @@
</control>
<!--page scrollbar-->
<control type="group" id="8000">
<visible>Control.IsVisible(60)</visible>
<visible>Control.IsVisible(60) + !EXP[isPhotoAlbum]</visible>
<animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
<control type="scrollbar" id="60">
<posx>54r</posx>
@ -41,7 +41,7 @@
<include>DebugGrid</include>
<control type="label">
<include>WindowID</include>
<label>MyPics.xml</label>
<label>MyPics.xml path: $INFO[container.folderpath] folder: $INFO[container.foldername] content: $INFO[container.content]</label>
</control>
</controls>
</window>

View File

@ -2,23 +2,53 @@
<includes>
<!--Photo browser-->
<include name="photos">
<control type="group">
<visible>$EXP[isPhotoAlbum]</visible>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>$INFO[container(50).listitem.art(thumb)]</texture>
<colordiffuse>FF555555</colordiffuse>
<aspectratio>scale</aspectratio>
<fadetime>250</fadetime>
</control>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>vignette.png</texture>
<colordiffuse>ffffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="label">
<posx>col-1-begin</posx>
<posy>21-row</posy>
<width>18-col</width>
<height>1-row</height>
<font>largeTitle</font>
<textcolor>textActive</textcolor>
<aligny>center</aligny>
<shadowcolor></shadowcolor>
<wrapmultiline>true</wrapmultiline>
<label>$INFO[container.foldername]</label>
</control>
</control>
<control type="panel" id="50">
<posx>col-1-begin</posx>
<posy>row-5-begin</posy>
<width>1800</width>
<height>25-row</height>
<visible>$EXP[isPhotoAlbum]</visible>
<posx>72</posx>
<posy>row-23-begin</posy>
<width>1764</width>
<height>10-row</height>
<onleft>9000</onleft>
<onright>60</onright>
<ondown>50</ondown>
<onup>50</onup>
<orientation>horizontal</orientation>
<scrolltime tween="cubic" easing="out">600</scrolltime>
<pagecontrol>60</pagecontrol>
<itemlayout width="444" height="360">
<itemlayout width="3-col" height="6-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>6-col-gutter</width>
<height>4-col-gutter</height>
<width>204</width>
<height>122</height>
<aspectratio>scale</aspectratio>
<texture>colors/black.png</texture>
<bordertexture colordiffuse="overlay">colors/black.png</bordertexture>
@ -28,8 +58,8 @@
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>6-col-gutter</width>
<height>4-col-gutter</height>
<width>204</width>
<height>122</height>
<aspectratio>scale</aspectratio>
<texture>$INFO[Listitem.thumb]</texture>
<bordersize>6</bordersize>
@ -37,33 +67,23 @@
</control>
<control type="label">
<posx>12</posx>
<posy>268</posy>
<width>360</width>
<posy>122</posy>
<width>192</width>
<height>1-row</height>
<aligny>center</aligny>
<font>thumbTitle</font>
<textcolor>textActive</textcolor>
<label>[B]$INFO[ListItem.label][/B]</label>
</control>
<control type="label">
<posx>12</posx>
<posy>292</posy>
<width>360</width>
<height>1-row</height>
<aligny>center</aligny>
<font>thumbTitle</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.path]</label>
</control>
</itemlayout>
<focusedlayout width="444" height="360">
<focusedlayout width="3-col" height="6-row">
<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>
<width>204</width>
<height>122</height>
<aspectratio>scale</aspectratio>
<texture border="6">colors/black.png</texture>
<bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
@ -73,32 +93,124 @@
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>6-col-gutter</width>
<height>4-col-gutter</height>
<width>204</width>
<height>122</height>
<aspectratio>scale</aspectratio>
<texture>$INFO[Listitem.thumb]</texture>
<bordersize>6</bordersize>
</control>
<control type="label">
<posx>12</posx>
<posy>268</posy>
<width>360</width>
<posy>122</posy>
<width>192</width>
<height>1-row</height>
<aligny>center</aligny>
<font>thumbTitle</font>
<textcolor>textActive</textcolor>
<label>[B]$INFO[ListItem.label][/B]</label>
</control>
<control type="label">
<posx>12</posx>
<posy>292</posy>
<width>360</width>
<height>1-row</height>
<aligny>center</aligny>
<font>thumbTitle</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.path]</label>
</control>
</control>
</focusedlayout>
</control>
<control type="panel" id="51">
<visible>!$EXP[isPhotoAlbum]</visible>
<posx>col-1-begin</posx>
<posy>row-5-begin</posy>
<width>24-col</width>
<height>23-row</height>
<onleft>9000</onleft>
<onright>61</onright>
<ondown>55</ondown>
<onup>55</onup>
<pagecontrol>61</pagecontrol>
<itemlayout width="24-col" height="2-row">
<control type="image">
<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>
<width>23-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>22-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>itemTitle</font>
<textcolor>textActive</textcolor>
<shadowcolor></shadowcolor>
<label>$INFO[ListItem.Label]</label>
</control>
<control type="label">
<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>
</itemlayout>
<focusedlayout width="24-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>3</posy>
<width>66</width>
<height>66</height>
<aspectratio scalediffuse="false">stretch</aspectratio>
<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"/>
</animation>
</control>
<control type="image">
<posx>1-col</posx>
<posy>0</posy>
<width>23-col</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture border="0">colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
</control>
<control type="label">
<posx>1-col-indent</posx>
<posy>0</posy>
<width>22-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>itemTitle</font>
<textcolor>textActive</textcolor>
<shadowcolor></shadowcolor>
<label>$INFO[ListItem.Label]</label>
</control>
<control type="label">
<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>
</focusedlayout>
</control>

View File

@ -38,6 +38,7 @@
[FIXED] Subtitle default bug
[FIXED] library update progress bar
- check play / pause on OSD. Something not right.
- check controls for new window: MyGames.xml
- Screenshots etc need updating
- SPOTIFY SUPPORT: playlists