supersonic/skin.tributary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #140 from jjd-uk/master

Browse Source 
[Master] Move search & add home screen button settings
This commit is contained in:
jjd-uk 2021-08-31 14:21:15 +01:00 committed by GitHub
commit acab988c54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 150 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
720p/Home.xml
View File

@ -499,7 +499,8 @@
<onleft>9000</onleft> <onleft>9000</onleft>
<onright>9000</onright> <onright>9000</onright>
<onup>20</onup> <onup>20</onup>
<ondown>608</ondown> <ondown condition="Control.IsVisible(600)">600</ondown>
<ondown condition="!Control.IsVisible(600)">9000</ondown>
<visible>false</visible> <visible>false</visible>
</control> </control>
<control type="group"> <control type="group">
@ -519,43 +520,12 @@
<visible>String.IsEmpty(Window(Videos).Property(PlayingBackgroundMedia))</visible> <visible>String.IsEmpty(Window(Videos).Property(PlayingBackgroundMedia))</visible>
<control type="image"> <control type="image">
<description>Background End image</description> <description>Background End image</description>
<left>0</left> <left>145</left>
<top>0</top> <top>0</top>
<width>35</width> <width>35</width>
<height>35</height> <height>35</height>
<colordiffuse>CCFFFFFF</colordiffuse> <colordiffuse>CCFFFFFF</colordiffuse>
<texture flipy="true" border="0,5,0,0" flipx="true">HomeSubEnd.png</texture> <texture flipy="true" border="0,5,0,0" flipx="true">HomeSubEnd.png</texture>
<animation effect="slide" start="0,0" end="145,0" time="0" condition="!System.AddonIsEnabled(script.globalsearch)">Conditional</animation>
</control>
<control type="radiobutton" id="608">
<colordiffuse>CCFFFFFF</colordiffuse>
<description>Global Search</description>
<left>35</left>
<top>0</top>
<height>35</height>
<width>145</width>
<textwidth>150</textwidth>
<textoffsetx>10</textoffsetx>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
<focusedcolor>white</focusedcolor>
<texturefocus flipy="true" border="5">HomeSubFO.png</texturefocus>
<texturenofocus flipy="true" border="5">HomeSubNF.png</texturenofocus>
<pulseonselect>false</pulseonselect>
<label>137</label>
<onclick condition="System.AddonIsEnabled(script.globalsearch)">RunScript(script.globalsearch)</onclick>
<onclick condition="!System.AddonIsEnabled(script.globalsearch) + System.HasAddon(script.globalsearch)">EnableAddon(script.globalsearch)</onclick>
<onclick condition="!System.HasAddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
<textureradioonfocus>icon_search_home.png</textureradioonfocus>
<textureradioonnofocus>icon_search_home.png</textureradioonnofocus>
<textureradioofffocus>icon_search_home.png</textureradioofffocus>
<textureradiooffnofocus>icon_search_home.png</textureradiooffnofocus>
<onleft>607</onleft>
<onright>601</onright>
<onup>9003</onup>
<ondown>9000</ondown>
</control> </control>
<control type="group" id="600"> <control type="group" id="600">
<left>180</left> <left>180</left>
@ -582,7 +552,7 @@
<label/> <label/>
<texturefocus>OSDPrevTrackFO.png</texturefocus> <texturefocus>OSDPrevTrackFO.png</texturefocus>
<texturenofocus>OSDPrevTrackNF.png</texturenofocus> <texturenofocus>OSDPrevTrackNF.png</texturenofocus>
<onleft>608</onleft> <onleft>607</onleft>
<onright>602</onright> <onright>602</onright>
<onup>9003</onup> <onup>9003</onup>
<ondown>9000</ondown> <ondown>9000</ondown>
@ -673,7 +643,7 @@
<label/> <label/>
<texturefocus>OSDChannelUPFO.png</texturefocus> <texturefocus>OSDChannelUPFO.png</texturefocus>
<texturenofocus>OSDChannelUPNF.png</texturenofocus> <texturenofocus>OSDChannelUPNF.png</texturenofocus>
<onleft>608</onleft> <onleft>607</onleft>
<onright>602</onright> <onright>602</onright>
<onup>9003</onup> <onup>9003</onup>
<ondown>9000</ondown> <ondown>9000</ondown>
@ -783,7 +753,7 @@
<textureradioofffocus>GoFullscreen.png</textureradioofffocus> <textureradioofffocus>GoFullscreen.png</textureradioofffocus>
<textureradiooffnofocus>GoFullscreen.png</textureradiooffnofocus> <textureradiooffnofocus>GoFullscreen.png</textureradiooffnofocus>
<onleft>606</onleft> <onleft>606</onleft>
<onright>608</onright> <onright>601</onright>
<onup>9003</onup> <onup>9003</onup>
<ondown>9000</ondown> <ondown>9000</ondown>
<enable>Player.HasMedia</enable> <enable>Player.HasMedia</enable>
@ -908,7 +878,7 @@
<height>60</height> <height>60</height>
<onleft>9000</onleft> <onleft>9000</onleft>
<onright>9000</onright> <onright>9000</onright>
<onup>608</onup> <onup>601</onup>
<ondown>9001</ondown> <ondown>9001</ondown>
<pagecontrol/> <pagecontrol/>
<scrolltime>300</scrolltime> <scrolltime>300</scrolltime>
@ -1188,55 +1158,91 @@
<left>20</left> <left>20</left>
<top>55r</top> <top>55r</top>
<include>Window_OpenClose_Animation</include> <include>Window_OpenClose_Animation</include>
<control type="button" id="20"> <control type="group">
<description>Favourites push button</description> <visible>!Skin.HasSetting(HomepageHideFavourite)</visible>
<left>55</left> <control type="button" id="20">
<top>0</top> <description>Favourites push button</description>
<width>45</width> <left>55</left>
<height>45</height> <top>0</top>
<label>31003</label> <width>45</width>
<font/> <height>45</height>
<onclick>ActivateWindow(Favourites)</onclick> <label>31003</label>
<texturefocus border="5">floor_buttonFO.png</texturefocus> <font/>
<texturenofocus border="5">floor_button.png</texturenofocus> <onclick>ActivateWindow(Favourites)</onclick>
<onleft>21</onleft> <texturefocus border="5">floor_buttonFO.png</texturefocus>
<onright>noop</onright> <texturenofocus border="5">floor_button.png</texturenofocus>
<onup>9002</onup> <onleft>21</onleft>
<ondown>9003</ondown> <onright>22</onright>
<onup>9002</onup>
<ondown>9003</ondown>
</control>
<control type="image">
<description>Favourites Icon</description>
<left>60</left>
<top>5</top>
<width>35</width>
<height>35</height>
<aspectratio>keep</aspectratio>
<texture>icon_favourites.png</texture>
</control>
</control> </control>
<control type="image"> <control type="group">
<description>Favourites Icon</description> <control type="button" id="21">
<left>60</left> <description>Power push button</description>
<top>5</top> <left>0</left>
<width>35</width> <top>0</top>
<height>35</height> <width>45</width>
<aspectratio>keep</aspectratio> <height>45</height>
<texture>icon_favourites.png</texture> <label>1036</label>
<font/>
<onclick>ActivateWindow(ShutdownMenu)</onclick>
<texturefocus border="5">floor_buttonFO.png</texturefocus>
<texturenofocus border="5">floor_button.png</texturenofocus>
<onleft>22</onleft>
<onright>20</onright>
<onup>9002</onup>
<ondown>9003</ondown>
</control>
<control type="image">
<description>Power Icon</description>
<left>5</left>
<top>5</top>
<width>35</width>
<height>35</height>
<aspectratio>keep</aspectratio>
<texture>icon_power.png</texture>
</control>
</control> </control>
<control type="button" id="21"> <control type="group">
<description>Power push button</description> <visible>!Skin.HasSetting(HomepageHideSearch)</visible>
<left>0</left> <animation effect="slide" start="0,0" end="-55,0" time="0" condition="Skin.HasSetting(HomepageHideFavourite)">conditional</animation>
<top>0</top> <control type="button" id="22">
<width>45</width> <description>Search push button</description>
<height>45</height> <left>110</left>
<label>1036</label> <top>0</top>
<font/> <width>45</width>
<onclick>ActivateWindow(ShutdownMenu)</onclick> <height>45</height>
<texturefocus border="5">floor_buttonFO.png</texturefocus> <label>137</label>
<texturenofocus border="5">floor_button.png</texturenofocus> <font/>
<onleft>noop</onleft> <onclick condition="System.AddonIsEnabled(script.globalsearch)">RunScript(script.globalsearch)</onclick>
<onright>20</onright> <onclick condition="!System.AddonIsEnabled(script.globalsearch) + System.HasAddon(script.globalsearch)">EnableAddon(script.globalsearch)</onclick>
<onup>9002</onup> <onclick condition="!System.HasAddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
<ondown>9003</ondown> <texturefocus border="5">floor_buttonFO.png</texturefocus>
</control> <texturenofocus border="5">floor_button.png</texturenofocus>
<control type="image"> <onleft>20</onleft>
<description>Power Icon</description> <onright>21</onright>
<left>5</left> <onup>9002</onup>
<top>5</top> <ondown>9003</ondown>
<width>35</width> </control>
<height>35</height> <control type="image">
<aspectratio>keep</aspectratio> <description>Search Icon</description>
<texture>icon_power.png</texture> <left>115</left>
<top>5</top>
<width>35</width>
<height>35</height>
<aspectratio>keep</aspectratio>
<texture>icon_search.png</texture>
</control>
</control> </control>
</control> </control>
<control type="group"> <control type="group">

12
720p/IncludesHomeRecentlyAdded.xml
View File

@ -4,7 +4,8 @@
<control type="group" id="9003"> <control type="group" id="9003">
<depth>DepthMenu</depth> <depth>DepthMenu</depth>
<onup>20</onup> <onup>20</onup>
<ondown>608</ondown> <ondown condition="Control.IsVisible(600)">600</ondown>
<ondown condition="!Control.IsVisible(600)">9000</ondown>
<visible>!Window.IsVisible(Favourites)</visible> <visible>!Window.IsVisible(Favourites)</visible>
<include>VisibleFadeEffect</include> <include>VisibleFadeEffect</include>
<animation effect="fade" time="225" delay="750">WindowOpen</animation> <animation effect="fade" time="225" delay="750">WindowOpen</animation>
@ -40,7 +41,8 @@
<onleft>8000</onleft> <onleft>8000</onleft>
<onright>8000</onright> <onright>8000</onright>
<onup>20</onup> <onup>20</onup>
<ondown>608</ondown> <ondown condition="Control.IsVisible(600)">600</ondown>
<ondown condition="!Control.IsVisible(600)">9000</ondown>
<viewtype label="535">list</viewtype> <viewtype label="535">list</viewtype>
<pagecontrol/> <pagecontrol/>
<scrolltime>200</scrolltime> <scrolltime>200</scrolltime>
@ -194,7 +196,8 @@
<onleft>8001</onleft> <onleft>8001</onleft>
<onright>8001</onright> <onright>8001</onright>
<onup>20</onup> <onup>20</onup>
<ondown>608</ondown> <ondown condition="Control.IsVisible(600)">600</ondown>
<ondown condition="!Control.IsVisible(600)">9000</ondown>
<viewtype label="535">list</viewtype> <viewtype label="535">list</viewtype>
<pagecontrol/> <pagecontrol/>
<scrolltime>200</scrolltime> <scrolltime>200</scrolltime>
@ -374,7 +377,8 @@
<onleft>8002</onleft> <onleft>8002</onleft>
<onright>8002</onright> <onright>8002</onright>
<onup>20</onup> <onup>20</onup>
<ondown>608</ondown> <ondown condition="Control.IsVisible(600)">600</ondown>
<ondown condition="!Control.IsVisible(600)">9000</ondown>
<viewtype label="535">list</viewtype> <viewtype label="535">list</viewtype>
<pagecontrol/> <pagecontrol/>
<scrolltime>200</scrolltime> <scrolltime>200</scrolltime>

41
720p/SkinSettings.xml
View File

@ -310,6 +310,7 @@
<onright>60</onright> <onright>60</onright>
<onup>9002</onup> <onup>9002</onup>
<ondown>9002</ondown> <ondown>9002</ondown>
<!-- Home screen options -->
<control type="label" id="200"> <control type="label" id="200">
<width>750</width> <width>750</width>
<height>45</height> <height>45</height>
@ -386,6 +387,44 @@
<texturefocus>MenuItemFO.png</texturefocus> <texturefocus>MenuItemFO.png</texturefocus>
<texturenofocus>MenuItemNF.png</texturenofocus> <texturenofocus>MenuItemNF.png</texturenofocus>
</control> </control>
<!-- Home screen buttons -->
<control type="label" id="210">
<width>750</width>
<height>45</height>
<font>font13_title</font>
<label>31146</label>
<textcolor>blue</textcolor>
<shadowcolor>black</shadowcolor>
<align>left</align>
<aligny>center</aligny>
</control>
<control type="radiobutton" id="211">
<description>Show Search button</description>
<width>750</width>
<height>40</height>
<font>font13</font>
<textcolor>grey2</textcolor>
<focusedcolor>white</focusedcolor>
<label>31147</label>
<onclick>Skin.ToggleSetting(HomepageHideFavourite)</onclick>
<selected>Skin.HasSetting(HomepageHideFavourite)</selected>
<texturefocus>MenuItemFO.png</texturefocus>
<texturenofocus>MenuItemNF.png</texturenofocus>
</control>
<control type="radiobutton" id="212">
<description>Show Search button</description>
<width>750</width>
<height>40</height>
<font>font13</font>
<textcolor>grey2</textcolor>
<focusedcolor>white</focusedcolor>
<label>31148</label>
<onclick>Skin.ToggleSetting(HomepageHideSearch)</onclick>
<selected>Skin.HasSetting(HomepageHideSearch)</selected>
<texturefocus>MenuItemFO.png</texturefocus>
<texturenofocus>MenuItemNF.png</texturenofocus>
</control>
<!-- Main menu buttons -->
<control type="label" id="220"> <control type="label" id="220">
<width>750</width> <width>750</width>
<height>45</height> <height>45</height>
@ -515,7 +554,6 @@
<texturefocus>MenuItemFO.png</texturefocus> <texturefocus>MenuItemFO.png</texturefocus>
<texturenofocus>MenuItemNF.png</texturenofocus> <texturenofocus>MenuItemNF.png</texturenofocus>
</control> </control>
<!-- Playlist buttons --> <!-- Playlist buttons -->
<control type="label" id="247"> <control type="label" id="247">
<width>750</width> <width>750</width>
@ -607,7 +645,6 @@
<onclick>Skin.SetFile(HomeMenuMusicPlaylist,*.xsp,special://profile/playlists/)</onclick> <onclick>Skin.SetFile(HomeMenuMusicPlaylist,*.xsp,special://profile/playlists/)</onclick>
<enable>Skin.HasSetting(HomeMenuMusicUsePlaylist)</enable> <enable>Skin.HasSetting(HomeMenuMusicUsePlaylist)</enable>
</control> </control>
<!-- Master buttons --> <!-- Master buttons -->
<control type="label" id="230"> <control type="label" id="230">
<width>750</width> <width>750</width>

14
language/resource.language.en_gb/strings.po
View File

@ -365,7 +365,19 @@ msgctxt "#31145"
msgid "playlist path" msgid "playlist path"
msgstr "" msgstr ""
#empty strings from id 31146 to 31199 msgctxt "#31146"
msgid "Hide home screen buttons"
msgstr ""
msgctxt "#31147"
msgid "Hide - Favourites"
msgstr ""\
msgctxt "#31148"
msgid "Hide - Search"
msgstr ""
#empty strings from id 31149 to 31199
msgctxt "#31200" msgctxt "#31200"
msgid "Shortcuts" msgid "Shortcuts"