Skip to content

Commit

Permalink
Merge pull request xbmc#194 from bossanova808/Nexus
Browse files Browse the repository at this point in the history
Nexus -  Changes & Fixes
  • Loading branch information
DaVukovic authored Feb 21, 2023
2 parents 3d39688 + 1d06949 commit a5eb8bd
Show file tree
Hide file tree
Showing 14 changed files with 688 additions and 395 deletions.
18 changes: 18 additions & 0 deletions 720p/Defaults.xml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,24 @@
<aligny>center</aligny>
<pulseonselect>no</pulseonselect>
</default>
<default type="colorbutton">
<posx>0</posx>
<posy>0</posy>
<width>300</width>
<height>42</height>
<colorwidth>130</colorwidth>
<colorheight>76</colorheight>
<texturecolormask>color-button-box.png</texturecolormask>
<texturecolordisabledmask colordiffuse="40FFFFFF">color-button-box.png</texturecolordisabledmask>
<texturefocus>list_focus.png</texturefocus>
<texturenofocus></texturenofocus>
<font>font20</font>
<textcolor>white</textcolor>
<disabledcolor>grey2</disabledcolor>
<textoffsetx>7</textoffsetx>
<aligny>center</aligny>
<pulseonselect>no</pulseonselect>
</default>
<default type="selectbutton">
<left>490</left>
<top>335</top>
Expand Down
126 changes: 126 additions & 0 deletions 720p/DialogColorPicker.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<defaultcontrol always="true">6</defaultcontrol>
<coordinates>
<left>110</left>
<top>60</top>
</coordinates>
<include>dialogeffect</include>
<controls>
<control type="group">
<control type="image">
<description>background image</description>
<left>0</left>
<top>0</top>
<width>1060</width>
<height>580</height>
<texture border="40">DialogBack.png</texture>
<visible>!Window.IsVisible(Slideshow)</visible>
</control>
<control type="image">
<description>background image</description>
<left>0</left>
<top>0</top>
<width>1060</width>
<height>580</height>
<texture border="40">DialogBack2.png</texture>
<visible>Window.IsVisible(Slideshow)</visible>
</control>
<control type="image">
<description>Dialog Header image</description>
<left>40</left>
<top>16</top>
<width>980</width>
<height>40</height>
<texture>dialogheader.png</texture>
</control>
<control type="label">
<description>header label</description>
<left>40</left>
<top>20</top>
<width>980</width>
<height>30</height>
<font>font13_title</font>
<label>Colour</label>
<align>center</align>
<aligny>center</aligny>
<textcolor>selected</textcolor>
<shadowcolor>black</shadowcolor>
</control>
<control type="button">
<description>Close Window button</description>
<left>970</left>
<top>15</top>
<width>64</width>
<height>32</height>
<label/>
<font/>
<onclick>PreviousMenu</onclick>
<texturefocus>DialogCloseButton-focus.png</texturefocus>
<texturenofocus>DialogCloseButton.png</texturenofocus>
<onleft>2</onleft>
<onright>2</onright>
<onup>2</onup>
<ondown>2</ondown>
<visible>system.getbool(input.enablemouse)</visible>
</control>

<!-- Color picker panel -->
<control type="panel" id="6">
<left>15</left>
<top>60</top>
<width>1020</width>
<bottom>26</bottom>
<onup>6</onup>
<ondown>6</ondown>
<onleft>9001</onleft>
<onright>61</onright>
<orientation>vertical</orientation>
<pagecontrol>61</pagecontrol>
<viewtype label="100">icon</viewtype>
<itemlayout height="50" width="60">
<control type="group">
<control type="image">
<top>3</top>
<left>8</left>
<width>56</width>
<height>46</height>
<texture border="0">colors/white.png</texture>
<colordiffuse>$INFO[ListItem.Label2]</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
</control>
</itemlayout>
<focusedlayout height="50" width="60">
<control type="group">
<animation effect="zoom" time="200" tween="sine" easing="inout" start="100" end="124" center="auto">Focus</animation>
<control type="image">
<top>3</top>
<left>8</left>
<width>56</width>
<height>46</height>
<texture border="0">colors/white.png</texture>
<colordiffuse>$INFO[ListItem.Label2]</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
</control>
</focusedlayout>
</control>

<control type="label">
<description>name of colour</description>
<left>730</left>
<top>530</top>
<width>300</width>
<height>35</height>
<font>font12</font>
<align>right</align>
<aligny>center</aligny>
<scroll>true</scroll>
<textcolor>grey</textcolor>
<label>[COLOR button_focus]$LOCALIZE[737]: [/COLOR]$INFO[Container(6).ListItem.Label,, - ]$INFO[Container(6).ListItem.Label2,#,]</label>
</control>

</control>
</controls>
</window>
2 changes: 1 addition & 1 deletion 720p/DialogSeekBar.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<defaultcontrol>1</defaultcontrol>
<visible>Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding | Player.ShowTime | Player.IsTempo</visible>
<visible>Player.Seeking | Player.HasPerformedSeek(3) | Player.Paused | Player.Forwarding | Player.Rewinding | Player.ShowTime | Player.IsTempo</visible>
<visible>!Player.HasGame</visible>
<visible>!Player.FrameAdvance</visible>
<animation effect="fade" start="0" end="100" time="150">WindowOpen</animation>
Expand Down
2 changes: 1 addition & 1 deletion 720p/Home.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1168,7 +1168,7 @@
<height>45</height>
<label>31003</label>
<font/>
<onclick>ActivateWindow(Favourites)</onclick>
<onclick>ActivateWindow(Favouritesbrowser)</onclick>
<texturefocus border="5">floor_buttonFO.png</texturefocus>
<texturenofocus border="5">floor_button.png</texturenofocus>
<onleft>21</onleft>
Expand Down
6 changes: 3 additions & 3 deletions 720p/Includes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -533,12 +533,12 @@
<variable name="SeekLabel">
<value condition="Player.IsTempo + String.StartsWith(Player.PlaySpeed,0.)">$LOCALIZE[31045]</value>
<value condition="Player.IsTempo + String.StartsWith(Player.PlaySpeed,1.)">$LOCALIZE[31044]</value>
<value condition="Player.Playing + !Player.Seeking + !Player.DisplayAfterSeek">$LOCALIZE[31042]</value>
<value condition="Player.Playing + !Player.Seeking + !Player.HasPerformedSeek(3)">$LOCALIZE[31042]</value>
<value condition="[Player.Paused + !Player.Caching] + !Player.Seeking">$LOCALIZE[31043]</value>
<value condition="[Player.Paused + Player.Caching] + !Player.Seeking">$LOCALIZE[15107] $INFO[Player.CacheLevel]%</value>
<value condition="!String.IsEmpty(Player.SeekStepSize) + ![player.forwarding | player.rewinding]">$LOCALIZE[31046][COLOR=grey] $INFO[Player.SeekStepSize][/COLOR]</value>
<value condition="Player.DisplayAfterSeek + ![player.forwarding | player.rewinding]">$LOCALIZE[31046][COLOR=grey] $INFO[Player.SeekOffset][/COLOR]</value>
<value condition="!Player.DisplayAfterSeek + Player.Seeking">$LOCALIZE[31046]</value>
<value condition="Player.HasPerformedSeek(3) + ![player.forwarding | player.rewinding]">$LOCALIZE[31046][COLOR=grey] $INFO[Player.SeekOffset][/COLOR]</value>
<value condition="!Player.HasPerformedSeek(3) + Player.Seeking">$LOCALIZE[31046]</value>
<value condition="Player.Forwarding">$LOCALIZE[31044]</value>
<value condition="Player.Rewinding">$LOCALIZE[31045]</value>
</variable>
Expand Down
93 changes: 93 additions & 0 deletions 720p/MyFavourites.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<defaultcontrol always="true">50</defaultcontrol>
<menucontrol>9000</menucontrol>
<onload condition="!Skin.HasSetting(FirstTimeRun)">ActivateWindow(1112)</onload>
<views>50,51,500</views>
<controls>
<include>CommonBackground</include>
<include>ContentPanelBackgrounds</include>
<control type="group">
<include>Window_OpenClose_Animation</include>
<!-- view id = 50 -->
<include>CommonRootView</include>
<!-- view id = 51 -->
<include>FullWidthList</include>
<!-- view id = 500 -->
<include>ThumbnailView</include>
</control>
<control type="group">
<depth>DepthFooter</depth>
<include>CommonPageCount</include>
<include>CommonNowPlaying</include>
</control>
<include>MainWindowMouseButtons</include>
<include>BehindDialogFadeOut</include>
<include>ScrollOffsetLabel</include>
<include content="CommonWindowHeader">
<param name="Icon" value="icon_favourites" />
<param name="Label" value="$LOCALIZE[10134]" />
</include>
<control type="group">
<left>-250</left>
<include>SideBladeLeft</include>
<control type="grouplist" id="9000">
<left>0</left>
<top>110</top>
<width>250</width>
<height>600</height>
<onleft>9000</onleft>
<onright>50</onright>
<onup>9000</onup>
<ondown>9000</ondown>
<onback>50</onback>
<itemgap>0</itemgap>
<control type="label" id="200">
<width>250</width>
<height>35</height>
<font>font12</font>
<label>31006</label>
<textcolor>blue</textcolor>
<align>center</align>
<aligny>center</aligny>
</control>
<control type="button" id="2">
<description>View As button</description>
<textwidth>235</textwidth>
<include>ButtonCommonValues</include>
<label/>
</control>
<control type="button" id="3">
<description>Sort by button</description>
<include>ButtonCommonValues</include>
<label>103</label>
</control>
<control type="togglebutton" id="4">
<description>Sort asc</description>
<include>ButtonCommonValues</include>
<alttexturefocus border="5">button-focus.png</alttexturefocus>
<alttexturenofocus/>
<label>31051</label>
<altlabel>31050</altlabel>
<usealttexture>Container.SortDirection(Ascending)</usealttexture>
</control>
<control type="edit" id="19">
<visible>Container.CanFilter + !Container.CanFilterAdvanced</visible>
<description>Filter</description>
<textwidth>230</textwidth>
<include>ButtonCommonValues</include>
<label>587</label>
</control>
<control type="radiobutton" id="20">
<visible>Container.CanFilterAdvanced</visible>
<description>Filter</description>
<include>ButtonCommonValues</include>
<label>587</label>
<onclick>right</onclick>
<onclick>Filter</onclick>
</control>
<include>CommonNowPlaying_Controls</include>
</control>
</control>
</controls>
</window>
Loading

0 comments on commit a5eb8bd

Please sign in to comment.