Aire-One
/
skin.pellucidPlus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

homescreen rework

This commit is contained in:
theDeadMan 2017-10-07 10:53:15 +01:00
parent 83d4ff0f1a
commit 89477a30dd
8 changed files with 295 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
1080i/Home.xml
View File

@ -4,6 +4,7 @@
<include>fadeInOut</include> <include>fadeInOut</include>
<onload>RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=9001&amp;group=mainmenu|videosubmenu|musicsubmenu|picturessubmenu)</onload> <onload>RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=9001&amp;group=mainmenu|videosubmenu|musicsubmenu|picturessubmenu)</onload>
<onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload> <onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
<onload>AlarmClock(hidemenu,setfocus(9999),00:20,true)</onload>
<controls> <controls>
<include>globalBackground</include> <include>globalBackground</include>
<control type="group"> <control type="group">
@ -30,11 +31,14 @@
<include>miniVideoPlayer</include> <include>miniVideoPlayer</include>
<!--main menu--> <!--main menu-->
<control type="panel" id="9000"> <control type="panel" id="9000">
<animation type="conditional" condition="control.hasfocus(9999)" reversible="true">
<effect type="fade" start="100" end="0" time="500" delay="0"/>
</animation>
<posx>col-5-begin</posx> <posx>col-5-begin</posx>
<posy>row-12-begin</posy> <posy>row-12-begin</posy>
<width>18-col</width> <width>18-col</width>
<height>12-row</height> <height>12-row</height>
<ondown>9001</ondown> <ondown>setfocus(9001,1)</ondown>
<orientation>vertical</orientation> <orientation>vertical</orientation>
<itemlayout width="4-col" height="3-row"> <itemlayout width="4-col" height="3-row">
<control type="image"> <control type="image">
@ -94,8 +98,8 @@
<posy>row-26-begin</posy> <posy>row-26-begin</posy>
<control type="panel" id="9001"> <control type="panel" id="9001">
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>18</posy>
<width>3-col</width> <width>4-col</width>
<height>1-col</height> <height>1-col</height>
<orientation>horizontal</orientation> <orientation>horizontal</orientation>
<onup>9000</onup> <onup>9000</onup>
@ -142,12 +146,18 @@
<onclick>ActivateWindow(Settings)</onclick> <onclick>ActivateWindow(Settings)</onclick>
</item> </item>
<item> <item>
<label></label> <visible>control.hasfocus(9999)</visible>
<onclick>ActivateWindow(shutdownmenu)</onclick> <label></label>
<onclick>setfocus(9000,0)</onclick>
</item> </item>
<item> <item>
<label></label> <visible>!control.hasfocus(9999)</visible>
<onclick>ActivateWindow(systeminfo)</onclick> <label></label>
<onclick>setfocus(9999)</onclick>
</item>
<item>
<label></label>
<onclick>ActivateWindow(shutdownmenu)</onclick>
</item> </item>
</content> </content>
</control> </control>
@ -156,6 +166,12 @@
<control type="group"> <control type="group">
<posx>col-1-begin</posx> <posx>col-1-begin</posx>
<posy>row-8-begin</posy> <posy>row-8-begin</posy>
<animation type="conditional" condition="control.hasfocus(9999) + !player.hasaudio" reversible="true">
<effect type="slide" start="0,0" end="0,538" time="200" delay="0"/>
</animation>
<animation type="conditional" condition="control.hasfocus(9999) + player.hasaudio" reversible="true">
<effect type="slide" start="0,0" end="0,484" time="200" delay="0"/>
</animation>
<control type="label"> <control type="label">
<posx>0</posx> <posx>0</posx>
<posy>-48</posy> <posy>-48</posy>
@ -241,6 +257,17 @@
<wrapmultiline>false</wrapmultiline> <wrapmultiline>false</wrapmultiline>
</control> </control>
</control> </control>
</control>
<control type="button" id="9999">
<posx>-500</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<onleft>setfocus(9000,0)</onleft>
<onright>setfocus(9000,0)</onright>
<onup>setfocus(9000,0)</onup>
<ondown>setfocus(9000,0)</ondown>
<onclick>setfocus(9000,0)</onclick>
</control> </control>
<!--debugging--> <!--debugging-->
<include>DebugGrid</include> <include>DebugGrid</include>

23
1080i/Settings.xml
View File

@ -45,8 +45,7 @@
<posy>2-row</posy> <posy>2-row</posy>
<width>18-col</width> <width>18-col</width>
<height>12-col</height> <height>12-col</height>
<onup>9000</onup> <ondown>9001</ondown>
<ondown>9000</ondown>
<itemlayout width="6-col" height="3-row"> <itemlayout width="6-col" height="3-row">
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
@ -211,14 +210,6 @@
<onclick>ActivateWindow(programs,addons,return)</onclick> <onclick>ActivateWindow(programs,addons,return)</onclick>
</item> </item>
<item> <item>
<label>$LOCALIZE[31226]</label>
<label2></label2>
<property name="label3">$LOCALIZE[31227]</property>
<onclick>RunAddon(service.libreelec.settings)</onclick>
<visible>System.HasAddon(service.libreelec.settings)</visible>
</item>
<item>
<visible>!System.HasAddon(service.libreelec.settings)</visible>
<description>System Info</description> <description>System Info</description>
<label>$LOCALIZE[138]</label> <label>$LOCALIZE[138]</label>
<label2></label2> <label2></label2>
@ -227,6 +218,18 @@
</item> </item>
</content> </content>
</control> </control>
<!--libreelec builds only-->
<control type="button" id="9001">
<visible>System.HasAddon(service.libreelec.settings)</visible>
<label>$LOCALIZE[31226]</label>
<posx>6-col</posx>
<posy>15-row</posy>
<width>6-col</width>
<align>center</align>
<texturenofocus>colors/offblack.png</texturenofocus>
<onclick>RunAddon(service.libreelec.settings)</onclick>
<onup>9000</onup>
</control>
</control> </control>
<!--debugging--> <!--debugging-->
<include>DebugGrid</include> <include>DebugGrid</include>

8
1080i/SkinSettings.xml
View File

@ -192,14 +192,6 @@
<onclick>ReloadSkin()</onclick> <onclick>ReloadSkin()</onclick>
<selected>Skin.HasSetting(lowPowerMode)</selected> <selected>Skin.HasSetting(lowPowerMode)</selected>
</control> </control>
<control type="radiobutton" id="11">
<visible>Container(8000).Hasfocus(1)</visible>
<description>Disable weather label on homescreen</description>
<width>14-col</width>
<label>31217</label>
<onclick>Skin.ToggleSetting(weatherdisplay)</onclick>
<selected>Skin.HasSetting(weatherdisplay)</selected>
</control>
<control type="button" id="12"> <control type="button" id="12">
<visible>Container(8000).Hasfocus(2)</visible> <visible>Container(8000).Hasfocus(2)</visible>
<description>Edit home menu</description> <description>Edit home menu</description>

168
1080i/custom_musicPlayerFullscreen.xml
View File

@ -42,38 +42,154 @@
</control> </control>
</control> </control>
<!--Track info--> <!--Track info-->
<control type="grouplist"> <!--Track info-->
<control type="group">
<posx>col-1-begin</posx> <posx>col-1-begin</posx>
<posy>row-21-begin</posy> <posy>row-23-begin</posy>
<orientation>vertical</orientation> <animation type="conditional" condition="!StringCompare(MusicPlayer.Time,00:00)">
<itemgap>10</itemgap> <effect type="slide" start="0,500" end="0,0" tween="sine" time="400"/>
<control type="textbox"> </animation>
<width>10-col</width> <!--coverart (or channel art if radio)-->
<height>auto</height> <control type="image">
<font>mediumStrong</font> <posx>0</posx>
<textcolor>textActive</textcolor> <posy>0</posy>
<wrapmultiline>true</wrapmultiline> <width>5-row</width>
<scroll>false</scroll> <height>182</height>
<shadowcolor>33000000</shadowcolor> <aspectratio>stretch</aspectratio>
<label>$INFO[MusicPlayer.Title]</label> <texture border="0">DefaultAlbumCover.png</texture>
<colordiffuse>textboxInactive</colordiffuse>
</control> </control>
<control type="textbox"> <control type="image">
<width>10-col</width> <posx>0</posx>
<height>auto</height> <posy>0</posy>
<font>textbox</font> <width>5-row</width>
<textcolor>textActive</textcolor> <height>182</height>
<scroll>false</scroll> <aspectratio>stretch</aspectratio>
<shadowcolor>33000000</shadowcolor> <texture border="6">$INFO[player.art(thumb)]</texture>
<label>[B]$INFO[MusicPlayer.artist][/B][CR]$INFO[MusicPlayer.Album] $INFO[MusicPlayer.year,(,)]</label> <colordiffuse>ffffffff</colordiffuse>
<bordertexture border="6">colors/white.png</bordertexture>
<bordersize>6</bordersize>
</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>
<control type="label"> <control type="label">
<width>10-col</width> <posx>24</posx>
<height>1-row</height> <posy>0</posy>
<font>buttonTitle</font> <width>542</width>
<height>2-row</height>
<font>regularStrong</font>
<textcolor>textActive</textcolor> <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> <scroll>false</scroll>
<shadowcolor>33000000</shadowcolor> <label>[UPPERCASE][B]$INFO[MusicPlayer.artist,, ][/B]$INFO[MusicPlayer.Album, | , ]$INFO[MusicPlayer.year,(,)][/UPPERCASE]</label>
<label>[B]$INFO[musicplayer.Playlistposition,$LOCALIZE[554] ,]$INFO[musicplayer.Playlistlength, / ] $INFO[MusicPlayer.TimeRemaining][/B]</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> </control>
</control> </control>

2
addon.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<addon id="skin.pellucid" version="1.3.0" name="Pellucid" provider-name="theDeadman"> <addon id="skin.pellucid" version="1.3.1" name="Pellucid" provider-name="theDeadman">
<requires> <requires>
<import addon="xbmc.gui" version="5.12.0"/> <import addon="xbmc.gui" version="5.12.0"/>
<import addon="script.skinshortcuts" version="1.0.13"/> <import addon="script.skinshortcuts" version="1.0.13"/>

4
changelog.txt
View File

@ -1,5 +1,9 @@
**Changelog** **Changelog**
[V1.3.1]
- [FIXED] back button not working correctly on plugin-based poster views
- [NEW] Homescreen menu hide function
[V1.3.0] [V1.3.0]
***Users who are upgrading from V1.2x are strongly encouraged to reset their menu structures to take account of structural changes to the skin*** ***Users who are upgrading from V1.2x are strongly encouraged to reset their menu structures to take account of structural changes to the skin***

4
language/English/strings.po
View File

@ -940,3 +940,7 @@ msgstr ""
msgctxt "#31228" msgctxt "#31228"
msgid "Edit Menu" msgid "Edit Menu"
msgstr "" msgstr ""
msgctxt "#31229"
msgid "Play Music"
msgstr ""

8
shortcuts/mainmenu.DATA.xml
View File

@ -78,6 +78,14 @@
<icon>DefaultAddon.png</icon> <icon>DefaultAddon.png</icon>
<thumb /> <thumb />
<action>ActivateWindow(Music,Files)</action> <action>ActivateWindow(Music,Files)</action>
</shortcut>
<shortcut>
<visible>Library.HasContent(Music)</visible>
<label>31229</label>
<label2>32034</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<action>PlayerControl(Partymode(music))</action>
</shortcut> </shortcut>
<shortcut> <shortcut>
<label>12600</label> <label>12600</label>