This commit is contained in:
theDeadMan 2020-07-11 19:22:54 +01:00
parent 73f8e9e379
commit d8b933f7a8
8 changed files with 1259 additions and 348 deletions

View File

@ -370,12 +370,12 @@
<label></label>
</control>
<control type="label">
<width>3-col</width>
<width>11-col</width>
<height>2-row</height>
<aligny>center</aligny>
<font>itemTitle</font>
<textcolor>textActive</textcolor>
<label fallback="31159">$INFO[listitem.duration]</label>
<label fallback="31159">$INFO[listitem.duration] [COLOR textboxInactive]$INFO[listitem.filename][/COLOR]</label>
</control>
</control>
<!--synopsis-->

View File

@ -99,7 +99,7 @@
<aspectratio>stretch</aspectratio>
<texture>colors/black.png</texture>
<bordersize>12</bordersize>
<colordiffuse>overlay</colordiffuse>
<colordiffuse>77FFFFFF</colordiffuse>
</control>
<control type="label">
<visible>ListItem.IsParentFolder</visible>
@ -122,6 +122,7 @@
<align>left</align>
<aligny>center</aligny>
<font>largeLight</font>
<shadowcolor>99000000</shadowcolor>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label]</label>
</control>
@ -205,6 +206,7 @@
<align>left</align>
<aligny>center</aligny>
<font>largeLight</font>
<shadowcolor>99000000</shadowcolor>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label]</label>
</control>

View File

@ -26,18 +26,6 @@
<texture fallback="colors/offblack.png" border="0">$INFO[player.art(fanart)]</texture>
<fadetime>500</fadetime>
<colordiffuse>77ffffff</colordiffuse>
</control>
<control type="image">
<visible>!Visualisation.Enabled</visible>
<posx>col-10-begin</posx>
<posy>row-8-begin</posy>
<width>6-col</width>
<height>6-col</height>
<aspectratio scalediffuse="false">stretch</aspectratio>
<texture fallback="noAlbumCover.jpg">$INFO[MusicPlayer.Cover]</texture>
<bordertexture colordiffuse="overlay">colors/black.png</bordertexture>
<bordersize>6</bordersize>
<colordiffuse>ffffffff</colordiffuse>
</control>
<!--visualisation-->
<control type="visualisation" id="2">
@ -51,17 +39,33 @@
<!--Track info-->
<control type="group">
<posx>col-1-begin</posx>
<posy>row-21-begin</posy>
<posy>row-9-begin</posy>
<animation type="conditional" condition="!String.IsEqual(MusicPlayer.Time,00:00)">
<effect type="slide" start="0,500" end="0,0" tween="sine" time="400"/>
</animation>
<animation type="conditional" condition="control.hasfocus(8001) | control.hasfocus(8002)">
<effect type="slide" start="0,0" end="0,-84" tween="sine" time="400"/>
</animation>
<animation type="conditional" condition="true">
<effect type="fade" end="90" time="0"/>
</animation>
<!--cover art-->
<control type="image">
<visible>!Visualisation.Enabled</visible>
<posx>9-col</posx>
<posy>0</posy>
<width>6-col</width>
<height>6-col</height>
<aspectratio scalediffuse="false">stretch</aspectratio>
<texture fallback="noAlbumCover.jpg">$INFO[MusicPlayer.Cover]</texture>
<bordertexture colordiffuse="overlay">colors/black.png</bordertexture>
<bordersize>6</bordersize>
<colordiffuse>ffffffff</colordiffuse>
</control>
<!--track info-->
<control type="group">
<posx>0</posx>
<posy>0</posy>
<posy>12-row</posy>
<control type="label">
<posx>7-col</posx>
<posy>62</posy>
@ -119,42 +123,217 @@
<label>$INFO[MusicPlayer.timeremaining]</label>
<shadowcolor>99000000</shadowcolor>
</control>
<!--additional touchscreen controls-->
<control type="group">
<visible>System.GetBool(input.enablemouse)</visible>
<control type="button" id="8514">
<description>previous</description>
<posx>7-col-gutter</posx>
<posy>200</posy>
<texturenofocus colordiffuse="99ffffff" diffuse="masks/circle.png">colors/black.png</texturenofocus>
<texturefocus colordiffuse="88ffffff" diffuse="masks/circle.png">colors/black.png</texturefocus>
<focusedcolor>textActive</focusedcolor>
<height>1-col</height>
<width>1-col</width>
<font>symbol</font>
<textoffsetx>25</textoffsetx>
<textcolor>22FFFFFF</textcolor>
<focusedcolor>22FFFFFF</focusedcolor>
<label></label>
<onclick>playercontrol(previous)</onclick>
</control>
<control type="button" id="8513">
<description>next</description>
<posx>1178</posx>
<posy>200</posy>
<texturenofocus colordiffuse="99ffffff" diffuse="masks/circle.png">colors/black.png</texturenofocus>
<texturefocus colordiffuse="88ffffff" diffuse="masks/circle.png">colors/black.png</texturefocus>
<focusedcolor>textActive</focusedcolor>
<height>1-col</height>
<width>1-col</width>
<font>symbol</font>
<textoffsetx>25</textoffsetx>
<textcolor>22FFFFFF</textcolor>
<focusedcolor>22FFFFFF</focusedcolor>
<label></label>
<onclick>playercontrol(next)</onclick>
</control>
</control>
</control>
<!--player controls and options-->
<control type="group">
<posy>738</posy>
<control type="image">
<posx>-96</posx>
<posy>0</posy>
<width>fullscreenWidth</width>
<height>5-row</height>
<texture>colors/black.png</texture>
<colordiffuse>88ffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<!--player controls-->
<control type="panel" id="8001">
<posx>-48</posx>
<posy>6</posy>
<width>7-col</width>
<height>2-row</height>
<itemgap>0</itemgap>
<onright>8002</onright>
<onup>Control.SetFocus(9876)</onup>
<orientation>horizontal</orientation>
<itemlayout width="1-col" height="2-row">
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbol</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
</control>
</itemlayout>
<focusedlayout width="1-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>69</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbol</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
<shadowcolor></shadowcolor>
</control>
</focusedlayout>
<content>
<item>
<description>Previous</description>
<label2></label2>
<thumb></thumb>
<onclick>PlayerControl(previous)</onclick>
</item>
<item>
<description>Stop</description>
<label2></label2>
<thumb></thumb>
<onclick>PlayerControl(stop)</onclick>
<onclick>Dialog.Close(1105)</onclick>
<onclick>Dialog.Close(1103)</onclick>
</item>
<item>
<visible>Player.Playing | player.forwarding | player.rewinding</visible>
<description>Play/Pause</description>
<label2></label2>
<thumb></thumb>
<onclick>PlayerControl(play)</onclick>
</item>
<item>
<visible>Player.Paused</visible>
<description>Pause</description>
<label2></label2>
<thumb></thumb>
<onclick>PlayerControl(play)</onclick>
</item>
<item>
<description>Next Chapter</description>
<label2></label2>
<thumb></thumb>
<onclick>PlayerControl(next)</onclick>
</item>
</content>
</control>
<!--final options-->
<control type="panel" id="8002">
<posx>6-col</posx>
<posy>6</posy>
<width>20-col</width>
<height>2-row</height>
<orientation>horizontal</orientation>
<onup>Control.SetFocus(9876)</onup>
<onleft>Control.SetFocus(8001,4)</onleft>
<itemlayout width="4-col" height="2-row">
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
</control>
<control type="label">
<posx>1-col-indent</posx>
<posy>0</posy>
<width>3-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>thumbTitle</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label]</label>
</control>
</itemlayout>
<focusedlayout width="4-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
</control>
<control type="image">
<posx>1-col</posx>
<posy>0</posy>
<width>3-col-gutter</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
<colordiffuse>eeffffff</colordiffuse>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
<shadowcolor></shadowcolor>
</control>
<control type="label">
<posx>1-col-indent</posx>
<posy>0</posy>
<width>3-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>thumbTitle</font>
<textcolor>black</textcolor>
<label>$INFO[ListItem.label]</label>
</control>
</focusedlayout>
<content>
<item>
<description>Playlist</description>
<label>31123</label>
<label2></label2>
<thumb></thumb>
<onclick>Dialog.Close(all,true)</onclick>
<onclick>activateWindow(musicplaylist)</onclick>
</item>
<item>
<description>Repeat</description>
<label>$VAR[repeatState]</label>
<label2></label2>
<thumb></thumb>
<onclick>PlayerControl(Repeat)</onclick>
</item>
<item>
<description>Shuffle</description>
<label>$VAR[shuffleState]</label>
<label2></label2>
<thumb></thumb>
<onclick condition="!Playlist.IsRandom">PlayerControl(RandomOn)</onclick>
<onclick condition="Playlist.IsRandom">PlayerControl(RandomOff)</onclick>
</item>
<item>
<description>Visualisation</description>
<label>31032</label>
<label2></label2>
<thumb></thumb>
<onclick>activateWindow(musicOSD)</onclick>
</item>
<item>
<visible>Visualisation.HasPresets</visible>
<description>Visualisation Settings</description>
<label>$LOCALIZE[21417]</label>
<label2></label2>
<thumb></thumb>
<onclick>Addon.Default.OpenSettings(xbmc.player.musicviz)</onclick>
</item>
</content>
</control>
</control>
</control>
</control>
@ -164,11 +343,7 @@
<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>
<onclick>control.setfocus(8001)</onclick>
</control>
<!--debugging-->
<include>DebugGrid</include>

View File

@ -1,279 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<window type="dialog" id="1105">
<defaultcontrol always="true">8001</defaultcontrol>
<include>fadeInOut</include>
<controls>
<!-- options menu-->
<control type="group">
<posx>0</posx>
<posy>0</posy>
<!--overlay-->
<control type="image">
<include>dimensionsFullscreen</include>
<texture>colors/black.png</texture>
<colordiffuse>e9FFFFFF</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="group">
<include>modalDialogInOut</include>
<posx>col-10-begin</posx>
<posy>row-7-begin</posy>
<!--player controls-->
<control type="panel" id="8001">
<posx>0</posx>
<posy>0</posy>
<width>6-col</width>
<height>2-row</height>
<itemgap>0</itemgap>
<ondown>8002</ondown>
<onup>Control.SetFocus(8003,4)</onup>
<orientation>horizontal</orientation>
<itemlayout width="1-col" height="2-row">
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbol</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
</control>
</itemlayout>
<focusedlayout width="1-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>69</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbol</font>
<textcolor>black</textcolor>
<label>$INFO[ListItem.label2]</label>
<shadowcolor></shadowcolor>
</control>
</focusedlayout>
<content>
<item>
<description>Previous</description>
<label2></label2>
<thumb></thumb>
<onclick>PlayerControl(previous)</onclick>
</item>
<item>
<description>Rewind</description>
<label2></label2>
<thumb></thumb>
<onclick>PlayerControl(rewind)</onclick>
</item>
<item>
<description>Stop</description>
<label2></label2>
<thumb></thumb>
<onclick>PlayerControl(stop)</onclick>
<onclick>Dialog.Close(1105)</onclick>
<onclick>Dialog.Close(1103)</onclick>
</item>
<item>
<visible>Player.Playing | player.forwarding | player.rewinding</visible>
<description>Play/Pause</description>
<label2></label2>
<thumb></thumb>
<onclick>PlayerControl(play)</onclick>
</item>
<item>
<visible>Player.Paused</visible>
<description>Pause</description>
<label2></label2>
<thumb></thumb>
<onclick>PlayerControl(play)</onclick>
</item>
<item>
<description>Fast forward</description>
<label2></label2>
<thumb></thumb>
<onclick>PlayerControl(forward)</onclick>
</item>
<item>
<description>Next Chapter</description>
<label2></label2>
<thumb></thumb>
<onclick>PlayerControl(next)</onclick>
</item>
</content>
</control>
<!--Star rating-->
<control type="group">
<posx>0</posx>
<posy>2-row</posy>
<control type="image">
<visible>control.hasfocus(8002)</visible>
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label></label>
</control>
<control type="button" id="8002">
<posx>1-col</posx>
<posy>0</posy>
<height>2-row</height>
<width>5-col</width>
<font>symbolLarge</font>
<textoffsetx>12</textoffsetx>
<label>$VAR[starRating]</label>
<onup>8001</onup>
<ondown>control.setfocus(8003,0)</ondown>
<onleft>decreaserating</onleft>
<onright>increaserating</onright>
</control>
</control>
<!--final options-->
<control type="panel" id="8003">
<posx>0</posx>
<posy>4-row</posy>
<width>429</width>
<height>14-row</height>
<orientation>vertical</orientation>
<onup>8002</onup>
<ondown>Control.SetFocus(8001,3)</ondown>
<itemlayout width="6-col" height="2-row">
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
</control>
<control type="label">
<posx>1-col-indent</posx>
<posy>0</posy>
<width>5-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label]</label>
</control>
</itemlayout>
<focusedlayout width="6-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
</control>
<control type="image">
<posx>1-col</posx>
<posy>0</posy>
<width>6-col</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
<colordiffuse>eeffffff</colordiffuse>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
<shadowcolor></shadowcolor>
</control>
<control type="label">
<posx>1-col-indent</posx>
<posy>0</posy>
<width>5-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>black</textcolor>
<label>$INFO[ListItem.label]</label>
</control>
</focusedlayout>
<content>
<item>
<description>Playlist</description>
<label>31123</label>
<label2></label2>
<thumb></thumb>
<onclick>Dialog.Close(all,true)</onclick>
<onclick>action(back)</onclick>
<onclick>activateWindow(musicplaylist)</onclick>
</item>
<item>
<description>Repeat</description>
<label>$VAR[repeatState]</label>
<label2></label2>
<thumb></thumb>
<onclick>PlayerControl(Repeat)</onclick>
</item>
<item>
<description>Shuffle</description>
<label>$VAR[shuffleState]</label>
<label2></label2>
<thumb></thumb>
<onclick condition="!Playlist.IsRandom">PlayerControl(RandomOn)</onclick>
<onclick condition="Playlist.IsRandom">PlayerControl(RandomOff)</onclick>
</item>
<item>
<description>Visualisation</description>
<label>31032</label>
<label2></label2>
<thumb></thumb>
<onclick>activateWindow(musicOSD)</onclick>
</item>
<item>
<visible>Visualisation.HasPresets</visible>
<description>Visualisation Settings</description>
<label>$LOCALIZE[21417]</label>
<label2></label2>
<thumb></thumb>
<onclick>Addon.Default.OpenSettings(xbmc.player.musicviz)</onclick>
</item>
</content>
</control>
</control>
</control>
<!--debugging-->
<include>DebugGrid</include>
<control type="label">
<include>DialogID</include>
<label>custom_musicPlayerOptions.xml</label>
</control>
</controls>
</window>

View File

@ -7,9 +7,8 @@ Built for the living room, Pellucid is a clean and carefully designed Kodi exper
#### Additional features
- Skin Shortcuts addon support is available from the Krypton release onwards.
- Skin Shortcuts addon support.
- Full PVR / Live TV support
- Support for touchscreens
Discussion thread: http://forum.kodi.tv/forumdisplay.php?fid=267

View File

@ -1,11 +1,3 @@
*In pipeline*
- edit control in smartplaylisteditor.xml
- revise controls for new window: MyGames.xml
- Weather
- add quick search
**Changelog**
[V2.0.1]

View File

@ -878,7 +878,7 @@ msgid "From"
msgstr ""
msgctxt "#31213"
msgid "Unwatched Only"
msgid "unwatched"
msgstr ""
msgctxt "#31214"

File diff suppressed because it is too large Load Diff