aboutsummaryrefslogtreecommitdiff
path: root/addons/skin.estuary/xml
diff options
context:
space:
mode:
Diffstat (limited to 'addons/skin.estuary/xml')
-rw-r--r--addons/skin.estuary/xml/Custom_1101_SettingsList.xml4
-rw-r--r--addons/skin.estuary/xml/DialogGameControllers.xml174
-rw-r--r--addons/skin.estuary/xml/DialogSelect.xml4
-rw-r--r--addons/skin.estuary/xml/GameOSD.xml15
-rw-r--r--addons/skin.estuary/xml/Includes_DialogSelect.xml8
5 files changed, 128 insertions, 77 deletions
diff --git a/addons/skin.estuary/xml/Custom_1101_SettingsList.xml b/addons/skin.estuary/xml/Custom_1101_SettingsList.xml
index 8cb172476a..998d0de6d0 100644
--- a/addons/skin.estuary/xml/Custom_1101_SettingsList.xml
+++ b/addons/skin.estuary/xml/Custom_1101_SettingsList.xml
@@ -8,7 +8,7 @@
<height>460</height>
<centertop>50%</centertop>
<width>700</width>
- <visible>!Window.IsActive(DialogSettings.xml) + !Window.IsActive(DialogSlider.xml) + !Window.IsActive(GameVideoFilter) + !Window.IsActive(GameViewMode) + !Window.IsActive(GameControllers) + !Window.IsActive(GameVideoRotation)</visible>
+ <visible>!Window.IsActive(DialogSettings.xml) + !Window.IsActive(DialogSlider.xml) + !Window.IsActive(GameVideoFilter) + !Window.IsActive(GameStretchMode) + !Window.IsActive(GameControllers) + !Window.IsActive(GameVideoRotation)</visible>
<animation effect="fade" time="200">VisibleChange</animation>
<include content="DialogBackgroundCommons">
<param name="width" value="700" />
@@ -127,7 +127,7 @@
<width>700</width>
<include>DialogSettingButton</include>
<label>$LOCALIZE[35233]</label>
- <onclick>ActivateWindow(GameViewMode)</onclick>
+ <onclick>ActivateWindow(GameStretchMode)</onclick>
</control>
<control type="button" id="14106">
<description>Video rotation button</description>
diff --git a/addons/skin.estuary/xml/DialogGameControllers.xml b/addons/skin.estuary/xml/DialogGameControllers.xml
index 7b6e163c31..da83b4112c 100644
--- a/addons/skin.estuary/xml/DialogGameControllers.xml
+++ b/addons/skin.estuary/xml/DialogGameControllers.xml
@@ -7,68 +7,87 @@
<centertop>50%</centertop>
<centerleft>50%</centerleft>
<width>1820</width>
- <height>690</height>
+ <height>870</height>
<include content="DialogBackgroundCommons">
<param name="width" value="1820" />
- <param name="height" value="690" />
+ <param name="height" value="870" />
<param name="header_label" value="$LOCALIZE[35058]" />
<param name="header_id" value="2" />
</include>
- <control type="label">
- <description>Controller profiles grouplist heading</description>
+ <control type="group">
+ <description>Controller list</description>
<top>90</top>
- <left>15</left>
- <width>330</width>
- <height>25</height>
- <font>font12</font>
- <label>$LOCALIZE[35050]</label>
- <align>center</align>
- <aligny>center</aligny>
- <textcolor>button_focus</textcolor>
- </control>
- <control type="image">
- <left>-5</left>
- <top>110</top>
- <width>370</width>
- <height>582</height>
- <texture border="40">buttons/dialogbutton-nofo.png</texture>
+ <left>30</left>
+ <width>410</width>
+ <height>580</height>
+ <control type="label">
+ <description>Controller profiles grouplist heading</description>
+ <height>25</height>
+ <right>20</right>
+ <font>font12</font>
+ <label>$LOCALIZE[35050]</label>
+ <align>center</align>
+ <aligny>center</aligny>
+ <textcolor>button_focus</textcolor>
+ </control>
+ <control type="image">
+ <description>Controller profiles grouplist background</description>
+ <top>20</top>
+ <bottom>-20</bottom>
+ <left>-20</left>
+ <right>0</right>
+ <texture border="40">buttons/dialogbutton-nofo.png</texture>
+ </control>
+ <control type="grouplist" id="3">
+ <description>Controller profiles grouplist</description>
+ <top>40</top>
+ <right>20</right>
+ <onleft>9001</onleft>
+ <onright>5</onright>
+ <onup>3</onup>
+ <ondown>3</ondown>
+ <pagecontrol>62</pagecontrol>
+ </control>
+ <control type="scrollbar" id="62">
+ <top>40</top>
+ <right>0</right>
+ <width>12</width>
+ <orientation>vertical</orientation>
+ </control>
+ <control type="button" id="10">
+ <description>Default controller button</description>
+ <width>390</width>
+ <height>60</height>
+ <align>center</align>
+ <aligny>center</aligny>
+ <font>font25_title</font>
+ <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus>
+ <texturenofocus />
+ </control>
</control>
- <control type="grouplist" id="3">
- <description>Controller profiles grouplist</description>
- <left>15</left>
+ <control type="gamecontroller" id="31">
<top>130</top>
- <width>330</width>
+ <left>470</left>
+ <width>540</width>
<height>540</height>
- <onleft>9001</onleft>
- <onright>5</onright>
- <onup>3</onup>
- <ondown>3</ondown>
- </control>
- <control type="button" id="10">
- <description>Default controller button</description>
- <height>60</height>
- <width>330</width>
- <align>center</align>
- <aligny>center</aligny>
- <font>font25_title</font>
- <texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus>
- <texturenofocus />
</control>
- <control type="gamecontroller" id="31">
- <left>400</left>
- <top>108</top>
- <width>547</width>
- <height>547</height>
+ <!--
+ <control type="image">
+ <top>110</top>
+ <left>440</left>
+ <width>580</width>
+ <height>580</height>
+ <texture border="40">buttons/dialogbutton-nofo.png</texture>
</control>
+ -->
<control type="group">
- <left>1000</left>
- <width>410</width>
+ <description>Feature list</description>
<top>90</top>
- <height>602</height>
+ <left>1040</left>
+ <width>410</width>
+ <height>580</height>
<control type="label">
<description>Feature list heading</description>
- <left>20</left>
- <right>20</right>
<height>25</height>
<font>font12</font>
<label>$LOCALIZE[35059]</label>
@@ -78,18 +97,17 @@
</control>
<control type="image">
<top>20</top>
- <bottom>0</bottom>
+ <bottom>-20</bottom>
+ <left>-20</left>
<right>0</right>
<texture border="40">buttons/dialogbutton-nofo.png</texture>
</control>
<control type="grouplist" id="5">
<description>Features grouplist</description>
- <left>20</left>
- <right>20</right>
<top>40</top>
- <bottom>20</bottom>
+ <right>20</right>
<onleft>3</onleft>
- <onright>61</onright>
+ <onright>9001</onright>
<onup>5</onup>
<ondown>5</ondown>
<pagecontrol>61</pagecontrol>
@@ -98,13 +116,11 @@
<right>0</right>
<top>40</top>
<width>12</width>
- <bottom>20</bottom>
- <onleft>5</onleft>
- <onright>9001</onright>
<orientation>vertical</orientation>
</control>
<control type="button" id="7">
<description>Default feature button</description>
+ <width>390</width>
<height>60</height>
<left>20</left>
<right>20</right>
@@ -116,28 +132,26 @@
</control>
<control type="label" id="8">
<description>Feature group title</description>
- <left>20</left>
- <right>20</right>
- <align>center</align>
- <top>0</top>
+ <width>390</width>
<height>40</height>
+ <align>center</align>
<aligny>center</aligny>
<font>font20_title</font>
<textcolor>grey</textcolor>
<shadowcolor>black</shadowcolor>
</control>
- </control>
- <control type="image" id="9">
- <description>Feature separator image</description>
- <height>3</height>
- <texture colordiffuse="AAAAAAAA" border="3">dialogs/separator-grey.png</texture>
+ <control type="image" id="9">
+ <description>Feature separator image</description>
+ <height>3</height>
+ <texture colordiffuse="AAAAAAAA" border="3">dialogs/separator-grey.png</texture>
+ </control>
</control>
<control type="grouplist" id="9001">
- <right>20</right>
<top>110</top>
+ <right>20</right>
+ <width>340</width>
<onleft>5</onleft>
<onright>3</onright>
- <width>350</width>
<itemgap>dialogbuttons_itemgap</itemgap>
<include content="DefaultDialogButton">
<param name="width" value="350" />
@@ -156,6 +170,11 @@
</include>
<include content="DefaultDialogButton">
<param name="width" value="350" />
+ <param name="id" value="22" />
+ <param name="label" value="$LOCALIZE[35021]" />
+ </include>
+ <include content="DefaultDialogButton">
+ <param name="width" value="350" />
<param name="id" value="17" />
<param name="label" value="$LOCALIZE[10043]" />
</include>
@@ -165,6 +184,29 @@
<param name="label" value="$LOCALIZE[35019]" />
</include>
</control>
+ <control type="group">
+ <description>Bottom controller description</description>
+ <bottom>30</bottom>
+ <left>30</left>
+ <right>30</right>
+ <height>140</height>
+ <control type="image">
+ <description>Controller description background image</description>
+ <top>-20</top>
+ <bottom>-20</bottom>
+ <left>-20</left>
+ <right>-20</right>
+ <texture border="40">buttons/dialogbutton-nofo.png</texture>
+ </control>
+ <control type="textbox" id="32">
+ <top>5</top>
+ <bottom>5</bottom>
+ <left>10</left>
+ <right>10</right>
+ <description>Controller description</description>
+ <textcolor>grey</textcolor>
+ </control>
+ </control>
</control>
</controls>
</window>
diff --git a/addons/skin.estuary/xml/DialogSelect.xml b/addons/skin.estuary/xml/DialogSelect.xml
index 0570fcd0b9..6ab3e2a5af 100644
--- a/addons/skin.estuary/xml/DialogSelect.xml
+++ b/addons/skin.estuary/xml/DialogSelect.xml
@@ -4,9 +4,9 @@
<include>Animation_DialogPopupOpenClose</include>
<depth>DepthOSD</depth>
<controls>
- <include condition="![Window.IsActive(gameviewmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation)]">DefaultDialogSelectLayout</include>
+ <include condition="![Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation)]">DefaultDialogSelectLayout</include>
<include condition="Window.IsActive(gamevideofilter)">GameDialogSelectFilterLayout</include>
- <include condition="Window.IsActive(gameviewmode)">GameDialogSelectViewLayout</include>
+ <include condition="Window.IsActive(gamestretchmode)">GameDialogSelectViewLayout</include>
<include condition="Window.IsActive(gamevideorotation)">GameDialogSelectViewLayout</include>
</controls>
</window>
diff --git a/addons/skin.estuary/xml/GameOSD.xml b/addons/skin.estuary/xml/GameOSD.xml
index c44464ac46..13b68d65db 100644
--- a/addons/skin.estuary/xml/GameOSD.xml
+++ b/addons/skin.estuary/xml/GameOSD.xml
@@ -5,18 +5,18 @@
<depth>DepthOSD</depth>
<controls>
<control type="group" id="1">
- <visible>!Window.IsActive(1101) + !Window.IsActive(GameVideoFilter) + !Window.IsActive(GameViewMode) + !Window.IsActive(GameControllers) + !Window.IsActive(GameVideoRotation)</visible>
+ <visible>!Window.IsActive(1101) + !Window.IsActive(GameVideoFilter) + !Window.IsActive(GameStretchMode) + !Window.IsActive(GameControllers) + !Window.IsActive(GameVideoRotation)</visible>
<control type="group" id="10">
<visible>System.GetBool(gamesgeneral.showosdhelp)</visible>
<defaultcontrol always="true">1103</defaultcontrol>
<centerleft>50%</centerleft>
- <height>910</height>
+ <height>1040</height>
<centertop>50%</centertop>
<width>700</width>
<animation effect="fade" time="200">VisibleChange</animation>
<include content="DialogBackgroundCommons">
<param name="width" value="700" />
- <param name="height" value="910" />
+ <param name="height" value="1040" />
<param name="header_label" value="$LOCALIZE[35221]" />
<param name="header_id" value="2" />
</include>
@@ -37,6 +37,15 @@
<width>640</width>
<height>640</height>
</control>
+ <control type="textbox">
+ <description>Additional help text. This will be removed in future versions.</description>
+ <bottom>30</bottom>
+ <left>30</left>
+ <right>30</right>
+ <height>130</height>
+ <font>font13</font>
+ <label>$LOCALIZE[35236]</label>
+ </control>
<control type="button">
<description>Button to close the dialog</description>
<top>0</top>
diff --git a/addons/skin.estuary/xml/Includes_DialogSelect.xml b/addons/skin.estuary/xml/Includes_DialogSelect.xml
index b0dc5e72c5..4139b8f9a8 100644
--- a/addons/skin.estuary/xml/Includes_DialogSelect.xml
+++ b/addons/skin.estuary/xml/Includes_DialogSelect.xml
@@ -189,7 +189,7 @@
<width>444</width>
<height>250</height>
<videofilter>$INFO[ListItem.Property(game.videofilter)]</videofilter>
- <viewmode>$INFO[ListItem.Property(game.viewmode)]</viewmode>
+ <stretchmode>$INFO[ListItem.Property(game.stretchmode)]</stretchmode>
<rotation>$INFO[ListItem.Property(game.videorotation)]</rotation>
</control>
<control type="label">
@@ -220,7 +220,7 @@
<width>444</width>
<height>250</height>
<videofilter>$INFO[ListItem.Property(game.videofilter)]</videofilter>
- <viewmode>$INFO[ListItem.Property(game.viewmode)]</viewmode>
+ <stretchmode>$INFO[ListItem.Property(game.stretchmode)]</stretchmode>
<rotation>$INFO[ListItem.Property(game.videorotation)]</rotation>
</control>
<control type="label">
@@ -295,7 +295,7 @@
<width>444</width>
<height>250</height>
<videofilter>$INFO[ListItem.Property(game.videofilter)]</videofilter>
- <viewmode>$INFO[ListItem.Property(game.viewmode)]</viewmode>
+ <stretchmode>$INFO[ListItem.Property(game.stretchmode)]</stretchmode>
<rotation>$INFO[ListItem.Property(game.videorotation)]</rotation>
</control>
<control type="label">
@@ -326,7 +326,7 @@
<width>444</width>
<height>250</height>
<videofilter>$INFO[ListItem.Property(game.videofilter)]</videofilter>
- <viewmode>$INFO[ListItem.Property(game.viewmode)]</viewmode>
+ <stretchmode>$INFO[ListItem.Property(game.stretchmode)]</stretchmode>
<rotation>$INFO[ListItem.Property(game.videorotation)]</rotation>
</control>
<control type="label">
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-19 15:54:05 +0000