This commit is contained in:
theDeadMan 2019-02-18 22:25:22 +00:00
parent 1f54f603e7
commit 094866ff92
10 changed files with 189 additions and 67 deletions

View File

@ -125,27 +125,27 @@
<width>10-col</width>
<height>6-row</height>
<enable>false</enable>
<itemlayout width="5-col" height="2-row">
<itemlayout width="5-col" height="78">
<control type="label">
<posx>12</posx>
<posy>0</posy>
<width>4-col-gutter</width>
<font>itemSubTitle</font>
<textcolor>highlight</textcolor>
<label>$INFO[ListItem.label]</label>
<label>[B]$INFO[ListItem.label][/B]</label>
<shadowcolor></shadowcolor>
</control>
<control type="label">
<posx>12</posx>
<posy>32</posy>
<posy>30</posy>
<width>4-col-gutter</width>
<font>itemSubTitle</font>
<textcolor>textActive</textcolor>
<label fallback="31159">$INFO[ListItem.label2]</label>
<label fallback="31159">[B]$INFO[ListItem.label2][/B]</label>
<shadowcolor></shadowcolor>
</control>
</itemlayout>
<focusedlayout width="5-col" height="2-row">
<focusedlayout width="5-col" height="78">
</focusedlayout>
<content>
<item>
@ -360,27 +360,27 @@
<width>10-col</width>
<height>6-row</height>
<enable>false</enable>
<itemlayout width="5-col" height="2-row">
<itemlayout width="5-col" height="78">
<control type="label">
<posx>12</posx>
<posy>0</posy>
<width>4-col-gutter</width>
<font>itemSubTitle</font>
<textcolor>highlight</textcolor>
<label>$INFO[ListItem.label]</label>
<label>[B]$INFO[ListItem.label][/B]</label>
<shadowcolor></shadowcolor>
</control>
<control type="label">
<posx>12</posx>
<posy>32</posy>
<posy>30</posy>
<width>4-col-gutter</width>
<font>itemSubTitle</font>
<textcolor>textActive</textcolor>
<label fallback="31159">$INFO[ListItem.label2]</label>
<label fallback="31159">[B]$INFO[ListItem.label2][/B]</label>
<shadowcolor></shadowcolor>
</control>
</itemlayout>
<focusedlayout width="5-col" height="2-row">
<focusedlayout width="5-col" height="78">
</focusedlayout>
<content>
<item>

View File

@ -113,27 +113,27 @@
<width>10-col</width>
<height>6-row</height>
<enable>false</enable>
<itemlayout width="5-col" height="2-row">
<itemlayout width="5-col" height="76">
<control type="label">
<posx>12</posx>
<posy>0</posy>
<width>4-col-gutter</width>
<font>itemSubTitle</font>
<textcolor>highlight</textcolor>
<label>$INFO[ListItem.label]</label>
<label>[B]$INFO[ListItem.label][/B]</label>
<shadowcolor></shadowcolor>
</control>
<control type="label">
<posx>12</posx>
<posy>32</posy>
<posy>30</posy>
<width>4-col-gutter</width>
<font>itemSubTitle</font>
<textcolor>textActive</textcolor>
<label fallback="31159">$INFO[ListItem.label2]</label>
<label fallback="31159">[B]$INFO[ListItem.label2][/B]</label>
<shadowcolor></shadowcolor>
</control>
</itemlayout>
<focusedlayout width="5-col" height="2-row">
<focusedlayout width="5-col" height="76">
</focusedlayout>
<content>
<item>
@ -358,7 +358,7 @@
</control>
<control type="grouplist">
<posx>0</posx>
<posy>-18</posy>
<posy>-20</posy>
<width>12-col</width>
<orientation>horizontal</orientation>
<control type="label">
@ -373,7 +373,7 @@
<width>3-col</width>
<height>2-row</height>
<aligny>center</aligny>
<font>regularStrong</font>
<font>itemTitle</font>
<textcolor>textActive</textcolor>
<label fallback="31159">$INFO[listitem.duration]</label>
</control>

View File

@ -46,10 +46,19 @@
<control type="image">
<posx>0</posx>
<posy>2-row</posy>
<width>18-col</width>
<width>9-col-textbox</width>
<height>71</height>
<texture>colors/black.png</texture>
<colordiffuse>textboxInactive</colordiffuse>
<colordiffuse>overlay</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<posx>9-col</posx>
<posy>2-row</posy>
<width>9-col</width>
<height>71</height>
<texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
</control>
@ -64,8 +73,8 @@
<height>2-row</height>
<width>8-col-gutter</width>
<label></label>
<font>itemSubTitle</font>
<textcolor>highlight</textcolor>
<font>itemTitle</font>
<textcolor>textActive</textcolor>
<shadowcolor></shadowcolor>
</control>
<!--page scrollbar-->
@ -148,8 +157,8 @@
<width>9-col-gutter</width>
<height>2-row</height>
<label></label>
<font>itemSubTitle</font>
<textcolor>highlight</textcolor>
<font>itemTitle</font>
<textcolor>textActive</textcolor>
</control>
<control type="list" id="21">
<posx>0</posx>

View File

@ -29,7 +29,7 @@
<include file="Includes_mediaShowcase.xml"/>
<!--view type conditions-->
<expression name="isVideoList">!String.Contains(container.folderpath,special://profile/playlists/video) + !String.Contains(container.folderpath,videodb://) + !String.Contains(container.folderpath,plugin://) | container.content(files) | String.IsEmpty(container.content) | container.content(playlists) | container.content(addons) | container.content(videos) | container.content(episodes)</expression>
<expression name="isVideoList">!String.Contains(container.folderpath,special://profile/playlists/video) + !String.Contains(container.folderpath,videodb://) + !String.Contains(container.folderpath,plugin://) | container.content(files) | String.IsEmpty(container.content) | container.content(addons) | container.content(videos) | container.content(episodes)</expression>
<expression name="isMovie">container.content(movies) + [String.Contains(container.folderpath,videodb://) | String.Contains(container.folderpath,special://profile/playlists/video)]</expression>
<expression name="isAddonMovieOrTVshow">!String.Contains(container.folderpath,videodb://) + String.Contains(container.folderpath,plugin://) + [container.content(movies) | container.content(tvshows) | container.content(seasons)]</expression>

View File

@ -69,8 +69,12 @@
<onclick>SettingsLevelChange</onclick>
<onup>3</onup>
<onright>5</onright>
<width>286</width>
</control>
<control type="grouplist" id="3">
<animation type="conditional" condition="control.hasfocus(1234)">
<effect type="fade" start="100" end="80" time="100"/>
</animation>
<posx>0</posx>
<posy>2-row</posy>
<width></width>

View File

@ -75,43 +75,89 @@
<!--player position-->
<control type="group">
<posx>0</posx>
<posy>5-row</posy>
<visible>!Pvr.IsPlayingTv</visible>
<posy>6-row</posy>
<control type="label">
<visible>!Pvr.IsPlayingTv</visible>
<posx>0</posx>
<posy>0</posy>
<width>8-col</width>
<height>3-row</height>
<font>buttonTitle</font>
<aligny>center</aligny>
<width>2-col</width>
<font>itemSubTitle</font>
<textcolor>highlight</textcolor>
<label>[B]$LOCALIZE[31143][/B]</label>
<shadowcolor></shadowcolor>
</control>
<control type="label">
<visible>!Pvr.IsPlayingTv</visible>
<posx>0</posx>
<posy>32</posy>
<width>6-col</width>
<font>itemTitle</font>
<textcolor>textActive</textcolor>
<label>[B]$INFO[player.timeremaining] $INFO[player.finishtime,$LOCALIZE[31160] ,][/B]</label>
<scroll>false</scroll>
<label fallback="31159">[B]$INFO[player.timeremaining][/B]</label>
<shadowcolor></shadowcolor>
</control>
<control type="label">
<visible>!Pvr.IsPlayingTv</visible>
<posx>3-col-gutter</posx>
<posy>0</posy>
<width>2-col</width>
<font>itemSubTitle</font>
<textcolor>highlight</textcolor>
<label>[B]$LOCALIZE[31245][/B]</label>
<shadowcolor></shadowcolor>
</control>
<control type="group">
<control type="label">
<visible>!Pvr.IsPlayingTv</visible>
<posx>3-col-gutter</posx>
<posy>32</posy>
<width>6-col</width>
<font>itemTitle</font>
<textcolor>textActive</textcolor>
<label fallback="31159">[B]$INFO[VideoPlayer.FinishTime][/B]</label>
<shadowcolor></shadowcolor>
</control>
<control type="label">
<visible>Pvr.IsPlayingTv</visible>
<control type="label">
<posx>0</posx>
<posy>5-row</posy>
<width>600</width>
<height>3-row</height>
<font>buttonTitle</font>
<aligny>center</aligny>
<textcolor>textActive</textcolor>
<label>$INFO[VideoPlayer.EndTime,[B]$LOCALIZE[31160][/B] ,]</label>
<scroll>false</scroll>
<posy>0</posy>
<width>2-col</width>
<font>itemSubTitle</font>
<textcolor>highlight</textcolor>
<label>[B]$LOCALIZE[31160][/B]</label>
<shadowcolor></shadowcolor>
</control>
<control type="label">
<visible>Pvr.IsPlayingTv</visible>
<posx>0</posx>
<posy>6-row</posy>
<width>600</width>
<height>3-row</height>
<font>buttonTitle</font>
<aligny>center</aligny>
<posy>32</posy>
<width>6-col</width>
<font>itemTitle</font>
<textcolor>textActive</textcolor>
<label>$INFO[VideoPlayer.NextTitle,[B]$LOCALIZE[31242][/B] ,]</label>
<scroll>false</scroll>
<label fallback="31159">[B]$INFO[VideoPlayer.EndTime][/B]</label>
<shadowcolor></shadowcolor>
</control>
<control type="label">
<visible>Pvr.IsPlayingTv</visible>
<posx>3-col-gutter</posx>
<posy>0</posy>
<width>2-col</width>
<font>itemSubTitle</font>
<textcolor>highlight</textcolor>
<label>[B]$LOCALIZE[31242][/B]</label>
<shadowcolor></shadowcolor>
</control>
<control type="label">
<visible>Pvr.IsPlayingTv</visible>
<posx>3-col-gutter</posx>
<posy>32</posy>
<width>6-col</width>
<font>itemTitle</font>
<textcolor>textActive</textcolor>
<label fallback="31159">[B]$INFO[VideoPlayer.NextTitle][/B]</label>
<shadowcolor></shadowcolor>
</control>
</control>
<!--synopsis-->

View File

@ -2,7 +2,7 @@
<includes>
<include name="movies">
<control type="group">
<visible>$EXP[isMovie] + !string.contains(container.folderpath,playlists)</visible>
<visible>$EXP[isMovie]</visible>
<control type="image">
<visible>control.hasfocus(9103) | control.hasfocus(9102)</visible>
<include>dimensionsFullscreen</include>
@ -134,6 +134,17 @@
<font>thumbTitle</font>
<textcolor>textActive</textcolor>
<label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.year]$INFO[listitem.duration(mins), • , $LOCALIZE[31018]]</label>
</control>
<control type="label">
<visible>!controlgroup(9000).hasfocus + Integer.IsGreaterOrEqual(ListItem.VideoResolution,1080)</visible>
<posx>184</posx>
<posy>350</posy>
<width>204</width>
<height>1-row</height>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label></label>
</control>
<control type="progress">
<visible>ListItem.IsResumable</visible>
@ -194,6 +205,17 @@
<textcolor>textActive</textcolor>
<label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.year]$INFO[listitem.duration(mins), • , $LOCALIZE[31018]]</label>
<scroll>false</scroll>
</control>
<control type="label">
<visible>!controlgroup(9000).hasfocus + Integer.IsGreaterOrEqual(ListItem.VideoResolution,1080)</visible>
<posx>184</posx>
<posy>350</posy>
<width>204</width>
<height>1-row</height>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label></label>
</control>
<control type="progress">
<visible>ListItem.IsResumable</visible>
@ -217,7 +239,7 @@
<effect type="slide" start="0,0" end="0,-576" tween="sine" time="400"/>
</animation>
<control type="label">
<visible>!controlgroup(9000).hasfocus + !$EXP[isTVShow] + $EXP[isMovie]</visible>
<visible>!controlgroup(9000).hasfocus + !$EXP[isTVShow] + $EXP[isMovie] + !string.contains(container.folderpath,playlists)</visible>
<posx>col-1-begin</posx>
<posy>760</posy>
<width>12-col</width>
@ -226,6 +248,17 @@
<font>menuTitle</font>
<textcolor>textActive</textcolor>
<label>$LOCALIZE[31224]</label>
</control>
<control type="label">
<visible>!controlgroup(9000).hasfocus + !$EXP[isTVShow] + $EXP[isMovie] + string.contains(container.folderpath,playlists)</visible>
<posx>col-1-begin</posx>
<posy>760</posy>
<width>12-col</width>
<height>2-row</height>
<aligny>center</aligny>
<font>menuTitle</font>
<textcolor>textActive</textcolor>
<label>$LOCALIZE[31097]</label>
</control>
<control type="panel" id="51">
<visible>$EXP[isMovie]</visible>
@ -236,7 +269,7 @@
<onleft>9000</onleft>
<onright>60</onright>
<ondown>51</ondown>
<onup>9103</onup>
<onup>51</onup>
<onback>9000</onback>
<pagecontrol>60</pagecontrol>
<scrolltime tween="cubic" easing="out">600</scrolltime>
@ -293,6 +326,17 @@
<font>thumbTitle</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.year]$INFO[listitem.duration(mins), • , $LOCALIZE[31018]]</label>
</control>
<control type="label">
<visible>!controlgroup(9000).hasfocus + Integer.IsGreaterOrEqual(ListItem.VideoResolution,1080)</visible>
<posx>178</posx>
<posy>368</posy>
<width>204</width>
<height>1-row</height>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label></label>
</control>
<control type="group">
<visible>String.IsEmpty(ListItem.PlayCount)</visible>
@ -372,6 +416,17 @@
<font>thumbTitle</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.year]$INFO[listitem.duration(mins), • , $LOCALIZE[31018]]</label>
</control>
<control type="label">
<visible>!controlgroup(9000).hasfocus + Integer.IsGreaterOrEqual(ListItem.VideoResolution,1080)</visible>
<posx>178</posx>
<posy>368</posy>
<width>204</width>
<height>1-row</height>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label></label>
</control>
<control type="group">
<visible>String.IsEmpty(ListItem.PlayCount)</visible>

View File

@ -190,6 +190,9 @@
</itemlayout>
<focusedlayout width="15-col" height="2-row">
<control type="image">
<animation type="focus">
<effect type="fade" start="100" end="50" time="0"/>
</animation>
<posx>0</posx>
<posy>0</posy>
<width>1-col-textbox</width>

View File

@ -1,7 +1,8 @@
*In pipeline*
edit in smartplaylisteditor.xml, view not rendering.
- revise controls for new window: MyGames.xml
- Add file info to library info screen (help with scraping)
- Add SD / HD flags to info screen
- check album thumbs on fullscreenmusicview
- Weather

View File

@ -1004,3 +1004,7 @@ msgstr ""
msgctxt "#31244"
msgid "REC."
msgstr ""
msgctxt "#31245"
msgid "Finishes"
msgstr ""