Skip to content

Commit

Permalink
Omega version (#244) (#247)
Browse files Browse the repository at this point in the history 
Sync master.

All know issues resolved.

* Omega update

- Add Video version support
- Convert skin from 720p to 1080p
- Update scrollbars
- Add grid overlay
- Add game agents
- Add disabled slider texture

* Fix scaling issue

* Fix default home selection issue

Fix an old typo
Fix issue when no Movie or TV Shows library exists
Remove unneeded actions for Master Mode

* Fix missing label

* Fix close button alignment

* Update progress bar textures

* Rework versions/extras textures

* Fix home focus problems

* Change Symbol button label

* Fix Formed/Born overlap issue

* Update script-cu-lrclyrics-main.xml

* Fix 'Movie' and 'TV Shows' buttons visible condition

* Fix Original/Localised title

* Fix panel height

* Add video version/extra select dialog

* Omega bump

* Fix conflict

* Delete Includes.xml

* Remove pointless font style

* Fix returning to home after playing video/music from home

* Remove 'More...' buttons from home lists

* Fix sub menu label width
  • Loading branch information
@Hitcher
Hitcher authored Apr 9, 2024
1 parent b8b0436 commit fcff955
Show file tree
Hide file tree
Showing 121 changed files with 11,085 additions and 10,221 deletions.
34 changes: 17 additions & 17 deletions 720p/AddonBrowser.xml → 1080p/AddonBrowser.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,22 @@
<param name="Label" value="$LOCALIZE[24001]" />
</include>
<control type="group">
<left>-250</left>
<left>-375</left>
<include>SideBladeLeft</include>
<control type="grouplist" id="9000">
<left>0</left>
<top>110</top>
<width>250</width>
<height>600</height>
<top>165</top>
<width>375</width>
<height>900</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>
<width>375</width>
<height>53</height>
<font>font12</font>
<label>31006</label>
<textcolor>blue</textcolor>
Expand All @@ -55,9 +55,9 @@
</control>
<control type="button" id="2">
<description>View As button</description>
<textwidth>235</textwidth>
<textwidth>353</textwidth>
<include>ButtonCommonValues</include>
<label/>
<label />
</control>
<control type="button" id="3">
<description>Sort by button</description>
Expand All @@ -68,14 +68,14 @@
<description>Sort asc</description>
<include>ButtonCommonValues</include>
<alttexturefocus border="5">button-focus.png</alttexturefocus>
<alttexturenofocus/>
<alttexturenofocus />
<label>31051</label>
<altlabel>31050</altlabel>
<usealttexture>Container.SortDirection(Ascending)</usealttexture>
</control>
<control type="label" id="201">
<width>250</width>
<height>35</height>
<width>375</width>
<height>53</height>
<font>font12</font>
<label>31026</label>
<textcolor>blue</textcolor>
Expand Down Expand Up @@ -107,9 +107,9 @@
<control type="label">
<description>Last updated label</description>
<left>0</left>
<top>650</top>
<height>60</height>
<width>240</width>
<top>975</top>
<height>90</height>
<width>360</width>
<label>31301</label>
<align>right</align>
<aligny>top</aligny>
Expand All @@ -119,9 +119,9 @@
<control type="label">
<description>Last updated value</description>
<left>0</left>
<top>680</top>
<height>25</height>
<width>240</width>
<top>1020</top>
<height>38</height>
<width>360</width>
<label>$INFO[Window.Property(Updated)]</label>
<font>font13_title</font>
<textcolor>white</textcolor>
Expand Down
14 changes: 14 additions & 0 deletions 1080p/Custom_1101_Overlay_Grid.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<window type="dialog" id="1101">
<zorder>100</zorder>
<visible>Skin.HasSetting(DebugGrid)</visible>
<controls>
<!-- Global debug grid -->
<control type="image">
<width>$INFO[System.ScreenWidth]</width>
<height>$INFO[System.ScreenHeight]</height>
<texture>special://skin/extras/debuggrid1080.png</texture>
<colordiffuse>88ffffff</colordiffuse>
</control>
</controls>
</window>
131 changes: 65 additions & 66 deletions 720p/Defaults.xml → 1080p/Defaults.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,96 +3,96 @@
<default type="image">
<left>0</left>
<top>0</top>
<texture/>
<texture />
</default>
<default type="label">
<label/>
<label />
<font>font13</font>
<textcolor>white</textcolor>
<disabledcolor>grey3</disabledcolor>
</default>
<default type="fadelabel">
<left>80</left>
<top>60</top>
<left>120</left>
<top>90</top>
<font>font13</font>
<textcolor>white</textcolor>
<disabledcolor>grey3</disabledcolor>
</default>
<default type="button">
<width>300</width>
<height>42</height>
<width>450</width>
<height>63</height>
<texturefocus border="5">button-focus.png</texturefocus>
<texturenofocus border="5">button-nofocus.png</texturenofocus>
<font>font13</font>
<textcolor>white</textcolor>
<disabledcolor>grey3</disabledcolor>
<textoffsetx>7</textoffsetx>
<textoffsetx>11</textoffsetx>
<aligny>center</aligny>
<pulseonselect>false</pulseonselect>
</default>
<default type="togglebutton">
<left>140</left>
<top>167</top>
<width>20</width>
<height>20</height>
<left>210</left>
<top>251</top>
<width>30</width>
<height>30</height>
<texturefocus>scroll-up-focus.png</texturefocus>
<texturenofocus>scroll-up.png</texturenofocus>
<alttexturefocus>scroll-down-focus.png</alttexturefocus>
<alttexturenofocus>scroll-down.png</alttexturenofocus>
<textcolor>white</textcolor>
<label/>
<label />
<font>font13</font>
<disabledcolor>grey3</disabledcolor>
<pulseonselect>false</pulseonselect>
</default>
<default type="textbox">
<left>220</left>
<top>222</top>
<width>410</width>
<height>213</height>
<left>330</left>
<top>333</top>
<width>615</width>
<height>320</height>
<align>left</align>
<textcolor>white</textcolor>
<font>font13</font>
</default>
<default type="progress">
<left>100</left>
<top>325</top>
<texturebg border="6,0,6,0">OSDProgressBack.png</texturebg>
<lefttexture/>
<midtexture border="6,0,6,0">OSDProgressMid.png</midtexture>
<righttexture/>
<overlaytexture/>
<left>150</left>
<top>488</top>
<texturebg border="9,13,9,13">OSDProgressBack.png</texturebg>
<lefttexture />
<midtexture border="9,13,9,13">OSDProgressMid.png</midtexture>
<righttexture />
<overlaytexture />
</default>
<default type="spincontrol">
<left>330</left>
<top>126</top>
<left>495</left>
<top>189</top>
<textureup>scroll-up-2.png</textureup>
<texturedown>scroll-down-2.png</texturedown>
<textureupdisabled colordiffuse="40FFFFFF">scroll-up-2.png</textureupdisabled>
<texturedowndisabled colordiffuse="40FFFFFF">scroll-down-2.png</texturedowndisabled>
<textureupfocus>scroll-up-focus-2.png</textureupfocus>
<texturedownfocus>scroll-down-focus-2.png</texturedownfocus>
<align>right</align>
<width>33</width>
<height>22</height>
<width>50</width>
<height>33</height>
<font>font13</font>
<reverse>yes</reverse>
<textcolor>white</textcolor>
<disabledcolor>grey3</disabledcolor>
<subtype>text</subtype>
<textoffsetx>-5</textoffsetx>
<textoffsetx>-8</textoffsetx>
<textoffsety>0</textoffsety>
<pulseonselect>false</pulseonselect>
</default>
<default type="spincontrolex">
<left>530</left>
<top>160</top>
<width>300</width>
<height>42</height>
<spinwidth>33</spinwidth>
<spinheight>22</spinheight>
<left>795</left>
<top>240</top>
<width>450</width>
<height>63</height>
<spinwidth>50</spinwidth>
<spinheight>33</spinheight>
<texturefocus>button-focus.png</texturefocus>
<texturenofocus/>
<texturenofocus />
<textureup>scroll-up-2.png</textureup>
<texturedown>scroll-down-2.png</texturedown>
<textureupdisabled colordiffuse="40FFFFFF">scroll-up-2.png</textureupdisabled>
Expand All @@ -102,18 +102,18 @@
<font>font13</font>
<textcolor>white</textcolor>
<disabledcolor>grey3</disabledcolor>
<textoffsetx>7</textoffsetx>
<textoffsetx>11</textoffsetx>
<aligny>center</aligny>
<reverse>yes</reverse>
<pulseonselect>false</pulseonselect>
</default>
<default type="radiobutton">
<left>300</left>
<top>200</top>
<width>300</width>
<height>42</height>
<radiowidth>24</radiowidth>
<radioheight>24</radioheight>
<left>450</left>
<top>300</top>
<width>450</width>
<height>63</height>
<radiowidth>36</radiowidth>
<radioheight>36</radioheight>
<textureradioonfocus>radiobutton-focus.png</textureradioonfocus>
<textureradioonnofocus>radiobutton-focus.png</textureradioonnofocus>
<textureradioofffocus>radiobutton-nofocus.png</textureradioofffocus>
Expand All @@ -126,15 +126,15 @@
<font>font13</font>
<textcolor>white</textcolor>
<disabledcolor>grey3</disabledcolor>
<textoffsetx>7</textoffsetx>
<textoffsetx>11</textoffsetx>
<aligny>center</aligny>
<pulseonselect>false</pulseonselect>
</default>
<default type="colorbutton">
<posx>0</posx>
<posy>0</posy>
<width>300</width>
<height>42</height>
<width>450</width>
<height>63</height>
<colorwidth>130</colorwidth>
<colorheight>76</colorheight>
<texturecolormask>color-button-box.png</texturecolormask>
Expand All @@ -144,19 +144,19 @@
<font>font13</font>
<textcolor>white</textcolor>
<disabledcolor>grey2</disabledcolor>
<textoffsetx>7</textoffsetx>
<textoffsetx>11</textoffsetx>
<aligny>center</aligny>
<pulseonselect>false</pulseonselect>
</default>
<default type="selectbutton">
<left>490</left>
<top>335</top>
<width>300</width>
<height>50</height>
<label/>
<left>735</left>
<top>503</top>
<width>450</width>
<height>75</height>
<label />
<font>font12</font>
<texturefocus/>
<texturenofocus/>
<texturefocus />
<texturenofocus />
<texturebg>button-focus.png</texturebg>
<textureleft>scroll-left.png</textureleft>
<textureleftfocus>scroll-left-focus.png</textureleftfocus>
Expand All @@ -172,46 +172,45 @@
<orientation>horizontal</orientation>
</default>
<default type="sliderex">
<height>35</height>
<textoffsetx>7</textoffsetx>
<height>53</height>
<textoffsetx>11</textoffsetx>
<aligny>center</aligny>
<texturefocus border="5">button-focus.png</texturefocus>
<texturenofocus border="5">button-nofocus.png</texturenofocus>
<sliderwidth>150</sliderwidth>
<sliderheight>20</sliderheight>
<texturesliderbar>osd_slider_bg.png</texturesliderbar>
<texturesliderbardisabled colordiffuse="40FFFFFF">osd_slider_bg.png</texturesliderbardisabled>
<texturesliderbardisabled colordiffuse="black">osd_slider_bg.png</texturesliderbardisabled>
<textureslidernib>osd_slider_nibNF.png</textureslidernib>
<textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus>
<textureslidernibdisabled colordiffuse="40FFFFFF">osd_slider_nib.png</textureslidernibdisabled>
<font>font12</font>
<textcolor>white</textcolor>
<disabledcolor>grey3</disabledcolor>
</default>
<default type="mover">
<left>60</left>
<top>192</top>
<left>90</left>
<top>288</top>
<texturefocus border="5">button-focus.png</texturefocus>
<texturenofocus border="5">button-nofocus.png</texturenofocus>
</default>
<default type="resize">
<left>60</left>
<top>192</top>
<left>90</left>
<top>288</top>
<texturefocus border="5">button-focus.png</texturefocus>
<texturenofocus border="5">button-nofocus.png</texturenofocus>
</default>
<default type="edit">
<left>300</left>
<top>200</top>
<width>300</width>
<height>42</height>
<left>450</left>
<top>300</top>
<width>450</width>
<height>63</height>
<texturefocus border="5">button-focus.png</texturefocus>
<texturenofocus border="5">button-nofocus.png</texturenofocus>
<font>font13</font>
<textcolor>white</textcolor>
<disabledcolor>grey3</disabledcolor>
<invalidcolor>invalid</invalidcolor>
<textoffsetx>7</textoffsetx>
<textoffsetx>11</textoffsetx>
<aligny>center</aligny>
<pulseonselect>false</pulseonselect>
</default>
Expand Down
Loading

0 comments on commit fcff955

Please sign in to comment.