This commit is contained in:
theDeadMan 2018-10-01 21:38:21 +01:00
parent ebecd5162a
commit 420317bcc8
12 changed files with 39 additions and 46 deletions

View File

@ -9,6 +9,17 @@
<posy>row-8-begin</posy> <posy>row-8-begin</posy>
<!--animations--> <!--animations-->
<include>modalDialogInOut</include> <include>modalDialogInOut</include>
<!--progress-->
<control type="label">
<posx>0</posx>
<posy>-72</posy>
<width>8-col-gutter</width>
<height>2-row</height>
<wrapmultiline>true</wrapmultiline>
<font>mediumStrong</font>
<textcolor>textActive</textcolor>
<label>$INFO[System.Progressbar,,%]</label>
</control>
<!--text--> <!--text-->
<control type="label" id="1"> <control type="label" id="1">
<description>heading</description> <description>heading</description>

View File

@ -180,6 +180,7 @@
</focusedlayout> </focusedlayout>
<content> <content>
<item id="1"> <item id="1">
<visible>Control.IsEnabled(28) + !window.isactive(osdsubtitlesettings)</visible>
<description>Ok Button</description> <description>Ok Button</description>
<label>186</label> <label>186</label>
<label2></label2> <label2></label2>
@ -187,6 +188,7 @@
<onclick>SendClick(28)</onclick> <onclick>SendClick(28)</onclick>
</item> </item>
<item id="2"> <item id="2">
<visible>Control.IsEnabled(29)</visible>
<description>Cancel Button</description> <description>Cancel Button</description>
<label>222</label> <label>222</label>
<label2></label2> <label2></label2>
@ -194,7 +196,7 @@
<onclick>SendClick(29)</onclick> <onclick>SendClick(29)</onclick>
</item> </item>
<item id="3"> <item id="3">
<visible>Control.IsEnabled(30) + !window.isactive(osdvideosettings) + !window.isactive(osdaudiosettings)</visible> <visible>Control.IsEnabled(30) + !window.isactive(osdvideosettings) + !window.isactive(osdaudiosettings) + !window.isactive(osdsubtitlesettings)</visible>
<description>clear / settings</description> <description>clear / settings</description>
<label>31048</label> <label>31048</label>
<label2></label2> <label2></label2>

View File

@ -40,7 +40,7 @@
<posx>col-6-begin</posx> <posx>col-6-begin</posx>
<posy>row-3-begin</posy> <posy>row-3-begin</posy>
<!--animations--> <!--animations-->
<include>modalDialogInOut</include> <include>modalDialogInOutVertical</include>
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>

View File

@ -31,7 +31,7 @@
<!--view type conditions--> <!--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(playlists) | 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="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)]</expression> <expression name="isAddonMovieOrTVshow">!String.Contains(container.folderpath,videodb://) + String.Contains(container.folderpath,plugin://) + [container.content(movies) | container.content(tvshows) | container.content(seasons)]</expression>
<expression name="isTVShow">container.content(tvshows) + [String.Contains(container.folderpath,videodb://) | String.Contains(container.folderpath,special://profile/playlists/video)]</expression> <expression name="isTVShow">container.content(tvshows) + [String.Contains(container.folderpath,videodb://) | String.Contains(container.folderpath,special://profile/playlists/video)]</expression>
<expression name="isSeason">container.content(seasons) + String.Contains(container.folderpath,videodb://)</expression> <expression name="isSeason">container.content(seasons) + String.Contains(container.folderpath,videodb://)</expression>

View File

@ -44,17 +44,6 @@
<bordersize>6</bordersize> <bordersize>6</bordersize>
<colordiffuse>BBffffff</colordiffuse> <colordiffuse>BBffffff</colordiffuse>
</control> </control>
<control type="textbox">
<visible>String.IsEmpty(listitem.title)</visible>
<posx>24</posx>
<posy>3-row</posy>
<width>228</width>
<height>6-row</height>
<font>largeTitle</font>
<wrapmultiline>true</wrapmultiline>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label]</label>
</control>
<control type="label"> <control type="label">
<visible>!controlgroup(9000).hasfocus</visible> <visible>!controlgroup(9000).hasfocus</visible>
<posx>12</posx> <posx>12</posx>
@ -64,7 +53,7 @@
<aligny>center</aligny> <aligny>center</aligny>
<font>thumbTitle</font> <font>thumbTitle</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<label>[B]$INFO[ListItem.title][/B]</label> <label>[B]$INFO[ListItem.label][/B]</label>
</control> </control>
<control type="label"> <control type="label">
<visible>!controlgroup(9000).hasfocus</visible> <visible>!controlgroup(9000).hasfocus</visible>
@ -74,7 +63,7 @@
<height>1-row</height> <height>1-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<font>thumbTitle</font> <font>thumbTitle</font>
<textcolor>textDisabled</textcolor> <textcolor>textActive</textcolor>
<label>$INFO[ListItem.year]</label> <label>$INFO[ListItem.year]</label>
</control> </control>
</itemlayout> </itemlayout>
@ -101,17 +90,6 @@
<texture>$INFO[ListItem.Art(poster)]</texture> <texture>$INFO[ListItem.Art(poster)]</texture>
<bordersize>6</bordersize> <bordersize>6</bordersize>
</control> </control>
<control type="textbox">
<visible>String.IsEmpty(listitem.title)</visible>
<posx>24</posx>
<posy>3-row</posy>
<width>228</width>
<height>6-row</height>
<font>largeTitle</font>
<wrapmultiline>true</wrapmultiline>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label]</label>
</control>
<control type="label"> <control type="label">
<posx>12</posx> <posx>12</posx>
<posy>338</posy> <posy>338</posy>
@ -120,7 +98,7 @@
<aligny>center</aligny> <aligny>center</aligny>
<font>thumbTitle</font> <font>thumbTitle</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<label>[B]$INFO[ListItem.title][/B]</label> <label>[B]$INFO[ListItem.label][/B]</label>
</control> </control>
<control type="label"> <control type="label">
<posx>12</posx> <posx>12</posx>

View File

@ -128,7 +128,7 @@
<aligny>center</aligny> <aligny>center</aligny>
<font>thumbTitle</font> <font>thumbTitle</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.artist][/COLOR] $INFO[listitem.year]</label> <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.artist] - $INFO[listitem.year]</label>
</control> </control>
</itemlayout> </itemlayout>
<focusedlayout width="352" height="5-col-gutter"> <focusedlayout width="352" height="5-col-gutter">
@ -164,7 +164,7 @@
<aligny>center</aligny> <aligny>center</aligny>
<font>thumbTitle</font> <font>thumbTitle</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.artist][/COLOR] $INFO[listitem.year]</label> <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.artist] - $INFO[listitem.year]</label>
</control> </control>
</control> </control>
</focusedlayout> </focusedlayout>
@ -243,7 +243,7 @@
<aligny>center</aligny> <aligny>center</aligny>
<font>thumbTitle</font> <font>thumbTitle</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.artist][/COLOR] $INFO[listitem.year]</label> <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.artist] - $INFO[listitem.year]</label>
</control> </control>
</itemlayout> </itemlayout>
<focusedlayout width="4-col" height="348"> <focusedlayout width="4-col" height="348">
@ -290,7 +290,7 @@
<aligny>center</aligny> <aligny>center</aligny>
<font>thumbTitle</font> <font>thumbTitle</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.artist][/COLOR] $INFO[listitem.year]</label> <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.artist] - $INFO[listitem.year]</label>
</control> </control>
</control> </control>
</focusedlayout> </focusedlayout>

View File

@ -134,7 +134,7 @@
<aligny>center</aligny> <aligny>center</aligny>
<font>thumbTitle</font> <font>thumbTitle</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.year][/COLOR]</label> <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.year]</label>
</control> </control>
<control type="progress"> <control type="progress">
<visible>ListItem.IsResumable</visible> <visible>ListItem.IsResumable</visible>
@ -193,7 +193,7 @@
<aligny>center</aligny> <aligny>center</aligny>
<font>thumbTitle</font> <font>thumbTitle</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.year][/COLOR]</label> <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.year]</label>
</control> </control>
<control type="progress"> <control type="progress">
<visible>ListItem.IsResumable</visible> <visible>ListItem.IsResumable</visible>
@ -291,7 +291,7 @@
<height>1-row</height> <height>1-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<font>thumbTitle</font> <font>thumbTitle</font>
<textcolor>textDisabled</textcolor> <textcolor>textActive</textcolor>
<label>$INFO[ListItem.year]</label> <label>$INFO[ListItem.year]</label>
</control> </control>
<control type="group"> <control type="group">

View File

@ -52,7 +52,7 @@
<height>1-row</height> <height>1-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<font>thumbTitle</font> <font>thumbTitle</font>
<textcolor>textDisabled</textcolor> <textcolor>textActive</textcolor>
<label>$INFO[ListItem.path]</label> <label>$INFO[ListItem.path]</label>
</control> </control>
</itemlayout> </itemlayout>

View File

@ -59,7 +59,7 @@
<aligny>center</aligny> <aligny>center</aligny>
<font>thumbTitle</font> <font>thumbTitle</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.artist][/COLOR] $INFO[listitem.year]</label> <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.artist] - $INFO[listitem.year]</label>
</control> </control>
</itemlayout> </itemlayout>
<focusedlayout width="4-col" height="348"> <focusedlayout width="4-col" height="348">
@ -106,7 +106,7 @@
<aligny>center</aligny> <aligny>center</aligny>
<font>thumbTitle</font> <font>thumbTitle</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.artist][/COLOR] $INFO[listitem.year]</label> <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.artist] - $INFO[listitem.year]</label>
</control> </control>
</control> </control>
</focusedlayout> </focusedlayout>

View File

@ -134,7 +134,7 @@
<aligny>center</aligny> <aligny>center</aligny>
<font>thumbTitle</font> <font>thumbTitle</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.Season,$LOCALIZE[31011] , ]$INFO[ListItem.Episode,$LOCALIZE[31204] ,][/COLOR]</label> <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.Season,$LOCALIZE[31011] , ]$INFO[ListItem.Episode,$LOCALIZE[31204] ,]</label>
</control> </control>
<control type="progress"> <control type="progress">
<visible>ListItem.IsResumable</visible> <visible>ListItem.IsResumable</visible>
@ -193,7 +193,7 @@
<aligny>center</aligny> <aligny>center</aligny>
<font>thumbTitle</font> <font>thumbTitle</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.Season,$LOCALIZE[31011] , ]$INFO[ListItem.Episode,$LOCALIZE[31204] ,][/COLOR]</label> <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.Season,$LOCALIZE[31011] , ]$INFO[ListItem.Episode,$LOCALIZE[31204] ,]</label>
</control> </control>
<control type="progress"> <control type="progress">
<visible>ListItem.IsResumable</visible> <visible>ListItem.IsResumable</visible>
@ -293,7 +293,7 @@
<height>1-row</height> <height>1-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<font>thumbTitle</font> <font>thumbTitle</font>
<textcolor>textDisabled</textcolor> <textcolor>textActive</textcolor>
<label>$INFO[ListItem.Property(TotalEpisodes),, $LOCALIZE[31189]]</label> <label>$INFO[ListItem.Property(TotalEpisodes),, $LOCALIZE[31189]]</label>
</control> </control>
<control type="label"> <control type="label">
@ -384,7 +384,7 @@
<height>1-row</height> <height>1-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<font>thumbTitle</font> <font>thumbTitle</font>
<textcolor>textDisabled</textcolor> <textcolor>textActive</textcolor>
<label>$INFO[ListItem.Property(TotalEpisodes),, $LOCALIZE[31189]]</label> <label>$INFO[ListItem.Property(TotalEpisodes),, $LOCALIZE[31189]]</label>
</control> </control>
<control type="label"> <control type="label">

View File

@ -9,8 +9,7 @@
<aspectratio scalediffuse="false">stretch</aspectratio> <aspectratio scalediffuse="false">stretch</aspectratio>
<texture fallback="colors/offblack.png" border="0">$INFO[Listitem.art(fanart)]</texture> <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.art(fanart)]</texture>
<fadetime>500</fadetime> <fadetime>500</fadetime>
<colordiffuse>99ffffff</colordiffuse> <colordiffuse>FF555555</colordiffuse>
<include>kenBurnsey</include>
</control> </control>
</control> </control>
<control type="panel" id="55"> <control type="panel" id="55">

View File

@ -35,9 +35,12 @@
[GO TO ALBUM / ARTIST] Update script. [GO TO ALBUM / ARTIST] Update script.
[FIXED] Subtitle default bug
[FIXED] library update progress bar
- check controls for new window: MyGames.xml - check controls for new window: MyGames.xml
- Screenshots etc need updating - Screenshots etc need updating
- SPOTIFY SUPPORT: Titles update and fanart if possible. Artists not working on libreelec - SPOTIFY SUPPORT: playlists
[V1.3.3] [V1.3.3]
- [FIXED] Weather label showing on homescreen even if no weather plugin enabled. - [FIXED] Weather label showing on homescreen even if no weather plugin enabled.