gamesOSD and other fixes

This commit is contained in:
theDeadMan 2018-03-08 20:45:57 +00:00
parent fc15a2ef5d
commit 320df252e2
3 changed files with 154 additions and 16 deletions

View File

@ -147,21 +147,21 @@
<label>186</label>
<label2></label2>
<thumb></thumb>
<onclick>SendClick(10140,10)</onclick>
<onclick>SendClick(28)</onclick>
</item>
<item id="2">
<description>Cancel Button</description>
<label>222</label>
<label2></label2>
<thumb></thumb>
<onclick>SendClick(10140,11)</onclick>
<onclick>SendClick(29)</onclick>
</item>
<item id="7">
<item id="3">
<description>Defaults Button</description>
<label>409</label>
<label2></label2>
<thumb></thumb>
<onclick>SendClick(10140,12)</onclick>
<onclick>SendClick(30)</onclick>
</item>
</content>
</control>
@ -172,7 +172,7 @@
<texturefocus>colors/white.png</texturefocus>
<texturenofocus></texturenofocus>
</control>
<control type="button" id="3">
<control type="button" id="7">
<description>Default Button</description>
</control>
<control type="radiobutton" id="8">
@ -181,13 +181,6 @@
<control type="spincontrolex" id="9">
<description>Default spincontrolex</description>
</control>
<control type="label" id="14">
<label></label>
<textoffsetx>24</textoffsetx>
<height>2-row</height>
<font>settingsCategoryTitle</font>
<textcolor>highlight</textcolor>
</control>
<control type="image" id="11">
<description>Default Separator</description>
<width>1</width>
@ -201,6 +194,13 @@
</control>
<control type="sliderex" id="13">
<description>Default Slider</description>
</control>
<control type="label" id="14">
<label></label>
<textoffsetx>24</textoffsetx>
<height>2-row</height>
<font>settingsCategoryTitle</font>
<textcolor>highlight</textcolor>
</control>
<!--ok, cancel etc buttons-->
<control type="group">

View File

@ -0,0 +1,139 @@
<?xml version="1.0" encoding="utf-8"?>
<window>
<defaultcontrol always="true">100</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>modalDialogInOutVertical</include>
<posx>col-10-begin</posx>
<posy>row-7-begin</posy>
<!--controls-->
<control type="panel" id="100">
<posx>0</posx>
<posy>4-row</posy>
<width>6-col</width>
<height>14-row</height>
<orientation>vertical</orientation>
<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>
<visible>Player.Playing | player.forwarding | player.rewinding</visible>
<description>Play/Pause</description>
<label>$LOCALIZE[35224]</label>
<label2></label2>
<thumb></thumb>
<onclick>PlayerControl(play)</onclick>
</item>
<item>
<visible>Player.Paused</visible>
<description>Pause</description>
<label>$LOCALIZE[35224]</label>
<label2></label2>
<thumb></thumb>
<onclick>PlayerControl(play)</onclick>
</item>
<item>
<description>Reset button</description>
<label>$LOCALIZE[13007]</label>
<label2></label2>
<onclick>PlayerControl(Reset)</onclick>
</item>
<item>
<description>Stop button</description>
<label>$LOCALIZE[35222]</label>
<label2></label2>
<onclick>Stop</onclick>
</item>
<item>
<description>Settings button</description>
<label>$LOCALIZE[5]</label>
<label2></label2>
<onclick>ActivateWindow(1101)</onclick>
</item>
</content>
</control>
</control>
</control>
<!--debugging-->
<include>DebugGrid</include>
<control type="label">
<include>DialogID</include>
<label>GameOSD.xml</label>
</control>
</controls>
</window>

View File

@ -28,14 +28,13 @@
- [COMPLETE] Subtitle Update
- [COMPLETE] Music Videos
- [COMPLETE] global search addon skinned
- [COMPLETE] GameOSD.xml
- new dialog: GameOSD.xml
- ensure texture background doesn't appear behind ken burns effect
- dialogsettings.xml - check controls (irl fails...)
- restore player controls video
- check controls for new window: MyGames.xml
- Screenshots etc need updating